caboose-cms 0.9.187 → 0.9.188

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 015b443d62f5ea387d8114f221f49c1668b75046
-  data.tar.gz: ee16f3a096800da8f8980642465443a413ec1060
+  metadata.gz: a7c4525d7d5ed779edc5c25e6a37dd29262323c9
+  data.tar.gz: b1b52dbf65395b217f8c4e854e72de6c515d21ef
 SHA512:
-  metadata.gz: 6b5f39ab0427ffdca934b1c318ffd189b056cb75bad48dc8dbd2f11680dee9672195b38133657b709a9f304a1aefe43637710ee11af6d526ee34f149664218df
-  data.tar.gz: a2f53f506c63eebd45016721d81d0844e3e167f1b07ba70b76294b3d4fa80601aa2df4d871a0a5368754e5e8b7f88186cf63c0b3bdab0f633b91713b18cebf6b
+  metadata.gz: c92c9b8d2e143a115ecbce0bf7c9aedfe549a49242e89db2f27299094ee937c611c0257e7e9538259f0d355b95d378d94898d6851669bdb92d6cb3387ecd5f4d
+  data.tar.gz: 835515f737dea95f203937ed5426c6c0450443099aea3e557549b545f54b5d780135a21bd04b638f4609c9bb8b8892e18982427b6a3242fe9922f63733f7f5e8

data/app/controllers/caboose/inbox_controller.rb

@@ -4,49 +4,35 @@ module Caboose
     
     # @route GET /admin/inbox
     def admin_index
-      has_inbox = "Contact".constantize rescue false
-      if has_inbox
-        where = params[:exclude].blank? ? "(id is not null)" : "(sent_to != '#{params[:exclude]}')"
-        @contacts = Contact.where(where).where(:site_id => @site.id, :captcha_valid => true, :deleted => false).order('date_submitted desc').all
-      end
+      where = params[:exclude].blank? ? "(id is not null)" : "(sent_to != '#{params[:exclude]}')"
+      @contacts = Caboose::FormSubmission.where(where).where(:site_id => @site.id, :is_spam => false, :is_deleted => false).order('date_submitted desc').all
     end
 
     # @route GET /admin/inbox/spam
     def admin_spam
-      has_inbox = "Contact".constantize rescue false
-      if has_inbox
-        @contacts = Contact.where(:site_id => @site.id, :captcha_valid => false, :deleted => false).order('date_submitted desc').all
-      end
+      @contacts = Caboose::FormSubmission.where(:site_id => @site.id, :is_spam => true, :is_deleted => false).order('date_submitted desc').all
     end
 
     # @route GET /admin/inbox/:id
     def admin_show
-      has_inbox = "Contact".constantize rescue false
-      if has_inbox
-        @contact = Contact.where(:site_id => @site.id, :id => params[:id], :deleted => false).first
-      end
+      @contact = Caboose::FormSubmission.where(:site_id => @site.id, :id => params[:id], :is_deleted => false).first
     end
 
     # @route GET /admin/inbox/:id/delete
     def admin_delete
-      has_inbox = "Contact".constantize rescue false
-      if has_inbox
-        @contact = Contact.where(:site_id => @site.id, :id => params[:id]).first
-        @contact.deleted = true
-        @contact.save
-        redirect_to '/admin/inbox'
-      end
+      @contact = Caboose::FormSubmission.where(:site_id => @site.id, :id => params[:id]).first
+      @contact.is_deleted = true
+      @contact.save
+      
+      redirect_to '/admin/inbox'
     end
 
     # @route GET /admin/inbox/:id/spam
     def admin_update
-      has_inbox = "Contact".constantize rescue false
-      if has_inbox
-        @contact = Contact.where(:site_id => @site.id, :id => params[:id]).first
-        @contact.captcha_valid = !@contact.captcha_valid
-        @contact.save
-        redirect_to '/admin/inbox/' + params[:id]
-      end
+      @contact = Caboose::FormSubmission.where(:site_id => @site.id, :id => params[:id]).first
+      @contact.is_spam = !@contact.is_spam
+      @contact.save
+      redirect_to '/admin/inbox/' + params[:id]
     end
             
   end

data/app/controllers/caboose/sites_controller.rb

@@ -215,9 +215,9 @@ module Caboose
           when 'zip' then site.zip = value
           when 'fax' then site.fax = value
           when 'contact_email' then site.contact_email = value
-          when 'head_code' then site.head_code = value
-          when 'body_open_code' then site.body_open_code = value
-          when 'body_close_code' then site.body_close_code = value
+          when 'head_code' then site.head_code = (value.blank? ? nil : value.gsub('<end/script>','</script>'))
+          when 'body_open_code' then site.body_open_code = (value.blank? ? nil : value.gsub('<end/script>','</script>'))
+          when 'body_close_code' then site.body_close_code = (value.blank? ? nil : value.gsub('<end/script>','</script>'))
     	  end
     	end
     	resp.success = save && site.save

data/app/models/caboose/core_plugin.rb

@@ -5,13 +5,12 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
         
   #  nav << { 'id' => 'logout'       , 'text' => 'Logout'     , 'href' => '/logout'     , 'modal' => false }    
   #  nav << { 'id' => 'my-account'   , 'text' => 'My Account' , 'href' => '/my-account' , 'modal' => true }
-    has_inbox = "Contact".constantize rescue false
     item = { 'id' => 'content', 'text' => 'Content', 'children' => [] }    
     item['children'] << { 'id' => 'media'        , 'text' => 'Media'       , 'href' => '/admin/media'        , 'modal' => false } if user.is_allowed('media'       , 'view')
     item['children'] << { 'id' => 'pages'        , 'text' => 'Pages'       , 'href' => '/admin/pages'        , 'modal' => false } if user.is_allowed('pages'       , 'view')
     item['children'] << { 'id' => 'posts'        , 'text' => 'Posts'       , 'href' => '/admin/posts'        , 'modal' => false } if user.is_allowed('posts'       , 'view')
     item['children'] << { 'id' => 'calendars'    , 'text' => 'Calendars'   , 'href' => '/admin/calendars'    , 'modal' => false } if user.is_allowed('calendars'   , 'view')
-    item['children'] << { 'icon' => 'box', 'id' => 'inbox'             , 'text' => 'Inbox'               , 'href' => '/admin/inbox'              , 'modal' => false } if user.is_allowed('contacts'             , 'view')   && has_inbox && Contact.where(:site_id => site.id).count > 0
+    item['children'] << { 'icon' => 'box', 'id' => 'inbox'             , 'text' => 'Inbox'               , 'href' => '/admin/inbox'              , 'modal' => false } if user.is_allowed('contacts'             , 'view') && Caboose::FormSubmission.where(:site_id => site.id).count > 0
     nav << item if item['children'].count > 0
     
     item = { 'id' => 'core', 'text' => 'Settings', 'children' => [] }   

data/app/models/caboose/form_submission.rb

@@ -0,0 +1,78 @@
+class Caboose::FormSubmission < ActiveRecord::Base
+
+	self.table_name = "form_submissions"
+
+	belongs_to :site, :class_name => 'Caboose::Site'     
+
+  attr_accessible :id,
+  	:site_id,
+  	:block_id,
+  	:form_name,
+  	:sent_to,
+  	:bcc_to,
+  	:category,
+  	:date_submitted,
+  	:is_spam,
+  	:is_deleted,
+  	:field1_name,
+  	:field1_description,
+  	:field1_value,
+  	:field2_name,
+  	:field2_description,
+  	:field2_value,
+  	:field3_name,
+  	:field3_description,
+  	:field3_value,
+  	:field4_name,
+  	:field4_description,
+  	:field4_value,
+  	:field5_name,
+  	:field5_description,
+  	:field5_value,
+  	:field6_name,
+  	:field6_description,
+  	:field6_value,
+  	:field7_name,
+  	:field7_description,
+  	:field7_value,
+  	:field8_name,
+  	:field8_description,
+  	:field8_value,
+  	:field9_name,
+  	:field9_description,
+  	:field9_value,
+  	:field10_name,
+  	:field10_description,
+  	:field10_value,
+  	:field11_name,
+  	:field11_description,
+  	:field11_value,
+  	:field12_name,
+  	:field12_description,
+  	:field12_value,
+  	:field13_name,
+  	:field13_description,
+  	:field13_value,
+  	:field14_name,
+  	:field14_description,
+  	:field14_value,
+  	:field15_name,
+  	:field15_description,
+  	:field15_value,
+  	:field16_name,
+  	:field16_description,
+  	:field16_value,
+  	:field17_name,
+  	:field17_description,
+  	:field17_value,
+  	:field18_name,
+  	:field18_description,
+  	:field18_value,
+  	:field19_name,
+  	:field19_description,
+  	:field19_value,
+  	:field20_name,
+  	:field20_description,
+  	:field20_value
+
+end

data/app/models/caboose/schema.rb

@@ -336,6 +336,77 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :style              , :string  ],
         [ :sort_order         , :integer ]
       ],
+      Caboose::FormSubmission => [
+        [ :site_id, :integer ],
+        [ :block_id, :integer ],
+        [ :form_name, :string ],
+        [ :sent_to, :string ],
+        [ :date_submitted, :datetime ],
+        [ :bcc_to, :string ],
+        [ :category, :string ],
+        [ :is_spam, :boolean   , { :default => false }],
+        [ :is_deleted, :boolean   , { :default => false }],
+        [ :field1_name, :string ],
+        [ :field1_description, :string ],
+        [ :field1_value, :text ],
+        [ :field2_name, :string ],
+        [ :field2_description, :string ],
+        [ :field2_value, :text ],
+        [ :field3_name, :string ],
+        [ :field3_description, :string ],
+        [ :field3_value, :text ],
+        [ :field4_name, :string ],
+        [ :field4_description, :string ],
+        [ :field4_value, :text ],
+        [ :field5_name, :string ],
+        [ :field5_description, :string ],
+        [ :field5_value, :text ],
+        [ :field6_name, :string ],
+        [ :field6_description, :string ],
+        [ :field6_value, :text ],
+        [ :field7_name, :string ],
+        [ :field7_description, :string ],
+        [ :field7_value, :text ],
+        [ :field8_name, :string ],
+        [ :field8_description, :string ],
+        [ :field8_value, :text ],
+        [ :field9_name, :string ],
+        [ :field9_description, :string ],
+        [ :field9_value, :text ],
+        [ :field10_name, :string ],
+        [ :field10_description, :string ],
+        [ :field10_value, :text ],
+        [ :field11_name, :string ],
+        [ :field11_description, :string ],
+        [ :field11_value, :text ],
+        [ :field12_name, :string ],
+        [ :field12_description, :string ],
+        [ :field12_value, :text ],
+        [ :field13_name, :string ],
+        [ :field13_description, :string ],
+        [ :field13_value, :text ],
+        [ :field14_name, :string ],
+        [ :field14_description, :string ],
+        [ :field14_value, :text ],
+        [ :field15_name, :string ],
+        [ :field15_description, :string ],
+        [ :field15_value, :text ],
+        [ :field16_name, :string ],
+        [ :field16_description, :string ],
+        [ :field16_value, :text ],
+        [ :field17_name, :string ],
+        [ :field17_description, :string ],
+        [ :field17_value, :text ],
+        [ :field18_name, :string ],
+        [ :field18_description, :string ],
+        [ :field18_value, :text ],
+        [ :field19_name, :string ],
+        [ :field19_description, :string ],
+        [ :field19_value, :text ],
+        [ :field20_name, :string ],
+        [ :field20_description, :string ],
+        [ :field20_value, :text ]
+      ],
       Caboose::GiftCard => [
         [ :site_id           , :integer  ],        
         [ :name              , :string   ],

data/app/views/caboose/inbox/admin_index.html.erb

@@ -1,3 +1,39 @@
+<%
+def get_name(fs)
+	(1..20).each do |ind|
+		field = "field#{ind}_name".to_sym
+		value = "field#{ind}_value".to_sym
+		if fs[field] == 'name' || fs[field] == 'name_required'
+			return fs[value]
+			break
+		end
+	end
+	return 
+end
+def get_subject(fs)
+	(1..20).each do |ind|
+		field = "field#{ind}_name".to_sym
+		value = "field#{ind}_value".to_sym
+		if fs[field] == 'subject' || fs[field] == 'subject_required'
+			return fs[value]
+			break
+		end
+	end
+	return ''
+end
+def get_message(fs)
+	(1..20).each do |ind|
+		field = "field#{ind}_name".to_sym
+		value = "field#{ind}_value".to_sym
+		if fs[field] == 'message' || fs[field] == 'message_required'
+			return fs[value]
+			break
+		end
+	end
+	return ''
+end
+%>
+
 <h1>Inbox</h1>
 
 <div class="constrain clearfix" style="padding:0 40px 0 10px;">
@@ -11,12 +47,12 @@
 			<th>Message</th>
 			<th>Date</th>
 		</tr>
-		<% @contacts.each do |c| %>
-			<tr data-id="<%= c.id %>">
-				<td><%= c.name %></td>
-				<td><%= c.subject %></td>
-				<td><%= c.message ? c.message.truncate(60) : '' %></td>
-				<td><%= c.date_submitted.strftime('%-m/%-d/%Y') %></td>
+		<% @contacts.each do |fs| %>
+			<tr data-id="<%= fs.id %>">
+				<td><%= get_name(fs) %></td>
+				<td><%= get_subject(fs) %></td>
+				<td><%= get_message(fs).truncate(60) %></td>
+				<td><%= fs.date_submitted.strftime('%-m/%-d/%Y') %></td>
 			</tr>
 		<% end %>
 	</table>

data/app/views/caboose/inbox/admin_show.html.erb

@@ -1,40 +1,52 @@
+<%
+email = nil
+subject = 'Inquiry'
+%>
+
 <h1>Inbox - Message</h1>
 
 <div class="constrain">
 	<div class="inbox-message">
-		<% if !@contact.captcha_valid %>
+		<% if @contact.is_spam %>
 			<p class="spam">SPAM</p>
 		<% end %>
 		<table cellspacing="0" cellpadding="0">
-			<tr>
-				<td>Name</td>
-				<td><%= @contact.name %></td>
-			</tr>
-			<tr>
-				<td>Email</td>
-				<td><a href="mailto:<%= @contact.email %>?subject=Re: <%= @contact.subject %>"><%= @contact.email %></a></td>
-			</tr>
-			<tr>
-				<td>Sent To</td>
-				<td><a href="mailto:<%= @contact.sent_to %>?subject=Re: <%= @contact.subject %>"><%= @contact.sent_to %></a></td>
-			</tr>
 			<tr>
 				<td>Date Submitted</td>
 				<td><%= @contact.date_submitted.strftime('%-m/%-d/%Y') %></td>
 			</tr>
+			<% (1..20).each do |ind| %>
+				<% 
+					field_name = "field#{ind}_name".to_s
+		      field_desc = "field#{ind}_description".to_s
+		      field_value = "field#{ind}_value".to_s
+		      next if @contact[field_desc].nil?
+		      if ['email','email_required','email_address','email_address_required'].include?(@contact[field_name])
+		      	email = @contact[field_value]
+		      elsif ['subject','subject_required'].include?(@contact[field_name])
+		      	email = @contact[field_value]
+		      end
+	      %>
+	      <tr>
+	      	<td><%= @contact[field_desc] %></td>
+	      	<td><%= @contact[field_value] %></td>
+	      </tr>
+			<% end %>
 			<tr>
-				<td>Subject</td>
-				<td><%= @contact.subject %></td>
+				<td>Sent To</td>
+				<td><a href="mailto:<%= @contact.sent_to %>?subject=Re: <%= subject %>"><%= @contact.sent_to %></a></td>
 			</tr>
+			<% if !@contact.bcc_to.blank? %>
 			<tr>
-				<td>Message</td>
-				<td><%= @contact.message %></td>
+				<td>BCC To</td>
+				<td><a href="mailto:<%= @contact.bcc_to %>?subject=Re: <%= subject %>"><%= @contact.bcc_to %></a></td>
 			</tr>
+			<% end %>
 		</table>
 		<div class="buttons">
-			<a href="mailto:<%= @contact.email %>?subject=Re: <%= @contact.subject %>" class="caboose-btn">Reply</a>
+			<a href="mailto:<%= email %>?subject=Re: <%= subject %>" class="caboose-btn">Reply</a>
 			<a href="/admin/inbox/<%= @contact.id %>/delete" class="caboose-btn">Delete</a>
-			<% if @contact.captcha_valid %>
+			<% if !@contact.is_spam %>
 			<a href="/admin/inbox/<%= @contact.id %>/spam" class="caboose-btn">Mark as Spam</a>
 			<% else %>
 			<a href="/admin/inbox/<%= @contact.id %>/spam" class="caboose-btn">Mark as Not Spam</a>

data/app/views/caboose/inbox/admin_spam.html.erb

@@ -1,3 +1,39 @@
+<%
+def get_name(fs)
+	(1..20).each do |ind|
+		field = "field#{ind}_name".to_sym
+		value = "field#{ind}_value".to_sym
+		if fs[field] == 'name' || fs[field] == 'name_required'
+			return fs[value]
+			break
+		end
+	end
+	return 
+end
+def get_subject(fs)
+	(1..20).each do |ind|
+		field = "field#{ind}_name".to_sym
+		value = "field#{ind}_value".to_sym
+		if fs[field] == 'subject' || fs[field] == 'subject_required'
+			return fs[value]
+			break
+		end
+	end
+	return ''
+end
+def get_message(fs)
+	(1..20).each do |ind|
+		field = "field#{ind}_name".to_sym
+		value = "field#{ind}_value".to_sym
+		if fs[field] == 'message' || fs[field] == 'message_required'
+			return fs[value]
+			break
+		end
+	end
+	return ''
+end
+%>
+
 <h1>Inbox - Spam</h1>
 
 <div class="constrain clearfix" style="padding:0 40px 0 10px;">
@@ -11,12 +47,12 @@
 			<th>Message</th>
 			<th>Date</th>
 		</tr>
-		<% @contacts.each do |c| %>
-			<tr data-id="<%= c.id %>">
-				<td><%= c.name %></td>
-				<td><%= c.subject %></td>
-				<td><%= c.message ? c.message.truncate(60) : '' %></td>
-				<td><%= c.date_submitted.strftime('%-m/%-d/%Y') %></td>
+		<% @contacts.each do |fs| %>
+			<tr data-id="<%= fs.id %>">
+				<td><%= get_name(fs) %></td>
+				<td><%= get_subject(fs) %></td>
+				<td><%= get_message(fs).truncate(60) %></td>
+				<td><%= fs.date_submitted.strftime('%-m/%-d/%Y') %></td>
 			</tr>
 		<% end %>
 	</table>

data/app/views/caboose/sites/admin_edit_codes.html.erb

@@ -28,9 +28,9 @@ $(document).ready(function() {
     update_url: '/admin/sites/<%= @site.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'head_code', nice_name: 'Code for &lt;head&gt;', type: 'textarea', value: <%== Caboose.json(@site.head_code) %>, width: 600, height: 300 },
-      { name: 'body_open_code', nice_name: 'Code for after &lt;body&gt;', type: 'textarea', value: <%== Caboose.json(@site.body_open_code) %>, width: 600, height: 300 },
-      { name: 'body_close_code', nice_name: 'Code for before &lt;/body&gt;', type: 'textarea', value: <%== Caboose.json(@site.body_close_code) %>, width: 600, height: 300 }
+      { name: 'head_code', nice_name: 'Code for &lt;head&gt;', type: 'textarea', value: <%== Caboose.json(@site.head_code.blank? ? '' : @site.head_code.gsub('</script>','<end/script>')) %>, width: 600, height: 300 },
+      { name: 'body_open_code', nice_name: 'Code for after &lt;body&gt;', type: 'textarea', value: <%== Caboose.json(@site.body_open_code.blank? ? '' : @site.body_open_code.gsub('</script>','<end/script>')) %>, width: 600, height: 300 },
+      { name: 'body_close_code', nice_name: 'Code for before &lt;/body&gt;', type: 'textarea', value: <%== Caboose.json(@site.body_close_code.blank? ? '' : @site.body_close_code.gsub('</script>','<end/script>')) %>, width: 600, height: 300 }
     ]    
   });       
 });

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.187'
+  VERSION = '0.9.188'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.187
+  version: 0.9.188
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -804,6 +804,7 @@ files:
 - app/models/caboose/font.rb
 - app/models/caboose/font_family.rb
 - app/models/caboose/font_variant.rb
+- app/models/caboose/form_submission.rb
 - app/models/caboose/ga.rb
 - app/models/caboose/gift_card.rb
 - app/models/caboose/invoice.rb