From: quix0r Date: Sat, 29 Dec 2012 23:56:28 +0000 (+0000) Subject: The usual changes: forms fixed X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=14650cc65dd5c82801f22f2202464b3742d2e255;p=mailer.git The usual changes: forms fixed --- diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php index 911dc01ea0..9e42da8f88 100644 --- a/inc/modules/admin/what-edit_emails.php +++ b/inc/modules/admin/what-edit_emails.php @@ -116,7 +116,7 @@ LIMIT 1', // Load template loadTemplate('admin_edit_bonus_email', FALSE, $content); -} elseif (isFormSent('save')) { +} elseif (isFormSent('do_edit')) { // Save changes if (isPostRequestElementSet('mid')) { // Update pool diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php index e1b95e3f59..678d58eb9d 100644 --- a/inc/modules/admin/what-extensions.php +++ b/inc/modules/admin/what-extensions.php @@ -86,9 +86,9 @@ if (isGetRequestElementSet('register_ext')) { // Redirect to prevent missing cache in js.php redirectToUrl('modules.php?module=admin&what=extensions&changed=' . countPostSelection()); -} elseif (((isFormSent('edit')) || (isPostRequestElementSet('modify'))) && (ifPostContainsSelections()) && (!isDemoModeActive())) { +} elseif (((isFormSent('edit')) || (isPostRequestElementSet('do_edit'))) && (ifPostContainsSelections()) && (!isDemoModeActive())) { // Change settings like CSS file load - if (isPostRequestElementSet('modify')) { + if (isPostRequestElementSet('do_edit')) { // Change entries $cache_update = '0'; foreach (postRequestElement('sel') as $ext_id => $sel) { diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php index 518ce7690b..8373690f78 100644 --- a/inc/modules/admin/what-list_country.php +++ b/inc/modules/admin/what-list_country.php @@ -85,7 +85,7 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl if (isFormSent('edit')) { // Edit template $row = 'admin_edit_country_row'; - $do = 'modify'; + $do = 'do_edit'; $class = 'form_submit'; $submit = '{--ADMIN_COUNTRY_EDIT_NOW--}'; $title = '{--ADMIN_COUNTRY_EDIT_TITLE--}'; @@ -93,7 +93,7 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl } else { // Delete template $row = 'admin_delete_country_row'; - $do = 'remove'; + $do = 'do_delete'; $class = 'form_delete'; $submit = '{--ADMIN_COUNTRY_DELETE_NOW--}'; $title = '{--ADMIN_COUNTRY_DELETE_TITLE--}'; @@ -138,7 +138,7 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl // Shall we modify / remove entries now? $message = ''; initSqls(); - if ((isPostRequestElementSet('modify')) && (isPostRequestElementSet('id'))) { + if ((isPostRequestElementSet('do_edit')) && (isPostRequestElementSet('id'))) { // Modify foreach (postRequestElement('id') as $id => $sel) { addSql("UPDATE @@ -163,6 +163,7 @@ LIMIT 1"); $message = '{--ADMIN_COUNTRIES_REMOVED--}'; } + // Are a message and some SQLs set? if ((!empty($message)) && (countSqls() > 0)) { // Run SQL commands runFilterChain('run_sqls'); @@ -173,7 +174,7 @@ LIMIT 1"); // Load currenty setup country codes to list $result = SQL_QUERY('SELECT `id`, `code`, `descr`, `is_active` FROM `{?_MYSQL_PREFIX?}_countries` ORDER BY `code` ASC', - __FILE__, __LINE__); + __FILE__, __LINE__); // Are there entries? if (!SQL_HASZERONUMS($result)) { diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php index 84a09db7b4..55155d0779 100644 --- a/inc/modules/admin/what-list_yoomedia_tm.php +++ b/inc/modules/admin/what-list_yoomedia_tm.php @@ -52,7 +52,7 @@ if (isFormSent()) { // Prepare mail for delivery YOOMEDIA_PREPARE_MAIL_DELIVERY(postRequestArray()); return; -} elseif (isPostRequestElementSet('sent')) { +} elseif (isPostRequestElementSet('send')) { // Sent mail YOOMEDIA_SEND_BONUS_MAIL(postRequestArray(), 'normal'); } elseif (isFormSent('do_delete')) { diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index e8a69633e3..3b76993684 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -58,9 +58,9 @@ $url = ''; // Detect what the member wants to do $mode = 'show'; // Show his data -if (isPostRequestElementSet('save')) $mode = 'save'; // Save entered data +if (isFormSent('save')) $mode = 'save'; // Save entered data if (isFormSent('edit')) $mode = 'edit'; // Edit data -if (isPostRequestElementSet('notify')) $mode = 'notify'; // Switch off notification +if (isFormSent('notify')) $mode = 'notify'; // Switch off notification switch ($mode) { case 'show': // Show his data diff --git a/templates/de/html/admin/admin_add_admins.tpl b/templates/de/html/admin/admin_add_admins.tpl index be6d1b8996..71ac09add9 100644 --- a/templates/de/html/admin/admin_add_admins.tpl +++ b/templates/de/html/admin/admin_add_admins.tpl @@ -33,7 +33,7 @@ - + diff --git a/templates/de/html/admin/admin_add_admins_acl.tpl b/templates/de/html/admin/admin_add_admins_acl.tpl index af8528b18b..6079e4d9b2 100644 --- a/templates/de/html/admin/admin_add_admins_acl.tpl +++ b/templates/de/html/admin/admin_add_admins_acl.tpl @@ -31,7 +31,7 @@ - + diff --git a/templates/de/html/admin/admin_add_cat.tpl b/templates/de/html/admin/admin_add_cat.tpl index 57f1cbb8f2..3851f93ef9 100644 --- a/templates/de/html/admin/admin_add_cat.tpl +++ b/templates/de/html/admin/admin_add_cat.tpl @@ -41,7 +41,7 @@ - + diff --git a/templates/de/html/admin/admin_add_config_network_type.tpl b/templates/de/html/admin/admin_add_config_network_type.tpl index cc4d110cc3..d2148ce6ea 100644 --- a/templates/de/html/admin/admin_add_config_network_type.tpl +++ b/templates/de/html/admin/admin_add_config_network_type.tpl @@ -14,7 +14,7 @@ - + {%form_close%} diff --git a/templates/de/html/admin/admin_add_country.tpl b/templates/de/html/admin/admin_add_country.tpl index bd80fe1ad8..69f02c4699 100644 --- a/templates/de/html/admin/admin_add_country.tpl +++ b/templates/de/html/admin/admin_add_country.tpl @@ -31,7 +31,7 @@ - + diff --git a/templates/de/html/admin/admin_add_forced_ad.tpl b/templates/de/html/admin/admin_add_forced_ad.tpl index 046527c08b..e6aa201ff3 100644 --- a/templates/de/html/admin/admin_add_forced_ad.tpl +++ b/templates/de/html/admin/admin_add_forced_ad.tpl @@ -85,7 +85,7 @@ - + diff --git a/templates/de/html/admin/admin_add_forced_campaign.tpl b/templates/de/html/admin/admin_add_forced_campaign.tpl index 669a665ae0..e4399b16ca 100644 --- a/templates/de/html/admin/admin_add_forced_campaign.tpl +++ b/templates/de/html/admin/admin_add_forced_campaign.tpl @@ -64,7 +64,7 @@ - + diff --git a/templates/de/html/admin/admin_add_forced_costs.tpl b/templates/de/html/admin/admin_add_forced_costs.tpl index d21798dbd7..d5831601ed 100644 --- a/templates/de/html/admin/admin_add_forced_costs.tpl +++ b/templates/de/html/admin/admin_add_forced_costs.tpl @@ -37,7 +37,7 @@ - + diff --git a/templates/de/html/admin/admin_add_grade_data.tpl b/templates/de/html/admin/admin_add_grade_data.tpl index 378257a50c..2099e4ffec 100644 --- a/templates/de/html/admin/admin_add_grade_data.tpl +++ b/templates/de/html/admin/admin_add_grade_data.tpl @@ -40,7 +40,7 @@ - + diff --git a/templates/de/html/admin/admin_add_max.tpl b/templates/de/html/admin/admin_add_max.tpl index 8915f38bab..d46a747521 100644 --- a/templates/de/html/admin/admin_add_max.tpl +++ b/templates/de/html/admin/admin_add_max.tpl @@ -24,7 +24,7 @@ - + diff --git a/templates/de/html/admin/admin_add_payout.tpl b/templates/de/html/admin/admin_add_payout.tpl index 5f40c3a1b6..48122afa7f 100644 --- a/templates/de/html/admin/admin_add_payout.tpl +++ b/templates/de/html/admin/admin_add_payout.tpl @@ -84,7 +84,7 @@ - + diff --git a/templates/de/html/admin/admin_add_point_accounts.tpl b/templates/de/html/admin/admin_add_point_accounts.tpl index 43fc738d01..c8a12d018e 100644 --- a/templates/de/html/admin/admin_add_point_accounts.tpl +++ b/templates/de/html/admin/admin_add_point_accounts.tpl @@ -55,7 +55,7 @@ - + diff --git a/templates/de/html/admin/admin_add_rallye_prices.tpl b/templates/de/html/admin/admin_add_rallye_prices.tpl index 013eec58de..4e6fd77630 100644 --- a/templates/de/html/admin/admin_add_rallye_prices.tpl +++ b/templates/de/html/admin/admin_add_rallye_prices.tpl @@ -27,7 +27,7 @@ - + diff --git a/templates/de/html/admin/admin_delete_sponsor.tpl b/templates/de/html/admin/admin_delete_sponsor.tpl index 13b6fee274..9c1d3ea7a8 100644 --- a/templates/de/html/admin/admin_delete_sponsor.tpl +++ b/templates/de/html/admin/admin_delete_sponsor.tpl @@ -19,8 +19,8 @@ diff --git a/templates/de/html/admin/admin_delete_user.tpl b/templates/de/html/admin/admin_delete_user.tpl index 534f3d3c1a..7435b96fe4 100644 --- a/templates/de/html/admin/admin_delete_user.tpl +++ b/templates/de/html/admin/admin_delete_user.tpl @@ -19,8 +19,8 @@ diff --git a/templates/de/html/admin/admin_edit_bank_packages.tpl b/templates/de/html/admin/admin_edit_bank_packages.tpl index 3762518418..d23a038110 100644 --- a/templates/de/html/admin/admin_edit_bank_packages.tpl +++ b/templates/de/html/admin/admin_edit_bank_packages.tpl @@ -10,7 +10,7 @@ $content - + diff --git a/templates/de/html/admin/admin_edit_bonus_email.tpl b/templates/de/html/admin/admin_edit_bonus_email.tpl index 1f29c87aa3..d6982b6246 100644 --- a/templates/de/html/admin/admin_edit_bonus_email.tpl +++ b/templates/de/html/admin/admin_edit_bonus_email.tpl @@ -34,7 +34,7 @@ - + diff --git a/templates/de/html/admin/admin_edit_email.tpl b/templates/de/html/admin/admin_edit_email.tpl index f32359e1a0..2d8d19bf0c 100644 --- a/templates/de/html/admin/admin_edit_email.tpl +++ b/templates/de/html/admin/admin_edit_email.tpl @@ -34,7 +34,7 @@ - + diff --git a/templates/de/html/admin/admin_edit_extensions.tpl b/templates/de/html/admin/admin_edit_extensions.tpl index c4441f5980..79fea0aecb 100644 --- a/templates/de/html/admin/admin_edit_extensions.tpl +++ b/templates/de/html/admin/admin_edit_extensions.tpl @@ -16,7 +16,7 @@ - + diff --git a/templates/de/html/admin/admin_edit_surfbar_actions.tpl b/templates/de/html/admin/admin_edit_surfbar_actions.tpl index 12f415b99d..85a25a8b71 100644 --- a/templates/de/html/admin/admin_edit_surfbar_actions.tpl +++ b/templates/de/html/admin/admin_edit_surfbar_actions.tpl @@ -10,7 +10,7 @@ $content - + diff --git a/templates/de/html/admin/admin_edit_surfbar_urls.tpl b/templates/de/html/admin/admin_edit_surfbar_urls.tpl index 20b60155c3..171d91585d 100644 --- a/templates/de/html/admin/admin_edit_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_edit_surfbar_urls.tpl @@ -10,7 +10,7 @@ $content - + diff --git a/templates/de/html/admin/admin_edit_theme.tpl b/templates/de/html/admin/admin_edit_theme.tpl index fb78af0936..518bb00d18 100644 --- a/templates/de/html/admin/admin_edit_theme.tpl +++ b/templates/de/html/admin/admin_edit_theme.tpl @@ -18,7 +18,7 @@ - + diff --git a/templates/de/html/admin/admin_list_beg_form.tpl b/templates/de/html/admin/admin_list_beg_form.tpl index aa893f3e91..36fd6cb278 100644 --- a/templates/de/html/admin/admin_list_beg_form.tpl +++ b/templates/de/html/admin/admin_list_beg_form.tpl @@ -1,5 +1,5 @@ {%form,formMethodPost=modules.php?module=admin&what=list_beg%} - + {%form_close%}
diff --git a/templates/de/html/admin/admin_list_bonus_form.tpl b/templates/de/html/admin/admin_list_bonus_form.tpl index 031e74d250..85b31e2880 100644 --- a/templates/de/html/admin/admin_list_bonus_form.tpl +++ b/templates/de/html/admin/admin_list_bonus_form.tpl @@ -1,5 +1,5 @@ {%form,formMethodPost=modules.php?module=admin&what=list_bonus%} - + {%form_close%}
diff --git a/templates/de/html/admin/admin_lock_sponsor.tpl b/templates/de/html/admin/admin_lock_sponsor.tpl index 6947279596..c2a9a7419d 100644 --- a/templates/de/html/admin/admin_lock_sponsor.tpl +++ b/templates/de/html/admin/admin_lock_sponsor.tpl @@ -19,8 +19,8 @@
diff --git a/templates/de/html/admin/admin_lock_user.tpl b/templates/de/html/admin/admin_lock_user.tpl index d3b5df3160..d77df656ba 100644 --- a/templates/de/html/admin/admin_lock_user.tpl +++ b/templates/de/html/admin/admin_lock_user.tpl @@ -6,23 +6,27 @@
$content[header]
+ $content[text] + [ {%user,surname=$content[userid]%} {%user,family=$content[userid]%} ({%user,status,translateUserStatus=$content[userid]%}) ] + + - - + + diff --git a/templates/de/html/admin/admin_logout_form.tpl b/templates/de/html/admin/admin_logout_form.tpl index c43caaed8a..04581c2fa5 100644 --- a/templates/de/html/admin/admin_logout_form.tpl +++ b/templates/de/html/admin/admin_logout_form.tpl @@ -18,8 +18,8 @@ - - + + diff --git a/templates/de/html/admin/admin_payout_overview_form.tpl b/templates/de/html/admin/admin_payout_overview_form.tpl index cad004280d..a677afba2a 100644 --- a/templates/de/html/admin/admin_payout_overview_form.tpl +++ b/templates/de/html/admin/admin_payout_overview_form.tpl @@ -1,7 +1,7 @@ {%form,formMethodPost=modules.php?module=admin&what=list_payouts&do=accept&pid=$content[pid]&task=$content[tid]%} - + {%form_close%}
{%form,formMethodPost=modules.php?module=admin&what=list_payouts&do=reject&pid=$content[pid]&task=$content[tid]%} - + {%form_close%} diff --git a/templates/de/html/admin/admin_reset_password.tpl b/templates/de/html/admin/admin_reset_password.tpl index cbb29a98f0..6e2e0afb68 100644 --- a/templates/de/html/admin/admin_reset_password.tpl +++ b/templates/de/html/admin/admin_reset_password.tpl @@ -17,7 +17,7 @@ - + diff --git a/templates/de/html/admin/admin_reset_password_form.tpl b/templates/de/html/admin/admin_reset_password_form.tpl index 3e9694ebc7..23fa98a480 100644 --- a/templates/de/html/admin/admin_reset_password_form.tpl +++ b/templates/de/html/admin/admin_reset_password_form.tpl @@ -6,6 +6,7 @@ {--ADMIN_RESET_PASSWORD_TITLE--} + {--ADMIN_SHOW_LOGIN--} @@ -15,6 +16,7 @@
[{--ADMIN_CHANGE_LOGIN--}]
+ {--ADMIN_ENTER_NEW_PASSWORD1--} @@ -23,6 +25,7 @@ + {--ADMIN_ENTER_NEW_PASSWORD2--} @@ -31,12 +34,13 @@ + - + diff --git a/templates/de/html/admin/admin_reset_password_send_link.tpl b/templates/de/html/admin/admin_reset_password_send_link.tpl index 454b00c4c4..5ac862aa9d 100644 --- a/templates/de/html/admin/admin_reset_password_send_link.tpl +++ b/templates/de/html/admin/admin_reset_password_send_link.tpl @@ -17,7 +17,7 @@ - + diff --git a/templates/de/html/admin/admin_send_yoomedia.tpl b/templates/de/html/admin/admin_send_yoomedia.tpl index 1f8f14b4d3..dad82dc5f6 100644 --- a/templates/de/html/admin/admin_send_yoomedia.tpl +++ b/templates/de/html/admin/admin_send_yoomedia.tpl @@ -64,7 +64,7 @@ - + diff --git a/templates/de/html/admin/admin_show_config_network_type.tpl b/templates/de/html/admin/admin_show_config_network_type.tpl index 76900e8d1c..1d118b028f 100644 --- a/templates/de/html/admin/admin_show_config_network_type.tpl +++ b/templates/de/html/admin/admin_show_config_network_type.tpl @@ -35,7 +35,7 @@ - + {%form_close%} diff --git a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl index 62d56a8389..00f1f38daa 100644 --- a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl @@ -17,8 +17,8 @@ $content - - + + diff --git a/templates/de/html/admin/admin_validate_reset_hash_form.tpl b/templates/de/html/admin/admin_validate_reset_hash_form.tpl index c83007d15f..e75c08a14d 100644 --- a/templates/de/html/admin/admin_validate_reset_hash_form.tpl +++ b/templates/de/html/admin/admin_validate_reset_hash_form.tpl @@ -19,7 +19,7 @@ - + diff --git a/templates/de/html/guest/guest_login.tpl b/templates/de/html/guest/guest_login.tpl index a70e7dd085..79ce56d184 100644 --- a/templates/de/html/guest/guest_login.tpl +++ b/templates/de/html/guest/guest_login.tpl @@ -73,7 +73,7 @@ - + diff --git a/templates/de/html/guest/guest_nickname_login.tpl b/templates/de/html/guest/guest_nickname_login.tpl index 9809131aaf..60a5fba095 100644 --- a/templates/de/html/guest/guest_nickname_login.tpl +++ b/templates/de/html/guest/guest_nickname_login.tpl @@ -73,7 +73,7 @@ - + diff --git a/templates/de/html/install/install_page1.tpl b/templates/de/html/install/install_page1.tpl index 6ec8597fcb..ccf4a6a900 100644 --- a/templates/de/html/install/install_page1.tpl +++ b/templates/de/html/install/install_page1.tpl @@ -33,7 +33,7 @@ - + diff --git a/templates/de/html/install/install_page2.tpl b/templates/de/html/install/install_page2.tpl index 3864681eb4..a030d69f7a 100644 --- a/templates/de/html/install/install_page2.tpl +++ b/templates/de/html/install/install_page2.tpl @@ -63,7 +63,7 @@ - + diff --git a/templates/de/html/install/install_page3.tpl b/templates/de/html/install/install_page3.tpl index 661c59c40a..61706bdcab 100644 --- a/templates/de/html/install/install_page3.tpl +++ b/templates/de/html/install/install_page3.tpl @@ -49,7 +49,7 @@ - + diff --git a/templates/de/html/member/member_add_subid.tpl b/templates/de/html/member/member_add_subid.tpl index b18871b761..172c8c7c28 100644 --- a/templates/de/html/member/member_add_subid.tpl +++ b/templates/de/html/member/member_add_subid.tpl @@ -16,7 +16,7 @@ {%form_close%} diff --git a/templates/de/html/member/member_holiday_deactivate.tpl b/templates/de/html/member/member_holiday_deactivate.tpl index c2535df2ca..9a80a5f42f 100644 --- a/templates/de/html/member/member_holiday_deactivate.tpl +++ b/templates/de/html/member/member_holiday_deactivate.tpl @@ -25,7 +25,7 @@ - + diff --git a/templates/de/html/member/member_mydata_edit.tpl b/templates/de/html/member/member_mydata_edit.tpl index 193dd93cff..786c73c98b 100644 --- a/templates/de/html/member/member_mydata_edit.tpl +++ b/templates/de/html/member/member_mydata_edit.tpl @@ -79,7 +79,7 @@ - + diff --git a/templates/de/html/member/member_order_page1.tpl b/templates/de/html/member/member_order_page1.tpl index 5eaa9018ce..45e66383b4 100644 --- a/templates/de/html/member/member_order_page1.tpl +++ b/templates/de/html/member/member_order_page1.tpl @@ -11,7 +11,7 @@ {%form_close%} diff --git a/templates/de/html/member/member_order_page2.tpl b/templates/de/html/member/member_order_page2.tpl index aef471759c..f19f12c51d 100644 --- a/templates/de/html/member/member_order_page2.tpl +++ b/templates/de/html/member/member_order_page2.tpl @@ -72,7 +72,7 @@ {%form_close%} diff --git a/templates/de/html/member/member_order_thanks.tpl b/templates/de/html/member/member_order_thanks.tpl index 8df4fc5061..83571d6923 100644 --- a/templates/de/html/member/member_order_thanks.tpl +++ b/templates/de/html/member/member_order_thanks.tpl @@ -9,7 +9,7 @@ {%form_close%}