camaleon_cms 2.9.2 → 2.9.3

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

@@ -2,7 +2,7 @@ module CamaleonCms
   module Frontend
     module NavMenuHelper
       # draw nav menu as html list
-      # key: slug for nav menu
+      # key: slug for a nav menu
       # to register this, go to admin -> appearance -> menus
       # (DEPRECATED)
       def get_nav_menu(key = 'main_menu', class_name = 'navigation')
@@ -24,18 +24,27 @@ module CamaleonCms
           sub_container: 'ul', # type of container for sub items
           sub_class: 'dropdown-menu', # class for sub container
           callback_item: ->(args) {},
-          # callback executed for each item (args = { menu_item, link, level, settings, has_children, link_attrs = "", index}).
+          # 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: ''}
           #     level: (Integer) current level
           #     has_children: (boolean) if this item contain sub menus
           #     settings: (Hash) menu settings
           #     index: (Integer) Index Position of this menu
-          #     link_attrs: (String) Here you can add your custom attrs for current link, sample: id='my_id' data-title='#{args[:link][:name]}'
+          #     link_attrs: (String) Here you can add your custom attrs for current link,
+          #       sample: id='my_id' data-title='#{args[:link][:name]}'
           #     item_container_attrs: (String) Here you can add your custom attrs for link container.
-          # In settings, you can change the values for this item, like after, before, ..:
-          # sample: lambda{|args| args[:settings][:after] = "<span class='caret'></span>" if args[:has_children]; args[:link_attrs] = "id='#{menu_item.id}'";  }
-          # sample: lambda{|args| args[:settings][:before] = "<i class='fa fa-home'></i>" if args[:level] == 0 && args[:index] == 0;  }
+          # In settings, you can change the values for this item, like after, before,...:
+          # sample:
+          #   lambda do |args|
+          #     args[:settings][:after] = "<span class='caret'></span>" if args[:has_children]
+          #     args[:link_attrs] = "id='#{menu_item.id}'"
+          #   end
+          # sample:
+          #   lambda do |args|
+          #     args[:settings][:before] = "<i class='fa fa-home'></i>" if args[:level] == 0 && args[:index] == 0
+          #   end
           before: '', # content before link text
           after: '', # content after link text
           link_current: 'current-link', # class for current menu link
@@ -49,7 +58,7 @@ module CamaleonCms
         }
 
         args = args_def.merge!(args)
-        nav_menu = current_site.nav_menus.find_by_slug(args[:menu_slug])
+        nav_menu = current_site.nav_menus.find_by_slug(args[:menu_slug]) # rubocop:disable Rails/DynamicFindBy
         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]}>"
@@ -61,19 +70,22 @@ module CamaleonCms
       end
 
       # draw menu items
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def cama_menu_draw_items(args, nav_menu, level = 0)
-        html = ''
+        items_html = []
         parent_current = false
         index = 0
+        # rubocop:disable Rails/FindEach -- Rendering must preserve the relation's configured term_order.
         nav_menu.eager_load(:metas).each do |nav_menu_item|
           _args = args.dup
           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] ||
+          _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]))
+          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,
@@ -88,44 +100,77 @@ module CamaleonCms
           _args = r[:settings]
 
           if has_children
-            html_children, current_children = cama_menu_draw_items(args, nav_menu_item.children.reorder(:term_order),
-                                                                   level + 1)
+            html_children, current_children = cama_menu_draw_items(
+              args, nav_menu_item.children.reorder(:term_order), level + 1
+            )
           else
             html_children = ''
             current_children = false
           end
-          parent_current = true if _is_current || current_children
+          parent_current ||= _is_current || current_children
+
+          item_classes = [_args[:item_class]]
+          item_classes << _args[:item_class_parent] if has_children
+          item_classes << _args[:item_current] if _is_current
+          item_classes << 'current-menu-ancestor' if current_children
+          item_class_str = item_classes.reject(&:blank?).join(' ')
+
+          item_attrs = []
+          item_attrs << r[:item_container_attrs] if r[:item_container_attrs].present?
+          item_attrs << "class='#{ERB::Util.html_escape(item_class_str)}'" if item_class_str.present?
+          item_attrs_str = item_attrs.reject(&:blank?).join(' ')
+
+          item_open = "<#{_args[:item_container]}"
+          item_open << " #{item_attrs_str}" if item_attrs_str.present?
+          item_open << '>'
+
+          link_attr_parts = []
+          link_attr_parts << r[:link_attrs] if r[:link_attrs].present?
+          if nav_menu_item.target.present?
+            link_attr_parts << "target='#{ERB::Util.html_escape(nav_menu_item.target.to_s)}'"
+          end
+          link_attr_parts << "href='#{ERB::Util.html_escape(data_nav_item[:link].to_s)}'"
+          link_classes = []
+          link_classes << args[:link_current] if _is_current
+          link_classes << _args[:link_class_parent] if has_children
+          link_classes << _args[:link_class]
+          link_class_str = link_classes.reject(&:blank?).join(' ')
+          link_attr_parts << "class='#{ERB::Util.html_escape(link_class_str)}'" if link_class_str.present?
+          link_attr_parts << "data-toggle='dropdown'" if has_children
+          link_attrs_str = link_attr_parts.reject(&:blank?).join(' ')
+
+          # Menu labels intentionally support trusted HTML snippets (icons, buttons, embeds) configured by site admins.
+          link_inner = [_args[:before], data_nav_item[:name].to_s, _args[:after]].reject(&:blank?).join('')
+          link_tag = "<a #{link_attrs_str}>#{link_inner}</a>"
+
+          item_inner = [
+            _args[:link_before],
+            link_tag,
+            _args[:link_after],
+            html_children
+          ].reject(&:blank?).join('')
+          item_html = "#{item_open}#{item_inner}</#{_args[:item_container]}>"
+          # rubocop:disable Rails/OutputSafety -- User-controlled fields are escaped before this trusted menu markup is marked safe.
+          items_html << item_html.html_safe
+          # rubocop:enable Rails/OutputSafety
 
-          html += "<#{_args[:item_container]} #{r[:item_container_attrs]} class='#{_args[:item_class]} #{if has_children
-                                                                                                           _args[:item_class_parent]
-                                                                                                         end} #{if _is_current
-                                                                                                                  _args[:item_current].to_s
-                                                                                                                end} #{if current_children
-                                                                                                                         'current-menu-ancestor'
-                                                                                                                       end}'>#{_args[:link_before]}
-                <a #{r[:link_attrs]} #{if nav_menu_item.target.present?
-                                         " target='#{nav_menu_item.target}'"
-                                       end} href='#{data_nav_item[:link]}' class='#{if _is_current
-                                                                                      args[:link_current]
-                                                                                    end} #{if has_children
-                                                                                             _args[:link_class_parent]
-                                                                                           end} #{_args[:link_class]}' #{if has_children
-                                                                                                                           "data-toggle='dropdown'"
-                                                                                                                         end} >#{_args[:before]}#{data_nav_item[:name]}#{_args[:after]}</a> #{_args[:link_after]}
-                #{html_children}
-              </#{_args[:item_container]}>"
           index += 1
         end
+        # rubocop:enable Rails/FindEach
 
         if level == 0
-          html
+          safe_join(items_html)
         else
-          html = "<#{args[:sub_container]} class='#{args[:sub_class]} #{if parent_current
-                                                                          "parent-#{args[:item_current]}"
-                                                                        end} level-#{level}'>#{html}</#{args[:sub_container]}>"
-          [html, parent_current]
+          sub_classes = [args[:sub_class]]
+          sub_classes << "parent-#{args[:item_current]}" if parent_current
+          sub_classes << "level-#{level}"
+          sub_container_class = sub_classes.reject(&:blank?).join(' ')
+          sub_html = "<#{args[:sub_container]} class='#{sub_container_class}'>" \
+                     "#{safe_join(items_html)}</#{args[:sub_container]}>"
+          [sub_html, parent_current]
         end
       end
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       # filter and parse all menu items visible for current user and adding the flag for current_parent or current_item
       # max_levels: max levels to iterate
@@ -139,9 +184,8 @@ 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', ''
-          )
+          _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?
           has_children = false if max_levels > 0 && max_levels == internal_level
           data_nav_item[:label] = data_nav_item[:name]
@@ -157,14 +201,15 @@ module CamaleonCms
           }.merge!(data_nav_item.except(:current, :name, :link))
 
           if has_children
-            r[:children], _is_current_parent, r[:levels] = cama_menu_parse_items(nav_menu_item.children, max_levels,
-                                                                                 internal_level + 1)
+            r[:children], _is_current_parent, r[:levels] =
+              cama_menu_parse_items(nav_menu_item.children, max_levels, internal_level + 1)
             if _is_current_parent
               is_current_parent = true
               r[:current_parent] = true
             end
             r[:levels] = r[:levels] + 1
           end
+
           is_current_parent = true if r[:current_item]
           levels << r[:levels]
           res << r
@@ -181,11 +226,12 @@ module CamaleonCms
       # draw the breadcrumb as html list
       def breadcrumb_draw
         res = []
-        @_front_breadcrumb.each_with_index do |item, index|
-          res << if @_front_breadcrumb.size == (index + 1) # last menu
+        breadcrumb_items = nav_menu_breadcrumb_items
+        breadcrumb_items.each_with_index do |item, index|
+          res << if breadcrumb_items.size == (index + 1) # last menu
                    "<li class='active'>#{item[0]}</li>"
                  else
-                   "<li><a href='#{item[1]}'>#{item[0]}</a></li>"
+                   "<li><a href='#{ERB::Util.html_escape(item[1])}'>#{item[0]}</a></li>"
                  end
         end
         res.join('')
@@ -195,11 +241,11 @@ module CamaleonCms
       # label => label of the link
       # url: url for the link
       def breadcrumb_add(label, url = '', prepend = false)
-        @_front_breadcrumb ||= []
+        breadcrumb_items = nav_menu_breadcrumb_items
         if prepend
-          @_front_breadcrumb.unshift([label, url])
+          breadcrumb_items.unshift([label, url])
         else
-          @_front_breadcrumb << [label, url]
+          breadcrumb_items << [label, url]
         end
       end
 
@@ -213,34 +259,44 @@ module CamaleonCms
             if is_from_backend || post.can_visit?
               result = { link: post.the_url(as_path: true), name: post.the_title, type_menu: type_menu,
                          url_edit: post.the_edit_url }
-              result[:current] = @cama_visited_post.present? && @cama_visited_post.id == post.id unless is_from_backend
+              unless is_from_backend
+                visited_post = nav_menu_visited_state(:frontend_visited_post)
+                result[:current] = visited_post.present? && visited_post.id == post.id
+              end
             end
           when 'category'
             category = CamaleonCms::Category.find(nav_menu_item.url).decorate
             result = { link: category.the_url(as_path: true), name: category.the_title,
                        url_edit: category.the_edit_url }
             unless is_from_backend
-              result[:current] =
-                @cama_visited_category.present? && @cama_visited_category.id == category.id
+              visited_category = nav_menu_visited_state(:frontend_visited_category)
+              result[:current] = visited_category.present? && visited_category.id == category.id
             end
           when 'post_tag'
             post_tag = CamaleonCms::PostTag.find(nav_menu_item.url).decorate
             result = { link: post_tag.the_url(as_path: true), name: post_tag.the_title,
                        url_edit: post_tag.the_edit_url }
-            result[:current] = @cama_visited_tag.present? && @cama_visited_tag.id == post_tag.id unless is_from_backend
+            unless is_from_backend
+              visited_tag = nav_menu_visited_state(:frontend_visited_tag)
+              result[:current] = visited_tag.present? && visited_tag.id == post_tag.id
+            end
           when 'post_type'
             post_type = CamaleonCms::PostType.find(nav_menu_item.url).decorate
             result = { link: post_type.the_url(as_path: true), name: post_type.the_title,
                        url_edit: post_type.the_edit_url }
             unless is_from_backend
-              result[:current] =
-                @cama_visited_post_type.present? && @cama_visited_post_type.id == post_type.id
+              visited_post_type = nav_menu_visited_state(:frontend_visited_post_type)
+              result[:current] = visited_post_type.present? && visited_post_type.id == post_type.id
             end
           when 'external'
             result = { link: nav_menu_item.url.to_s.translate, name: nav_menu_item.name.to_s.translate, current: false }
             # permit to customize or mark as current menu
             # _args: (HASH) {menu_item: Model Menu Item, parsed_menu: Parsed Menu }
-            #   Sample parsed_menu: {link: "url of the link", name: "Text of the menu", current: Boolean (true => is current menu, false => not current menu item)}
+            #   Sample parsed_menu:
+            # {
+            #   link: "url of the link", name: "Text of the menu",
+            #   current: Boolean (true => is current menu, false => not current menu item)
+            # }
             unless is_from_backend
               result[:link] = cama_root_path if result[:link] == 'root_url'
               result[:link] = site_current_path if site_current_path == "#{current_site.the_path}#{result[:link]}"
