trusty-cms 4.1.3 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ec4507891ffcef07709998473113f66f350d6c17ac1a1a40ca8593d6b565855
-  data.tar.gz: 994dec6d305e0ce812c7311ef3ff4c15f5a439f61d09a21bcafdf235d6a4f08d
+  metadata.gz: '06485f3b9ed1c9ca511e064801b64e301c62a152a1da3ad7902215ab146f6c0d'
+  data.tar.gz: f2c25843032b941ffb0f1b7cb8920b07298ab131f626b2bd4cab6aee580a61e4
 SHA512:
-  metadata.gz: 642b211413fead95b9f8a33eeead86c404f9f6debc150c3440416f380534be866ea9c817a312a5e65610a3df06ba8f7d0397a74429be26e2afeae0dd9de5e6b1
-  data.tar.gz: 12cc8927f097db47b3b97c38fd66f708fb5ac81ae4e12e5f43a0a07ae011184d82eef46adaa0d7e3b6f49a1f2dc2b585bb9dc19f0551bf83023219743a429d4c
+  metadata.gz: f3660bb986c773d9e81821660898e04af9c985297acfd8bc2a57c4623f931b9636dc4f628176e370a46d3676608f9778b476ff9a21e1d775587c2739755f6873
+  data.tar.gz: 23246702302f14f37569aa164467d76f771df08a562a1f7c2dc773a85308ab2abcfd81e7343f68bf4f4cab92c2678544fda3139161eacd23856beb6298e7cd29

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (4.1.3)
+    trusty-cms (4.1.4)
       RedCloth (= 4.3.2)
       acts_as_list (>= 0.9.5, < 1.1.0)
       acts_as_tree (>= 2.6.1, < 2.9.0)
@@ -16,7 +16,7 @@ PATH
       mini_racer
       mysql2
       paperclip (> 5.2)
-      rack (~> 2.0.1)
+      rack (>= 2.0.1, < 2.3.0)
       rack-cache (~> 1.7)
       radius (~> 0.7)
       rails
@@ -168,7 +168,7 @@ GEM
       multipart-post
     launchy (2.5.0)
       addressable (~> 2.7)
-    libv8 (7.3.492.27.1-x86_64-linux)
+    libv8 (7.3.492.27.1)
     loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -210,7 +210,7 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     public_suffix (4.0.5)
-    rack (2.0.9)
+    rack (2.2.3)
     rack-cache (1.12.0)
       rack (>= 0.4)
     rack-test (1.1.0)

data/app/assets/javascripts/rad_social/rad_ajax_form.js

@@ -16,6 +16,9 @@ function RadAjaxForm(form) {
             type: "POST",
             url: form.find('input[name=submit_url]').attr('value'),
             data: form.serialize(),
+            beforeSend: function ( xhr ) {
+              xhr.setRequestHeader("X-CSRF-Token", $('meta[name=csrf-token]').attr('content'));
+            },
             success: function(data, status, xhr) {
                 form.find(".loader").removeClass('ajax-loader');
                 form.find(".loader-small").removeClass('ajax-loader-small');

data/app/assets/javascripts/rad_social/rad_email.js

@@ -1,6 +1,5 @@
 //= require jquery
 //= require 'rad_social/jquery.validate.min'
 //= require 'rad_social/rad_ajax_form'
-//= require 'rad_social/captcha'
 //= require 'rad_social/rad_email_validator'
 //= require 'rad_social/rad_email_form'

data/app/assets/javascripts/rad_social/rad_email_form.js

@@ -63,17 +63,12 @@ $(document).ready(function() {
     $('#rs-from_name').val('');
     $('#rs-to').val('');
     $('#rs-message').val($('#rs-base-message').val());
-    var captcha = new Captcha("#recaptcha-container");
-    captcha.reload();
   }
 
-function processFailure(xhr)
-{
-    var captcha = new Captcha("#recaptcha-container");
+  function processFailure(xhr) {
     var error_msg = xhr.getResponseHeader("ErrorMsg");
     displayErrorMessage(error_msg);
-    captcha.reload();
-}
+  }
 
 function displayErrorMessage(msg) {
     var error_msg_div = $('.rad-email-error');

data/app/assets/stylesheets/rad_social/rad_screen.scss

@@ -55,10 +55,6 @@
   float: right;
 }
 
-.rad-email-form .captcha-container {
-  padding: 10px 0px;
-}
-
 .rad-email-form input.std_input {
   margin-bottom: 10px;
 }

data/app/controllers/social_mailer_controller.rb

@@ -12,13 +12,6 @@ class SocialMailerController < ApplicationController
       message: params[:message],
       subject: params[:subject],
     }
-
-    if verify_recaptcha(action: 'emailSeats')
-      RadSocialMailer.social_mail(mailer_options).deliver_now
-      head :ok
-    else
-      head :bad_request, ErrorMsg: 'We have detected suspicious activity and have disabled this feature for your user.'
-    end
   end
 
   def social_mail_form

data/app/views/rad_social_mailer/social_mail_form.html.haml

@@ -1,6 +1,6 @@
 = stylesheet_link_tag('rad_social/rad_screen')
-= javascript_include_tag('https://www.google.com/recaptcha/api/js/recaptcha_ajax.js')
 = javascript_include_tag('rad_social/rad_email')
+= csrf_meta_tags
 
 .rad-dialog-titlebar
   %span.rad-dialog-title
@@ -31,8 +31,6 @@
         = email_message
   %input{:type=>'hidden', :name=>'subject', :value=> email_subject}
   %input{:type=>'hidden', :id=>'rs-base-message', :value=> email_message}
-  #recaptcha-container.captcha-container
-    = recaptcha_v3 action: 'emailSeats'
   %input{:type=>'hidden', :name=>'submit_url', :value=> email_action_url}
   %input.button.primary-button{:id => 'rad_email_submit', :type=>:button ,:value=>'Submit'}
   .loader

data/app/views/widget/_email_form.html.haml

@@ -1,5 +1,3 @@
-- javascript('rad_social/captcha')
-
 = form_tag
 %form{:id=>'rad_social_email_form', :class=>'rad-email-form'}
   %label{:for => 'from'}
@@ -20,6 +18,3 @@
   %input{:type=>'hidden', :name=>'submit_url', :value=>'contact/email'}
   %input.button.primary-button{:id => 'email_submit', :type=>:button ,:value=>'Submit'}
   .loader
-
-  #recaptcha-container.captcha-container
-    = recaptcha_v3 action: 'emailSeats'

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '4.1.3'.freeze
+    VERSION = '4.1.4'.freeze
   end
 end

data/lib/trusty_cms/engine.rb

@@ -12,7 +12,6 @@ module TrustyCms
         ckeditor/skins/moono/editor.css
         ckeditor/lang/en.js
         rad_social/rad_screen.css
-        rad_social/captcha.js
         rad_social/rad_email.js
         rad_social/rad_widget.js
       )

data/trusty_cms.gemspec

@@ -36,7 +36,7 @@ a general purpose content managment system--not merely a blogging engine.'
   s.add_dependency 'mini_racer'
   s.add_dependency 'mysql2'
   s.add_dependency 'paperclip',       '> 5.2'
-  s.add_dependency 'rack',            '~> 2.0.1'
+  s.add_dependency 'rack',            '>= 2.0.1', '< 2.3.0'
   s.add_dependency 'rack-cache',      '~> 1.7'
   s.add_dependency 'radius',          '~> 0.7'
   s.add_dependency 'rails'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.4
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -226,16 +226,22 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rack-cache
   requirement: !ruby/object:Gem::Requirement
@@ -600,7 +606,6 @@ files:
 - app/assets/javascripts/admin/validations/user_validations.js
 - app/assets/javascripts/ckeditor/config.js
 - app/assets/javascripts/ckeditor/contents.css
-- app/assets/javascripts/rad_social/captcha.js
 - app/assets/javascripts/rad_social/jquery.validate.min.js
 - app/assets/javascripts/rad_social/rad_ajax_form.js
 - app/assets/javascripts/rad_social/rad_email.js

data/app/assets/javascripts/rad_social/captcha.js

@@ -1,42 +0,0 @@
-function Captcha(element) {
-    var self = this;
-    var challengeFieldSelector = "#recaptcha_challenge_field";
-    var responseFieldSelector = "#recaptcha_response_field";
-
-    self.challengeValue = function() {
-        return $(element).find(challengeFieldSelector).val();
-    };
-
-    self.responseValue = function() {
-        return $(element).find(responseFieldSelector).val();
-    };
-
-    self.visible = function() {
-        return ($(element).find("#recaptcha_area").length > 0);
-    };
-
-    self.requestData = function() {
-        requestHash = {};
-        if(this.visible()) {
-            $.extend(requestHash, {
-                'recaptcha_challenge_field': this.challengeValue(),
-                'recaptcha_response_field': this.responseValue()
-            });
-        }
-        return requestHash;
-    };
-
-    self.isValid = function() {
-        if(this.visible()) {
-            return this.responseValue().length > 0;
-        }
-        return true;
-    };
-
-    self.reload = function() {
-        if(Recaptcha) {
-            Recaptcha.reload();
-        }
-    };
-
-}