camaleon_cms 2.0.1 → 2.0.2

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

@@ -13,7 +13,7 @@ module CamaleonCms::FrontendConcern extend ActiveSupport::Concern
   #   you can add custom sitemap elements in the attr "custom", like: https://github.com/owen2345/camaleon-cms/issues/106#issuecomment-146232211
   #   you can customize your content for html or xml format
   def sitemap
-    r = {layout: (params[:format] == "html" ? (self.send :_layout) : false), render: "sitemap", custom: {a: a}, format: params[:format], skip_post_ids: [], skip_posttype_ids: [], skip_cat_ids: [], skip_tag_ids: []}
+    r = {layout: (params[:format] == "html" ? (self.send :_layout) : false), render: "sitemap", custom: {}, format: params[:format], skip_post_ids: [], skip_posttype_ids: [], skip_cat_ids: [], skip_tag_ids: []}
     hooks_run("on_render_sitemap", r)
     @r = r
     render r[:render], layout: r[:layout]

data/app/decorators/camaleon_cms/application_decorator.rb

@@ -9,7 +9,7 @@
 class CamaleonCms::ApplicationDecorator < Draper::Decorator
   delegate_all
   @_deco_locale = nil
-  include MetasDecoratorMethods
+  include CamaleonCms::MetasDecoratorMethods
 
   # return the keywords for this model
   def the_keywords

data/app/decorators/camaleon_cms/custom_field_decorator.rb

@@ -21,10 +21,4 @@ class CamaleonCms::CustomFieldDecorator < Draper::Decorator
       object.description
     end
   end
-
-  # cache identifier, the format is: [current-site-prefix]/[object-id]-[object-last_updated]/[current locale]
-  # key: additional key for the model
-  def cache_prefix(key = "")
-    "#{h.current_site.cache_prefix}/cfield#{object.id}#{"/#{key}" if key.present?}"
-  end
 end

data/app/decorators/camaleon_cms/metas_decorator_methods.rb

@@ -8,7 +8,7 @@
 =end
 module CamaleonCms::MetasDecoratorMethods
   # return meta value translated for key in this model
-  def the_option(key)
+  def the_meta(key)
     object.get_meta(key, "").translate(@_deco_locale)
   end
 

data/app/decorators/camaleon_cms/plugin_decorator.rb

@@ -0,0 +1,11 @@
+=begin
+  Camaleon CMS is a content management system
+  Copyright (C) 2015 by Owen Peredo Diaz
+  Email: owenperedo@gmail.com
+  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
+  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the  GNU Affero General Public License (GPLv3) for more details.
+=end
+class CamaleonCms::PluginDecorator < CamaleonCms::TermTaxonomyDecorator
+  delegate_all
+end

data/app/decorators/camaleon_cms/post_decorator.rb

@@ -191,12 +191,6 @@ class CamaleonCms::PostDecorator < CamaleonCms::ApplicationDecorator
     r[:flag] && object.status == 'published'
   end
 
-  # check if the post can be commented
-  def can_commented?
-    object.manage_comments?
-  end
-
-
   # add_post_type: true/false to include post type link
   # children: true/false (show/hide last item link)
   # show_categories: true/false, true: add categories tree to the breadcrumb
@@ -215,9 +209,4 @@ class CamaleonCms::PostDecorator < CamaleonCms::ApplicationDecorator
     object.post_type.decorate
   end
 
-  # cache identifier, the format is: [current-site-prefix]/[object-id]-[object-last_updated]/[current locale]
-  # key: additional key for the model
-  def cache_prefix(key = "")
-    "#{h.current_site.cache_prefix}/post#{object.id}#{"/#{key}" if key.present?}"
-  end
 end

data/app/decorators/camaleon_cms/post_type_decorator.rb

@@ -72,7 +72,7 @@ class CamaleonCms::PostTypeDecorator < CamaleonCms::TermTaxonomyDecorator
   # return thumbnail for this post type
   # default: if thumbnail is not present, will render default
   def the_thumb_url(default = nil)
-    th = object.get_option("thumb")
+    th = object.get_option("thumb", object.get_option("default_thumb"))
     th.present? ? th : (default || h.asset_url("camaleon_cms/image-not-found.png"))
   end
 end

data/app/decorators/camaleon_cms/site_decorator.rb

@@ -86,6 +86,8 @@ class CamaleonCms::SiteDecorator < CamaleonCms::TermTaxonomyDecorator
   end
 
   # return the post_tag object with id or slug = slug_or_id from this site
+  # sample: current_site.the_tag('test').the_url
+  # sample2: current_site.the_tag('test').the_posts
   def the_tag(slug_or_id)
     return object.post_tags.where(id: slug_or_id).first.decorate rescue nil if slug_or_id.is_a?(Integer)
     return object.post_tags.find_by_slug(slug_or_id).decorate rescue nil if slug_or_id.is_a?(String)
@@ -152,7 +154,7 @@ class CamaleonCms::SiteDecorator < CamaleonCms::TermTaxonomyDecorator
   # return root url for this site
   def the_url(*args)
     args = args.extract_options!
-    args[:host] = object.main_site? ? object.slug : (object.slug.include?(".") ? object.slug : "#{object.slug}.#{PluginRoutes.system_info["base_domain"]}" )
+    args[:host] = object.main_site? ? PluginRoutes.system_info["base_domain"] : (object.slug.include?(".") ? object.slug : "#{object.slug}.#{PluginRoutes.system_info["base_domain"]}" )
     args[:port] = (args[:host].split(":")[1] rescue nil)
     args[:locale] = @_deco_locale unless args.include?(:locale)
     args[:host] = args[:host].split(":").first
@@ -168,7 +170,7 @@ class CamaleonCms::SiteDecorator < CamaleonCms::TermTaxonomyDecorator
   # =============================== ADMIN =======================
   # admin root url for this site
   def the_admin_url
-    host = object.main_site? ? object.slug : (object.slug.include?(".") ? object.slug : "#{object.slug}.#{PluginRoutes.system_info["base_domain"]}" )
+    host = object.main_site? ? PluginRoutes.system_info["base_domain"] : (object.slug.include?(".") ? object.slug : "#{object.slug}.#{PluginRoutes.system_info["base_domain"]}" )
     port = (host.split(":")[1] rescue nil)
     h.cama_url_to_fixed("cama_admin_dashboard_url", host: host, port: port, locale: false)
   end

data/app/decorators/camaleon_cms/term_taxonomy_decorator.rb

@@ -7,7 +7,7 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class CamaleonCms::TermTaxonomyDecorator < CamaleonCms::ApplicationDecorator
-  include CustomFieldsConcern
+  include CamaleonCms::CustomFieldsConcern
   delegate_all
 
   # return the title for current locale
@@ -84,20 +84,16 @@ class CamaleonCms::TermTaxonomyDecorator < CamaleonCms::ApplicationDecorator
     h.link_to("&rarr; #{title || h.ct("edit")}".html_safe, the_edit_url, attrs)
   end
 
-  # cache identifier, the format is: [current-site-prefix]/[object-id]-[object-last_updated]/[current locale]
-  # key: additional key for the model
-  def cache_prefix(key = "")
-    res = ""
-    case object.class.name
-      when "CamaleonCms::PostType"
-        res = "#{h.current_site.cache_prefix}/ptype#{object.id}#{"/#{key}" if key.present?}"
-      when "CamaleonCms::Category"
-        res = "#{h.current_site.cache_prefix}/pcat#{object.id}#{"/#{key}" if key.present?}"
-      when "CamaleonCms::PostTag"
-        res = "#{h.current_site.cache_prefix}/ptag#{object.id}#{"/#{key}" if key.present?}"
-      when "CamaleonCms::Site"
-        res = "/#{object.id}/#{I18n.locale}#{"/#{key}" if key.present?}"
-    end
-    res
+  # return the user owner of this item
+  # sample: my_item.the_owner.the_url
+  def the_owner
+    owner.decorate rescue nil
+  end
+
+  # return the parent item of this item
+  # sample: my_item.the_parent.the_url
+  def the_parent
+    parent.decorate rescue nil
   end
+
 end

data/app/decorators/camaleon_cms/user_decorator.rb

@@ -61,12 +61,6 @@ class CamaleonCms::UserDecorator < CamaleonCms::ApplicationDecorator
     h.current_site.posts.where(user_id: object.id)
   end
 
-  # cache identifier, the format is: [current-site-prefix]/[object-id]-[object-last_updated]/[current locale]
-  # key: additional key for the model
-  def cache_prefix(key = "")
-    "#{h.current_site.cache_prefix}/user#{object.id}#{"/#{key}" if key.present?}"
-  end
-
   private
 
   def avatar_exists?

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

@@ -40,7 +40,7 @@ module CamaleonCms::Admin::MenusHelper
     admin_menu_add_menu("appearance", {icon: "paint-brush", title: t('camaleon_cms.admin.sidebar.appearance'), url: "", items: items, datas: "data-intro='#{t("camaleon_cms.admin.intro.appearance")}' data-position='right' data-wait='500'"}) if items.present?
 
 
-    admin_menu_add_menu("plugins", {icon: "plug", title: "#{t('camaleon_cms.admin.sidebar.plugins')} <small class='label label-primary'>#{PluginRoutes.all_plugins.size}</small>", url: cama_admin_plugins_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.plugins")}' data-position='right'"}) if can? :manager, :plugins
+    admin_menu_add_menu("plugins", {icon: "plug", title: "#{t('camaleon_cms.admin.sidebar.plugins')} <small class='label label-primary'>#{PluginRoutes.all_plugins.clone.delete_if{|plugin| plugin[:domain].present? && !plugin[:domain].split(",").include?(current_site.the_slug) }.size}</small>", url: cama_admin_plugins_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.plugins")}' data-position='right'"}) if can? :manager, :plugins
 
     if can? :manager, :users
       items = []

data/app/helpers/camaleon_cms/camaleon_helper.rb

@@ -15,7 +15,7 @@ module CamaleonCms::CamaleonHelper
   # attachs: array of files to be attached to the email
   # layout_name: path of the template to render
   # template_name: template name to render in template_path
-  def sendmail(email,subject='Tiene una notificacion',content='',from=nil,attachs=[],template_name = 'mailer', layout_name = 'mailer')
+  def sendmail(email,subject='Tiene una notificacion',content='',from=nil,attachs=[],template_name = 'mailer', layout_name = 'camaleon_cms/mailer')
     Thread.abort_on_exception=true
     Thread.new do
       HtmlMailer.sender(email, subject, content, from, attachs, cama_root_url, current_site, template_name, layout_name).deliver_now

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

@@ -161,7 +161,8 @@ module CamaleonCms::Frontend::NavMenuHelper
           post_type = CamaleonCms::PostType.find(nav_menu_item.get_option('object_id')).decorate
           {link: post_type.the_url(as_path: true), name: post_type.the_title, type_menu: type_menu, current: @cama_visited_post_type.present? && @cama_visited_post_type.id == post_type.id}
         when 'external'
-          r = {link: nav_menu_item.get_option('object_id'), name: nav_menu_item.name.to_s.translate, type_menu: type_menu, current: false}
+          r = {link: nav_menu_item.get_option('object_id', ""), name: nav_menu_item.name.to_s.translate, type_menu: type_menu, current: false}
+          r[:current] = r[:link] == site_current_url || r[:link] == site_current_path
           r[:link] = cama_url_to_fixed("cama_root_url") if r[:link] == "root_url"
           r
         else

data/app/helpers/camaleon_cms/html_helper.rb

@@ -13,8 +13,20 @@ module CamaleonCms::HtmlHelper
     @_assets_content = []
   end
 
+  # register a new asset library to be included on demand calling by: cama_load_libraries(...)
+  # sample: cama_assets_library_register("my_library", {js: ["url_js", "url_js2"], css: ["url_css1", "url_css2"]})
+  #   cama_load_libraries("my_library")
+  def cama_assets_library_register(key, assets = {})
+    key = key.to_sym
+    cama_assets_libraries
+    @_cama_assets_libraries[key] = {css: [], js: [] } unless @_cama_assets_libraries[key].present?
+    @_cama_assets_libraries[key][:css] += assets[:css] if assets[:css].present?
+    @_cama_assets_libraries[key][:js] += assets[:js] if assets[:js].present?
+  end
+
   # enable to load admin or registered libraries (colorpicker, datepicker, form_builder, tinymce, form_ajax, cropper)
   # sample: add_asset_library("datepicker", "colorpicker")
+  # This will add this assets library in the admin head or in a custom place by calling: cama_draw_custom_assets()
   def cama_load_libraries(*keys)
     keys.each do |key|
       library = cama_assets_libraries[key.to_sym]
@@ -88,6 +100,7 @@ module CamaleonCms::HtmlHelper
 
   private
   def cama_assets_libraries
+    return @_cama_assets_libraries if @_cama_assets_libraries.present?
     libs = {}
     libs[:colorpicker] = {js: ['camaleon_cms/admin/bootstrap-colorpicker'], css: ["camaleon_cms/admin/colorpicker.css"]}
     libs[:datepicker] = {js: ['camaleon_cms/admin/bootstrap-datepicker']}
@@ -101,6 +114,6 @@ module CamaleonCms::HtmlHelper
     libs[:validate] = {js: ['camaleon_cms/admin/jquery.validate']}
     libs[:nav_menu] = {css: ['camaleon_cms/admin/nestable/jquery.nestable', "camaleon_cms/admin/nav-menu"], js: ["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"]}
-    libs
+    @_cama_assets_libraries = libs
   end
 end

data/app/helpers/camaleon_cms/session_helper.rb

@@ -40,6 +40,36 @@ module CamaleonCms::SessionHelper
     @user && @user.authenticate(password)
   end
 
+  ##
+  # User registration.
+  #
+  # user_data must contain:
+  # - email
+  # - username
+  # - password
+  # - password_confirmation
+  #
+  # meta must contain:
+  # - first_name
+  # - last_name
+  #
+  def cama_register_user(user_data, meta)
+    @user = current_site.users.new(user_data)
+    r = {user: @user, params: params}; hook_run('user_before_register', r)
+
+    if current_site.security_user_register_captcha_enabled? && !cama_captcha_verified?
+      {:result => false, :type => :captcha_error, :message => t('camaleon_cms.admin.users.message.error_captcha')}
+    else
+      if @user.save
+        @user.set_meta_from_form(meta)
+        r = {user: @user, message: t('camaleon_cms.admin.users.message.created'), redirect_url: cama_admin_login_path}; hooks_run('user_after_register', r)
+        {:result => true, :message => r[:message], :redirect_url => r[:redirect_url]}
+      else
+        {:result => false, :type => :no_saved}
+      end
+    end
+  end
+
   # check if current host is heroku
   def cama_on_heroku?
     ENV.keys.any? { |var_name| var_name.match(/(heroku|dyno)/i) }
@@ -76,6 +106,7 @@ module CamaleonCms::SessionHelper
   def cama_sign_in?
     !cama_current_user.nil?
   end
+
   alias_method :signin?, :cama_sign_in?
 
   # return the role for current user
@@ -99,6 +130,7 @@ module CamaleonCms::SessionHelper
       @current_user = (current_site.users_include_admins.find_by_auth_token(c[0]).decorate rescue nil)
     end
   end
+
   alias_method :current_user, :cama_current_user
 
   # check if a visitor was logged in

data/app/helpers/camaleon_cms/short_code_helper.rb

