Updated eForm to 1.4.5

- Updated language files - Added &attachmentField parameter - Added &attachmentPath parameter
modxcms · Feb 14, 2014 · 8d511a4 · 8d511a4
1 parent 14f45bf
commit 8d511a4
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 deletions.
diff --git a/assets/snippets/eform/docs/eform.htm b/assets/snippets/eform/docs/eform.htm
@@ -281,6 +281,10 @@ <h2>Installation</h2>
 			</li>
 			<li><strong>&amp;snipFolder</strong> <span class="new">(new in 1.4.4)</span> (Optional)<br />
 			For those that want to keep different versions of eForm active. You can now save all of eForm's files in a different directory and set the &amp;snipFolder accordingly. You can for instance save version 1.4.4 in the 'assets/snippets/eform/1.4.4' folder and set <code>&amp;snipFolder=`eform/1.4.4`</code>. The value of &amp;snipFolder is added to the basic snippets folder 'assets/snippets/'.It should not include a closing slash (/)!</li>
+			<li><strong>&amp;attachmentField</strong> <span class="new">(new in 1.4.5)</span> (Optional)<br />
+			The name of the form field that contains a comma separated list of filenames located in &amp;attachmentFolder that are attached to the mail sent to the &amp;to address. Usefull if you want to create/set attachments in event functions.
+			<li><strong>&amp;attachmentFolder</strong> <span class="new">(new in 1.4.5)</span> (Optional)<br />
+			The folder (relative to the MODX basepath) that contains the files specified by &amp;attachmentField. It should not include a closing slash (/)!</li>
 			</ul>
 
 

diff --git a/assets/snippets/eform/docs/eform_history.htm b/assets/snippets/eform/docs/eform_history.htm
@@ -131,6 +131,12 @@
 			</ul>
 		</div>
 		<div class="qe_level_1"><h2>Version History</h2>
+			<h3>Version 1.4.5</h3>
+			<ul>
+                <li>Updated language files.</li>
+                <li>Added &amp;attachmentField parameter.</li>
+                <li>Added &amp;attachmentPath parameter.</li>
+			</ul>
 			<h3>Version 1.4.4.9</h3>
 			<ul>
                 <li>Updated language files.</li>

diff --git a/assets/snippets/eform/eform.inc.php b/assets/snippets/eform/eform.inc.php
@@ -1,5 +1,5 @@
 <?php
-# eForm 1.4.4.9 - Electronic Form Snippet
+# eForm 1.4.5 - Electronic Form Snippet
 # Original created by: Raymond Irving 15-Dec-2004.
 # Extended by: Jelle Jager (TobyL) September 2006
 # -----------------------------------------------------
@@ -54,7 +54,7 @@ function eForm($modx,$params) {
 
 	extract($params,EXTR_SKIP); // extract params into variables
 
-	$fileVersion = '1.4.4';
+	$fileVersion = '1.4.5';
 	$version = isset($version)?$version:'prior to 1.4.2';
 
 	#include default language file
@@ -321,7 +321,7 @@ function eForm($modx,$params) {
 
 			#set validation message
 			if (count($rMsg) > 0) {
-			    $rMsg = "<span class=\"requiredlist\"><span>" . implode(" </span><span>",$rMsg) . " </span></span>";
+			    $rMsg = "<span class=\"requiredlist\"><span>" . implode("</span><span>",$rMsg) . "</span></span>";
 			    $tmp = str_replace("{fields}", $rMsg, $_lang['ef_required_message']);
 			} else {
 			    $tmp = "";
@@ -459,6 +459,17 @@ function eForm($modx,$params) {
 			$from = ($from)? formMerge($from,$fields):"";
 			$fromname	= ($from)? formMerge($fromname,$fields):"";
 
+			# added in 1.4.5 - Use a field for attachments
+			if ($attachmentField != '' && isset($fields[$attachmentField]) && !empty($fields[$attachmentField])) {
+				$attachmentPath = realpath(MODX_BASE_PATH . $attachmentPath) . '/';
+				$filenames = explode(',', $fields[$attachmentField]);
+				foreach ($filenames as $filename) {
+					if (file_exists($attachmentPath . $filename)) {
+						$attachments[count($attachments)] = $attachmentPath . $filename;
+					}
+				}
+			}
+
 			$to = formMerge($to,$fields);
 			if(empty($to) || !strpos($to,'@')) $nomail=1;
 

diff --git a/assets/snippets/eform/snippet.eform.php b/assets/snippets/eform/snippet.eform.php
@@ -1,6 +1,6 @@
 <?php
 if(!defined('MODX_BASE_PATH')){die('What are you doing? Get out of here!');}
-# eForm 1.4.4.9 - Electronic Form Snippet
+# eForm 1.4.5 - Electronic Form Snippet
 # Original created by Raymond Irving 15-Dec-2004.
 # Version 1.3+ extended by Jelle Jager (TobyL) September 2006
 # -----------------------------------------------------
@@ -85,7 +85,9 @@
    'invalidClass' => isset($invalidClass)?$invalidClass:"invalid",
    'runSnippet' => ( isset($runSnippet) && !is_numeric($runSnippet) )?$runSnippet:'',
    'autoSenderName' => isset($autoSenderName)?$autoSenderName:'',
-   'version' => '1.4.4'
+   'attachmentField' => isset($attachmentField)?$attachmentField:'',
+   'attachmentPath' => isset($attachmentPath)?$attachmentPath:'',
+   'version' => '1.4.5'
 );
 
 // pixelchutes PHx workaround

diff --git a/install/assets/snippets/eform.tpl b/install/assets/snippets/eform.tpl
@@ -5,7 +5,7 @@
  * Robust form parser/processor with validation, multiple sending options, chunk/page support for forms and reports, and file uploads
  *
  * @category   snippet
- * @version    1.4.4.9
+ * @version    1.4.5
  * @license    http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL)
  * @internal   @properties
  * @internal   @modx_category Forms