camaleon_cms 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e67f1be72288c728d249247f0dfe7f6caea78f3
-  data.tar.gz: 75092f52ee20f970a60b5f3fccd28905d1d21304
+  metadata.gz: d119a0fad758a8ad11ba5cc42dd42942896862ee
+  data.tar.gz: f7b2d4e99f044d16c5e9972f639c1bb5e9765813
 SHA512:
-  metadata.gz: a20628ee74729584fccc227a9c1c1c80748449a9ddfa780ad21c9ec7328efd507e6da8150895dd4fe28689fe3a4ccdea49acee34133aa27514e6d61dd74b12ce
-  data.tar.gz: 5265b4b7ebeed15f0c1f35e99f961560dfcc29c9bf73b67c9275269f248019fa7030a7cc39b15dfe00ffca48cdecb0be7a130bb701a49a0188abebc9c592728b
+  metadata.gz: dc0fd94340d4eb4cd7d9cf9ab4e2b0b001376b36e958885d43101e4511b4888618938aedb856bf76d8edd582d8ebe6d9cb74e27e41d14cc8e7a9cc546a9afc01
+  data.tar.gz: ca5f44b3daa47f296d66462ff143c4e69e4b3ad76ab49d770a78e682d865016b9deb8315748683a3483da75a56b0679a6c43adf6dac80126b736978b71466266

data/README.md

@@ -180,4 +180,18 @@ http://camaleon.tuzitio.com/license.html/
 Visit the web site for more information: http://camaleon.tuzitio.com/
 
 ## Version History
-http://camaleon.tuzitio.com/version-history.html
+* Version 1.0.8
+  - Fix logo size on admin panel
+  - Fixed: Raise error when visiting unexisting urls. Example: Random troll writes domain.com/asdasdasd/adfasdasd.
+  - Allow email domains up to 10 characters in the contact form plugin
+  - Added advanced shortcodes to print data in any content:Permit to generate specific data of a post. (see more details in link below)
+  - fixed vertical scroll for multiple modals- added a library to create inline field to upload fields.
+  - Added control to clean cache after restart server.
+  - Added hook to include custom links from plugins or themes.
+  - changed custom sitemap into hash.
+  - added sitemap skippers to filter private elements.
+  - fixed the_breadcrumb for current_site.
+  - Unify current_user removing current_resource_owner. Solved bug with login_user_with_password.
+  - Added generic API response methods, render_json_error & render_json_ok.
+
+See more here: http://camaleon.tuzitio.com/version-history.html

data/app/apps/plugins/contact_form/admin_forms_controller.rb

@@ -71,15 +71,6 @@ class Plugins::ContactForm::AdminFormsController < Apps::PluginsAdminController
 
   end
 
-  def fix_meta_value(value)
-    if (value.is_a?(Array) || value.is_a?(Hash))
-      value = value.to_json
-    elsif value.is_a?(String)
-      value = value.to_var
-    end
-    value
-  end
-
   # here add your custom functions
   private
   def set_form

data/app/apps/plugins/contact_form/contact_form_helper.rb

@@ -74,15 +74,106 @@ module Plugins::ContactForm::ContactFormHelper
   end
 
   def contact_form_admin_before_load
-    admin_menu_append_menu_item("settings", {icon: "envelope-o", title: t('plugin.contact_form.contact_form'), url:  admin_plugins_contact_form_admin_forms_path, datas: "data-intro='This plugin permit you to create you contact forms with desired fields and paste your short_code in any content.' data-position='right'"})
+    admin_menu_append_menu_item("settings", {icon: "envelope-o", title: t('plugin.contact_form.contact_form'), url: admin_plugins_contact_form_admin_forms_path, datas: "data-intro='This plugin permit you to create you contact forms with desired fields and paste your short_code in any content.' data-position='right'"})
   end
 
   def contact_form_app_before_load
