cama_contact_form 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c62ff6a2ffa06fa0199bd98fc8470028e58e5e8
-  data.tar.gz: 65920724d779cef458098431667654f0b3816a30
+  metadata.gz: 1e0943d6f462a7f834e435510534030ec25adebf
+  data.tar.gz: d37c4f408019f089f41ebc85a29b096f6439ca4e
 SHA512:
-  metadata.gz: b18259cefbc6228ebd1a2923e0e51678d759e13d0486dca2aa95266e9833e059835e5121786c8fef4100ed125aee59cae623c16f1dbcdf90e7e9848f35c23958
-  data.tar.gz: cafcf31e33d951b2f7f5e833afa673f5b418949e83129a4f64b3ae38fb528ef57409b5d6448a0c9ce275d81c90c955d0083348f16a7de5d19b4450006c36ad6d
+  metadata.gz: 735fa908aecfdc95ee55c788e09b58db50fc5f5c11af6690baa39571c6683fcb99768aaa6c6f3b940085ada2d334826900cc7d518132f9a7b99737de88bd1466
+  data.tar.gz: c2d6c3eb58a5d8f25a5e4b8abc23bf714c429683d8db7323ced018dccefb657c170c9da37ba0586daa05ea8addb1228798534d6826798efd834560fbbb378989

data/app/controllers/concerns/plugins/cama_contact_form/contact_form_controller_concern.rb

@@ -60,9 +60,16 @@ module Plugins::CamaContactForm::ContactFormControllerConcern
             end
           end
         when 'captcha'
-          unless cama_captcha_verified?
+          error_message = ->{
             errors << "#{label.to_s.translate}: #{form.the_message('captcha_not_match', t('.captch_error_val', default: 'The entered code is incorrect'))}"
             validate = false
+          }
+            
+          if form.recaptcha_enabled?
+            form.set_captcha_settings!
+            error_message.call unless verify_recaptcha
+          else
+            error_message.call unless cama_captcha_verified?
           end
       end
     end

data/app/controllers/plugins/cama_contact_form/admin_forms_controller.rb

@@ -16,7 +16,7 @@ class Plugins::CamaContactForm::AdminFormsController < CamaleonCms::Apps::Plugin
 
   def update
     if @form.update(params.require(:plugins_cama_contact_form_cama_contact_form).permit(:name, :slug))
-      settings = {"railscf_mail" => params[:railscf_mail], "railscf_message" => params[:railscf_message], "railscf_form_button" => params[:railscf_form_button]}
+      settings = {"railscf_mail" => params[:railscf_mail], "railscf_message" => params[:railscf_message], "railscf_form_button" => params[:railscf_form_button], recaptcha_site_key: params[:recaptcha_site_key], recaptcha_secret_key: params[:recaptcha_secret_key]}
       fields = []
       (params[:fields] || {}).each{|k, v|
         v[:field_options][:options] = v[:field_options][:options].values if v[:field_options][:options].present?

data/app/helpers/plugins/cama_contact_form/main_helper.rb

@@ -1,4 +1,5 @@
 module Plugins::CamaContactForm::MainHelper
+  include Recaptcha::ClientHelper
   def self.included(klass)
     klass.helper_method [:cama_form_element_bootstrap_object, :cama_form_shortcode] rescue "" # here your methods accessible from views
   end
@@ -109,7 +110,11 @@ module Plugins::CamaContactForm::MainHelper
           class_type = "railscf-field-#{ob[:field_type]}" if ob[:field_type]=="email"
           temp2 = "<input #{ob[:custom_attrs].to_attr_format} type=\"#{ob[:field_type]}\" value=\"#{values[cid] || ob[:default_value].to_s.translate}\" name=\"#{f_name}\"  class=\"#{ob[:custom_class].presence || 'form-control'} #{class_type}\">"
         when 'captcha'
-          temp2 = cama_captcha_tag(5, {}, {class: "#{ob[:custom_class].presence || 'form-control'} field-captcha required"}.merge(ob[:custom_attrs]))
+          if form.recaptcha_enabled?
+            temp2 = recaptcha_tags
+          else
+            temp2 = cama_captcha_tag(5, {}, {class: "#{ob[:custom_class].presence || 'form-control'} field-captcha required"}.merge(ob[:custom_attrs]))
+          end
         when 'file'
           temp2 = "<input multiple=\"multiple\" type=\"file\" value=\"\" name=\"#{f_name}[]\" #{ob[:custom_attrs].to_attr_format} class=\"#{ob[:custom_class].presence || 'form-control'}\">"
         when 'dropdown'

data/app/models/plugins/cama_contact_form/cama_contact_form.rb

@@ -32,6 +32,22 @@ class Plugins::CamaContactForm::CamaContactForm < ActiveRecord::Base
   def self.field_template
     "<div class='form-group'>\n\t <label>[label ci]</label>\n\t<p>[descr ci]</p>\n\t<div>[ci]</div> \n</div>"
   end
+  
+  # define recaptcha settings
+  def set_captcha_settings!
+    if recaptcha_enabled?
+      Recaptcha.configure do |config|
+        config.site_key  = the_settings[:recaptcha_site_key]
+        config.secret_key = the_settings[:recaptcha_secret_key]
+      end
+    end
+  end
+  
+  # verify if recaptcha was enabled for this form
+  # this method can be overwritten if recaptcha was already defined on initializers to return true as default 
+  def recaptcha_enabled?
+    the_settings[:recaptcha_site_key].present?
+  end
 
   private
   def before_validating

data/app/views/plugins/cama_contact_form/admin_forms/edit.html.erb

@@ -84,6 +84,29 @@
             </div>
         </div>
 
+        <div class="panel panel-default">
+          <div class="panel-heading">
+            <h3 class="panel-title"><%= t('.form_recaptcha_title', default: 'Recaptcha Settings') %></h3>
+            <ul class="panel-controls">
+              <li><a href="#" class="panel-collapse"><span class="fa fa-angle-down"></span></a></li>
+            </ul>
+          </div>
+          <div class="panel-body">
+            <div class="alert alert-info alert-xs" style="padding: 2px"><small><%= t('.recaptcha_info', default: 'If recaptcha settings is defined, will use recaptcha rather than classic captcha') %></small></div>
+            <div class="">
+              <div class="form-group">
+                <label><%= t('.recaptcha_site_key', default: 'Site Key') %>:</label><br>
+                <input class="form-control" type="text" name="recaptcha_site_key" value="<%= @form.the_settings[:recaptcha_site_key] rescue '' %>" />
+              </div>
+  
+              <div class="form-group">
+                <label><%= t('.recaptcha_secret_key', default: 'Secret Key') %>:</label><br>
+                <input class="form-control" type="text" name="recaptcha_secret_key" value="<%= @form.the_settings[:recaptcha_secret_key] rescue '' %>" />
+              </div>
+            </div>
+          </div>
+        </div>
+
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h3 class="panel-title"><%= t('.confirmation_email_settings', default: 'Confirmation Email Settings') %></h3>

data/app/views/plugins/cama_contact_form/forms_shorcode.html.erb

@@ -1,6 +1,7 @@
 <%
    @form =  attributes['slug'] == '__first__' ? current_site.contact_forms.first : current_site.contact_forms.where({slug: attributes['slug']}).first
    if @form.present?
+     @form.set_captcha_settings!
      values_fields =  (flash[:values].present?)? flash[:values].to_sym : {}
      values = JSON.parse(@form.value).to_sym
      r = {form: @form, form_class: "railscf-form railscf-form-group", before_form: @form.the_settings[:railscf_mail][:previous_html].to_s, after_form: @form.the_settings[:railscf_mail][:after_html].to_s, submit: "<div class='form-group'><button class='submit_btn btn btn-default pull-right' type='submit'>[submit_label]</button></div>"}

data/lib/cama_contact_form.rb

@@ -1,4 +1,5 @@
 require "cama_contact_form/engine"
-
+require "recaptcha"
+require "recaptcha/rails"
 module CamaContactForm
 end

data/lib/cama_contact_form/version.rb

@@ -1,3 +1,3 @@
 module CamaContactForm
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cama_contact_form
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Owen Peredo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: recaptcha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement