updated to 1.3.26

WebsiteBaker-modules · Jan 23, 2019 · 51a0794 · 51a0794
1 parent d6c6688
commit 51a0794
Show file tree

Hide file tree

Showing 65 changed files with 102 additions and 77 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -5,9 +5,13 @@ MODULE VERSION HISTORY
 ======================
 
 ------------------------------------------------------------------------------------------------------------------------
+        *** 1.3.26 (Martin Hecht: 23-Jan-2019) ***
+        put required attribute into required input fields (thanks to dbs)
+        write file names correctly to results table when correcting an upload error (thanks again to hansi)
+
         *** 1.3.25 (Martin Hecht: 15-Jan-2019) ***
         replace module_header_footer by core function of admin class
-        support writing multiple file names to results table
+        support writing multiple file names per field to results table (thanks to hansi)
 
         *** 1.3.24 (Martin Hecht: 27-Dec-2018) ***
         updated pear and its http_upload class (thanks to dbs)

diff --git a/TODO b/TODO
@@ -3,6 +3,8 @@
  * todo list for upcoming releases:
  * ================================
  *
+ * - add a checkbox for file upload to control if multiple files may be selected
+ *
  * - make workflow more flexible. Right now, saving results in various tables
  *   and sending emails happens in a fixed order. Moving these steps around
  *   like it is possible to drag&drop fields would be nice, but it needs a

diff --git a/add.php b/add.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/add_field.php b/add_field.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/ajax/ajax.php b/ajax/ajax.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/ajax/ajax_dragdrop.php b/ajax/ajax_dragdrop.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/ajax/index.php b/ajax/index.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/ajax/pry_submission.php b/ajax/pry_submission.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/constants.php b/constants.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/copy_field.php b/copy_field.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/delete.php b/delete.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/delete_field.php b/delete_field.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/delete_submission.php b/delete_submission.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/docs/DE/index.php b/docs/DE/index.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/docs/DE/mpform/index.php b/docs/DE/mpform/index.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/docs/DE/mpform/referenz-der-optionen/index.php b/docs/DE/mpform/referenz-der-optionen/index.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

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.25</version>
+                <version>1.3.26</version>
         </module>
         <export_section_table>
                 <tablename>mod_mpform_fields</tablename>

diff --git a/docs/EN/index.php b/docs/EN/index.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/docs/EN/mpform/index.php b/docs/EN/mpform/index.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/docs/EN/mpform/settings-of-mpform/index.php b/docs/EN/mpform/settings-of-mpform/index.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

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.25</version>
+                <version>1.3.26</version>
         </module>
         <export_section_table>
                 <tablename>mod_mpform_fields</tablename>

diff --git a/docs/images/index.php b/docs/images/index.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/docs/index.php b/docs/index.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/docs/style/index.php b/docs/style/index.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/evalform.php b/evalform.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform
@@ -872,14 +872,15 @@ function eval_form($section_id) {
                                 }
                             }
                             if($file_counter>0){
+                                $curr_field = str_replace("''", ",", $curr_field);
                                 $_SESSION['mpf']['datafield'.$field_id]
                                     = array(
                                         'user' => $tmp_html_user,
                                         'site' => $tmp_html_site,
                                         'files' => $tmp_files_to_attach,
-                                        'filenames' => $tmp_filenames
+                                        'filenames' => $tmp_filenames,
+                                        'field' => $curr_field
                                     );
-                                $curr_field = str_replace("''", ",", $curr_field);
 
                                 $html_data_user .= $tmp_html_user;
                                 $html_data_site .= $tmp_html_site;
@@ -891,6 +892,8 @@ function eval_form($section_id) {
                                 $html_data_user .= $_SESSION['mpf']['datafield'.$field_id]['user'];
                             if(isset($_SESSION['mpf']['datafield'.$field_id]['site']))
                                 $html_data_site .= $_SESSION['mpf']['datafield'.$field_id]['site'];
+                            if(isset($_SESSION['mpf']['datafield'.$field_id]['field']))
+                                $curr_field .= $_SESSION['mpf']['datafield'.$field_id]['field'];
                             $files_to_attach = array_merge($files_to_attach, $tmp_files_to_attach);
                             if ( ($field['required']==1)
                                  && ( (!isset($_SESSION['mpf']['datafield'.$field_id]['user']))

diff --git a/export.php b/export.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/export_submissions.php b/export_submissions.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/functions.php b/functions.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/help.php b/help.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/htt/index.php b/htt/index.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/images/index.php b/images/index.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/import.php b/import.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/index.php b/index.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/info.php b/info.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform
@@ -20,7 +20,7 @@
 $module_directory   = 'mpform';
 $module_name        = 'mpForm';
 $module_function    = 'page';
-$module_version     = '1.3.25';
+$module_version     = '1.3.26';
 $module_platform    = '2.8.x';
 $module_status      = 'stable';
 $module_author      = 'Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others';

diff --git a/install.php b/install.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/jscalendar.php b/jscalendar.php
@@ -6,7 +6,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/languages/DE.php b/languages/DE.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/languages/EN.php b/languages/EN.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform

diff --git a/languages/FR.php b/languages/FR.php
@@ -7,7 +7,7 @@
  *
  * @category            page
  * @module              mpform
- * @version             1.3.25
+ * @version             1.3.26
  * @authors             Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others
  * @copyright           (c) 2009 - 2019, Website Baker Org. e.V.
  * @url                 https://github.com/WebsiteBaker-modules/mpform