camaleon_cms 2.7.4 → 2.8.0

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

@@ -476,7 +476,7 @@ window.cama_init_media = function(mediaPanel) {
                     '<div class="alert alert-danger">' +
                       I18n(
                         'msg.cors_error',
-                        'Please verify the following: <ul><li>If the image exist: %{url_img}</li> <li>Check if cors configuration are defined well, only for external images: S3, cloudfront(if you are using cloudfront).</li></ul><br> More information about CORS: <a href="%{url_blog}" target="_blank">here.</a>', { url_img: data.url, url_blog: 'http://blog.celingest.com/en/2014/10/02/tutorial-using-cors-with-cloudfront-and-s3/' }
+                        'Please verify the following: <ul><li>If the image exist: %{url_img}</li> <li>Check if cors configuration are defined well, only for external images: S3, cloudfront(if you are using cloudfront).</li></ul><br> More information about CORS: <a href="%{url_blog}" target="_blank">here.</a>', { url_img: data.url, url_blog: 'https://blog.digitalis.io/how-to-add-cors-to-s3-with-cloudfront-1be59c74abaa' }
                       ) +
                       '</div>'
                   )
@@ -566,7 +566,7 @@ window.cama_media_get_custom_params = function(customSettings) {
 }
 
 $(() =>
-  // sample: $.fn.upload_url({url: 'http://camaleon.tuzitio.com/media/132/logo2.png', dimension: '120x120', versions: '200x200', folder: 'my_folder', thumb_size: '100x100'})
+  // sample: $.fn.upload_url({url: 'https://camaleon.website/media/132/logo2.png', dimension: '120x120', versions: '200x200', folder: 'my_folder', thumb_size: '100x100'})
   // dimension: default current dimension
   // folder: default current folder
   // private: (Boolean) if true => list private files

data/app/controllers/camaleon_cms/admin/appearances/nav_menus_controller.rb

@@ -3,9 +3,11 @@ module CamaleonCms
     module Appearances
       class NavMenusController < CamaleonCms::AdminController
         include CamaleonCms::Frontend::NavMenuHelper
+
         add_breadcrumb I18n.t('camaleon_cms.admin.sidebar.appearance')
         add_breadcrumb I18n.t('camaleon_cms.admin.sidebar.menus')
         before_action :check_menu_permission
+
         def index
           @nav_menu = if params[:id].present?
                         current_site.nav_menus.find_by_id(params[:id])
@@ -64,7 +66,10 @@ module CamaleonCms
         # render edit external menu item
         def edit_menu_item
           render '_external_menu', layout: false,
-                                   locals: { nav_menu: current_site.nav_menus.find(params[:nav_menu_id]), menu_item: current_site.nav_menu_items.find(params[:id]) }
+                                   locals: {
+                                     nav_menu: current_site.nav_menus.find(params[:nav_menu_id]),
+                                     menu_item: current_site.nav_menu_items.find(params[:id])
+                                   }
         end
 
         # update an external menu item
@@ -98,22 +103,22 @@ module CamaleonCms
         def add_items
           items = []
           @nav_menu = current_site.nav_menus.find(params[:nav_menu_id])
-          if params[:external].present?
-            item = @nav_menu.append_menu_item(parse_external_menu(params[:external]))
-            item.set_options(params[:external].require(:options).permit!) if params[:external][:options].present?
-            items << item
+          external_params = params[:external]
+          if external_params.present?
+            external_item = @nav_menu.append_menu_item(parse_external_menu(external_params))
+            external_item.set_options(external_params.require(:options).permit!) if external_params[:options].present?
+            items << external_item
           end
 
           if params[:custom_items].present? # custom menu items
-            params[:custom_items].each do |_index, item|
-              type = item['kind'].present? ? item['kind'] : 'external'
-              item = @nav_menu.append_menu_item({ label: item['label'], link: item['url'], type: type })
-              items << item
+            params[:custom_items].each_value do |custom_item|
+              type = custom_item['kind'].present? ? custom_item['kind'] : 'external'
+              items << @nav_menu.append_menu_item({ label: custom_item['label'], link: custom_item['url'], type: type })
             end
           end
 
           if params[:items].present?
-            params[:items].each do |_index, item|
+            params[:items].each_value do |item|
               item = @nav_menu.append_menu_item({ label: 'auto', link: item['id'], type: item['kind'] })
               items << item
             end

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

@@ -27,7 +27,7 @@ module CamaleonCms
       def welcome; end
 
       def installer_verification
-        redirect_to cama_root_url unless CamaleonCms::Site.count.zero?
+        redirect_to cama_root_url unless CamaleonCms::Site.count == 0
       end
     end
   end

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

@@ -6,15 +6,6 @@ module CamaleonCms
       skip_before_action :verify_authenticity_token, only: :upload, raise: false
       before_action :init_media_vars, except: :download_private_file
 
-      LOCALHOST_DOMAIN_MATCHER = /
-        localhost|
-        127\.0\.0\.1|
-        0\.0\.0\.0|
-        0x7f\.0x0\.0x0\.0x1| # hex encoding
-        0177\.0\.0\.01| # octal encoding
-        2130706433 # dword encoding
-      /x.freeze
-
       # render media section
       def index
         authorize! :manage, :media
@@ -71,13 +62,13 @@ module CamaleonCms
           cama_uploader.delete_file(params[:folder].gsub('//', '/'))
           render plain: ''
         when 'crop_url'
-          unless params[:url].start_with?('data:')
-            params[:url] = (params[:url].start_with?('http') ? '' : current_site.the_url(locale: nil)) + params[:url]
-          end
-          r = if local_url?(params[:url])
-                { error: t('camaleon_cms.admin.media.local_upload_denied') }
+          user_url = params[:url].to_s
+          user_url = "#{current_site.the_url(locale: nil)}#{user_url}" unless user_url.start_with?('data:', 'http')
+          url_validation_result = UserUrlValidator.validate(user_url)
+          r = if url_validation_result.is_a?(Array)
+                { error: url_validation_result.join(', ') }
               else
-                cama_tmp_upload(params[:url], formats: params[:formats], name: params[:name])
+                cama_tmp_upload(user_url, formats: params[:formats], name: params[:name])
               end
           if r[:error].present?
             render plain: helpers.sanitize(r[:error])
@@ -91,10 +82,6 @@ module CamaleonCms
         end
       end
 
-      def local_url?(url)
-        url.try :match?, LOCALHOST_DOMAIN_MATCHER
-      end
-
       # upload files from media uploader
       def upload(settings = {})
         params[:dimension] = nil if params[:skip_auto_crop].present?

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

@@ -26,7 +26,7 @@ module CamaleonCms
           flash[:notice] = t('camaleon_cms.admin.settings.message.site_updated')
           args = { action: :site }
           args[:host], args[:port] = @site.get_domain.to_s.split(':') if cache_slug != @site.slug
-          redirect_to(args)
+          redirect_to(args, allow_other_host: true)
         else
           render 'site'
         end
@@ -70,7 +70,8 @@ module CamaleonCms
 
       # send email test
       def test_email
-        CamaleonCms::HtmlMailer.sender(params[:email], 'Test', { content: 'Test content' }).deliver_now
+        data = { content: 'Test content', current_site: current_site, url_base: cama_root_url }
+        CamaleonCms::HtmlMailer.sender(params[:email], 'Test', data).deliver_now
         head :ok
       rescue StandardError => e
         render inline: e.message, status: 502

data/app/controllers/camaleon_cms/camaleon_controller.rb

@@ -51,7 +51,7 @@ module CamaleonCms
     # generate captcha image
     def captcha
       image = cama_captcha_build(params[:len])
-      send_data image.to_blob, type: image.mime_type, disposition: 'inline'
+      send_data image.to_blob, type: MiniMime.lookup_by_extension(image.type).content_type, disposition: 'inline'
     end
 
     private
@@ -103,7 +103,13 @@ module CamaleonCms
     def cama_site_check_existence
       if !current_site.present?
         if Cama::Site.main_site.present?
-          redirect_to Cama::Site.main_site.decorate.the_url
+          url = Cama::Site.main_site.decorate.the_url
+          # TODO: Remove this condition when Rails 6.x won't be supported
+          if Rails.gem_version >= Gem::Version.new('7.0.0')
+            redirect_to url, allow_other_host: true
+          else
+            redirect_to url
+          end
         else
           redirect_to cama_admin_installers_path
         end

data/app/decorators/camaleon_cms/application_decorator.rb

@@ -4,6 +4,14 @@ module CamaleonCms
     @_deco_locale = nil
     include CamaleonCms::MetasDecoratorMethods
 
+    def marshal_dump
+      @object
+    end
+
+    def marshal_load(obj)
+      @object = obj
+    end
+
     # return the keywords for this model
     def the_keywords
       k = object.get_option('keywords', '')

data/app/decorators/camaleon_cms/category_decorator.rb

@@ -21,7 +21,7 @@ module CamaleonCms
 
     # return all children categories for the current category (active_record) filtered by permissions + hidden posts + roles + etc...
     # in return object, you can add custom where's or pagination like here:
-    # http://edgeguides.rubyonrails.org/active_record_querying.html
+    # https://edgeguides.rubyonrails.org/active_record_querying.html
     def the_categories
       object.children
     end
@@ -29,7 +29,8 @@ module CamaleonCms
     # return a child category from this category with id (integer) or by slug (string)
     def the_category(slug_or_id)
       return object.categories.where(id: slug_or_id).first if slug_or_id.is_a?(Integer)
-      return object.categories.find_by_slug(slug_or_id) if slug_or_id.is_a?(String)
+
+      object.categories.find_by_slug(slug_or_id) if slug_or_id.is_a?(String)
     end
 
     # ---------------------

data/app/decorators/camaleon_cms/post_decorator.rb

@@ -41,8 +41,8 @@ module CamaleonCms
       if th.present?
         th
       else
-        (default || object.post_type.get_option('default_thumb',
-                                                nil) || h.asset_url('camaleon_cms/image-not-found.png'))
+        default || object.post_type.get_option('default_thumb',
+                                               nil) || h.asset_url('camaleon_cms/image-not-found.png')
       end
     end
     alias the_image_url the_thumb_url
@@ -61,12 +61,12 @@ module CamaleonCms
     end
 
     # return front url for this post
-    # sample: http://localhost.com/my-page.html
+    # sample: https://localhost.com/my-page.html
     # args:
     #   locale: language (default current language)
     #   as_path: return the path instead of full url, sample: /my-page.html
     #   Also, you can pass extra attributes as params for the url, sample: page.the_url(my_param: 'value', other: "asd")
-    #     => http://localhost.com/my-page.html?my_param=value&other=asd
+    #     => https://localhost.com/my-page.html?my_param=value&other=asd
     # Return String URL
     def the_url(*args)
       args = args.extract_options!
@@ -127,7 +127,7 @@ module CamaleonCms
     end
 
     # return a hash of frontend urls for this post
-    # sample: {es: 'http://mydomain.com/es/articulo-3.html', en: 'http://mydomain.com/en/post-3.html'}
+    # sample: {es: 'https://mydomain.com/es/articulo-3.html', en: 'https://mydomain.com/en/post-3.html'}
     def the_urls(*args)
       args = args.extract_options!
       res = {}

data/app/decorators/camaleon_cms/post_type_decorator.rb

@@ -55,14 +55,14 @@ module CamaleonCms
 
     # return main categories (first level) for the post_type (active_record) filtered by permissions
     # in return object, you can add custom where's or pagination like here:
-    # http://edgeguides.rubyonrails.org/active_record_querying.html
+    # https://edgeguides.rubyonrails.org/active_record_querying.html
     def the_categories
       object.categories
     end
 
     # return full categories (all levels) for the post_type (active_record) filtered by permissions
     # in return object, you can add custom where's or pagination like here:
-    # http://edgeguides.rubyonrails.org/active_record_querying.html
+    # https://edgeguides.rubyonrails.org/active_record_querying.html
     def the_full_categories
       object.full_categories
     end
@@ -70,12 +70,13 @@ module CamaleonCms
     # return a category from this post_type with id (integer) or by slug (string)
     def the_category(slug_or_id)
       return the_categories.where(id: slug_or_id).first if slug_or_id.is_a?(Integer)
-      return the_categories.find_by_slug(slug_or_id) if slug_or_id.is_a?(String)
+
+      the_categories.find_by_slug(slug_or_id) if slug_or_id.is_a?(String)
     end
 
     # return all post_tags for the post_type (active_record) filtered by permissions + hidden posts + roles + etc...
     # in return object, you can add custom where's or pagination like here:
-    # http://edgeguides.rubyonrails.org/active_record_querying.html
+    # https://edgeguides.rubyonrails.org/active_record_querying.html
     def the_post_tags
       object.post_tags
     end

data/app/decorators/camaleon_cms/site_decorator.rb

@@ -80,7 +80,8 @@ module CamaleonCms
     # slug_or_id: string => return all main categories of the post_type with slug = slug_or_id
     def the_categories(slug_or_id = nil)
       return the_post_type(slug_or_id).the_categories if slug_or_id.present?
-      return object.categories unless slug_or_id.present?
+
+      object.categories unless slug_or_id.present?
     end
 
     # return the category object with id or slug = slug_or_id from this site

data/app/decorators/camaleon_cms/term_taxonomy_decorator.rb

@@ -48,7 +48,7 @@ module CamaleonCms
     # ---------------------- filters
     # return all posts for this model (active_record) filtered by permissions + hidden posts + roles + etc...
     # in return object, you can add custom where's or pagination like here:
-    # http://edgeguides.rubyonrails.org/active_record_querying.html
+    # https://edgeguides.rubyonrails.org/active_record_querying.html
     def the_posts
       h.verify_front_visibility(object.posts)
     end

data/app/helpers/camaleon_cms/admin/category_helper.rb

@@ -17,7 +17,7 @@ module CamaleonCms
           options << [('—' * level) + category.the_title, category.id]
           children = attrs[:max_level] < level ? [] : category.children
           children = [] if attrs[:until_cats].include?(category.id)
-          options += cama_category_get_options_html(children, level + 1, attrs) if children.size.positive?
+          options += cama_category_get_options_html(children, level + 1, attrs) unless children.empty?
         end
         options
       end

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

@@ -23,7 +23,7 @@ module CamaleonCms
           item_class_parent: 'dropdown', # class for all menu items that contain sub items
           sub_container: 'ul', # type of container for sub items
           sub_class: 'dropdown-menu', # class for sub container
-          callback_item: ->(args) {},
+          callback_item: ->(args) {}, # rubocop:disable Lint/ShadowingOuterLocalVariable
           # callback executed for each item (args = { menu_item, link, level, settings, has_children, link_attrs = "", index}).
           #     menu_item: (Object) Menu object
           #     link: (Hash) link data: {link: '', name: ''}
@@ -48,10 +48,11 @@ module CamaleonCms
           container_append: '' # content append for menu container
         }
 
-        args = args_def.merge(args)
+        args = args_def.merge!(args)
         nav_menu = current_site.nav_menus.find_by_slug(args[:menu_slug])
-        nav_menu = current_site.nav_menus.first unless nav_menu.present?
-        html = "<#{args[:container]} class='#{args[:container_class]}' id='#{args[:container_id]}'>#{args[:container_prepend]}{__}#{args[:container_append]}</#{args[:container]}>"
+        nav_menu ||= current_site.nav_menus.first
+        html = "<#{args[:container]} class='#{args[:container_class]}' "\
+          "id='#{args[:container_id]}'>#{args[:container_prepend]}{__}#{args[:container_append]}</#{args[:container]}>"
         if nav_menu.present?
           html.sub('{__}', cama_menu_draw_items(args, nav_menu.children.reorder(:term_order)))
         else
@@ -69,10 +70,10 @@ module CamaleonCms
           data_nav_item = cama_parse_menu_item(nav_menu_item)
           next if data_nav_item == false
 
-          _is_current = data_nav_item[:current] || site_current_path == data_nav_item[:link] || site_current_path == data_nav_item[:link].sub(
-            '.html', ''
-          )
-          has_children = nav_menu_item.have_children? && (args[:levels] == -1 || (args[:levels] != -1 && level <= args[:levels]))
+          _is_current = data_nav_item[:current] || site_current_path == data_nav_item[:link] ||
+                        site_current_path == data_nav_item[:link].sub('.html', '')
+          has_children = nav_menu_item.have_children? && (args[:levels] == -1 ||
+                         (args[:levels] != -1 && level <= args[:levels]))
           r = {
             menu_item: nav_menu_item.decorate,
             link: data_nav_item,
@@ -116,7 +117,7 @@ module CamaleonCms
           index += 1
         end
 
-        if level.zero?
+        if level == 0
           html
         else
           html = "<#{args[:sub_container]} class='#{args[:sub_class]} #{if parent_current
@@ -142,7 +143,7 @@ module CamaleonCms
             '.html', ''
           )
           has_children = nav_menu_item.have_children?
-          has_children = false if max_levels.positive? && max_levels == internal_level
+          has_children = false if max_levels > 0 && max_levels == internal_level
           data_nav_item[:label] = data_nav_item[:name]
           data_nav_item[:url] = data_nav_item[:link]
           r = {
@@ -169,7 +170,7 @@ module CamaleonCms
           res << r
         end
 
-        if internal_level.zero?
+        if internal_level == 0
           res
         else
           [res, is_current_parent, levels.max]

data/app/helpers/camaleon_cms/html_helper.rb

@@ -72,14 +72,14 @@ module CamaleonCms
     def cama_draw_custom_assets
       cama_html_helpers_init unless @_assets_libraries.present?
       libs = []
-      @_assets_libraries.each do |_key, assets|
+      @_assets_libraries.each_value do |assets|
         libs += assets[:css] if assets[:css].present?
       end
       stylesheets = libs.uniq
       css = stylesheet_link_tag(*stylesheets, media: 'all')
 
       libs = []
-      @_assets_libraries.each do |_key, assets|
+      @_assets_libraries.each_value do |assets|
         libs += assets[:js] if assets[:js].present?
       end
       javascripts = libs.uniq
@@ -98,7 +98,7 @@ module CamaleonCms
       terms.all.each do |term|
         options << [('—' * level) + term.name, term.id] unless @term.id == term.id
         children = term.children
-        options += cama_get_options_html_from_items(children, level + 1) if children.size.positive?
+        options += cama_get_options_html_from_items(children, level + 1) unless children.empty?
       end
       options
     end
@@ -121,18 +121,18 @@ module CamaleonCms
       libs[:datepicker] = { js: [] }
       libs[:datetimepicker] = { js: [], css: [] }
       libs[:tinymce] =
-        { js: ['camaleon_cms/admin/tinymce/tinymce.min', 'camaleon_cms/admin/tinymce/plugins/filemanager/plugin.min'],
+        { js: %w[camaleon_cms/admin/tinymce/tinymce.min camaleon_cms/admin/tinymce/plugins/filemanager/plugin.min],
           css: ['camaleon_cms/admin/tinymce/skins/lightgray/content.min'] }
       libs[:form_ajax] = { js: ['camaleon_cms/admin/form/jquery.form'] }
       libs[:cropper] = {} # loaded by default
       libs[:post] =
-        { js: ['camaleon_cms/admin/jquery.tagsinput.min', 'camaleon_cms/admin/post'],
+        { js: %w[camaleon_cms/admin/jquery.tagsinput.min camaleon_cms/admin/post],
           css: ['camaleon_cms/admin/jquery.tagsinput'] }
       libs[:multiselect] = { js: ['camaleon_cms/admin/bootstrap-select.js'] }
       libs[:validate] = { js: ['camaleon_cms/admin/jquery.validate'] }
       libs[:nav_menu] =
         { css: ['camaleon_cms/admin/nestable/jquery.nestable'],
-          js: ['camaleon_cms/admin/jquery.nestable', 'camaleon_cms/admin/nav_menu'] }
+          js: %w[camaleon_cms/admin/jquery.nestable camaleon_cms/admin/nav_menu] }
       libs[:admin_intro] =
         { js: ['camaleon_cms/admin/introjs/intro.min'], css: ['camaleon_cms/admin/introjs/introjs.min'] }
       @_cama_assets_libraries = libs

data/app/helpers/camaleon_cms/plugins_helper.rb

@@ -127,7 +127,7 @@ module CamaleonCms
     # asset: (String) asset name
     # plugin_key: (optional) plugin name, default (current plugin caller to this function)
     # sample:
-    #   plugin_asset_url("css/main.css") => return: http://myhost.com/assets/plugins/my_plugin/assets/css/main-54505620f.css
+    #   plugin_asset_url("css/main.css") => return: https://myhost.com/assets/plugins/my_plugin/assets/css/main-54505620f.css
     def plugin_asset_url(asset, plugin_key = nil)
       key = plugin_key || self_plugin_key(1)
       p = PluginRoutes.plugin_info(key)['gem_mode'] ? "plugins/#{key}/#{asset}" : "plugins/#{key}/assets/#{asset}"

data/app/helpers/camaleon_cms/session_helper.rb

@@ -6,7 +6,7 @@ module CamaleonCms
     # redirect_url (default nil): after initialized the session, this will be redirected to
     #   "redirect_url" if defined
     #   it doesn't redirect if redirect_url === false
-    #   return to previous page if defined the cookie['return_to'] or login url received extra param: return_to=http://mysite.com
+    #   return to previous page if defined the cookie['return_to'] or login url received extra param: return_to=https://mysite.com
     def login_user(user, remember_me = false, redirect_url = nil)
       c = { value: [user.auth_token, request.user_agent, request.ip], expires: 24.hours.from_now }
       c[:domain] = :all if PluginRoutes.system_info['users_share_sites'].present? && CamaleonCms::Site.count > 1

data/app/helpers/camaleon_cms/short_code_helper.rb

@@ -15,7 +15,7 @@ module CamaleonCms
                       return args[:shortcode] unless attrs.present?
 
                       cama_load_libraries(*attrs['data'].to_s.split(','))
-                      return ''
+                      ''
                     },
                     "Permit to load libraries on demand, sample: [load_libraries data='datepicker,tinymce']")
 

data/app/helpers/camaleon_cms/site_helper.rb

@@ -32,7 +32,7 @@ module CamaleonCms
         nil
       end
       unless r[:site].present?
-        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)
+        Rails.logger.error 'Camaleon CMS - Please define your current site: $current_site = CamaleonCms::Site.first.decorate or map your domains: https://camaleon.website/documentation/category/139779-examples/how.html'.cama_log_style(:red)
       end
       @current_site = r[:site]
     end

data/app/helpers/camaleon_cms/theme_helper.rb

@@ -26,7 +26,7 @@ module CamaleonCms
     # asset: (String) asset name
     # theme_name: (optional) theme name, default (current theme caller to this function)
     # sample:
-    #   theme_asset_url("css/main.css") => return: http://myhost.com/assets/themes/my_theme/assets/css/main-54505620f.css
+    #   theme_asset_url("css/main.css") => return: https://myhost.com/assets/themes/my_theme/assets/css/main-54505620f.css
     def theme_asset_url(asset, theme_name = nil)
       p = theme_asset_path(asset, theme_name)
       begin

data/app/helpers/camaleon_cms/uploader_helper.rb

@@ -16,7 +16,7 @@ module CamaleonCms
     #       sample "test.png", versions: '200x200,450x450' will generate: thumb/test-png_200x200.png, test-png_450x450.png
     #   thumb_size: String (redefine the dimensions of the thumbnail, sample: '100x100' ==> only for images)
     #   temporal_time: if great than 0 seconds, then this file will expire (removed) in that time (default: 0)
-    #     To manage jobs, please check http://edgeguides.rubyonrails.org/active_job_basics.html
+    #     To manage jobs, please check https://edgeguides.rubyonrails.org/active_job_basics.html
     #     Note: if you are using temporal_time, you will need to copy the file to another directory later
     # sample: upload_file(params[:my_file], {formats: "images", folder: "temporal"})
     # sample: upload_file(params[:my_file], {formats: "jpg,png,gif,mp3,mp4", temporal_time: 10.minutes, maximum: 10.megabytes})
@@ -45,7 +45,7 @@ module CamaleonCms
         generate_thumb: true,
         temporal_time: 0,
         filename: begin
-          (cached_name || uploaded_io.original_filename)
+          cached_name || uploaded_io.original_filename
         rescue StandardError
           uploaded_io.path.split('/').last
         end.cama_fix_filename,
@@ -72,7 +72,6 @@ module CamaleonCms
       # save file
       key = File.join(settings[:folder], settings[:filename]).to_s.cama_fix_slash
       res = cama_uploader.add_file(settings[:uploaded_io], key, { same_name: settings[:same_name] })
-      {} if (settings[:temporal_time]).positive?
 
       # generate image versions
       if res['file_type'] == 'image'
@@ -92,6 +91,12 @@ module CamaleonCms
       FileUtils.rm_f(uploaded_io.path) if settings[:remove_source] && File.exist?(uploaded_io.path)
 
       hooks_run('after_upload', settings)
