camaleon_cms 2.4.5.5 → 2.4.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8419630c27eedca0f0d5603ea0e405e69f680bcb
-  data.tar.gz: d235701cf45e0ff0a79de9e372f223ef317425c6
+  metadata.gz: c40d70430d7edd9132d9ed5529735b8421054db1
+  data.tar.gz: f34b54e713ca8a1d88a8de55e1cd3b5d048cc08b
 SHA512:
-  metadata.gz: dd7fbc9ba304c545ae752e5260dc4df8bd3e6e642781acb480212d5bec08c1e0bd9b9f42987152eceec3dae23d17963a2d1c07b2c789f37255c179ac06294177
-  data.tar.gz: 8a03d1a54e9f4dac2dd75fd313cc073e118e144a59ce494aa8c2a08ce953a28b4c5a0955f4f5362f851fba0c953e94c3625e6488399c01a688ba85fbfcc4a90b
+  metadata.gz: 4bdd8d1ce6f4a4ceaddd893c5ca4cf4d478ca3f5ede911b4cf86935ab39fcf6637abd300073a69dd194666366c90e2919bf65fabdba7fe21771e3b159bb68eb9
+  data.tar.gz: f6c8551c32f86b304a0b328b725b5bb0efcd9546784b56151ebe70aaaaaaf5e2ec62b1d0f2b7183f48e4593504bac472be12418796f2c940f162a4e6a67833f7

data/app/apps/themes/default/views/partials/_comments.html.erb

@@ -1,25 +1,40 @@
 <section id="comments" class="comments-area">
-    <% if post.the_comments.count > 0 %>
-        <h2 class="comments-title"><%= post.the_comments.count %> <%= ct('comments', default: 'Comments')%> "<span><%= post.the_title %></span>"</h2>
-        <section class="comment-list">
-            <%= render partial: "partials/comments_list", locals: { comments: post.the_comments, children: "" } %>
-        </section>
-    <% end %>
+  <% if post.the_comments.count > 0 %>
+      <h2 class="comments-title"><%= post.the_comments.count %> <%= ct('comments', default: 'Comments') %>
+        "<span><%= post.the_title %></span>"</h2>
+      <section class="comment-list">
+        <%= render partial: "partials/comments_list", locals: {comments: post.the_comments, children: ""} %>
+      </section>
+  <% end %>
+  <% if post.can_commented? %>
     <div id="respond" class="comment-respond">
-        <% if signin? %>
-            <h3 id="reply-title" class="comment-reply-title"><%= ct('comment_new', default: 'New Comment')%></h3>
-            <%= form_for post, url:{action: :save_comment, post_id: post.id}, html: {method: "post", class: "comment-form"} do |f|%>
-                <input type="hidden" name="post_comment[post_id]" value="<%= post.id %>">
-                <input type="hidden" name="slug" value="<%= post.slug %>">
-                <div class="mb-20">
-                    <textarea id="textarea_comments" name="post_comment[content]" class="form-control counted" placeholder="<%= ct('comment', default: 'Enter youe comment here')%>"></textarea>
-                </div>
-                <div class="mb-20">
-                    <button type="submit" class="btn btn-info pull-right"><%= ct('comment', default: 'Comment')%></button>
-                </div>
-            <% end %>
-        <% else %>
-            <div class="panel-login-comment"><%= ct('comment_msg', default: 'You need to be logged in')%>  <a class="link-login-comment" href="<%= cama_admin_path %>"><%= ct('login', default: 'Login')%></a></div>
-        <% end %>
+      <h3><%= ct('comment_new', default: 'New Comment') %></h3>
+      <% if signin? || current_site.get_option('permit_anonimos_comment', false) %>
+          <%= form_for post, url: {action: :save_comment, post_id: post.id}, html: {method: "post", class: "form-comment comment-form", id: 'form-comment'} do |f| %>
+              <%= render partial: "camaleon_cms/flash_messages", locals: {flash: (flash[:comment_submit] || {}).with_indifferent_access} %>
+              <% unless signin? %>
+                  <div class="form-group">
+                    <%= text_field_tag 'post_comment[name]', '', class: 'form-control required', placeholder: t('.anonymous_name', default: 'Name') %>
+                  </div>
+                  <div class="form-group">
+                    <%= email_field_tag 'post_comment[email]', '', class: 'form-control required', placeholder: t('.anonymous_email', default: 'Email') %>
+                  </div>
+                  <% if current_site.is_enable_captcha_for_comments? %>
+                      <%= content_tag :div, raw(cama_captcha_tag), class: 'form-group' %>
+                  <% end %>
+              <% end %>
+              <div class="form-group">
+                <%= text_area_tag 'post_comment[content]', '', class: 'form-control required counted', placeholder: ct('comment', default: 'Here your comment') %>
+              </div>
+              <div class="form-group text-right">
+                <button type="submit" class="btn btn-info"><%= ct('comment', default: 'Comment') %></button>
+              </div>
+          <% end %>
+      <% else %>
+          <div class="panel-login-comment"><%= ct('comment_msg', default: 'You must be logged in to post a comment') %>
+            <a class="link-login-comment" href="<%= cama_admin_path %>"><%= ct('login', default: 'Login') %></a>
+          </div>
+      <% end %>
     </div>
+  <% end %>
 </section>

data/app/apps/themes/default/views/post.html.erb

@@ -11,4 +11,4 @@
         <%= raw @post.the_content %>
     </div><!-- .entry-content -->
 </article><!-- #post -->
-<%= render partial: 'partials/comments', locals: {post: @post} if @post.can_commented? %>
+<%= render partial: 'partials/comments', locals: {post: @post} %>

data/app/assets/javascripts/camaleon_cms/admin/uploader/_media_manager.js.coffee

@@ -20,18 +20,18 @@ window["cama_init_media"] = (media_panel) ->
         "<div class='p_label'><b>"+I18n("button.name")+": </b><br> <span>"+data["name"]+"</span></div>" +
         "<div class='p_body'>" +
         "<div style='overflow: auto;'><b>"+I18n("button.url")+":</b><br> <a target='_blank' href='"+data["url"]+"'>"+data["url"]+"</a></div>" +
-        "<div><b>"+I18n("button.size")+":</b> <span>"+cama_humanFileSize(data["size"])+"</span></div>" +
+        "<div><b>"+I18n("button.size")+":</b> <span>"+cama_humanFileSize(parseFloat(data["file_size"]))+"</span></div>" +
         "</div>"
 
     if window["callback_media_uploader"]
-      if !media_panel.attr("data-formats") || (media_panel.attr("data-formats")  && ($.inArray(data["format"], media_panel.attr("data-formats").split(",")) >= 0 || $.inArray(data["url"].split(".").pop().toLowerCase(), media_panel.attr("data-formats").split(",")) >= 0))
+      if !media_panel.attr("data-formats") || (media_panel.attr("data-formats")  && ($.inArray(data["file_type"], media_panel.attr("data-formats").split(",")) >= 0 || $.inArray(data["url"].split(".").pop().toLowerCase(), media_panel.attr("data-formats").split(",")) >= 0))
         tpl += "<div class='p_footer'>" +
           "<button class='btn btn-primary insert_btn'>"+I18n("button.insert")+"</button>" +
           "</div>"
 
     media_info.html(tpl)
     media_info.find(".p_thumb").html(item.find(".thumb").html())
-    if data["format"] == "image"
+    if data["file_type"] == "image"
       if item.find('.edit_item') # add button to edit image
         edit_img = $('<button type="button" class="pull-right btn btn-default" title="Edit"><i class="fa fa-pencil"></i></button>').click ->
           item.find('.edit_item').trigger('click')
@@ -351,7 +351,7 @@ window["cama_init_media"] = (media_panel) ->
       title: I18n('button.edit_image', 'Edit Image')+' - ' + data['name'] + (if media_panel.attr("data-dimension") then " <small><i>("+media_panel.attr("data-dimension")+")</i></small>" else ''),
       content: '<div>' +
                 '<div class="editable_wrapper">' +
-                  '<img style="max-width: 100%;" class="editable" id="media_editable_image" src="'+data['url']+'">' +
+                  '<img style="max-width: 100%;" class="editable" id="media_editable_image" crossorigin src="'+data['url']+'">' +
                 '</div>' +
                 '<div class="row" style="margin-top: 5px;">' +
                   '<div class="col-md-8">' +

