cama_contact_form 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79f5408cc5871edfdbd3ed0fb697114eeb2e25c3
-  data.tar.gz: 23273662b1911e32621c4620a4653a940a950acc
+  metadata.gz: fe2363fedca3389a35c18dd01afa5f3490cd3388
+  data.tar.gz: 874ff2d71598d58c8fddc2cc08396557ca718aaa
 SHA512:
-  metadata.gz: 42a40daf5a2f72c7a25f2ba0fd165c7440443fa2023b554f74c38b4587b918e27ceb6be770c516a3773d53aec00645e0833ccfdb09b58825060ab29827441406
-  data.tar.gz: 4c5e6aaa633869ea020f8c1adea7c852cedd41acfe9287607b91d64f2d6b77c8f04bf50b1fafd553e663b33834ca6f122000e60599133f83ce8480b2fa6f6d04
+  metadata.gz: 40120eed98b0562e75542e158e5ed9fabbb67ec1783ed885490a6c53ac80995d88365df3c0721df9c3372be00b18921619ce72d723b52cada74f0d76e89a09da
+  data.tar.gz: 94465e8e2e4c07d0efc8e5fb18382dc9603431e4d4802aa064cebf9a9e53a1e7beb350205b00411ef93fafc28220099e39b0151aa72fad08da892bab941a23d0

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

@@ -4,13 +4,22 @@ module Plugins::CamaContactForm::ContactFormControllerConcern
     if validate_to_save_form(form, fields, errors)
       form.fields.each do |f|
         if f[:field_type] == 'file'
-          res = cama_tmp_upload(fields[f[:cid].to_sym], {maximum: 5.megabytes, path: Rails.public_path.join("contact_form", current_site.id.to_s)})
-          if res[:error].present?
-            errors << res[:error].to_s.translate
-          else
-            attachments << res[:file_path]
-            fields[f[:cid].to_sym] = res[:file_path].sub(Rails.public_path.to_s, cama_root_url)
+          file_paths = []
+          fields[f[:cid].to_sym].each do |file|
+            res = cama_tmp_upload(file, {
+                maximum: current_site.get_option('filesystem_max_size', 100).megabytes,
+                path: Rails.public_path.join("contact_form", current_site.id.to_s),
+                name: file.original_filename
+              }
+            )
+            if res[:error].present?
+              errors << res[:error].to_s.translate
+            else
+              attachments << res[:file_path]
+              file_paths << res[:file_path].sub(Rails.public_path.to_s, cama_root_url)
+            end
           end
+          fields[f[:cid].to_sym] = file_paths
         end
       end
       new_settings = {"fields" => fields, "created_at" => Time.current.strftime("%Y-%m-%d %H:%M:%S").to_s}.to_json
@@ -27,7 +36,7 @@ module Plugins::CamaContactForm::ContactFormControllerConcern
           cama_send_email(answer_to, form.the_settings[:railscf_mail][:subject_answer].to_s.translate.cama_replace_codes(fields), {content: content})
         end
       else
-        errors << form.the_message('mail_sent_ng', t('.error_form_val', default: 'Occurred an error, please try again.'))
+        errors << form.the_message('mail_sent_ng', t('.error_form_val', default: 'An error occurred, please try again.'))
       end
     end
   end
@@ -44,8 +53,8 @@ module Plugins::CamaContactForm::ContactFormControllerConcern
             errors << "#{label.to_s.translate}: #{form.the_message('invalid_required', t('.error_validation_val', default: 'This value is required'))}"
             validate = false
           end
-          if f[:field_type].to_s == "email"
-            if !fields[cid].match(/@/)
+          if f[:field_type].to_s == 'email'
+            unless fields[cid].match(/@/)
               errors << "#{label.to_s.translate}: #{form.the_message('invalid_email', t('.email_invalid_val', default: 'The e-mail address appears invalid'))}"
               validate = false
             end
@@ -70,7 +79,8 @@ module Plugins::CamaContactForm::ContactFormControllerConcern
       label = values.keys.include?(field[:label]) ? "#{field[:label]} (#{cid})" : field[:label].to_s.translate
       values[label] = []
       if ft == 'file'