@@ -251,11 +307,15 @@ module CamaleonCms
             end
           else
             # permit to build custom menu items registered as Custom Menu by hook "nav_menu_custom"
-            # sample: def my_parse_custom_menu_item_listener(args);
+            # sample:
+            # def my_parse_custom_menu_item_listener(args)
             #   if args[:menu_item].kind == 'MyModelClass'
             #     my_model = MyModelClass.find(args[:menu_item].url)
-            #     res = {name: my_model.name, url_edit: my_model_edit_url(id: my_model.id), link: my_model_public_url(id: my_model.id)}
-            #     res[:current] = site_current_path == my_model_public_url(id: my_model.id) unless args[:is_from_backend]
+            #     res = {
+            #       name: my_model.name, url_edit: my_model_edit_url(id: my_model.id),
+            #       link: my_model_url(id: my_model.id)
+            #     }
+            #     res[:current] = site_current_path == my_model_url(id: my_model.id) unless args[:is_from_backend]
             #     args[:parsed_menu] = res
             #   end
             # end
@@ -264,17 +324,34 @@ module CamaleonCms
             result = hook_args[:parsed_menu]
           end
         rescue StandardError => e
-          Rails.logger.error "Camaleon CMS - Menu Item Not Found => Skipped menu for: #{e.message} (#{nav_menu_item.inspect})".cama_log_style(:red)
+          Rails.logger.error(
+            "Camaleon CMS - Menu Item Not Found => Skipped menu for: #{e.message} (#{nav_menu_item.inspect})"
+              .cama_log_style(:red)
+          )
         end
 
-        # permit to customize data, like: current, title, ... of parsed menu item or skip menu item by assigning false into :parsed_menu
-        if is_from_backend
-          result
-        else
-          _args = { menu_item: nav_menu_item, parsed_menu: result }
-          hooks_run('on_render_front_menu_item', _args)
-          _args[:parsed_menu]
+        # permit customizing data, like: current, title, ... of parsed menu item or
+        # skip menu item by assigning false into :parsed_menu
+        return result if is_from_backend
+
+        _args = { menu_item: nav_menu_item, parsed_menu: result }
+        hooks_run('on_render_front_menu_item', _args)
+        _args[:parsed_menu]
+      end
+
+      private
+
+      def nav_menu_breadcrumb_items
+        CurrentRequest.theme_helper_state ||= {}
+        CurrentRequest.theme_helper_state[:front_breadcrumb] ||= []
+      end
+
+      def nav_menu_visited_state(current_request_attr)
+        if respond_to?(:camaleon_frontend_visited_state, true)
+          return camaleon_frontend_visited_state(current_request_attr)
         end
+
+        CurrentRequest.public_send(current_request_attr)
       end
     end
   end

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

@@ -5,42 +5,49 @@ module CamaleonCms
       # you can pass custom data to overwrite default data generated by the system
       # return hash of seo attributes used by the_head(...)
       def cama_the_seo(data = {})
+        visited_post = camaleon_frontend_visited_state(:frontend_visited_post)
+        visited_post_type = camaleon_frontend_visited_state(:frontend_visited_post_type)
+        visited_tag = camaleon_frontend_visited_state(:frontend_visited_tag)
+        visited_category = camaleon_frontend_visited_state(:frontend_visited_category)
+        visited_user = CurrentRequest.frontend_user
+        visited_user ||= instance_variable_get(:@user) if instance_variable_defined?(:@user) # legacy @user (M20)
+
         data2 = if is_home?
                   {}
                 elsif is_page?
-                  { image: @cama_visited_post.the_thumb_url,
-                    title: "#{current_site.the_title} | #{@cama_visited_post.the_title}",
-                    description: @cama_visited_post.the_excerpt,
-                    keywords: @cama_visited_post.the_keywords,
-                    object: @cama_visited_post }
+                  { image: visited_post.the_thumb_url,
+                    title: "#{current_site.the_title} | #{visited_post.the_title}",
+                    description: visited_post.the_excerpt,
+                    keywords: visited_post.the_keywords,
+                    object: visited_post }
                 elsif is_ajax?
                   {}
                 elsif is_search?
                   { title: "#{current_site.the_title} | #{ct('search_title', default: 'Search')}" }
                 elsif is_post_type?
-                  { image: @cama_visited_post_type.the_thumb_url,
-                    title: "#{current_site.the_title} | #{@cama_visited_post_type.the_title}",
-                    description: @cama_visited_post_type.the_excerpt,
-                    keywords: @cama_visited_post_type.the_keywords,
-                    object: @cama_visited_post_type }
+                  { image: visited_post_type.the_thumb_url,
+                    title: "#{current_site.the_title} | #{visited_post_type.the_title}",
+                    description: visited_post_type.the_excerpt,
+                    keywords: visited_post_type.the_keywords,
+                    object: visited_post_type }
                 elsif is_post_tag?
-                  { title: "#{current_site.the_title} | #{@cama_visited_tag.the_title}",
-                    description: @cama_visited_tag.the_excerpt,
-                    keywords: @cama_visited_tag.the_keywords,
-                    object: @cama_visited_tag }
+                  { title: "#{current_site.the_title} | #{visited_tag.the_title}",
+                    description: visited_tag.the_excerpt,
+                    keywords: visited_tag.the_keywords,
+                    object: visited_tag }
                 elsif is_category?
-                  { image: @cama_visited_category.the_thumb_url,
-                    title: "#{current_site.the_title} | #{@cama_visited_category.the_title}",
-                    description: @cama_visited_category.the_excerpt,
-                    keywords: @cama_visited_category.the_keywords,
-                    object: @cama_visited_category }
+                  { image: visited_category.the_thumb_url,
+                    title: "#{current_site.the_title} | #{visited_category.the_title}",
+                    description: visited_category.the_excerpt,
+                    keywords: visited_category.the_keywords,
+                    object: visited_category }
                 elsif is_profile?
-                  { image: @user.the_avatar, title: "#{current_site.the_title} | #{@user.the_name}",
-                    description: @user.the_slogan, object: @user }
+                  { image: visited_user.the_avatar, title: "#{current_site.the_title} | #{visited_user.the_name}",
+                    description: visited_user.the_slogan, object: visited_user }
                 else
                   {}
                 end
-        cama_build_seo(data2.merge!(@_cama_seo_setting_values || {}).merge(data))
+        cama_build_seo(data2.merge!(camaleon_frontend_seo_settings || {}).merge(data))
       end
 
       # permit to define seo attributes by code without hooks
@@ -51,19 +58,23 @@ module CamaleonCms
       # )
       # This values will be shown within the_head(...)
       def cama_seo_settings(options)
-        @_cama_seo_setting_values ||= {}
-        @_cama_seo_setting_values = @_cama_seo_setting_values.merge(options)
+        CurrentRequest.frontend_seo_settings ||= {}
+        CurrentRequest.frontend_seo_settings = CurrentRequest.frontend_seo_settings.merge(options)
       end
 
       private
 
+      def camaleon_frontend_seo_settings
+        CurrentRequest.frontend_seo_settings
+      end
+
       # create seo attributes with options + default attributes
       def cama_build_seo(options = {})
-        options[:image] = current_site.get_option('screenshot', current_site.the_logo) unless options[:image].present?
-        options[:title] = current_site.the_title unless options[:title].present?
-        options[:description] = current_site.the_option('seo_description') unless options[:description].present?
+        options[:image] = current_site.get_option('screenshot', current_site.the_logo) if options[:image].blank?
+        options[:title] = current_site.the_title if options[:title].blank?
+        options[:description] = current_site.the_option('seo_description') if options[:description].blank?
         options[:url] = request.original_url