data/app/controllers/camaleon_cms/admin/categories_controller.rb

@@ -32,9 +32,12 @@ class CamaleonCms::Admin::CategoriesController < CamaleonCms::AdminController
 
   def create
     @category = @post_type.categories.new(params.require(:category).permit!)
+    hooks_run("create_category", {category: @category, post_type: @post_type})
+
     if @category.save
       @category.set_options(params[:meta])
       @category.set_field_values(params[:field_options])
+      hooks_run("created_category", {category: @category, post_type: @post_type})
       flash[:notice] = t('camaleon_cms.admin.post_type.message.created')
       redirect_to action: :index
     else

data/app/controllers/camaleon_cms/admin/media_controller.rb

@@ -8,7 +8,7 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
   def index
     authorize! :manage, :media
     @show_file_actions = true
-    @files = @tree[:files].map{|k,v|v}.paginate(page: params[:page], per_page: 100)
+    @files = @tree.paginate(page: params[:page], per_page: 100)
     @next_page = @files.current_page < @files.total_pages ? @files.current_page + 1 : nil
     add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.media")
   end
@@ -38,10 +38,10 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
       @show_file_actions = true
     end
     @tree = cama_uploader.search(params[:search]) if params[:search].present?
-    @files = @tree[:files].map{|k,v|v}.paginate(page: params[:page], per_page: 100)
+    @files = @tree.paginate(page: params[:page], per_page: 100)
     @next_page = @files.current_page < @files.total_pages ? @files.current_page + 1 : nil
     if params[:partial].present?
-      render json: {next_page: @next_page, html: render_to_string(partial: "files_list", locals: { files: @files, folders: params[:page].present? ? [] : @tree[:folders] })}
+      render json: {next_page: @next_page, html: render_to_string(partial: "render_file_item", locals: { files: @files })}
     else
       render "index", layout: false unless params[:partial].present?
     end
@@ -56,7 +56,7 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
     case params[:media_action]
       when "new_folder"
         params[:folder] = slugify_folder(params[:folder])
-        render partial: "render_folder_item", locals: { fname: params[:folder].split("/").last, folder: cama_uploader.add_folder(params[:folder])}
+        render partial: "render_file_item", locals: {files: [cama_uploader.add_folder(params[:folder])]}
       when "del_folder"
         cama_uploader.delete_folder(params[:folder])
         render inline: ""
@@ -64,7 +64,9 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
         cama_uploader.delete_file(params[:folder].gsub("//", "/"))
         render inline: ""
       when 'crop_url'
-        params[:url] = (params[:url].start_with?('http') ? '' : current_site.the_url(locale: nil)) + params[:url]
+        unless params[:url].start_with?('data:')
+          params[:url] = (params[:url].start_with?('http') ? '' : current_site.the_url(locale: nil)) + params[:url]
+        end
         r = cama_tmp_upload( params[:url], formats: params[:formats], name: params[:name])
         unless r[:error].present?
           params[:file_upload] = r[:file_path]
@@ -93,7 +95,8 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
   # init basic media variables
   def init_media_vars
     @cama_uploader = CamaleonCmsLocalUploader.new({current_site: current_site, private: true}) if params[:private].present?
-    cama_uploader.clear_cache if params[:cama_media_reload].present? && params[:cama_media_reload] == 'clear_cache'
+    cama_uploader.clear_cache if params[:cama_media_reload] == 'clear_cache'
+    cama_uploader.reload if params[:cama_media_reload] == 'reload'
     @media_formats = (params[:media_formats] || "").sub("media", ",video,audio").sub("all", "").split(",")
     @tree = cama_uploader.objects(@folder = params[:folder] || "/")
     @show_file_actions ||= params[:actions].to_s == 'true'

data/app/controllers/camaleon_cms/admin/sessions_controller.rb

@@ -112,7 +112,7 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
       user_data = user_permit_data
       result = cama_register_user(user_data, params[:meta])
       if result[:result] == false && result[:type] == :captcha_error
-        @user.errors[:captcha] = t('camaleon_cms.admin.users.message.error_captcha')
+        @user.errors.add(:captcha, t('camaleon_cms.admin.users.message.error_captcha'))
         render 'register'
       elsif result[:result]
         flash[:notice] = result[:message]

data/app/controllers/camaleon_cms/admin/settings/post_types_controller.rb

@@ -19,6 +19,7 @@ class CamaleonCms::Admin::Settings::PostTypesController < CamaleonCms::Admin::Se
   def update
     if @post_type.update(@data_term)
       @post_type.set_field_values(params.require(:field_options).permit!) if params[:field_options].present?
+      hooks_run("updated_post_type", {post_type: @post_type})
       flash[:notice] = t('camaleon_cms.admin.post_type.message.updated')
       redirect_to action: :index
     else
@@ -30,6 +31,7 @@ class CamaleonCms::Admin::Settings::PostTypesController < CamaleonCms::Admin::Se
     @post_type = current_site.post_types.new(@data_term)
     if @post_type.save
       @post_type.set_field_values(params.require(:field_options).permit!) if params[:field_options].present?
+      hooks_run("created_post_type", {post_type: @post_type})
       flash[:notice] = t('camaleon_cms.admin.post_type.message.created')
       redirect_to action: :index
     else

data/app/controllers/concerns/camaleon_cms/frontend_concern.rb

@@ -31,6 +31,7 @@ module CamaleonCms::FrontendConcern extend ActiveSupport::Concern
     @post = current_site.posts.find_by_id(params[:post_id]).decorate
     user = cama_current_user
     comment_data = {}
+    flash[:comment_submit][:error] = t('.comments_not_enabled', default: 'This post can not be commented') if !@post.can_commented?
     if user.present?
       comment_data[:author] = user.fullname
       comment_data[:author_email] = user.email
@@ -39,23 +40,26 @@ module CamaleonCms::FrontendConcern extend ActiveSupport::Concern
       comment_data[:is_anonymous] = true
       comment_data[:author] = params[:post_comment][:name]
       comment_data[:author_email] = params[:post_comment][:email]
+      flash[:comment_submit][:error] = t('camaleon_cms.admin.users.message.error_captcha', default: 'Invalid captcha value') if current_site.is_enable_captcha_for_comments? && !cama_captcha_verified?
     end
 
-    if @post.can_commented? && user.present?
-      comment_data[:user_id] = user.id
-      comment_data[:author_url] = params[:post_comment][:url] || ""
-      comment_data[:author_IP] = request.remote_ip.to_s
-      comment_data[:approved] = current_site.front_comment_status
-      comment_data[:agent] = request.user_agent.force_encoding("ISO-8859-1").encode("UTF-8")
-      comment_data[:content] = params[:post_comment][:content]
-      @comment = params[:post_comment][:parent_id].present? ? @post.comments.find_by_id(params[:post_comment][:parent_id]).children.new(comment_data) :  @post.comments.main.new(comment_data)
-      if @comment.save
-        flash[:comment_submit][:notice] = t('camaleon_cms.admin.comments.message.created')
+    unless flash[:comment_submit][:error] 
+      if user.present?
+        comment_data[:user_id] = user.id
+        comment_data[:author_url] = params[:post_comment][:url] || ""
+        comment_data[:author_IP] = request.remote_ip.to_s
+        comment_data[:approved] = current_site.front_comment_status
+        comment_data[:agent] = request.user_agent.force_encoding("ISO-8859-1").encode("UTF-8")
+        comment_data[:content] = params[:post_comment][:content]
+        @comment = params[:post_comment][:parent_id].present? ? @post.comments.find_by_id(params[:post_comment][:parent_id]).children.new(comment_data) :  @post.comments.main.new(comment_data)
+        if @comment.save
+          flash[:comment_submit][:notice] = t('camaleon_cms.admin.comments.message.created')
+        else
+          flash[:comment_submit][:error] = "#{t('camaleon_cms.common.comment_error', default: 'An error was occurred on save comment')}:<br> #{@comment.errors.full_messages.join(', ')}"
+        end
       else
-        flash[:comment_submit][:error] = "#{t('camaleon_cms.common.comment_error', default: 'An error was occurred on save comment')}:<br> #{@comment.errors.full_messages.join(', ')}"
+        flash[:comment_submit][:error] = t('camaleon_cms.admin.message.unauthorized')
       end
-    else
-      flash[:comment_submit][:error] = t('camaleon_cms.admin.message.unauthorized')
     end
     params[:format] == 'json' ? render(json: flash.discard(:comment_submit).to_hash) : redirect_to(request.referer || @post.the_url(as_path: true))
   end

data/app/decorators/camaleon_cms/post_decorator.rb

@@ -217,7 +217,6 @@ class CamaleonCms::PostDecorator < CamaleonCms::ApplicationDecorator
   # @param _parent: parent decorated model, like: (PostType *default), Category, PostTag, Site
   # @samples: my_post.the_next_post(), my_post.the_next_post(@category), my_post.the_next_post(current_site)
   def the_next_post(_parent = nil)
-    puts "next for: #{object.slug}"
     (_parent.presence || the_post_type).the_posts.where("#{CamaleonCms::Post.table_name}.post_order > :position OR (#{CamaleonCms::Post.table_name}.post_order = :position and #{CamaleonCms::Post.table_name}.created_at > :created_at)", {position: object.post_order, created_at: object.created_at}).where.not(id: object.id).take.try(:decorate)
   end
 

data/app/helpers/camaleon_cms/captcha_helper.rb

@@ -34,7 +34,7 @@ module CamaleonCms::CaptchaHelper
 
   # verify captcha value
   def cama_captcha_verified?
-    (session[:cama_captcha] || []).include?((params[:cama_captcha] || params[:captcha]).to_s.upcase) || Rails.env == "test"
+    (session[:cama_captcha] || []).include?((params[:cama_captcha] || params[:captcha]).to_s.upcase)
   end
 
   #************************* captcha in attack helpers ***************************#

data/app/helpers/camaleon_cms/frontend/nav_menu_helper.rb

@@ -166,6 +166,7 @@ module CamaleonCms::Frontend::NavMenuHelper
   # label => label of the link
   # url: url for the link
   def breadcrumb_add(label, url = "", prepend = false)
+    @_front_breadcrumb ||= []
     if prepend
       @_front_breadcrumb = @_front_breadcrumb.unshift([label, url])
     else

data/app/helpers/camaleon_cms/hooks_helper.rb

@@ -18,8 +18,13 @@ module CamaleonCms::HooksHelper
     PluginRoutes.enabled_apps(current_site).each do |plugin|
       _do_hook(plugin, hook_key, params)
     end
-  end
 
+    # call all anonymous hooks
+    PluginRoutes.get_anonymous_hooks(hook_key).each do |_hook|
+      _hook.call(params)
+    end
+  end
+  
   # skip hook function with name: hook_function_name
   def hook_skip(hook_function_name)
     @_hooks_skip << hook_function_name

data/app/helpers/camaleon_cms/site_helper.rb

@@ -11,7 +11,7 @@ module CamaleonCms::SiteHelper
       host << request.subdomain if request.subdomain.present?
       site = CamaleonCms::Site.where(slug: host).first.decorate rescue nil
     end
-    r = {site: site, request: request};
+    r = {site: site, request: (request rescue nil)};
     cama_current_site_helper(r) rescue nil
     Rails.logger.error 'Camaleon CMS - Please define your current site: $current_site = CamaleonCms::Site.first.decorate or map your domains: http://camaleon.tuzitio.com/documentation/category/139779-examples/how.html'.cama_log_style(:red) if !r[:site].present?
     @current_site = r[:site]

data/app/helpers/camaleon_cms/uploader_helper.rb

@@ -1,5 +1,6 @@
 module CamaleonCms::UploaderHelper
   include ActionView::Helpers::NumberHelper
+  include CamaleonCms::CamaleonHelper
   # upload a file into server
   # settings:
   #   folder: Directory where the file will be saved (default: "")
@@ -21,7 +22,7 @@ module CamaleonCms::UploaderHelper
   def upload_file(uploaded_io, settings = {})
     cached_name = uploaded_io.is_a?(ActionDispatch::Http::UploadedFile) ? uploaded_io.original_filename : nil
     return {error: "File is empty", file: nil, size: nil} unless uploaded_io.present?