-        values[label] << fields[cid].split('/').last if fields[cid].present?
+        nr_files = fields[cid].size
+        values[label] << "#{nr_files} #{"file".pluralize(nr_files)} (attached)" if fields[cid].present?
       elsif ft == 'radio' || ft == 'checkboxes'
         values[label] << fields[cid].map { |f| f.to_s.translate }.join(', ') if fields[cid].present?
       else

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

@@ -20,7 +20,10 @@ class Plugins::CamaContactForm::FrontController < CamaleonCms::Apps::PluginsFron
         flash[:values] = fields.delete_if{|k, v| v.class.name == 'ActionDispatch::Http::UploadedFile' }
       end
     end
-    params[:format] == 'json' ? render(json: flash.discard(:contact_form).to_hash) : (redirect_to :back)
+    if Rails::VERSION::MAJOR >= 5
+      params[:format] == 'json' ? render(json: flash.discard(:contact_form).to_hash) : (redirect_back fallback_location: cama_root_path)
+    else
+      params[:format] == 'json' ? render(json: flash.discard(:contact_form).to_hash) : (redirect_to :back)
+    end
   end
-
-end
+end

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

@@ -111,7 +111,7 @@ module Plugins::CamaContactForm::MainHelper
         when 'captcha'
           temp2 = cama_captcha_tag(5, {}, {class: "#{ob[:custom_class].presence || 'form-control'} field-captcha required"}.merge(ob[:custom_attrs]))
         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'}\">"
+          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'
           temp2 = cama_form_select_multiple_bootstrap(ob, ob[:label], "select",values)
         else

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

@@ -1,4 +1,5 @@
 class Plugins::CamaContactForm::CamaContactForm < ActiveRecord::Base
+  include Plugins::CamaContactForm::MainHelper
   self.table_name = 'plugins_contact_forms'
   belongs_to :site, class_name: "CamaleonCms::Site"
   # attr_accessible :site_id, :name, :description, :count, :slug, :value, :settings, :parent_id
@@ -9,6 +10,7 @@ class Plugins::CamaContactForm::CamaContactForm < ActiveRecord::Base
 
   before_validation :before_validating
   before_create :fix_save_settings
+  before_destroy :delete_uploaded_files
 
   default_scope { order(created_at: :desc) }
 
@@ -42,4 +44,18 @@ class Plugins::CamaContactForm::CamaContactForm < ActiveRecord::Base
     self.value = {"fields" => []}.to_json unless self.value.present?
     self.settings = {}.to_json unless self.settings.present?
   end
+
+  def delete_uploaded_files
+    return if self.parent_id.nil?
+    form = self.class.find_by_id self.parent_id
+    response_data = the_settings[:fields]
+    file_cids = form.fields
+                    .select { |f| f[:field_type] == 'file' }
+                    .map { |f| f[:cid].to_sym }
+
+    file_cids
+        .flat_map { |cid| response_data[cid] }
+        .map { |file| file.sub Rails.application.routes.url_helpers.cama_root_url, Rails.public_path.to_s }
+        .each { |file| File.delete file if File.exists? file }
+  end
 end

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

@@ -32,7 +32,12 @@
                 <% @op_fields.each do |default| %>
                     <% cid = default[:cid].to_sym %>
                     <% if default[:field_type] == "file" %>
-                        <td><%= link_to(value[:fields][cid], value[:fields][cid]) %></td>
+                        <td>
+                        <%# flatten is necessary for backwards compatibility: ["file"].flatten == [["file]].flatten %>
+                        <% [value[:fields][cid]].flatten.each do |file| %>
+                            <%= link_to file.split('/').last, file, target: '_blank' %><br>
+                        <% end %>
+                        </td>
                     <% elsif default[:field_type] == "radio" || default[:field_type] == "checkboxes" %>
                         <td><%= value[:fields][cid].map { |f| f.to_s.translate }.join(', ') if value[:fields][cid].present? %></td>
                     <% else %>

data/lib/cama_contact_form/version.rb

@@ -1,3 +1,3 @@
 module CamaContactForm
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cama_contact_form
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Owen Peredo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails