From 51a0794ed7d146e5bbe43b13f2f458061f558d13 Mon Sep 17 00:00:00 2001 From: Martin Hecht Date: Wed, 23 Jan 2019 20:54:39 +0100 Subject: [PATCH] updated to 1.3.26 --- CHANGELOG.txt | 6 ++- TODO | 2 + add.php | 2 +- add_field.php | 2 +- ajax/ajax.php | 2 +- ajax/ajax_dragdrop.php | 2 +- ajax/index.php | 2 +- ajax/pry_submission.php | 2 +- constants.php | 2 +- copy_field.php | 2 +- delete.php | 2 +- delete_field.php | 2 +- delete_submission.php | 2 +- docs/DE/index.php | 2 +- docs/DE/mpform/index.php | 2 +- .../DE/mpform/referenz-der-optionen/index.php | 2 +- docs/DE/mpform/standardformular.xml | 2 +- docs/EN/index.php | 2 +- docs/EN/mpform/index.php | 2 +- docs/EN/mpform/settings-of-mpform/index.php | 2 +- docs/EN/mpform/standardform.xml | 2 +- docs/images/index.php | 2 +- docs/index.php | 2 +- docs/style/index.php | 2 +- evalform.php | 9 +++-- export.php | 2 +- export_submissions.php | 2 +- functions.php | 2 +- help.php | 2 +- htt/index.php | 2 +- images/index.php | 2 +- import.php | 2 +- index.php | 2 +- info.php | 4 +- install.php | 2 +- jscalendar.php | 2 +- languages/DE.php | 2 +- languages/EN.php | 2 +- languages/FR.php | 2 +- languages/IT.php | 2 +- languages/NL.php | 2 +- languages/NO.php | 2 +- languages/index.php | 2 +- modify.php | 2 +- modify_adv_settings.php | 2 +- modify_field.php | 2 +- modify_settings.php | 2 +- move_down.php | 2 +- move_up.php | 2 +- paintform.php | 38 +++++++++++++------ pear/FixPHP5PEARWarnings.php | 2 +- pear/index.php | 2 +- pear/languages/DE.php | 2 +- pear/languages/EN.php | 2 +- pear/languages/FR.php | 2 +- pear/languages/IT.php | 2 +- pear/languages/index.php | 2 +- private.default.php | 2 +- save_adv_settings.php | 2 +- save_field.php | 2 +- save_settings.php | 2 +- uninstall.php | 2 +- upgrade.php | 2 +- view.php | 2 +- view_submission.php | 2 +- 65 files changed, 102 insertions(+), 77 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 4b0dd65..b0f20e0 100644 --- 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 index 5ddd157..8bb3779 100644 --- 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 index b725797..ef3d693 100644 --- 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 index ba25803..49e81dd 100644 --- 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 index d53dac2..f3cbbef 100644 --- 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 index b997c1e..5b4eb01 100644 --- 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 index a2f8c6d..259c217 100644 --- 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 index 005e7ba..aaefe72 100644 --- 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 index afce0ea..eb8217b 100644 --- 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 index 5e4563d..2f4ddf3 100644 --- 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 index fde421e..1b99468 100644 --- 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 index 2a21871..8a3c1b2 100644 --- 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 index c35f3e9..818be12 100644 --- 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 index 69b72b0..a36110e 100644 --- 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 index 69b72b0..a36110e 100644 --- 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 index 69b72b0..a36110e 100644 --- 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 index a522e1b..08e86d2 100644 --- a/docs/DE/mpform/standardformular.xml +++ b/docs/DE/mpform/standardformular.xml @@ -2,7 +2,7 @@ mpform - 1.3.25 + 1.3.26 mod_mpform_fields diff --git a/docs/EN/index.php b/docs/EN/index.php index 69b72b0..a36110e 100644 --- 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 index 69b72b0..a36110e 100644 --- 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 index 69b72b0..a36110e 100644 --- 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 index 9772bef..2d38d98 100644 --- a/docs/EN/mpform/standardform.xml +++ b/docs/EN/mpform/standardform.xml @@ -2,7 +2,7 @@ mpform - 1.3.25 + 1.3.26 mod_mpform_fields diff --git a/docs/images/index.php b/docs/images/index.php index 69b72b0..a36110e 100644 --- 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 index 2cf5669..18e3398 100644 --- 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 index 69b72b0..a36110e 100644 --- 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 index 9834415..2dd9b96 100644 --- 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 index d9dd5fe..ae8afa7 100644 --- 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 index aee49ef..1efbcd5 100644 --- 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 index e39e027..2a8867a 100644 --- 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 index 3fb8355..7a700ae 100644 --- 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 index 10bb814..78d367d 100644 --- 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 index 10bb814..78d367d 100644 --- 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 index 7fbf13b..b4d2c4f 100644 --- 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 index 69b72b0..a36110e 100644 --- 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 index 3f8ff15..34992c5 100644 --- 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 index 25516be..0cf9e8d 100644 --- 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 index 672cddb..04dfcc3 100644 --- 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 index 20e3a88..2ddf87a 100644 --- 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 index 48dff17..e6eb98d 100644 --- 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 index 721c006..4fbe951 100644 --- 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 diff --git a/languages/IT.php b/languages/IT.php index f9c39d7..83c41bc 100644 --- a/languages/IT.php +++ b/languages/IT.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/NL.php b/languages/NL.php index 8e7a301..30bbbd2 100644 --- a/languages/NL.php +++ b/languages/NL.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/NO.php b/languages/NO.php index 43ec203..cd2de65 100644 --- a/languages/NO.php +++ b/languages/NO.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/index.php b/languages/index.php index 10bb814..78d367d 100644 --- a/languages/index.php +++ b/languages/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/modify.php b/modify.php index 24b3538..7d323c4 100644 --- a/modify.php +++ b/modify.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/modify_adv_settings.php b/modify_adv_settings.php index 7caf949..7d0fdfd 100644 --- a/modify_adv_settings.php +++ b/modify_adv_settings.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/modify_field.php b/modify_field.php index ea159d9..a1140fb 100644 --- a/modify_field.php +++ b/modify_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/modify_settings.php b/modify_settings.php index dc392f2..4b128d1 100644 --- a/modify_settings.php +++ b/modify_settings.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/move_down.php b/move_down.php index cc7b9e4..34eb6cb 100644 --- a/move_down.php +++ b/move_down.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/move_up.php b/move_up.php index d8ea1b1..adfec49 100644 --- a/move_up.php +++ b/move_up.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/paintform.php b/paintform.php index f9d02dd..e9e39fd 100644 --- a/paintform.php +++ b/paintform.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 @@ -44,7 +44,8 @@ function make_option( $option = ''; } else { if (in_array($h, $values) or ($isnew and $def > 0)) { - $option = ''; + $option = ''; } else { $option = ''; } @@ -63,7 +64,8 @@ function make_checkbox( $value, $sErrClass, $isnew, - $value_option_separator + $value_option_separator, + $required ) { $def = strpos($option, MPFORM_IS_DEFAULT); ($def > 0) ? $h = substr($option, 0, $def) : $h = $option; @@ -87,7 +89,8 @@ function make_checkbox( . ' id="'.$label_id.'"' . ' name="field'.$field_id.'['.$idx.']"' . ' value="'.$v.'"' - . ' checked="checked" />' + . ' checked="checked"' + . $required.' />' . '