-    if uploaded_io.is_a?(String) && (uploaded_io.start_with?("http://") || uploaded_io.start_with?("https://")) # download url file
+    if uploaded_io.is_a?(String) && uploaded_io.match(/^https?:\/\//).present? # download url file
       tmp = cama_tmp_upload(uploaded_io)
       return tmp if tmp[:error].present?
       settings[:remove_source] = true
@@ -58,22 +59,21 @@ module CamaleonCms::UploaderHelper
     end
     # save file
     key = File.join(settings[:folder], settings[:filename]).to_s.cama_fix_slash
-    res = cama_uploader.add_file(uploaded_io, key, {same_name: settings[:same_name]})
+    res = cama_uploader.add_file(settings[:uploaded_io], key, {same_name: settings[:same_name]})
     {} if settings[:temporal_time] > 0 # temporal file upload (always put as local for temporal files) (TODO: use delayjob)
 
     # generate image versions
-    if res['format'] == 'image'
+    if res['file_type'] == 'image'
       settings[:versions].to_s.gsub(' ', '').split(',').each do |v|
-        version_path = cama_resize_upload(uploaded_io.path, v, {replace: false})
+        version_path = cama_resize_upload(settings[:uploaded_io].path, v, {replace: false})
         cama_uploader.add_file(version_path, cama_uploader.version_path(res['key'], v), is_thumb: true, same_name: true)
         FileUtils.rm_f(version_path)
       end
     end
 
     # generate thumb
-    cama_uploader_generate_thumbnail(uploaded_io.path, res['key'], settings[:thumb_size]) if settings[:generate_thumb] && res['thumb'].present?
-
-    FileUtils.rm_f(uploaded_io.path) if settings[:remove_source]
+    cama_uploader_generate_thumbnail(uploaded_io.path, res['key'], settings[:thumb_size], settings[:remove_source]) if settings[:generate_thumb] && res['thumb'].present?
+    FileUtils.rm_f(uploaded_io.path) if File.exist?(uploaded_io.path) if settings[:remove_source]
 
     hooks_run('after_upload', settings)
     res
@@ -82,13 +82,13 @@ module CamaleonCms::UploaderHelper
   # generate thumbnail of a existent image
   # key: key of the current file
   # the thumbnail will be saved in my_images/my_img.png => my_images/thumb/my_img.png
-  def cama_uploader_generate_thumbnail(uploaded_io, key, thumb_size = nil)
+  def cama_uploader_generate_thumbnail(uploaded_io, key, thumb_size = nil, remove_source = false)
     w, h = cama_uploader.thumb[:w], cama_uploader.thumb[:h]
     w, h = thumb_size.split('x') if thumb_size.present?
     uploaded_io = File.open(uploaded_io) if uploaded_io.is_a?(String)
     path_thumb = cama_resize_and_crop(uploaded_io.path, w, h)
-    thumb = cama_uploader.add_file(path_thumb, cama_uploader.version_path(key), is_thumb: true, same_name: true)
-    FileUtils.rm_f(path_thumb)
+    thumb = cama_uploader.add_file(path_thumb, cama_uploader.version_path(key).sub('.svg', '.jpg'), is_thumb: true, same_name: true)
+    FileUtils.rm_f(path_thumb) if remove_source
     thumb
   end
 
@@ -133,24 +133,26 @@ module CamaleonCms::UploaderHelper
   def cama_crop_image(file_path, w=nil, h=nil, w_offset = 0, h_offset = 0, resize = false , replace = true)
     force = ""
     force = "!" if w.present? && h.present? && !w.include?("?") && !h.include?("?")
-    image = MiniMagick::Image.open(file_path)
-    w = image[:width].to_f > w.sub('?', '').to_i ? w.sub('?', "") : image[:width] if w.present? && w.to_s.include?('?')
-    h = image[:height].to_f > h.sub('?', '').to_i ? h.sub('?', "") : image[:height] if h.present? && h.to_s.include?('?')
-    image.combine_options do |i|
-      i.resize("#{w if w.present?}x#{h if h.present?}#{force}") if resize
-      i.crop "#{w if w.present?}x#{h if h.present?}+#{w_offset}+#{h_offset}#{force}" unless resize
+    img = MiniMagick::Image.open(file_path)
+    w = img[:width].to_f > w.sub('?', '').to_i ? w.sub('?', "") : img[:width] if w.present? && w.to_s.include?('?')
+    h = img[:height].to_f > h.sub('?', '').to_i ? h.sub('?', "") : img[:height] if h.present? && h.to_s.include?('?')
+    data = {img: img, w: w, h: h, w_offset: w_offset, h_offset: h_offset, resize: resize, replace: replace}; hooks_run("before_crop_image", data)
+    data[:img].combine_options do |i|
+      i.resize("#{w if w.present?}x#{h if h.present?}#{force}") if data[:resize]
+      i.crop "#{w if w.present?}x#{h if h.present?}+#{w_offset}+#{h_offset}#{force}" unless data[:resize]
     end
 
     res = file_path
-    unless replace
+    unless data[:replace]
       ext = File.extname(file_path)
       res = file_path.gsub(ext, "_crop#{ext}")
     end
-    image.write res
+    data[:img].write res
     res
   end
 
   # resize and crop a file
+  # SVGs are converted to JPEGs for editing
   # Params:
   #   file: (String) File path
   #   w: (Integer) width
@@ -164,6 +166,11 @@ module CamaleonCms::UploaderHelper
   def cama_resize_and_crop(file, w, h, settings = {})
     settings = {gravity: :north_east, overwrite: true, output_name: ""}.merge(settings)
     img = MiniMagick::Image.open(file)
+    if file.end_with? '.svg'
+      img.format 'jpg'
+      file.sub! '.svg', '.jpg'
+      settings[:output_name].sub!('.svg', '.jpg') if settings[:output_name]
+    end
     w = img[:width].to_f > w.sub('?', '').to_i ? w.sub('?', "") : img[:width] if w.present? && w.to_s.include?('?')
     h = img[:height].to_f > h.sub('?', '').to_i ? h.sub('?', "") : img[:height] if h.present? && h.to_s.include?('?')
     w_original, h_original = [img[:width].to_f, img[:height].to_f]
@@ -181,19 +188,21 @@ module CamaleonCms::UploaderHelper
       h_result = h
     end
 
-    w_offset, h_offset = cama_crop_offsets_by_gravity(settings[:gravity], [w_result, h_result], [ w, h])
-    img.combine_options do |i|
-      i.resize(op_resize)
+    w_offset, h_offset = cama_crop_offsets_by_gravity(settings[:gravity], [w_result, h_result], [w, h])
+    data = {img: img, w: w, h: h, w_offset: w_offset, h_offset: h_offset, op_resize: op_resize, settings: settings}; hooks_run("before_resize_crop", data)
+    data[:img].combine_options do |i|
+      i.resize(data[:op_resize])
       i.gravity(settings[:gravity])
-      i.crop "#{w.to_i}x#{h.to_i}+#{w_offset}+#{h_offset}!"
+      i.crop "#{data[:w].to_i}x#{data[:h].to_i}+#{data[:w_offset]}+#{data[:h_offset]}!"
     end
 
-    img.write(file) if settings[:overwrite]
-    unless settings[:overwrite]
+    if settings[:overwrite]
+      data[:img].write(file.sub '.svg', '.jpg')
+    else
       if settings[:output_name].present?
-        img.write(file = File.join(File.dirname(file), settings[:output_name]).to_s)
+        data[:img].write(file = File.join(File.dirname(file), settings[:output_name]).to_s)
       else
-        img.write(file = uploader_verify_name(File.join(File.dirname(file), "crop_#{File.basename(file)}")))
+        data[:img].write(file = uploader_verify_name(File.join(File.dirname(file), "crop_#{File.basename(file.sub '.svg', '.jpg')}")))
       end
     end
     file
@@ -271,7 +280,7 @@ module CamaleonCms::UploaderHelper
       }
       hooks_run("on_uploader", args)
       return args[:custom_uploader] if args[:custom_uploader].present?
-      
+
       case args[:server]
         when 's3', 'aws'
           CamaleonCmsAwsUploader.new({current_site: current_site, thumb: args[:thumb], aws_settings: args[:aws_settings]}, self)