camaleon_cms 2.4.3.12 → 2.4.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a88c2eae7a1687093b36edc1b7e114025c6f35c5
-  data.tar.gz: 2a4a338e0a9e7331d2c9ede64cb7a01a14ea2ce4
+  metadata.gz: 60220e65572eba3df3e3307a97c423dda3a5c88b
+  data.tar.gz: 8fbafdb15258a5aec532b99f1f361f3f76a65d83
 SHA512:
-  metadata.gz: e8058188fc6b86f8103fdb8391cddb1f3cade1c2ac0c178d91c71454bf0443de450891563303ea1363690f6a54e762debd50291113efc1e7cc01836c2698bf6b
-  data.tar.gz: 5cf62d58034bbe6d0e9e71677089648a154a91d3062ed9e6f88341e3c11af7b3ddc39200a21be5425a127a62041595762559072abf381a76cdfaea6fad2a2968
+  metadata.gz: 3f392f06e049b9fc300785f955cbca6e57efda0e30719e2cfa7f1271673578579a2e328b040ae27b977247a9a2b0633464a27af960dbf0fceadaa51642d9f7dc
+  data.tar.gz: 6bef7a0c8e4c174456cbf5b9daec32377199a69f6e4d3238b887e615964a35c8fa529a616a2cfd12c0cfe9c5f971b5521702ff8f41b13d34039848cd68b4c57c

data/app/apps/plugins/authoring_post/authoring_post_helper.rb

@@ -42,7 +42,7 @@ module Plugins::AuthoringPost::AuthoringPostHelper
   def plugin_authoring_authors_list(post)
     author_id = post.new_record? ? current_user.id : post.author.id
     ret = ''
-    current_site.users.unscoped.where('role <> ?', 'client').order(:username).each do |user|
+    current_site.users.where('role <> ?', 'client').order(:username).each do |user|
       ret += "<option value='#{user.id}' #{user.id.eql?(author_id) ? 'selected' : ''}>#{user.username.titleize}#{user.fullname.eql?(user.username.titleize) ? '' : ' (' +  user.fullname + ')' }</option>"
     end
     ret

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

@@ -23,11 +23,7 @@ class Plugins::FrontCache::AdminController < CamaleonCms::Apps::PluginsAdminCont
   def clean_cache
     flash[:notice] = "#{t('plugin.front_cache.message.cache_destroyed')}"
     front_cache_clean()
-    if Rails.version.to_i < 5
-      redirect_to :back
-    else
-      redirect_back(fallback_location: '/admin/plugins')
-    end
+    redirect_to(request.referer || '/admin/plugins')
   end
 
 end

data/app/apps/plugins/visibility_post/assets/js/form.js

@@ -1,12 +1,12 @@
 jQuery(function($){
     var panel = $("#panel-post-visibility");
     var link_edit = panel.find(".edit-visibility").click(function(){
-        panel.find(".panel-options").removeClass("hidden").show().find('input[name="post_private_groups[]"]:first').addClass('required data-error-place-parent');
+        panel.find(".panel-options").removeClass("hidden").show();
         link_edit.hide();
         return false;
     });
     panel.find(".lnk_hide").click(function(){
-        panel.find(".panel-options").hide().find('input[name="post_private_groups[]"]:first').removeClass('required');
+        panel.find(".panel-options").hide();
         link_edit.show();
         return false;
     });
@@ -15,11 +15,14 @@ jQuery(function($){
         var label = $(this).closest("label");
         panel.find(".visibility_label").html(label.text());
         label.siblings("div").hide();
-        label.next().show();
-    }).click(function(){
-        //var label = $(this).closest("label");
-        //label.siblings("div").hide();
-        //label.next().show();
+        var rel_block = label.next().show();
+        
+        if($(this).val() == 'private') rel_block.find('input.visibility_private_group_item:first').addClass('required data-error-place-parent');
+        else panel.find('input.visibility_private_group_item:first').removeClass('required');
+
+        if($(this).val() == 'password') rel_block.find('input:text').addClass('required');
+        else panel.find('input.password_field_value').removeClass('required');
+        
     }).filter(":checked").trigger("change");
 
     var cal_input = $("#form-post").find('#published_from');

data/app/apps/plugins/visibility_post/visibility_post_helper.rb

@@ -102,7 +102,7 @@ module Plugins::VisibilityPost::VisibilityPostHelper
         <div style='padding-left: 20px;'>#{groups_list(post)}</div>
 
         <label style='display: block;'><input type='radio' name='post[visibility]' claass='radio' value='password' #{"checked=''" if "password" == post.visibility}> #{t('camaleon_cms.admin.table.password_protection')}</label>
-        <div><input type='text' class='form-control' name='post[visibility_value]' value='#{post.visibility_value if "password" == post.visibility}'></div>
+        <div><input type='text' class='form-control password_field_value' name='post[visibility_value]' value='#{post.visibility_value if "password" == post.visibility}'></div>
 
         <p>
           <a class='lnk_hide' href='#'>#{t('camaleon_cms.admin.table.hide')}</a>
@@ -116,7 +116,7 @@ module Plugins::VisibilityPost::VisibilityPostHelper
     current_groups = []
     current_groups = post.visibility_value.split(",") if post.visibility == "private"
     current_site.user_roles.each do |role|
-      res << "<label><input type='checkbox' name='post_private_groups[]' class='' value='#{role.slug}' #{"checked=''" if current_groups.include?(role.slug.to_s) }> #{role.name}</label><br>"
+      res << "<label><input type='checkbox' name='post_private_groups[]' class='visibility_private_group_item' value='#{role.slug}' #{"checked=''" if current_groups.include?(role.slug.to_s) }> #{role.name}</label><br>"
     end
     res.join("")
   end

data/app/assets/javascripts/camaleon_cms/admin/_bootstrap-datepicker.js

@@ -2302,7 +2302,7 @@
             input = element;
         } else {
             input = element.find(options.datepickerInput);
-            if (input.size() === 0) {
+            if (input.length === 0) {
                 input = element.find('input');
             } else if (!input.is('input')) {
                 throw new Error('CSS class "' + options.datepickerInput + '" cannot be applied to non input element');
@@ -2311,7 +2311,7 @@
 
         if (element.hasClass('input-group')) {
             // in case there is more then one 'input-group-addon' Issue #48
-            if (element.find('.datepickerbutton').size() === 0) {
+            if (element.find('.datepickerbutton').length === 0) {
                 component = element.find('.input-group-addon');
             } else {
                 component = element.find('.datepickerbutton');

data/app/assets/javascripts/camaleon_cms/admin/_jquery.slugify.js

@@ -44,7 +44,7 @@ function slugFunc(v, sep){
 			} else {
 				$target.filter(':not(.slugify-locked)').text(slug);
 			}
-            if(settings.change && $target.filter(':not(.slugify-locked)').size() > 0){
+            if(settings.change && $target.filter(':not(.slugify-locked)').length > 0){
                 settings.change(slug);
             }
 		};

data/app/assets/javascripts/camaleon_cms/admin/_libraries.js

@@ -52,7 +52,7 @@ var init_form_validations = function (form, args) {
 
     (form ? form : $('#admin_content form')).each(function () {
         var $form = $(this)
-        if ($form.find('.translatable').size() > 0) {
+        if ($form.find('.translatable').length > 0) {
             $form.find('.translatable').Translatable();
         }
     }).filter(".validate").each(function () {

data/app/assets/javascripts/camaleon_cms/admin/_modal.js

@@ -61,7 +61,7 @@ function open_modal(settings){
     settings = $.extend({}, def, settings);
     if(settings.id){
         var hidden_modal = $("#"+settings.id);
-        if(hidden_modal.size()){ hidden_modal.modal('show'); return hidden_modal; }
+        if(hidden_modal.length){ hidden_modal.modal('show'); return hidden_modal; }
     }
     var modal = $('<div id="'+settings.id+'" class="modal fade modal-'+settings.type+'">'+
         '<div class="modal-dialog '+settings.modal_size+'">'+

data/app/assets/javascripts/camaleon_cms/admin/_post.js

@@ -56,7 +56,7 @@ function cama_init_post(obj) {
     window["post_editor_draft_intrval"] = setInterval(function () { if($form.length == 0){ clearInterval(window["post_editor_draft_intrval"]); } else{ App_post.save_draft_ajax(null, true); } }, 1 * 60 * 1000);
     window.save_draft = App_post.save_draft_ajax;
 
-    if($form.find(".title-post" + class_translate).size() == 0) class_translate = '';
+    if($form.find(".title-post" + class_translate).length == 0) class_translate = '';
     $form.find(".title-post" + class_translate).each(function () {
         var $this = $(this);
         if (!$this.hasClass('sluged')) {

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

@@ -108,7 +108,7 @@ window["cama_init_media"] = (media_panel) ->
     dynamicFormData: customFileData,
     onSuccess: ((files,res_upload,xhr,pd)->
       if res_upload.search("media_item") >= 0 # success upload
-        media_panel.trigger("add_file", {item: res_upload, selected: $(pd.statusbar).siblings().not('.error_file_upload').size() == 0})
+        media_panel.trigger("add_file", {item: res_upload, selected: $(pd.statusbar).siblings().not('.error_file_upload').length == 0})
         $(pd.statusbar).remove();
       else
         $(pd.statusbar).find(".ajax-file-upload-progress").html("<span style='color: red;'>"+res_upload+"</span>");

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

@@ -158,7 +158,7 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
         flash[:error] = @post.errors.full_messages.join(', ')
       end
     end
-    redirect_to (:back || url_for(action: :index, s: params[:s]))
+    redirect_to(request.referer || url_for(action: :index, s: params[:s]))
   end
 
   # ajax options

data/app/controllers/camaleon_cms/camaleon_controller.rb

@@ -100,7 +100,14 @@ class CamaleonCms::CamaleonController < ApplicationController
       # inactive page control
       if current_site.is_inactive?
         p = current_site.posts.find(current_site.get_option('page_inactive')).decorate
-        redirect_to(p.the_url) if params != {"controller"=>"camaleon_cms/frontend", "action"=>"post", "slug"=>p.the_slug}
+        if request.original_url.to_s.match /\A#{current_site.the_url}admin(\/|\z)/
+          if cama_current_user.present?
+            cama_logout_user
+            flash[:error] = ('Site is Inactive')
+          end
+        else
+          redirect_to(p.the_url) unless params == {"controller"=>"camaleon_cms/frontend", "action"=>"post", "slug"=>p.the_slug}
+        end
       end
 
       # maintenance page and IP's control

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

@@ -57,6 +57,6 @@ module CamaleonCms::FrontendConcern extend ActiveSupport::Concern
     else
       flash[:comment_submit][:error] = t('camaleon_cms.admin.message.unauthorized')
     end
-    params[:format] == 'json' ? render(json: flash.discard(:comment_submit).to_hash) : redirect_to(:back)
+    params[:format] == 'json' ? render(json: flash.discard(:comment_submit).to_hash) : redirect_to(request.referer || @post.the_url(as_path: true))
   end
-end
+end

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

@@ -2,7 +2,7 @@ module CamaleonCms::Admin::BreadcrumbHelper
   # draw the title for the admin admin panel according the breadcrumb
   def cama_admin_title_draw
     res = [t("camaleon_cms.admin.sidebar_top.admin_panel")]
-    @breadcrumbs.reverse.slice(0, 2).reverse.each{|b| res << b.name }
+    @breadcrumbs.reverse.slice(0, 2).reverse.each{|b| res << (b.is_a?(Hash) ? b[:name] : b.name) }
     res.join(" &raquo; ")
   end
 

data/app/views/camaleon_cms/admin/settings/custom_fields/_get_items.html.erb

@@ -133,7 +133,7 @@
 
                         $('#add_btn<%= @index %>').click(function(){
                             add_option_default({
-                                value: $sortable.children('li').size() + 1
+                                value: $sortable.children('li').length + 1
                             });
                             return false;
                         });

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.4.3.12'
+  VERSION = '2.4.3.13'
 end

data/spec/dummy/db/schema.rb

@@ -13,12 +13,6 @@
 
 ActiveRecord::Schema.define(version: 20161215202255) do
 
-  create_table "ar_internal_metadata", primary_key: "key", force: :cascade do |t|
-    t.string   "value"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
   create_table "comments", force: :cascade do |t|
     t.string   "author"
     t.string   "author_email"
@@ -84,17 +78,6 @@ ActiveRecord::Schema.define(version: 20161215202255) do
   add_index "metas", ["object_class"], name: "index_metas_on_object_class"
   add_index "metas", ["objectid"], name: "index_metas_on_objectid"
 
-  create_table "plugins_attacks", force: :cascade do |t|
-    t.string   "path"
-    t.string   "browser_key"
-    t.integer  "site_id"
-    t.datetime "created_at"
-  end
-
-  add_index "plugins_attacks", ["browser_key"], name: "index_plugins_attacks_on_browser_key"
-  add_index "plugins_attacks", ["path"], name: "index_plugins_attacks_on_path"
-  add_index "plugins_attacks", ["site_id"], name: "index_plugins_attacks_on_site_id"
-
   create_table "plugins_contact_forms", force: :cascade do |t|
     t.integer  "site_id"
     t.integer  "count"

data/spec/spec_helper.rb

@@ -45,9 +45,9 @@ end
 #****** configuration to test using poltergeist *****#
 require 'capybara/poltergeist'
 # Note: you need phantomjs 1.9.x which can be downloaded from here: https://code.google.com/archive/p/phantomjs/downloads
-if File.exist?(File.join(CAMALEON_CMS_ROOT, '..', 'phantomjs'))
+if File.exist?(File.join(CAMALEON_CMS_ROOT, 'spec', 'bin', 'phantomjs'))
   Capybara.register_driver :poltergeist do |app|
-    Capybara::Poltergeist::Driver.new(app, :phantomjs => File.join(CAMALEON_CMS_ROOT, '..', 'phantomjs').to_s)
+    Capybara::Poltergeist::Driver.new(app, :phantomjs => File.join(CAMALEON_CMS_ROOT, 'spec', 'bin', 'phantomjs').to_s)
   end
 end
 Capybara.javascript_driver = :poltergeist

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.3.12
+  version: 2.4.3.13
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement