Removed already no longer used last parameter from addMaxReceiveList(), so more EL...

diff --git a/inc/modules/admin/what-add_tester_user.php b/inc/modules/admin/what-add_tester_user.php
index 920aa291762987adf40e3ec04e8888666f7d0323..17577227f342387ec5d1a58a0849c9ee124d78ea 100644 (file)
--- 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 3ef7b69b32c1efcd9156a6390443200f35498e9f..1a0b5463d453395417db9f34789e79c7a9f05b2d 100644 (file)
--- 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 4ed6637853b689e4d3897abd6039ffa1c2eb15fa..3d87be6e11ad5b766e7da221bc9623a38cb856d6 100644 (file)
--- 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 cfd3e318cd896fcbf174e2eaf150380de76538d5..8d55ecfb3330bb058f7eda0a3f895f6c714ef03b 100644 (file)
--- 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 3d21a93b392c3636748e43655c3981c4c05fb1cb..42ce66820ea9609f594e4ec38bf78ece6d5c0370 100644 (file)
--- a/templates/de/html/admin/admin_add_tester_user.tpl
+++ b/templates/de/html/admin/admin_add_tester_user.tpl
@@ -70,7 +70,7 @@
        <fieldset id="add_tester_user_max_receive_fields">
                <legend>{--ADMIN_ADD_TESTER_USER_MAX_RECEIVE_LEGEND--}</legend>
 
-               $content[max_receive_selection]
+               {%pipe,addMaxReceiveList=admin%}
        </fieldset>
 
        <fieldset id="add_tester_user_passwords">

diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl
index 35d788c5c350b006e1594ce8ca7cf6e9a27c6775..fd09971bbfc37f80dee42b647253a760dd2138df 100644 (file)
--- a/templates/de/html/guest/guest_register.tpl
+++ b/templates/de/html/guest/guest_register.tpl
@@ -6,11 +6,13 @@
                        $content[header_content]
                </td>
        </tr>
+
        <tr>
                <td colspan="2" class="table_header bottom">
                        {--REGISTER_PERSONAL_DATA--}:
                </td>
        </tr>
+
        <tr>
                <td class="bottom" colspan="2" align="center">
                <table border="0" cellspacing="0" cellpadding="0" width="100%">
@@ -22,6 +24,7 @@
                                        {%pipe,generateGenderSelectionBox=$content[gender]%}
                                </td>
                        </tr>
+
                        <tr>
                                <td class="register_left">{--SURNAME--}$content[must_fillout_surname],
                                        {--FAMILY--}$content[must_fillout_family]:
@@ -31,6 +34,7 @@
                                        <input type="text" class="form_field" name="family" size="15" maxlength="255" value="$content[family]" />
                                </td>
                        </tr>
+
                        <tr>
                                <td class="register_left">
                                        {--STREET_NR--}$content[must_fillout_street_nr]:
@@ -39,17 +43,19 @@
                                        <input type="text" class="form_field" name="street_nr" size="25" maxlength="255" value="$content[street_nr]" />
                                </td>
                        </tr>
+
                        <tr>
                                <td align="right" class="register_left">
                                        {--COUNTRY--}$content[must_fillout_cntry], {--ZIP--}$content[must_fillout_zip],
                                        {--CITY--}$content[must_fillout_city]:
                                </td>
                                <td class="register_right">
-                                       $content[country]
+                                       {%pipe,postRequestElement,addCountryCodeSelectionBox=country_code%}
                                        <input type="text" class="form_field" name="zip" size="5" maxlength="10" value="$content[zip]" />
                                        <input type="text" class="form_field" name="city" size="20" maxlength="255" value="$content[city]" />
                                </td>
                        </tr>
+
                        <tr>
                                <td align="right" class="register_left">
                                        {--EMAIL--}$content[must_fillout_email]:&nbsp;&nbsp;
@@ -58,6 +64,7 @@
                                        <input type="text" class="form_field" name="email" size="30" maxlength="255" value="$content[email]" />
                                </td>
                        </tr>
+
                        <tr>
                                <td align="right" class="register_left">
                                        {--BIRTHDAY--}$content[must_fillout_birthday]:
@@ -66,6 +73,7 @@
                                        $content[birthday_selection]
                                </td>
                        </tr>
+
                        <tr>
                                <td colspan="2" align="center">
                                        <div class="notice">$content[must_fillout_marker]&nbsp;:&nbsp;{--GUEST_REGISTER_MUST_SET_NOTICE--}</div>
@@ -74,31 +82,37 @@
                </table>
                </td>
        </tr>
+
        <tr>
                <td colspan="2" class="table_header bottom">
                        {--REGISTER_CATEGORIES--}:
                </td>
        </tr>
+
        <tr>
                <td colspan="2" class="table_header">
                        {--GUEST_SELECT_LEAST_CATEGORIES--}
                </td>
        </tr>
+
        <tr>
                <td colspan="2" class="bottom">
                        {%pipe,registerGenerateCategoryTable=guest%}
                </td>
        </tr>
+
        <tr>
                <td colspan="2" class="table_header bottom">
                        {--REGISTER_MISC--}:
                </td>
        </tr>
+
        <tr>
                <td colspan="2" align="center">
                        <div class="notice tiny">{--GUEST_EMPTY_PASSWORD_HINT--}</div>
                </td>
        </tr>
+
        <tr>
                <td align="right" class="register_left">
                        {--PASS_1--}, {--PASS_2--}:
@@ -108,17 +122,21 @@
                        <input type="password" class="form_field" name="pass2" size="10" maxlength="100" />
                </td>
        </tr>
+
        <tr>
                <td colspan="2" align="center">
-                       $content[max_receive_list]
+                       {%pipe,addMaxReceiveList=guest%}
                </td>
        </tr>
+
        $content[refid_content]
+
        <tr>
                <td colspan="2" class="table_header bottom top">
                        {--TERMS_OF_USAGE--}:
                </td>
        </tr>
+
        <tr>
                <td colspan="2" class="bottom">
                        <table border="0" cellspacing="0" cellpadding="0" width="640" class="table">