From e4083f1d0eb6de099f43a4d3509dbc5593848589 Mon Sep 17 00:00:00 2001 From: quix0r Date: Thu, 4 Oct 2012 18:52:48 +0000 Subject: [PATCH] Removed already no longer used last parameter from addMaxReceiveList(), so more EL coce can be used --- inc/modules/admin/what-add_tester_user.php | 3 --- inc/modules/guest/what-register.php | 6 ----- inc/modules/member/what-mydata.php | 2 +- inc/mysql-manager.php | 11 +++------- .../de/html/admin/admin_add_tester_user.tpl | 2 +- templates/de/html/guest/guest_register.tpl | 22 +++++++++++++++++-- 6 files changed, 25 insertions(+), 21 deletions(-) diff --git a/inc/modules/admin/what-add_tester_user.php b/inc/modules/admin/what-add_tester_user.php index 920aa29176..17577227f3 100644 --- a/inc/modules/admin/what-add_tester_user.php +++ b/inc/modules/admin/what-add_tester_user.php @@ -61,9 +61,6 @@ if (!isNewUserTesterAllowed()) { } } // END - if -// Generate max-receive selection -$content['max_receive_selection'] = addMaxReceiveList('admin', '', true); - // Display form loadTemplate('admin_add_tester_user', false, $content); diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php index 3ef7b69b32..1a0b5463d4 100644 --- a/inc/modules/guest/what-register.php +++ b/inc/modules/guest/what-register.php @@ -116,9 +116,6 @@ if ((isFormSent()) && (isRegistrationDataComplete())) { break; } // END - switch - // Adds maximum receiveable mails list... :) - $content['max_receive_list'] = addMaxReceiveList('guest', '', true); - // Shall I display the refid or shall I make it editable? if (isDisplayRefidEnabled()) { // Load "hide" form template @@ -142,9 +139,6 @@ if ((isFormSent()) && (isRegistrationDataComplete())) { $content[$entry] = SQL_ESCAPE(postRequestElement($entry)); } // END - foreach - // Prepare country selection box - $content['country'] = addCountryCodeSelectionBox(postRequestElement('country_code')); - // Set must-fillout fields $content = runFilterChain('register_must_fillout', $content); diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index 4ed6637853..3d87be6e11 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -188,7 +188,7 @@ LIMIT 1", break; } // END - if - $content['max_receive_list'] = addMaxReceiveList('member', $content['max_mails'], true); + $content['max_receive_list'] = addMaxReceiveList('member', $content['max_mails']); if (isExtensionActive('country')) { // Init WHERE statement diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index cfd3e318cd..8d55ecfb33 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -629,7 +629,7 @@ function isAdmin () { } // Generates a list of "max receiveable emails per day" -function addMaxReceiveList ($mode, $default = '', $return = false) { +function addMaxReceiveList ($mode, $default = '') { $OUT = ''; $result = false; @@ -677,13 +677,8 @@ function addMaxReceiveList ($mode, $default = '', $return = false) { // Free result SQL_FREERESULT($result); - if ($return === true) { - // Return generated HTML code - return $OUT; - } else { - // Output directly (default) - outputHtml($OUT); - } + // Return generated HTML code + return $OUT; } // Checks whether the given email address is used. diff --git a/templates/de/html/admin/admin_add_tester_user.tpl b/templates/de/html/admin/admin_add_tester_user.tpl index 3d21a93b39..42ce66820e 100644 --- a/templates/de/html/admin/admin_add_tester_user.tpl +++ b/templates/de/html/admin/admin_add_tester_user.tpl @@ -70,7 +70,7 @@
{--ADMIN_ADD_TESTER_USER_MAX_RECEIVE_LEGEND--} - $content[max_receive_selection] + {%pipe,addMaxReceiveList=admin%}
diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl index 35d788c5c3..fd09971bbf 100644 --- a/templates/de/html/guest/guest_register.tpl +++ b/templates/de/html/guest/guest_register.tpl @@ -6,11 +6,13 @@ $content[header_content] + {--REGISTER_PERSONAL_DATA--}: + @@ -22,6 +24,7 @@ {%pipe,generateGenderSelectionBox=$content[gender]%} + + + + + +
{--SURNAME--}$content[must_fillout_surname], {--FAMILY--}$content[must_fillout_family]: @@ -31,6 +34,7 @@
{--STREET_NR--}$content[must_fillout_street_nr]: @@ -39,17 +43,19 @@
{--COUNTRY--}$content[must_fillout_cntry], {--ZIP--}$content[must_fillout_zip], {--CITY--}$content[must_fillout_city]: - $content[country] + {%pipe,postRequestElement,addCountryCodeSelectionBox=country_code%}
{--EMAIL--}$content[must_fillout_email]:   @@ -58,6 +64,7 @@
{--BIRTHDAY--}$content[must_fillout_birthday]: @@ -66,6 +73,7 @@ $content[birthday_selection]
$content[must_fillout_marker] : {--GUEST_REGISTER_MUST_SET_NOTICE--}
@@ -74,31 +82,37 @@
+ {--REGISTER_CATEGORIES--}: + {--GUEST_SELECT_LEAST_CATEGORIES--} + {%pipe,registerGenerateCategoryTable=guest%} + {--REGISTER_MISC--}: +
{--GUEST_EMPTY_PASSWORD_HINT--}
+ {--PASS_1--}, {--PASS_2--}: @@ -108,17 +122,21 @@ + - $content[max_receive_list] + {%pipe,addMaxReceiveList=guest%} + $content[refid_content] + {--TERMS_OF_USAGE--}: + -- 2.39.5