updated to 1.3.4

WebsiteBaker-modules · Jan 30, 2017 · 22ad426 · 22ad426
1 parent 6d8347b
commit 22ad426
Show file tree

Hide file tree

Showing 73 changed files with 343 additions and 198 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -6,6 +6,12 @@ MODULE VERSION HISTORY
 
    ------------------------------------------------------------------------------------------------------------------------ 
 
+        *** 1.3.4 (Martin Hecht: 30-Jan-2017) ***
+        allow use of {TEMPLATE} place holders in notification mails (request by gottfried)
+        implement css for mails (to site owner and to submitter)
+        fix warning in disabled file upload fields (thanks to dbs for reporting)
+        fix warning when saving fields
+
         *** 1.3.3 (Martin Hecht: 19-Dec-2016) ***
         fix the local template so that indeed all place holders are allowed there
         introduce {TEMPLATE1} ... {TEMPLATE9} for a single line of the local template

diff --git a/add.php b/add.php
@@ -6,9 +6,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661
@@ -76,13 +76,15 @@
     . 'Referer page: {REFERER}'
     . '<br />'
     . 'IP address: {IP}';
+$email_css = '';
 $success_email_to = '';
 $success_email_from = $admin->get_email();
 $success_email_fromname = '';
 $success_email_text = 'Thank you for submitting your data.'
     . ' We received the following data:'
     . '<br />'."\n".'{DATA}'
     . '<br />'."\n";
+$success_email_css = '';
 $success_email_subject = $LANG['backend']['EMAIL_SUC_SUBJ'];
 $max_submissions = 50;
 $stored_submissions = 1000;
@@ -111,13 +113,15 @@
      . " `email_fromname` = '".$email_fromname."', "
      . " `email_subject` = '".$email_subject."', "
      . " `email_text` = '".$email_text."', "
+     . " `email_css` = '".$email_css."', "
      . " `success_page` = '".$success_page."', "
      . " `success_text` = '".$success_text."', "
      . " `submissions_text` = '".$submissions_text."', "
      . " `success_email_to` = '".$success_email_to."', "
      . " `success_email_from` = '".$success_email_from."', "
      . " `success_email_fromname` = '".$success_email_fromname."', "
      . " `success_email_text` = '".$success_email_text."', "
+     . " `success_email_css` = '".$success_email_css."', "
      . " `success_email_subject` = '".$success_email_subject."', "
      . " `max_submissions` = '".$max_submissions."', "
      . " `stored_submissions` = '".$stored_submissions."', "

diff --git a/add_field.php b/add_field.php
@@ -6,9 +6,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/ajax/ajax.php b/ajax/ajax.php
@@ -7,9 +7,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/ajax/ajax_dragdrop.php b/ajax/ajax_dragdrop.php
@@ -7,9 +7,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/ajax/index.php b/ajax/index.php
@@ -7,9 +7,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/ajax/pry_submission.php b/ajax/pry_submission.php
@@ -6,9 +6,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/constants.php b/constants.php
@@ -6,9 +6,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/copy_field.php b/copy_field.php
@@ -6,9 +6,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/delete.php b/delete.php
@@ -6,9 +6,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/delete_field.php b/delete_field.php
@@ -6,9 +6,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/delete_submission.php b/delete_submission.php
@@ -6,9 +6,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/docs/DE/images/OD5.png b/docs/DE/images/OD5.png
diff --git a/docs/DE/images/OD6.png b/docs/DE/images/OD6.png
diff --git a/docs/DE/index.php b/docs/DE/index.php
@@ -7,9 +7,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/docs/DE/mpform/index.php b/docs/DE/mpform/index.php
@@ -7,9 +7,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/docs/DE/mpform/referenz-der-optionen/bestaetigungsmail-an-formularabsender.html b/docs/DE/mpform/referenz-der-optionen/bestaetigungsmail-an-formularabsender.html
@@ -117,6 +117,11 @@ <h2>MPForm-Dokumentation: E-Mail-Einstellungen (Best&auml;tigungsmail an Formula
        {USER} wird mit dem Benutzernamen ausgef&uuml;llt, wenn der Benutzer angemeldet ist und {EMAIL}
        ist die Absender-email-Adresse wie oben eingestellt. <br />
     </dd>
+    <dt>Success Email Style</dt>
+    <dd>Hier k&ouml;nnen Sie CSS-Definitionen f&uuml;r die HTML-Version der Email 
+       hinterlegen. In der Plain-Text Variante finden diese selbstverst&auml;ndlich
+       keine Anwendung.<br />
+    </dd>
 </dl>
 </div>
 

diff --git a/docs/DE/mpform/referenz-der-optionen/index.php b/docs/DE/mpform/referenz-der-optionen/index.php
@@ -7,9 +7,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/docs/DE/mpform/referenz-der-optionen/mail-an-sitebetreiber.html b/docs/DE/mpform/referenz-der-optionen/mail-an-sitebetreiber.html
@@ -149,6 +149,11 @@ <h2>MPForm-Dokumentation: E-Mail-Einstellungen (Mail an Sitebetreiber)</h2>
        {USER} wird mit dem Benutzernamen ausgef&uuml;llt, wenn der Benutzer angemeldet ist und {EMAIL}
        ist die Absender-email-Adresse wie oben eingestellt. <br />
     </dd>
+    <dt>Email Style</dt>
+    <dd>Hier k&ouml;nnen Sie CSS-Definitionen f&uuml;r die HTML-Version der Email 
+       hinterlegen. In der Plain-Text Variante finden diese selbstverst&auml;ndlich
+       keine Anwendung.<br />
+    </dd>
 </dl>
 <p><span style="color: rgb(255, 0, 0);">Achtung Fallstrick: 
    </span>Es macht keinen Sinn, jeweils mehr als ein Feld der Typen 

diff --git a/docs/DE/mpform/standardformular.xml b/docs/DE/mpform/standardformular.xml
@@ -2,7 +2,7 @@
 <export_section>
         <module>
                 <name>mpform</name>
-                <version>1.3.3</version>
+                <version>1.3.4</version>
         </module>
         <export_section_table>
                 <tablename>mod_mpform_fields</tablename>
@@ -156,6 +156,7 @@
                         <export_section_field><fieldn>email_subject</fieldn><fieldv><![CDATA[Formularereintragung von der Website...]]></fieldv></export_section_field>
                         <export_section_field><fieldn>email_text</fieldn><fieldv><![CDATA[Folgende Daten wurden &uuml;bermittelt:<br />{DATA}
 <br />Verweisseite: {REFERER}<br />IP-Adresse: {IP}<br />Datum: {DATE}]]></fieldv></export_section_field>
+                        <export_section_field><fieldn>email_css</fieldn><fieldv><![CDATA[]]></fieldv></export_section_field>
                         <export_section_field><fieldn>success_page</fieldn><fieldv><![CDATA[none]]></fieldv></export_section_field>
                         <export_section_field><fieldn>success_text</fieldn><fieldv><![CDATA[<div class=\"mpform_results\">Danke f&uuml;r das Ausf&uuml;llen des Formulars. Wir haben folgende Daten erhalten:<br />{DATA}</div>]]></fieldv></export_section_field>
                         <export_section_field><fieldn>submissions_text</fieldn><fieldv><![CDATA[{DATA}
@@ -166,6 +167,7 @@ Datum: {DATE}]]></fieldv></export_section_field>
                         <export_section_field><fieldn>success_email_from</fieldn><fieldv><![CDATA[[email protected]]]></fieldv></export_section_field>
                         <export_section_field><fieldn>success_email_fromname</fieldn><fieldv><![CDATA[]]></fieldv></export_section_field>
                         <export_section_field><fieldn>success_email_text</fieldn><fieldv><![CDATA[Danke f&uuml;r das Ausf&uuml;llen des Formulars. Wir haben folgende Daten erhalten:&lt;br /&gt;{DATA}]]></fieldv></export_section_field>
+                        <export_section_field><fieldn>success_email_css</fieldn><fieldv><![CDATA[]]></fieldv></export_section_field>
                         <export_section_field><fieldn>success_email_subject</fieldn><fieldv><![CDATA[Sie haben ein Formular abgeschickt]]></fieldv></export_section_field>
                         <export_section_field><fieldn>stored_submissions</fieldn><fieldv><![CDATA[1000]]></fieldv></export_section_field>
                         <export_section_field><fieldn>max_submissions</fieldn><fieldv><![CDATA[50]]></fieldv></export_section_field>

diff --git a/docs/EN/images/OE3.png b/docs/EN/images/OE3.png
diff --git a/docs/EN/images/OE4.png b/docs/EN/images/OE4.png
diff --git a/docs/EN/index.php b/docs/EN/index.php
@@ -7,9 +7,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/docs/EN/mpform/index.php b/docs/EN/mpform/index.php
@@ -7,9 +7,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/docs/EN/mpform/settings-of-mpform/confirmation-mail.html b/docs/EN/mpform/settings-of-mpform/confirmation-mail.html
@@ -112,6 +112,10 @@ <h2>MPForm Documentation: E-Mail Settings (confirmation mail to user)</h2>
         {USER} contains the user name in case the user is registered and logged into website baker
         and {EMAIL} is the From address as it is adjusted above. <br />
     </dd>
+    <dt>Success Email Style</dt>
+    <dd>Here you can define CSS classes to be applied in the HTML version of the email.
+       Of course they are not applied to the plain text variant of the mail.<br />
+    </dd>
 </dl>
 </div>
 

diff --git a/docs/EN/mpform/settings-of-mpform/index.php b/docs/EN/mpform/settings-of-mpform/index.php
@@ -7,9 +7,9 @@
  *  
  * @category            page
  * @module              mpform
- * @version             1.3.3
+ * @version             1.3.4
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
- * @copyright           (c) 2009 - 2016, Website Baker Org. e.V.
+ * @copyright           (c) 2009 - 2017, Website Baker Org. e.V.
  * @url                 http://forum.websitebaker.org/index.php/topic,28496.0.html
  * @url                 https://github.com/WebsiteBaker-modules/mpform
  * @url                 https://forum.wbce.org/viewtopic.php?id=661

diff --git a/docs/EN/mpform/settings-of-mpform/mail-to-site-owner.html b/docs/EN/mpform/settings-of-mpform/mail-to-site-owner.html
@@ -141,6 +141,10 @@ <h2>MPForm Documentation: E-Mail Settings (mail to site owner)</h2>
        {USER} contains the user name in case the user is registered and logged into website baker
        and {EMAIL} is the From address as it is adjusted above. <br />
     </dd>
+    <dt>Success Email Style</dt>
+    <dd>Here you can define CSS classes to be applied in the HTML version of the email.
+       Of course they are not applied to the plain text variant of the mail.<br />
+    </dd>
 </dl>
 <p><span style="color: rgb(255, 0, 0);">Attention Pitfall: </span>
    It makes no sense to use more than one of each field of the types <strong>E-Mail recipient</strong> 

diff --git a/docs/EN/mpform/standardform.xml b/docs/EN/mpform/standardform.xml
@@ -2,7 +2,7 @@
 <export_section>
         <module>
                 <name>mpform</name>
-                <version>1.3.3</version>
+                <version>1.3.4</version>
         </module>
         <export_section_table>
                 <tablename>mod_mpform_fields</tablename>
@@ -160,6 +160,7 @@
                         <export_section_field><fieldn>email_subject</fieldn><fieldv><![CDATA[Results from form on website...]]></fieldv></export_section_field>
                         <export_section_field><fieldn>email_text</fieldn><fieldv><![CDATA[The following data was submitted:<br />{DATA}
 <br />Referer page: {REFERER}<br />IP address: {IP}]]></fieldv></export_section_field>
+                        <export_section_field><fieldn>email_css</fieldn><fieldv><![CDATA[]]></fieldv></export_section_field>
                         <export_section_field><fieldn>success_page</fieldn><fieldv><![CDATA[none]]></fieldv></export_section_field>
                         <export_section_field><fieldn>success_text</fieldn><fieldv><![CDATA[<div class=\"mpform_results\">Thank you for submitting your data. We received the following data:<br />{DATA}
 <br />Referer page: {REFERER}<br />Your IP address: {IP}</div>]]></fieldv></export_section_field>
@@ -172,6 +173,7 @@ Date: {DATE}]]></fieldv></export_section_field>
                         <export_section_field><fieldn>success_email_fromname</fieldn><fieldv><![CDATA[]]></fieldv></export_section_field>
                         <export_section_field><fieldn>success_email_text</fieldn><fieldv><![CDATA[Thank you for submitting your data. We received the following data:&lt;br /&gt;{DATA}
 &lt;br /&gt;Referer page: {REFERER}&lt;br /&gt;Your IP address: {IP}]]></fieldv></export_section_field>
+                        <export_section_field><fieldn>success_email_css</fieldn><fieldv><![CDATA[]]></fieldv></export_section_field>
                         <export_section_field><fieldn>success_email_subject</fieldn><fieldv><![CDATA[You have submitted a form]]></fieldv></export_section_field>
                         <export_section_field><fieldn>stored_submissions</fieldn><fieldv><![CDATA[1000]]></fieldv></export_section_field>
                         <export_section_field><fieldn>max_submissions</fieldn><fieldv><![CDATA[50]]></fieldv></export_section_field>