-        options[:keywords] = current_site.the_option('keywords') unless options[:keywords].present?
+        options[:keywords] = current_site.the_option('keywords') if options[:keywords].blank?
 
         s = {
           keywords: options[:keywords],

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

@@ -9,48 +9,48 @@ module CamaleonCms
       # return current url visited as path
       # http://localhost:9001/category/cat-post-2  => /category/cat-post-2
       def site_current_path
-        @_site_current_path ||= site_current_url.sub(cama_root_url(locale: nil), '/')
+        CurrentRequest.frontend_site_current_path ||= site_current_url.sub(cama_root_url(locale: nil), '/')
       end
 
       # **************** section is a? ****************#
       # check if current section visited is home page
       def is_home?
-        @cama_visited_home.present?
+        camaleon_frontend_visited_state(:frontend_visited_home).present?
       end
 
       # check if current section visited is for post
       def is_page?
-        @cama_visited_post.present?
+        camaleon_frontend_visited_state(:frontend_visited_post).present?
       end
 
       # check if current section visited is for ajax
       def is_ajax?
-        @cama_visited_ajax.present?
+        camaleon_frontend_visited_state(:frontend_visited_ajax).present?
       end
 
       # check if current section visited is for search
       def is_search?
-        @cama_visited_search.present?
+        camaleon_frontend_visited_state(:frontend_visited_search).present?
       end
 
       # check if current section visited is for post type
       def is_post_type?
-        @cama_visited_post_type.present?
+        camaleon_frontend_visited_state(:frontend_visited_post_type).present?
       end
 
       # check if current section visited is for post tag
       def is_post_tag?
-        @cama_visited_tag.present?
+        camaleon_frontend_visited_state(:frontend_visited_tag).present?
       end
 
       # check if current section visited is for category
       def is_category?
-        @cama_visited_category.present?
+        camaleon_frontend_visited_state(:frontend_visited_category).present?
       end
 
       # check if visited page is user profile (frontend)
       def is_profile?
-        @cama_visited_profile == true
+        camaleon_frontend_visited_state(:frontend_visited_profile) == true
       end
 
       # **************** end section is a? ****************#
@@ -60,9 +60,29 @@ module CamaleonCms
       # seo_attrs: Custom attributes for seo in Hash format
       # show_seo: (Boolean) control to append or not the seo attributes
       def the_head(seo_attrs = {}, _show_seo = true)
-        js = "<script>var ROOT_URL = '#{cama_root_url}'; var LANGUAGE = '#{I18n.locale}'; </script>".html_safe
-        js += cama_draw_pre_asset_contents
-        "#{csrf_meta_tag || ''}\n#{display_meta_tags(cama_the_seo(seo_attrs))}\n#{js}\n#{cama_draw_custom_assets}"
+        js = javascript_tag("var ROOT_URL = #{cama_root_url.to_json}; var LANGUAGE = #{I18n.locale.to_s.to_json};")
+        safe_join(
+          [
+            csrf_meta_tag.presence,
+            display_meta_tags(cama_the_seo(seo_attrs)).presence,
+            js,
+            cama_draw_pre_asset_contents.presence,
+            cama_draw_custom_assets.presence
+          ].compact,
+          "\n"
+        )
+      end
+
+      private
+
+      def camaleon_frontend_visited_state(current_request_attr)
+        value = CurrentRequest.public_send(current_request_attr)
+        return value unless value.nil?
+
+        # Fall back to a legacy @cama_visited_* ivar a plugin front controller may have set directly;
+        # core writes both stores, so stock flows never reach here. Regression M20.
+        legacy_ivar = CamaleonCms::FrontendVisitedStateConcern::LEGACY_VISITED_IVAR_BY_ATTR[current_request_attr]
+        instance_variable_get(legacy_ivar) if legacy_ivar && instance_variable_defined?(legacy_ivar)
       end
     end
   end

data/app/helpers/camaleon_cms/hooks_helper.rb

@@ -16,7 +16,8 @@ module CamaleonCms
     # hook_key: hook key
     # params: params for hook
     def hooks_run(hook_key, params = nil)
-      PluginRoutes.enabled_apps(current_site).each do |plugin|
+      theme_slug = current_theme&.slug.presence || current_site.get_theme_slug
+      PluginRoutes.enabled_apps(current_site, theme_slug).each do |plugin|
         _do_hook(plugin, hook_key, params)
       end
 
@@ -28,16 +29,16 @@ module CamaleonCms
 
     # skip hook function with name: hook_function_name
     def hook_skip(hook_function_name)
-      @_hooks_skip << hook_function_name
+      hook_skip_list << hook_function_name
     end
 
     private
 
     def _do_hook(plugin, hook_key, params = nil)
-      return if !plugin.present? || !plugin['hooks'].present? || !plugin['hooks'][hook_key].present?
+      return if plugin.blank? || plugin['hooks'].blank? || plugin['hooks'][hook_key].blank?
 
       plugin['hooks'][hook_key].each do |hook|
-        next if @_hooks_skip.present? && @_hooks_skip.include?(hook)
+        next if hook_skip_list.include?(hook)
 
         begin
           if params.nil?
@@ -60,5 +61,14 @@ module CamaleonCms
         end
       end
     end
+
+    def hook_skip_list
+      state = camaleon_hooks_state
+      state[:hooks_skip] ||= []
+    end
+
+    def camaleon_hooks_state
+      CurrentRequest.hooks_helper_state ||= {}
+    end
   end
 end