+
+      # temporal file upload (always put as local for temporal files)
+      if settings[:temporal_time] > 0
+        CamaleonCmsUploader.delete_block.call(settings, cama_uploader, key)
+      end
+
       res
     end
 
@@ -237,7 +242,7 @@ module CamaleonCms
     # upload tmp file
     # support for url and local path
     # sample:
-    # cama_tmp_upload('http://camaleon.tuzitio.com/media/132/logo2.png')  ==> /var/rails/my_project/public/tmp/1/logo2.png
+    # cama_tmp_upload('https://camaleon.website/media/132/logo2.png')  ==> /var/rails/my_project/public/tmp/1/logo2.png
     # cama_tmp_upload('/var/www/media/132/logo 2.png')  ==> /var/rails/my_project/public/tmp/1/logo-2.png
     # accept args:
     #   name: to indicate the name to use, sample: cama_tmp_upload('/var/www/media/132/logo 2.png', {name: 'owen.png', formats: 'images'})
@@ -324,7 +329,7 @@ module CamaleonCms
             cloud_front: current_site.get_option('filesystem_s3_cloudfront'),
             aws_file_upload_settings: lambda { |settings|
                                         settings
-                                      }, # permit to add your custom attributes for file_upload http://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Object.html#upload_file-instance_method
+                                      }, # permit to add your custom attributes for file_upload https://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Object.html#upload_file-instance_method
             aws_file_read_settings: lambda { |data, _s3_file|
                                       data
                                     } # permit to read custom attributes from aws file and add to file parsed object

data/app/mailers/camaleon_cms/html_mailer.rb

@@ -58,8 +58,11 @@ module CamaleonCms
       prepend_view_path(Rails.root.join(views_dir).to_s)
 
       theme = @current_site.get_theme
-      lookup_context.prefixes.prepend("themes/#{theme.slug}") if theme.settings['gem_mode']
-      lookup_context.prefixes.prepend("themes/#{theme.slug}/views") unless theme.settings['gem_mode']
+      if theme.settings && theme.settings['gem_mode']
+        lookup_context.prefixes.prepend("themes/#{theme.slug}")
+      else
+        lookup_context.prefixes.prepend("themes/#{theme.slug}/views")
+      end
       lookup_context.use_camaleon_partial_prefixes = true
       ((data[:files] || []) + (data[:attachments] || [])).each do |attach|
         if File.exist?(attach) && !File.directory?(attach)

data/app/models/camaleon_cms/ability.rb

@@ -105,7 +105,7 @@ module CamaleonCms
         end
 
         # support for custom abilities for each posttype
-        # sample: http://camaleon.tuzitio.com/documentation/category/40756-uncategorized/custom-models.html
+        # sample: https://camaleon.website/documentation/category/40756-uncategorized/custom-models.html
         @roles_post_type.each do |k, v|
           next if %w[edit edit_other edit_publish publish manage_categories].include?(k.to_s)
 

data/app/models/camaleon_cms/custom_field_group.rb

@@ -5,8 +5,8 @@ module CamaleonCms
     alias_attribute :site_id, :parent_id
 
     default_scope do
-      where.not(object_class: '_fields')
-           .reorder("#{CamaleonCms::CustomField.table_name}.field_order ASC")
+      where("object_class != '_fields'")
+        .reorder("#{CamaleonCms::CustomField.table_name}.field_order ASC")
     end
 
     has_many :metas, -> { where(object_class: 'CustomFieldGroup') }, foreign_key: :objectid, dependent: :destroy

data/app/models/camaleon_cms/nav_menu.rb

@@ -10,7 +10,7 @@ module CamaleonCms
     # add menu item for current menu
     # value: (Hash) is a hash object that contains label, type, link
     #   options for type: post | category | post_type | post_tag | external
-    # sample: {label: "my label", type: "external", link: "http://camaleon.tuzitio.com", target: '_blank'}
+    # sample: {label: "my label", type: "external", link: "https://camaleon.website", target: '_blank'}
     # sample: {label: "my label", type: "post", link: 10}
     # sample: {label: "my label", type: "category", link: 12}
     # return item created

data/app/models/camaleon_cms/post.rb

@@ -42,7 +42,7 @@ module CamaleonCms
     validates_with CamaleonCms::PostUniqValidator
     attr_accessor :show_title_with_parent
 
-    before_create :fix_post_order, if: ->(p) { !p.post_order.present? || p.post_order.zero? }
+    before_create :fix_post_order, if: ->(p) { !p.post_order.present? || p.post_order == 0 }
 
     # return all parents for current page hierarchy ordered bottom to top
     def parents

data/app/models/camaleon_cms/post_default.rb

@@ -42,7 +42,7 @@ module CamaleonCms
       res = where("#{CamaleonCms::Post.table_name}.slug = ? OR #{CamaleonCms::Post.table_name}.slug LIKE ? ", slug,
                   "%-->#{slug}<!--%")
       # end
-      res.reorder('').first
+      res.take
     end
 
     # return the parent of a post (support for sub contents or tree of posts)