-    shortcode_add('forms',  plugin_view("contact_form", "forms_shorcode"), "This is a shortocode for contact form to permit you to put your contact form in any content.
+    shortcode_add('forms', plugin_view("contact_form", "forms_shorcode"), "This is a shortocode for contact form to permit you to put your contact form in any content.
     Sample: [forms slug='key-for-my-form']")
   end
 
   def contact_form_front_before_load
-    append_asset_libraries({"plugin_contact_form"=> { css: [plugin_asset_path("contact_form", "css/front/railsform")] }})
+    append_asset_libraries({"plugin_contact_form" => {css: [plugin_asset_path("contact_form", "css/front/railsform")]}})
+  end
+
+  def perform_save_form(form, values, fields, settings, success, errors)
+    attachments = []
+    if validate_to_save_form(values, fields, settings, errors)
+      values[:fields].each do |f|
+        cid = f[:cid].to_sym
+        if f[:field_type] == 'file'
+          res = upload_file(fields[cid], {maximum: 5.megabytes, folder: current_site.upload_directory("uploads")})
+          if res[:error].present?
+            errors << res[:error]
+          else
+            attachments << res['file']
+          end
+        end
+      end
+
+      new_settings = {"fields" => fields, "created_at" => Time.now.strftime("%Y-%m-%d %H:%M:%S").to_s}.to_json
+      form_new = current_site.contact_forms.new(name: "response-#{Time.now}", description: form.description, settings: fix_meta_value(new_settings), site_id: form.site_id, parent_id: form.id)
+
+      if form_new.save
+        begin
+          content = render_to_string partial: 'contact_form/submission',
+                                     layout: false,
+                                     locals: {
+                                         file_attachments: attachments,
+                                         fields: convert_form_values(
+                                             values[:fields],
+                                             fields
+                                         )
+                                     }
+        rescue ActionView::MissingTemplate
+          content = render_to_string partial: 'contact_form/views/contact_form/submission',
+                                     layout: false,
+                                     locals: {
+                                         file_attachments: attachments,
+                                         fields: convert_form_values(
+                                             values[:fields],
+                                             fields
+                                         )
+                                     }
+        end
+
+        sendmail(
+            settings[:railscf_mail][:to], settings[:railscf_mail][:subject],
+            content,
+            settings[:railscf_mail][:to],
+            attachments
+        )
+        success << settings[:railscf_message][:mail_sent_ok]
+      else
+        errors << settings[:railscf_message][:mail_sent_ng]
+      end
+    end
+  end
+
+  def validate_to_save_form(values, fields, settings, errors)
+    validate = true
+    values[:fields].each do |f|
+      cid = f[:cid].to_sym
+      label = f[:label].to_sym
+
+      case f[:field_type].to_s
+        when 'text', 'website', 'paragraph', 'textarea', 'email', 'radio', 'checkboxes', 'dropdown', 'file'
+          if f[:required] && !fields[cid].present?
+            errors << "#{label}: #{settings[:railscf_message][:invalid_required]}"
+            validate = false
+          end
+          if f[:field_type].to_s == "email"
+            if !fields[cid].match(/\b[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,10}\z/)
+              errors << "#{label}: #{settings[:railscf_message][:invalid_email]}"
+              validate = false
+            end
+          end
+        when 'captcha'
+          unless captcha_verified?
+            errors << "#{label}: #{settings[:railscf_message][:captcha_not_match]}"
+            validate = false
+          end
+      end
+    end
+    validate
+  end
+
+  def fix_meta_value(value)
+    if (value.is_a?(Array) || value.is_a?(Hash))
+      value = value.to_json
+    elsif value.is_a?(String)
+      value = value.to_var
+    end
+    value
   end
 end

data/app/apps/plugins/contact_form/front_controller.rb

@@ -19,76 +19,10 @@ class Plugins::ContactForm::FrontController < Apps::PluginsFrontController
     values = JSON.parse(@form.value).to_sym
     settings = JSON.parse(@form.settings).to_sym
     fields = params[:fields]
-    attachments = []
-
     errors = []
     success = []
 
-    validate = true
-
-    values[:fields].each do |f|
-      cid = f[:cid].to_sym
-      label = f[:label].to_sym
-
-      case f[:field_type].to_s
-      when 'text', 'website', 'paragraph', 'textarea', 'email', 'radio', 'checkboxes', 'dropdown', 'file'
-        if f[:required] && !fields[cid].present?
-          errors << "#{label}: #{settings[:railscf_message][:invalid_required]}"
-          validate = false
-        end
-        if f[:field_type].to_s == "email"
-          if !fields[cid].match(/\b[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,10}\z/)
-            errors << "#{label}: #{settings[:railscf_message][:invalid_email]}"
-            validate = false
-          end
-        end
-      when 'captcha'
-        unless captcha_verified?
-          errors << "#{label}: #{settings[:railscf_message][:captcha_not_match]}"
-          validate = false
-        end
-      end
-    end
-
-    if validate
-      values[:fields].each do |f|
-        cid = f[:cid].to_sym
-        if f[:field_type] == 'file'
-          res = upload_file(fields[cid], {maximum: 5.megabytes, folder: current_site.upload_directory("uploads")})
-          if res[:error].present?
-            errors << res[:error]
-          else
-            attachments << res['file']
-          end
-        end
-      end
-
-      new_settings = {"fields" => fields, "created_at" => Time.now.strftime("%Y-%m-%d %H:%M:%S").to_s}.to_json
-      @form_new = current_site.contact_forms.new(name: "response-#{Time.now}", description: @form.description, settings:fix_meta_value(new_settings), site_id: @form.site_id, parent_id: @form.id)
-
-      if @form_new.save
-        content = render_to_string partial: 'contact_form/submission',
-                                   layout: false,
-                                   locals: {
-                                     file_attachments: attachments,
-                                     fields: convert_form_values(
-                                       values[:fields],
-                                       fields
-                                     )
-                                   }
-        # send mail
-        sendmail(
-          settings[:railscf_mail][:to], settings[:railscf_mail][:subject],
-          content,
-          settings[:railscf_mail][:to],
-          attachments
-        )
-        success << settings[:railscf_message][:mail_sent_ok]
-      else
-        errors << settings[:railscf_message][:mail_sent_ng]
-      end
-    end
-
+    perform_save_form(@form, values, fields, settings, success, errors)
     if success.present?
       flash[:notice] = success.join('<br>')
     else
@@ -113,4 +47,4 @@ class Plugins::ContactForm::FrontController < Apps::PluginsFrontController
     end
     value
   end
-end
+end

data/app/apps/plugins/front_cache/front_cache_helper.rb

@@ -139,8 +139,12 @@ module Plugins::FrontCache::FrontCacheHelper
 
   # clear all frontend cache files
   def front_cache_clean
-    FileUtils.rm_f(cache_store.cache_path) # clear fragment caches
-    FileUtils.rm_rf(File.join(ActionController::Base.page_cache_directory, current_site.id.to_s)) # clear site pages cache
+    # TODO replace with custom cache page
+    begin
+      FileUtils.rm_f(cache_store.cache_path) # clear fragment caches
+      FileUtils.rm_rf(File.join(ActionController::Base.page_cache_directory, current_site.id.to_s)) # clear site pages cache
+    rescue
+    end
   end
 
   private

data/app/controllers/admin/appearances/widgets/assign_controller.rb

@@ -20,9 +20,9 @@ class Admin::Appearances::Widgets::AssignController < Admin::AppearancesControll
     @assigned = @sidebar.assigned.find(params[:id])
     if @assigned.update(params[:assign])
       @assigned.set_field_values(params[:field_options])
-      flash[:notice] = "Widget assign updated"
+      flash[:notice] = t('admin.widgets.assign.updated')
     else
-      flash[:error] = "Widget assign not updated"
+      flash[:error] = t('admin.widgets.assign.error_updated')
     end
     redirect_to admin_appearances_widgets_main_index_path
   end
@@ -37,4 +37,4 @@ class Admin::Appearances::Widgets::AssignController < Admin::AppearancesControll
     authorize! :manager, :widgets
   end
 
-end
+end

data/app/controllers/admin/appearances/widgets/sidebar_controller.rb

@@ -17,9 +17,9 @@ class Admin::Appearances::Widgets::SidebarController < Admin::AppearancesControl
   def create
     @sidebar = current_site.sidebars.new(params[:widget_sidebar])
     if @sidebar.save
-      flash[:notice] = "Sidebar Create"
+      flash[:notice] = t('admin.widgets.sidebar.created')
     else
-      flash[:error] = "No created sidebar"
+      flash[:error] = t('admin.widgets.sidebar.error_created')
     end
     redirect_to admin_appearances_widgets_main_index_path
   end
@@ -31,9 +31,9 @@ class Admin::Appearances::Widgets::SidebarController < Admin::AppearancesControl
 
   def update
     if current_site.sidebars.find(params[:id]).update(params[:widget_sidebar])
-      flash[:notice] = "Sidebar Update"
+      flash[:notice] = t('admin.widgets.sidebar.updated')
     else
-      flash[:error] = "No  Update sidebar"
+      flash[:error] = t('admin.widgets.sidebar.error_updated')
     end
     redirect_to admin_appearances_widgets_main_index_path
   end
@@ -47,7 +47,7 @@ class Admin::Appearances::Widgets::SidebarController < Admin::AppearancesControl
 
   def destroy
     @sidebar = current_site.sidebars.find(params[:id]).destroy
-    flash[:notice] = "Sidebar deleted."
+    flash[:notice] = t('admin.widgets.sidebar.error_deleted')
     redirect_to admin_appearances_widgets_main_index_path
   end
 

data/app/controllers/admin/sessions_controller.rb

@@ -36,7 +36,7 @@ class Admin::SessionsController < CamaleonController
       if captcha_validate
         flash[:error] = t('admin.login.message.fail')
       else
-        flash[:error] = "Invalid captcha"
+        flash[:error] = t('admin.login.message.invalid_caption')
       end
       @user = current_site.users.new(data_user)
       render 'admin/sessions/login'

data/app/controllers/api/api_controller.rb

@@ -1,17 +1,20 @@
 class Api::ApiController < CamaleonController
   #before_action -> { doorkeeper_authorize! :client }
-
   def account
     render json: current_user
   end
 
-  def render_json_error(internal_message = 'Unexpected error', code = 100, status = 404, user_message = 'Unexpected error')
+  def render_json_error(error, status = 404)
+    render json: error, status: status
+  end
+
+  def render_json_error_message(internal_message = 'Unexpected error', code = 100, status = 404, user_message = 'Unexpected error')
     error = {
-        'userMessage': user_message,
-    'internalMessage': internal_message,
-    'code': code
+        userMessage: user_message,
+        internalMessage: internal_message,
+        code: code
     }
-    render :json => error, :status => status
+    render_json_error(error, status)
   end
 
   def render_json_ok(message = 'Success', status = 200, more_info = {})
@@ -19,7 +22,10 @@ class Api::ApiController < CamaleonController
         message: message,
         more_info: more_info
     }
-    render :json => msg, :status => status
+    render json: msg, status: status
   end
 
+  def render_json_not_found
+    render nothing: true, status: 404
+  end
 end

data/app/controllers/api/v1/category_controller.rb

@@ -1,7 +1,15 @@
 class Api::V1::CategoryController < Api::ApiController
 
+  swagger_controller :categories, 'Categories'
+
+  swagger_api :categories do
+    summary 'Categories'
+    notes 'Notes...'
+  end
+
   def categories
-    render json: current_site.full_categories
+    @categories = current_site.full_categories
+    render json: ActiveModel::ArraySerializer.new(@categories, each_serializer: Api::V1::CategorySerializer)
   end
 
 end

data/app/controllers/api/v1/contact_form_controller.rb

@@ -0,0 +1,55 @@
+class Api::V1::ContactFormController < Api::ApiController
+  #TODO this controller must be into ContactForm plugin app
+  skip_before_filter :verify_authenticity_token
+
+  swagger_controller :contact_form, 'ContactForm'
+
+  swagger_api :contact_form_by_slug do
+    summary "Fetch a single Contact Form by slug"
+    param :path, :slug, :string, :required, 'Contact form slug'
+    response :ok, 'Success', :ContactForm
+    response :not_found
+  end
+
+  def contact_form_by_slug
+    form = current_site.contact_forms.where("parent_id is null and slug = '#{params[:slug]}'").first
+    if form.nil?
+      render_json_not_found
+    else
+      render json: {
+                 :id => form.id,
+                 :fields => JSON.parse(form.value).to_sym[:fields],
+                 :settings => JSON.parse(form.settings).to_sym
+             }
+    end
+  end
+
+  swagger_api :save_form do
+    summary "Submit a contact form"
+    param :form, :id, :integer, :required, 'Contact form id'
+    param :form, :fields, :array, :required, 'Fields'
+    response :ok, 'Success'
+    response :not_found
+  end
+
+  def save_form
+    form = current_site.contact_forms.find_by_id(params[:id])
+    unless form.nil?
+      values = JSON.parse(form.value).to_sym
+      settings = JSON.parse(form.settings).to_sym
+      fields = params[:fields]
+      errors = []
+      success = []
+
+      perform_save_form(form, values, fields, settings, success, errors)
+      if success.present?
+        render_json_ok(success.join('<br>'))
+      else
+        render_json_ok({:errors => :errors, :fields => fields})
+      end
+    else
+      render_json_not_found
+    end
+  end
+
+end

data/app/controllers/camaleon_controller.rb

@@ -49,9 +49,16 @@ class CamaleonController < ApplicationController
     # including all helpers (system, themes, plugins) for this site
     PluginRoutes.enabled_apps(current_site, current_theme.slug).each{|plugin| plugin_load_helpers(plugin) }
 
-    # set default cache directory for current site
-    cache_store.cache_path = File.join(cache_store.cache_path.split("site-#{current_site.id}").first, "site-#{current_site.id}")
-    # Rails.cache.write("#{current_site.id}-#{Time.now}", 1)
+    # Set default cache file store directory for current site
+    # Sample: Rails.cache.write("#{current_site.id}-#{Time.now}", 1)
+    begin
+      cache_store.cache_path = File.join(cache_store.cache_path.split("site-#{current_site.id}").first, "site-#{current_site.id}")
+    rescue
+      # skip error for non cache file, sample: dalli
+      # you need to define your cache store settings by config file or using the hook "app_before_load"
+      # for multi site support you can use namespace: "site-#{current_site.id}"
+    end
+
 
     # initializing short codes
     shortcodes_init()