@@ -18,7 +18,7 @@ module CamaleonCms::ShortCodeHelper
                 Sample: [widget widget_key]")
 
     shortcode_add("load_libraries",
-                  lambda{|attrs, args| add_asset_library(*attrs["data"].to_s.split(",")); return ""; },
+                  lambda{|attrs, args| cama_load_libraries(*attrs["data"].to_s.split(",")); return ""; },
                   "Permit to load libraries on demand, sample: [load_libraries data='datepicker,tinymce']")
 
     shortcode_add("asset",
@@ -145,7 +145,7 @@ module CamaleonCms::ShortCodeHelper
   # determine the content to replace instead the shortcode
   # return string
   def _eval_shortcode(code, attrs, args={}, template = nil)
-    template ||= (@_shortcodes_template[code].present? ? @_shortcodes_template[code] : "shortcode_templates/#{code}")
+    template ||= (@_shortcodes_template[code].present? ? @_shortcodes_template[code] : "camaleon_cms/shortcode_templates/#{code}")
     if @_shortcodes_template[code].class.name == "Proc"
       res = @_shortcodes_template[code].call(_shortcode_parse_attr(attrs), args)
     else

data/app/helpers/camaleon_cms/site_helper.rb

@@ -12,9 +12,8 @@ module CamaleonCms::SiteHelper
     @current_site = site.decorate if site.present?
     return $current_site if defined?($current_site)
     return @current_site if defined?(@current_site)
-    all_sites = CamaleonCms::Site.all
-    if all_sites.size == 1
-      site = all_sites.first.decorate
+    if PluginRoutes.get_sites.size == 1
+      site = PluginRoutes.get_sites.first.decorate
     else
       host = request.original_url.to_s.parse_domain
       if host == PluginRoutes.system_info["base_domain"]
@@ -33,7 +32,7 @@ module CamaleonCms::SiteHelper
   def cama_site_check_existence()
     if !current_site.present?
       if (PluginRoutes.main_site).present?
-        base_domain = PluginRoutes.main_site.slug
+        base_domain = PluginRoutes.system_info["base_domain"]
         redirect_to cama_root_url(host: base_domain.split(":").first, port: (base_domain.split(":")[1] rescue nil))
       else
         redirect_to cama_admin_installers_path

data/app/helpers/camaleon_cms/uploader_helper.rb

@@ -57,7 +57,7 @@ module CamaleonCms::UploaderHelper
           settings[:formats] = "zip,7z,rar,tar,bz2,gz,rar2"
       end
 
-      unless settings[:formats].downcase.split(",").include?(File.extname(file_path).sub(".", "").downcase)
+      unless settings[:formats].downcase.split(",").include?(File.extname(settings[:filename]).sub(".", "").downcase)
         res[:error] = ct("file_format_error")
         return res
       end
@@ -123,7 +123,9 @@ module CamaleonCms::UploaderHelper
   # add a new folder in fog
   def cama_uploader_add_folder(folder)
     cama_uploader_init_connection(true)
-    @fog_connection_bucket_dir.files.create({:key => "#{current_site.id}/#{folder}/".gsub(/(\/){2,}/, "/"), content: "", :public => true})
+    key = "#{current_site.id}/#{folder}/".split("/").clean_empty.join("/")
+    key += '/_tmp.txt' unless @fog_connection.class.name.include?("AWS")
+    @fog_connection_bucket_dir.files.create({:key => key, content: "", :public => true})
   end
 
   # initialize fog uploader and trigger hook to customize fog storage
@@ -186,7 +188,7 @@ module CamaleonCms::UploaderHelper
         folder_src[:folders][file.key.split("/").last] = {folders: {}, files: []}
       else
         r_file = cama_uploader_parse_file(file)
-        folder_src[:files] << r_file if r_file["url"].present? # skip non public url files (protected)
+        folder_src[:files] << r_file if r_file["url"].present? && !file.key.include?('/_tmp.txt') # skip non public url files (protected)
       end
     end
   end
@@ -211,10 +213,10 @@ module CamaleonCms::UploaderHelper
 
   # parse file information of FOG file
   def cama_uploader_parse_file(file)
-    res = {"name"=> File.basename(file.key), "size"=> file.content_length, "url"=> (file.public_url rescue "#{@fog_connection.endpoint}/#{file.key}"), "deleteUrl"=> "" }
+    res = {"name"=> File.basename(file.key), "file"=> file.key, "size"=> file.content_length, "url"=> (file.public_url rescue [current_site.get_option("filesystem_s3_endpoint"), file.key ].join("/")), "deleteUrl"=> "" }
     ext = File.extname(file.key).sub(".", "").downcase
     res["format"] = "unknown"
-    if "jpg,jpeg,png,gif,bmp".split(",").include?(ext)
+    if "jpg,jpeg,png,gif,bmp,ico".split(",").include?(ext)
       if File.extname(res["name"]) == ".gif"
         res["thumb"] = res["url"]
       else

data/app/mailers/camaleon_cms/html_mailer.rb

@@ -37,6 +37,10 @@ class CamaleonCms::HtmlMailer < ActionMailer::Base
                                             }
     end
 
+    views_dir = "app/apps/"
+    self.prepend_view_path(File.join($camaleon_engine_dir, views_dir).to_s)
+    self.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"]

data/app/models/camaleon_cms/ability.rb

@@ -30,34 +30,34 @@ class CamaleonCms::Ability
       ids_delete_other = @roles_post_type[:delete_other] || []
       ids_delete_publish = @roles_post_type[:delete_publish] || []
 
-      can :posts, PostType do |pt|
+      can :posts, CamaleonCms::PostType do |pt|
         (ids_edit + ids_edit_other + ids_edit_publish).to_i.include?(pt.id) rescue false
       end
 
-      can :create_post, PostType do |pt|
+      can :create_post, CamaleonCms::PostType do |pt|
         ids_edit.to_i.include?(pt.id) rescue false
       end
-      can :publish_post, PostType do |pt|
+      can :publish_post, CamaleonCms::PostType do |pt|
         ids_publish.to_i.include?(pt.id) rescue false
       end
 
-      can :categories, PostType do |pt|
+      can :categories, CamaleonCms::PostType do |pt|
         @roles_post_type[:manage_categories].to_i.include?(pt.id) rescue false
       end
-      can :post_tags, PostType do |pt|
+      can :post_tags, CamaleonCms::PostType do |pt|
         @roles_post_type[:manage_tags].to_i.include?(pt.id) rescue false
       end
 
-      can :update, Post do |post|
+      can :update, CamaleonCms::Post do |post|
         pt_id = post.post_type.id
         r = false
         r ||= (ids_edit).to_i.include?(pt_id) && post.user_id == user.id rescue false
-        r ||= (ids_edit_publish ).to_i.include?(pt_id) && post.published? rescue false
-        r ||= (ids_edit_other).to_i.include?(pt_id) && post.user_id != user.id  rescue false
+        r ||= (ids_edit_publish).to_i.include?(pt_id) && post.published? rescue false
+        r ||= (ids_edit_other).to_i.include?(pt_id) && post.user_id != user.id rescue false
         r
       end
 
-      can :destroy, Post do |post|
+      can :destroy, CamaleonCms::Post do |post|
         pt_id = post.post_type.id
         r = false
         r ||= (ids_delete).to_i.include?(pt_id) && post.user_id == user.id rescue false
@@ -67,7 +67,6 @@ class CamaleonCms::Ability
       end
 
 
-
       #others
       can :manage, :media     if @roles_manager[:media] rescue false
       can :manage, :comments  if @roles_manager[:comments] rescue false
@@ -83,8 +82,6 @@ class CamaleonCms::Ability
     end
 
 
-
-
     # variants:
 
     # can [:update, :destroy], [Article, Comment]
@@ -105,8 +102,6 @@ class CamaleonCms::Ability
     # end
 
 
-
-
     # See the wiki for details:
     # https://github.com/CanCanCommunity/cancancan/wiki/Defining-Abilities
   end