From 7236934838938b5a6fafe04a7f3a8ce2a1d32804 Mon Sep 17 00:00:00 2001 From: Martin Hecht Date: Sun, 21 Aug 2016 00:09:11 +0200 Subject: [PATCH] updated to 1.2.3 --- CHANGELOG.txt | 10 +++++++++- add.php | 2 +- add_field.php | 2 +- ajax/ajax.php | 2 +- ajax/ajax_dragdrop.js | 2 +- ajax/ajax_dragdrop.php | 2 +- ajax/index.php | 2 +- ajax/pry_submission.php | 2 +- backend_body.js | 3 ++- 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 +- docs/DE/mpform/referenz-der-optionen/index.php | 2 +- docs/EN/index.php | 2 +- docs/EN/mpform/index.php | 2 +- docs/EN/mpform/settings-of-mpform/index.php | 2 +- docs/images/index.php | 2 +- docs/index.php | 2 +- docs/style/index.php | 2 +- evalform.php | 2 +- export.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 | 9 ++++++++- modify_adv_settings.php | 2 +- modify_field.php | 11 +++++++++-- modify_settings.php | 2 +- move_down.php | 2 +- move_up.php | 2 +- paintform.php | 2 +- pear/FixPHP5PEARWarnings.php | 2 +- pear/index.php | 2 +- pear/languages/DE.php | 2 +- pear/languages/EN.php | 2 +- pear/languages/index.php | 2 +- private.default.php | 2 +- save_adv_settings.php | 2 +- save_field.php | 15 +-------------- save_settings.php | 2 +- uninstall.php | 2 +- upgrade.php | 11 ++++++----- view.php | 2 +- view_submission.php | 6 +++--- 61 files changed, 93 insertions(+), 82 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 3d2bf6a..c49caf4 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,10 +5,18 @@ MODULE VERSION HISTORY ====================== ------------------------------------------------------------------------------------------------------------------------ + *** 1.2.3 (Martin Hecht: 20-Aug-2016) *** + fix query for position in upgrade script, thanks to norhei for reporting + fix drag and drop in ajax helper, thanks to florian for reporting + honor redirection_timer in ajax notifications, thanks to florian for this hint + + *** 1.2.2 (Martin Hecht: 18-Aug-2016) *** + two typo fixes in view_submissions, thanks to norhei for reporting + *** 1.2.1 (Martin Hecht: 02-Aug-2016) *** fix the redirection on the help page repair the build system which has inserted text by mistake - fix curly brace in private.php + fix curly brace in private.php, thanks to florian for reporting *** 1.2.0 (Martin Hecht: 28-Jul-2016) *** realign the code (break long lines and properly ident) diff --git a/add.php b/add.php index 20086cc..5304cca 100644 --- a/add.php +++ b/add.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/add_field.php b/add_field.php index d03cd8e..ee83f93 100644 --- a/add_field.php +++ b/add_field.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/ajax/ajax.php b/ajax/ajax.php index 1767de7..d3fa7d2 100644 --- a/ajax/ajax.php +++ b/ajax/ajax.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/ajax/ajax_dragdrop.js b/ajax/ajax_dragdrop.js index c0a8900..c9adb72 100644 --- a/ajax/ajax_dragdrop.js +++ b/ajax/ajax_dragdrop.js @@ -26,7 +26,7 @@ if(jQuery().sortable){ jQuery(function() { jQuery('.dragdrop_item').addClass('dragdrop_handle'); jQuery(".dragdrop_form .move_position a").remove(); - var sDataString = jQuery(this).sortable("serialize") + '&action=updatePosition'; + //var sDataString = jQuery(this).sortable("serialize") + '&action=updatePosition'; jQuery(".dragdrop_form tbody").sortable({ appendTo: 'body', diff --git a/ajax/ajax_dragdrop.php b/ajax/ajax_dragdrop.php index 7ff3560..2f6407a 100644 --- a/ajax/ajax_dragdrop.php +++ b/ajax/ajax_dragdrop.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/ajax/index.php b/ajax/index.php index 30a537d..80ff264 100644 --- a/ajax/index.php +++ b/ajax/index.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/ajax/pry_submission.php b/ajax/pry_submission.php index d052196..78397b3 100644 --- a/ajax/pry_submission.php +++ b/ajax/pry_submission.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/backend_body.js b/backend_body.js index e9b271f..d765252 100644 --- a/backend_body.js +++ b/backend_body.js @@ -2,6 +2,7 @@ var MODULE_URL = WB_URL + '/modules/mpform'; var ICONS = MODULE_URL + '/images'; var AJAX_PLUGINS = MODULE_URL + '/ajax'; // this var could change in the future var LANGUAGE = LANGUAGE ? LANGUAGE : 'EN'; // set var LANGUAGE to EN if LANGUAGE not set before +var REDIRECT_TIMER = REDIRECT_TIMER ? REDIRECT_TIMER : 1500; // ms $.insert(AJAX_PLUGINS +"/localization.js"); // load external language file // @function: getUrlVars (retrieve GET Parameters) @@ -91,7 +92,7 @@ $(function() { { // jNotify Settings autoHide : true, // added in v2.0 - TimeShown : 1200, // ms + TimeShown : REDIRECT_TIMER, HorizontalPosition : 'center', VerticalPosition : 'top', ColorOverlay : '#FFF' diff --git a/constants.php b/constants.php index 9b5e3e1..2e17165 100644 --- a/constants.php +++ b/constants.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/copy_field.php b/copy_field.php index f5ed6d8..dd87d54 100644 --- a/copy_field.php +++ b/copy_field.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/delete.php b/delete.php index 1575c3e..1232152 100644 --- a/delete.php +++ b/delete.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/delete_field.php b/delete_field.php index 82ce463..3a5d1fe 100644 --- a/delete_field.php +++ b/delete_field.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/delete_submission.php b/delete_submission.php index 8843b12..cb480ff 100644 --- a/delete_submission.php +++ b/delete_submission.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/docs/DE/index.php b/docs/DE/index.php index 62cea44..b76579b 100644 --- a/docs/DE/index.php +++ b/docs/DE/index.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/docs/DE/mpform/index.php b/docs/DE/mpform/index.php index 62cea44..b76579b 100644 --- a/docs/DE/mpform/index.php +++ b/docs/DE/mpform/index.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/docs/DE/mpform/referenz-der-optionen/index.php b/docs/DE/mpform/referenz-der-optionen/index.php index 62cea44..b76579b 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.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/docs/EN/index.php b/docs/EN/index.php index 62cea44..b76579b 100644 --- a/docs/EN/index.php +++ b/docs/EN/index.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/docs/EN/mpform/index.php b/docs/EN/mpform/index.php index 62cea44..b76579b 100644 --- a/docs/EN/mpform/index.php +++ b/docs/EN/mpform/index.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/docs/EN/mpform/settings-of-mpform/index.php b/docs/EN/mpform/settings-of-mpform/index.php index 62cea44..b76579b 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.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/docs/images/index.php b/docs/images/index.php index 62cea44..b76579b 100644 --- a/docs/images/index.php +++ b/docs/images/index.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/docs/index.php b/docs/index.php index 655d671..a29dc72 100644 --- a/docs/index.php +++ b/docs/index.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/docs/style/index.php b/docs/style/index.php index 62cea44..b76579b 100644 --- a/docs/style/index.php +++ b/docs/style/index.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/evalform.php b/evalform.php index 113a048..a72908a 100644 --- a/evalform.php +++ b/evalform.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/export.php b/export.php index 9811bde..9845406 100644 --- a/export.php +++ b/export.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/functions.php b/functions.php index 2fb6893..a545a8f 100644 --- a/functions.php +++ b/functions.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/help.php b/help.php index 4c47ee0..5cfe00b 100644 --- a/help.php +++ b/help.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/htt/index.php b/htt/index.php index 6df983a..0d49d28 100644 --- a/htt/index.php +++ b/htt/index.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/images/index.php b/images/index.php index 6df983a..0d49d28 100644 --- a/images/index.php +++ b/images/index.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/import.php b/import.php index 11fbb23..b35ab0c 100644 --- a/import.php +++ b/import.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/index.php b/index.php index 62cea44..b76579b 100644 --- a/index.php +++ b/index.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/info.php b/info.php index 2807ad3..da74bae 100644 --- a/info.php +++ b/info.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html @@ -21,7 +21,7 @@ $module_directory = 'mpform'; $module_name = 'mpForm'; $module_function = 'page'; -$module_version = '1.2.1'; +$module_version = '1.2.3'; $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 dad07a2..c51ba99 100644 --- a/install.php +++ b/install.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/jscalendar.php b/jscalendar.php index 5058f15..0c9214d 100644 --- a/jscalendar.php +++ b/jscalendar.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/languages/DE.php b/languages/DE.php index 0319504..8d0d687 100644 --- a/languages/DE.php +++ b/languages/DE.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/languages/EN.php b/languages/EN.php index 05ee206..34f5825 100644 --- a/languages/EN.php +++ b/languages/EN.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/languages/FR.php b/languages/FR.php index 2957c78..b8ab1ad 100644 --- a/languages/FR.php +++ b/languages/FR.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/languages/IT.php b/languages/IT.php index 7888b2c..58e9fd2 100644 --- a/languages/IT.php +++ b/languages/IT.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/languages/NL.php b/languages/NL.php index 38733ad..21a651d 100644 --- a/languages/NL.php +++ b/languages/NL.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/languages/NO.php b/languages/NO.php index 21849b6..800d73b 100644 --- a/languages/NO.php +++ b/languages/NO.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/languages/index.php b/languages/index.php index 6df983a..0d49d28 100644 --- a/languages/index.php +++ b/languages/index.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/modify.php b/modify.php index e2d6429..557de32 100644 --- a/modify.php +++ b/modify.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html @@ -279,9 +279,16 @@ $tpl->parse('main', 'main_block', false); $tpl->pparse('output', 'page', false, false); +$redirect_timer + = ((defined('REDIRECT_TIMER')) && (REDIRECT_TIMER <= 10000)) + ? REDIRECT_TIMER + : 0; + + ?> diff --git a/modify_adv_settings.php b/modify_adv_settings.php index 4fb2106..e851770 100644 --- a/modify_adv_settings.php +++ b/modify_adv_settings.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/modify_field.php b/modify_field.php index 0c05a4e..5f395a9 100644 --- a/modify_field.php +++ b/modify_field.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html @@ -430,10 +430,17 @@ // Parse template objects output $tpl->parse('main', 'main_block', false); $tpl->pparse('output', 'page',false, false); + +$redirect_timer + = ((defined('REDIRECT_TIMER')) && (REDIRECT_TIMER <= 10000)) + ? REDIRECT_TIMER + : 0; + ?> diff --git a/modify_settings.php b/modify_settings.php index 1c22936..fd8228e 100644 --- a/modify_settings.php +++ b/modify_settings.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/move_down.php b/move_down.php index c3088fd..3f27b0f 100644 --- a/move_down.php +++ b/move_down.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/move_up.php b/move_up.php index 52ff9cc..cd33a18 100644 --- a/move_up.php +++ b/move_up.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/paintform.php b/paintform.php index 2e6a44d..66dbea3 100644 --- a/paintform.php +++ b/paintform.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/pear/FixPHP5PEARWarnings.php b/pear/FixPHP5PEARWarnings.php index 27deeaf..9be7ec7 100644 --- a/pear/FixPHP5PEARWarnings.php +++ b/pear/FixPHP5PEARWarnings.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/pear/index.php b/pear/index.php index ee5ab20..f7b8300 100644 --- a/pear/index.php +++ b/pear/index.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/pear/languages/DE.php b/pear/languages/DE.php index d26598f..dc0ec87 100644 --- a/pear/languages/DE.php +++ b/pear/languages/DE.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/pear/languages/EN.php b/pear/languages/EN.php index 2018e4d..8f5ed54 100644 --- a/pear/languages/EN.php +++ b/pear/languages/EN.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/pear/languages/index.php b/pear/languages/index.php index 568f306..72916f9 100644 --- a/pear/languages/index.php +++ b/pear/languages/index.php @@ -7,7 +7,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/private.default.php b/private.default.php index a95c8da..6bf1b11 100644 --- a/private.default.php +++ b/private.default.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/save_adv_settings.php b/save_adv_settings.php index a57dc79..fbea3b0 100644 --- a/save_adv_settings.php +++ b/save_adv_settings.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/save_field.php b/save_field.php index 977eb4f..385a8d4 100644 --- a/save_field.php +++ b/save_field.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html @@ -223,19 +223,6 @@ function int_not0($s) { $iFID = int_not0($admin->get_post_escaped('value')); $value_option_separator=MPFORM_DEFAULT_OPT_SEPARATOR; // fallback $field_loop='{FIELD}'; - $des_field_loop = 'Folgende Platzhalter sind möglich:
' - . '  {CLASSES} - css-Klasse ' - . '(abhängig von Feldtyp und Fehlerstatus)
' - . '  {TITLE} - Bezeichnung des ' - . 'Formularfeldes
' - . '  {FIELD} - Das Formularfeld
' - . '  {REQUIRED} - Markierung für ' - . 'Pflichtfelder
' - . '  {HELP} - Hilfetext verdeckt, ' - . 'Javascript erforderlich
' - . '  {HELPTXT} - Hilfetext immer sichtbar
' - . '  {ERRORTEXT} - Fehlertext ' - . '(nur bei bestimmten Feldtypen)
'; // Get settings (we need the value_option_separator) $query_settings diff --git a/save_settings.php b/save_settings.php index 789fc98..322baf2 100644 --- a/save_settings.php +++ b/save_settings.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/uninstall.php b/uninstall.php index 00b4241..93a3c2b 100644 --- a/uninstall.php +++ b/uninstall.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/upgrade.php b/upgrade.php index b517f06..7e22183 100644 --- a/upgrade.php +++ b/upgrade.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html @@ -161,16 +161,17 @@ // adding new (dummy) field 'position' in version 1.1.15: //get settings table to see what needs to be created + $submissionstable=$database->query( - "SELECT * FROM" - . " `".TP_MPFORM."submissions`" + "SHOW COLUMNS" + . " FROM `".TP_MPFORM."submissions`" + . " LIKE 'position'" ); -$submissions = $submissionstable->fetchRow(); // If not already there, add new field(s) to the existing settings table echo'Adding new field(s) to the submissions table
'; -if (!isset($submissions['position'])){ +if ($submissionstable->numRows() < 1 ) { $qs = "ALTER TABLE `".TP_MPFORM."submissions`" . " ADD `position` INT NOT NULL DEFAULT '0' AFTER `page_id`"; $database->query($qs); diff --git a/view.php b/view.php index c8b72d0..94d7888 100644 --- a/view.php +++ b/view.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html diff --git a/view_submission.php b/view_submission.php index 77cfe99..86da4e0 100644 --- a/view_submission.php +++ b/view_submission.php @@ -6,7 +6,7 @@ * * @category page * @module mpform - * @version 1.2.1 + * @version 1.2.3 * @authors Frank Heyne, NorHei(heimsath.org), Christian M. Stefan (Stefek), Martin Hecht (mrbaseman) and others * @copyright (c) 2009 - 2016, Website Baker Org. e.V. * @url http://forum.websitebaker.org/index.php/topic,28496.0.html @@ -123,7 +123,7 @@ echo ''; $sModuleUrl = WB_URL.'/modules/'.basename(dirname(__FILE__)); -$sIconDir = $sModuleUrl.'/images' +$sIconDir = $sModuleUrl.'/images'; echo '' . '' @@ -141,7 +141,7 @@ ? $admin->getIDKEY($submission_id) : $submission_id) . '\');">' - . '' . $TEXT['DELETE']