Rewrote some code, added templates/functions:

- Introduced return(Error)Message() functions
- Added template for choosing registration provider
- Added template helper which reads all activated registration provider
- Other improvements

diff --git a/.gitattributes b/.gitattributes
index 80a004b10a97378473de1522cc0646245b731951..5b0136190c4e3cabb5db377d35869f3324dc0640 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1850,6 +1850,7 @@ templates/de/html/guest/guest_receive_table.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register_refid.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register_refid_hide.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register_refid.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register_refid_hide.tpl svneol=native#text/plain

+templates/de/html/guest/guest_registration_select.tpl svneol=native#text/plain

 templates/de/html/guest/guest_show_rallye.tpl svneol=native#text/plain
 templates/de/html/guest/guest_sponsor_act_row.tpl svneol=native#text/plain
 templates/de/html/guest/guest_sponsor_activate.tpl svneol=native#text/plain
 templates/de/html/guest/guest_show_rallye.tpl svneol=native#text/plain
 templates/de/html/guest/guest_sponsor_act_row.tpl svneol=native#text/plain
 templates/de/html/guest/guest_sponsor_activate.tpl svneol=native#text/plain

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 88676dd81c362218b87cfda5c8ab7199796805fd..ea9e4673cb600f7965fae167a7cf189db0520362 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -873,7 +873,7 @@ function addExtensionVerboseSqlTable ($title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVA
                        $OUT = loadTemplate('admin_extension_sql_table', TRUE, $content);
                } else {
                        // No addional SQL commands to run
                        $OUT = loadTemplate('admin_extension_sql_table', TRUE, $content);
                } else {
                        // No addional SQL commands to run

-                       $OUT = displayMessage('{--ADMIN_EXTENSION_VERBOSE_SQLS_404--}', TRUE);
+                       $OUT = returnMessage('{--ADMIN_EXTENSION_VERBOSE_SQLS_404--}');

                }
        } // END - if
 
                }
        } // END - if
 

diff --git a/inc/install-functions.php b/inc/install-functions.php
index 5942280ffa3af7a7728bffd4338c51e71aa0673e..4222ee2e9570c99cad783211bf9a7addb50a29f3 100644 (file)
--- a/inc/install-functions.php
+++ b/inc/install-functions.php
@@ -151,7 +151,7 @@ function getInstallerContent () {
                $content = $GLOBALS['install_content'];
        } else {
                // Nothing found, this needs fixing
                $content = $GLOBALS['install_content'];
        } else {
                // Nothing found, this needs fixing

-               $content = displayMessage('{--INSTALLER_CONTENT_404--}', TRUE);
+               $content = returnMessage('{--INSTALLER_CONTENT_404--}');

        }
 
        // Return content
        }
 
        // Return content

diff --git a/inc/language/register_de.php b/inc/language/register_de.php
index 2296f384534292a851eb7592ce2a3e7af99c2b98..a46ef6fc7c07c4f394e96272a432d6f7c80afe12 100644 (file)
--- a/inc/language/register_de.php
+++ b/inc/language/register_de.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addMessages(array(
        'GUEST_REGISTER_MUST_SET_NOTICE' => "Sind Pflichtangaben, ansonsten erfolgt keine Anmeldung.",
        'PRE_USER_REGISTRATION_FAILED' => "Anmeldung fehlgeschlagen: Pre-Filterkette nicht gelaufen! Bitte melden Sie dies beim zuständigen Webmaster.",
 addMessages(array(
        'GUEST_REGISTER_MUST_SET_NOTICE' => "Sind Pflichtangaben, ansonsten erfolgt keine Anmeldung.",
        'PRE_USER_REGISTRATION_FAILED' => "Anmeldung fehlgeschlagen: Pre-Filterkette nicht gelaufen! Bitte melden Sie dies beim zuständigen Webmaster.",

-       'CNTRY' => "Ländercode",
+       'COUNTRY_CODE' => "Ländercode",

        'GUEST_EMAIL_IS_ALREADY_REGISTERED' => "Sie haben sich bereits mit dieser Email-Adresse angemeldet, oder jemand anderes verwendet Ihre. Doppelte Anmeldungen sind bei uns verboten.",
        'GUEST_ENTER_PASSWORDS' => "Passwort und -wiederholung eingeben:",
 
        'GUEST_EMAIL_IS_ALREADY_REGISTERED' => "Sie haben sich bereits mit dieser Email-Adresse angemeldet, oder jemand anderes verwendet Ihre. Doppelte Anmeldungen sind bei uns verboten.",
        'GUEST_ENTER_PASSWORDS' => "Passwort und -wiederholung eingeben:",
 


@@ -54,6 +54,11 @@ addMessages(array(
        'POINTS_SUBJECT_REFERRAL_BONUS' => "Einmalige Werbeprämie",
        'POINTS_SUBJECT_REFERRAL_BONUS_REF' => "Anteilige einml. Werbeprämie",
 
        'POINTS_SUBJECT_REFERRAL_BONUS' => "Einmalige Werbeprämie",
        'POINTS_SUBJECT_REFERRAL_BONUS_REF' => "Anteilige einml. Werbeprämie",
 

+       // Guest - others
+       'GUEST_SELECT_OTHER_REGISTRATION_FORM_TITLE' => "Mit anderen Diensten bei {?MAIN_TITLE?} anmelden.",
+       'GUEST_SELECT_OTHER_REGISTRATION_FORM_NOTICE' => "Beim Anmelden mit einen anderen Dienst "verbinden" Sie diesen mit diesem {?mt_word?}. Dadurch werden Daten vom Anmeldedienst an diesen übertragen. Mehr dazu steht beim Anmeldeformular des jweiligen Anbieters.",
+       'GUEST_EXTRA_REGISTRATION_PROVIDER_404' => "Es wurden noch keine weiteren Anmeldedienste freigegeben oder eingerichtet. Bitte verwenden Sie das nachfolgende Formular zur lokalen Anmeldung.",
+

        // Admin - others
        'ADMIN_SAVE_REGISTER_MUST' => "Einstellungen ändern",
        'ADMIN_REGISTER_CHANGES_SAVED' => "Es wurden <span class=\"data\">%s</span> Pflichtfelder aktualisiert.",
        // Admin - others
        'ADMIN_SAVE_REGISTER_MUST' => "Einstellungen &auml;ndern",
        'ADMIN_REGISTER_CHANGES_SAVED' => "Es wurden <span class=\"data\">%s</span> Pflichtfelder aktualisiert.",

diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php
index 12d7a50cadd6bdc396c98910f2bc22c0f1a9af0f..cea77504164f829f9d4c5a954a0517cacd90df6b 100644 (file)
--- a/inc/language/sponsor_de.php
+++ b/inc/language/sponsor_de.php
@@ -55,7 +55,7 @@ addMessages(array(
        'ADMIN_SPONSOR_ENTER_CONTACT_DATA' => "Kontaktdaten des Sponsors",
        'SPONSOR_ENTER_STREET_NR1' => "Straße mit Hausnummer",
        'SPONSOR_ENTER_STREET_NR2' => "(noch Straße; Zeile 2)",
        'ADMIN_SPONSOR_ENTER_CONTACT_DATA' => "Kontaktdaten des Sponsors",
        'SPONSOR_ENTER_STREET_NR1' => "Straße mit Hausnummer",
        'SPONSOR_ENTER_STREET_NR2' => "(noch Straße; Zeile 2)",

-       'SPONSOR_ENTER_CNTRY_ZIP_CITY' => "Ländercode, PLZ, Wohnort",
+       'SPONSOR_ENTER_COUNTRY_CODE_ZIP_CITY' => "Ländercode, PLZ, Wohnort",

        'SPONSOR_ENTER_PHONE' => "Telefonnummer",
        'SPONSOR_ENTER_FAX' => "Faxnummer",
        'SPONSOR_ENTER_CELL' => "Handynummer",
        'SPONSOR_ENTER_PHONE' => "Telefonnummer",
        'SPONSOR_ENTER_FAX' => "Faxnummer",
        'SPONSOR_ENTER_CELL' => "Handynummer",


@@ -174,7 +174,7 @@ addMessages(array(
        'SPONSOR_ACCOUNT_UNLOCKED' => "Ihr Sponsorenaccount wurde hiermit von einem unserer Administratoren wieder freigegeben. Sie können sich mit den alten Logindaten wieder einloggen. Sollten Sie Ihr Passwort vergessen haben, können Sie sich unter Sponsoren->Einloggen ein neues zusenden lassen.",
        'SPONSOR_EMAIL_STREET_NR1' => "Strasse mit Hausnummer",
        'SPONSOR_EMAIL_STREET_NR2' => "(noch Strasse; Zeile 2)",
        'SPONSOR_ACCOUNT_UNLOCKED' => "Ihr Sponsorenaccount wurde hiermit von einem unserer Administratoren wieder freigegeben. Sie können sich mit den alten Logindaten wieder einloggen. Sollten Sie Ihr Passwort vergessen haben, können Sie sich unter Sponsoren->Einloggen ein neues zusenden lassen.",
        'SPONSOR_EMAIL_STREET_NR1' => "Strasse mit Hausnummer",
        'SPONSOR_EMAIL_STREET_NR2' => "(noch Strasse; Zeile 2)",

-       'SPONSOR_EMAIL_CNTRY_ZIP_CITY' => "Ländercode, PLZ, Wohnort",
+       'SPONSOR_EMAIL_COUNTRY_CODE_ZIP_CITY' => "Ländercode, PLZ, Wohnort",

        'SPONSOR_PASS_UNCHANGED' => "- Nicht geändert! -",
 
        // Guest headers
        'SPONSOR_PASS_UNCHANGED' => "- Nicht geändert! -",
 
        // Guest headers

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index a13a12487753d245d9dd61a5e5157bec0c8ea9ca..aa1667045a23d72904d2b6315eada49954b812ad 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -713,7 +713,7 @@ ORDER BY
                }
        } else {
                // Nothing selected
                }
        } else {
                // Nothing selected

-               $content = displayErrorMessage('{--ADMIN_ENTRIES_404--}');
+               $content = returnErrorMessage('{--ADMIN_ENTRIES_404--}');

        }
 
        // Free the result
        }
 
        // Free the result


@@ -759,7 +759,7 @@ ORDER BY
                $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id');
        } else {
                // Nothing selected
                $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id');
        } else {
                // Nothing selected

-               $content = displayErrorMessage('{--ADMIN_ENTRIES_404--}');
+               $content = returnErrorMessage('{--ADMIN_ENTRIES_404--}');

        }
 
        // Free the result
        }
 
        // Free the result


@@ -806,7 +806,7 @@ ORDER BY
                $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id', '', '_title');
        } else {
                // Nothing selected
                $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id', '', '_title');
        } else {
                // Nothing selected

-               $content = displayErrorMessage('{--ADMIN_ENTRIES_404--}');
+               $content = returnErrorMessage('{--ADMIN_ENTRIES_404--}');

        }
 
        // Free the result
        }
 
        // Free the result

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index b330fea6c1aa225c098f9207a5da1ab5fad26fd3..2fc717896b9417610150ebc8bcdff62e8db708fd 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -661,5 +661,54 @@ function doTemplateAdminRegisterCategoryTable ($templateName, $clear = FALSE, $c
        return registerGenerateCategoryTable('admin', $configEntry);
 }
 
        return registerGenerateCategoryTable('admin', $configEntry);
 }
 

+// Template helper for generating a list of all activated user registration provider
+function doTemplateGuestRegistrationList ($templateName, $clear = FALSE) {
+       // Init output
+       $content = '';
+
+       // Default is only activated provider
+       $addSql = " AND `provider_is_active`='Y'";
+
+       // Is admin logged-in?
+       if (isAdmin()) {
+               // Then show all
+               $addSql = '';
+       } // END - if
+
+       // Search for all
+       $result = sqlQuery("SELECT
+       `provider_name`,
+       `provider_extension`
+FROM
+       `{?_MYSQL_PREFIX?}_user_register_provider`
+WHERE
+       `provider_extension` != 'register'
+       " . $addSql . "
+ORDER BY
+       `provider_name` ASC", __FUNCTION__, __LINE__);
+
+       // Are there entries?
+       if (sqlNumRows($result) > 0) {
+               // Loop through all
+               $row = '';
+               while ($content = sqlFetchArray($result)) {
+                       // Load row template
+                       $row .= loadTemplate('guest_registration_provider_row', TRUE, $content);
+               } // END - while
+
+               // Load main template
+               $content = loadTemplate('guest_registration_provider', TRUE, $row);
+       } else {
+               // Nothing found
+               $content = returnMessage('{--GUEST_EXTRA_REGISTRATION_PROVIDER_404--}');
+       }
+
+       // Free result
+       sqlFreeResult($result);
+
+       // Return the generated content
+       return $content;
+}
+

 // [EOF]
 ?>
 // [EOF]
 ?>

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index e42defec891ae0beb0c347b09742845d312724b8..b6876178559d84a30fd0583d215d4ed93a3f120e 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -221,7 +221,7 @@ LIMIT 1",
                                        // Is this non-productive?
                                        if (isExtensionProductive() === FALSE) {
                                                // Issue warning
                                        // Is this non-productive?
                                        if (isExtensionProductive() === FALSE) {
                                                // Issue warning

-                                               $taskData['text'] = displayMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=' . $ext_name . '%}', TRUE) . $taskData['text'];
+                                               $taskData['text'] = returnMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=' . $ext_name . '%}') . $taskData['text'];

                                        } // END - if
 
                                        // Set current extension name
                                        } // END - if
 
                                        // Set current extension name

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 14f786730acc480e6a60783cc5b92f87bd4d0928..beae9b8c35c51753e504dfc85a6324f56765859e 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -119,14 +119,14 @@ ORDER BY
                        $content['withdraw_form'] = loadTemplate('admin_list_beg_form', TRUE);
                } else {
                        // Display message "no manual withdraw possible"
                        $content['withdraw_form'] = loadTemplate('admin_list_beg_form', TRUE);
                } else {
                        // Display message "no manual withdraw possible"

-                       $content['withdraw_form'] = displayMessage('{--ADMIN_BEG_ALREADY_WITHDRAW--}', TRUE);
+                       $content['withdraw_form'] = returnMessage('{--ADMIN_BEG_ALREADY_WITHDRAW--}');

                }
 
                // Prepare constant for timemark
                if (isExtensionActive('autopurge')) {
                        $content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
                } else {
                }
 
                // Prepare constant for timemark
                if (isExtensionActive('autopurge')) {
                        $content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
                } else {

-                       $content['autopurge_timeout'] = displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}', TRUE);
+                       $content['autopurge_timeout'] = returnMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}');

                }
 
                // Load final template
                }
 
                // Load final template

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index a9c155c40c1770aefb44d31a0970558133d4a292..671c73589a881d32e01a40f7545a5cdcbeee7e2b 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -129,7 +129,7 @@ ORDER BY
                        $content['withdraw_form'] = loadTemplate('admin_list_bonus_form', TRUE);
                } else {
                        // Display message "no manual withdraw possible"
                        $content['withdraw_form'] = loadTemplate('admin_list_bonus_form', TRUE);
                } else {
                        // Display message "no manual withdraw possible"

-                       $content['withdraw_form'] = displayErrorMessage('{--ADMIN_BONUS_ALREADY_WITHDRAW--}', TRUE);
+                       $content['withdraw_form'] = returnErrorMessage('{--ADMIN_BONUS_ALREADY_WITHDRAW--}');

                }
 
                // Prepare constant for timemark
                }
 
                // Prepare constant for timemark

diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php
index 702388ed31015ac00b5dd46187c9b64b82dc6b6b..4c4d676740d5286b68c467d3560bc05ef65ccd68 100644 (file)
--- a/inc/modules/admin/what-list_sponsor_pay.php
+++ b/inc/modules/admin/what-list_sponsor_pay.php
@@ -199,7 +199,7 @@ ORDER BY
                $content['list_out'] = loadTemplate('admin_list_sponsor_pay', TRUE, $OUT);
        } else {
                // Noting setup so far!
                $content['list_out'] = loadTemplate('admin_list_sponsor_pay', TRUE, $OUT);
        } else {
                // Noting setup so far!

-               $content['list_out'] = displayMessage('{--ADMIN_SPONSOR_NO_PAYTYPES--}', TRUE);
+               $content['list_out'] = returnMessage('{--ADMIN_SPONSOR_NO_PAYTYPES--}');

        }
 
        // Free memory
        }
 
        // Free memory

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 822d58d766f4c89e08f857a682c544f80a85e8c9..66bdca441a1ec7f18ae96523d903410fa810f301 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -191,7 +191,7 @@ LIMIT %s",
                        $OUT = loadTemplate('admin_list_unconfirmed_list', TRUE, $OUT);
                } else {
                        // All links are confirmed... strange, you shall normally not get a link to this place in this scenario... hmmm.
                        $OUT = loadTemplate('admin_list_unconfirmed_list', TRUE, $OUT);
                } else {
                        // All links are confirmed... strange, you shall normally not get a link to this place in this scenario... hmmm.

-                       $OUT = displayMessage('{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}', TRUE);
+                       $OUT = returnMessage('{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}');

                }
 
                // Prepare content
                }
 
                // Prepare content

diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index 0750e187559d13e8b4868ad77522d24801c137e3..784f56f6c32414891a57964716a1e081ac283783 100644 (file)
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -279,7 +279,7 @@ ORDER BY
 
                        // Errors found?
                        if (isFilledArray($formErrors)) {
 
                        // Errors found?
                        if (isFilledArray($formErrors)) {

-                               $OUT = displayMessage('{--SPONSOR_REGISTER_SOMETHING_MISSING--}', TRUE);
+                               $OUT = returnMessage('{--SPONSOR_REGISTER_SOMETHING_MISSING--}');

                                $OUT .= '<ol>';
                                foreach ($formErrors as $error) {
                                        $OUT .= '<li>' . $error . '</li>';
                                $OUT .= '<ol>';
                                foreach ($formErrors as $error) {
                                        $OUT .= '<li>' . $error . '</li>';

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index a7cdf89b310b9e66f16165de6ced82cc48f6e6d3..0ccaac089a003d159093696ea1b5951b7bb6930b 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -73,7 +73,7 @@ switch ($mode) {
                // How far is last change on his profile away from now?
                if ((($content['last_update'] + getProfileLock()) > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
                        // You cannot change your account
                // How far is last change on his profile away from now?
                if ((($content['last_update'] + getProfileLock()) > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
                        // You cannot change your account

-                       $content['change'] = displayMessage('<div class="notice">{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['last_update'] + getProfileLock(), 0) . '%}</div>', TRUE);
+                       $content['change'] = returnMessage('<div class="notice">{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['last_update'] + getProfileLock(), 0) . '%}</div>');

                } else {
                        // He is allowed to change his profile
                        $content['change'] = loadTemplate('member_mydata_button', TRUE);
                } else {
                        // He is allowed to change his profile
                        $content['change'] = loadTemplate('member_mydata_button', TRUE);

diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php
index 529d73f50fa5bd14f8c7d700a4bcd9357faf2988..9581176d5c98af777e1b966dc180c345fe933c97 100644 (file)
--- a/inc/modules/member/what-reflinks.php
+++ b/inc/modules/member/what-reflinks.php
@@ -110,7 +110,7 @@ if (!ifSqlHasZeroNums($result)) {
        $content['refbanner_content'] = loadTemplate('member_list_reflinks', TRUE, $OUT);
 } else {
        // No refbanner found
        $content['refbanner_content'] = loadTemplate('member_list_reflinks', TRUE, $OUT);
 } else {
        // No refbanner found

-       $content['refbanner_content'] = displayMessage('{--MEMBER_REFERRAL_BANNER_404--}', TRUE);
+       $content['refbanner_content'] = returnMessage('{--MEMBER_REFERRAL_BANNER_404--}');

 }
 
 // Free result
 }
 
 // Free result

diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php
index 12390580eeecf40b8f5a739977af9ba78f2378db..118f1b840b180fe5e4bc7b3c00df41d28b5ef910 100644 (file)
--- a/inc/modules/member/what-stats.php
+++ b/inc/modules/member/what-stats.php
@@ -84,7 +84,7 @@ if (!ifSqlHasZeroNums($result)) {
        $main_content['pool'] = loadTemplate('member_pool_table', TRUE, $OUT);
 } else {
        // No mails in pool!
        $main_content['pool'] = loadTemplate('member_pool_table', TRUE, $OUT);
 } else {
        // No mails in pool!

-       $main_content['pool'] = displayMessage('{--MEMBER_NO_MAILS_IN_POOL--}', TRUE);
+       $main_content['pool'] = returnMessage('{--MEMBER_NO_MAILS_IN_POOL--}');

 }
 
 // Free result
 }
 
 // Free result


@@ -128,7 +128,7 @@ if (!ifSqlHasZeroNums($result)) {
        $main_content['stats'] = loadTemplate('member_stats_table', TRUE, $OUT);
 } else {
        // No mail orders fond
        $main_content['stats'] = loadTemplate('member_stats_table', TRUE, $OUT);
 } else {
        // No mail orders fond

-       $main_content['stats'] = displayMessage('{--MEMBER_NO_MAILS_IN_STATS--}', TRUE);
+       $main_content['stats'] = returnMessage('{--MEMBER_NO_MAILS_IN_STATS--}');

 }
 
 // Free result
 }
 
 // Free result

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 6dea4dd47acb3245a8ea719a2b0ba6cfbdeff594..74ebcfd9f28b63683da6413152cfcd3b68a93f90 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -234,7 +234,7 @@ switch ($mode) {
                                sqlFreeResult($result);
                        } else {
                                // No one else is opt-in
                                sqlFreeResult($result);
                        } else {
                                // No one else is opt-in

-                               $OUT = displayMessage('{--MEMBER_TRANSFER_NO_ONE_ELSE_OPT_IN--}', TRUE);
+                               $OUT = returnMessage('{--MEMBER_TRANSFER_NO_ONE_ELSE_OPT_IN--}');

                                $content['to_disabled'] = ' disabled="disabled"';
                        }
 
                                $content['to_disabled'] = ' disabled="disabled"';
                        }
 


@@ -256,7 +256,7 @@ switch ($mode) {
                                $content['captcha_code'] = '<input type="hidden" name="code_chk" value="' . $rand . '" /><input type="text" name="code" class="form_field" size="5" maxlength="7"' . $content['to_disabled'] . ' />&nbsp;' . $img;
                        } else {
                                $code = '00000';
                                $content['captcha_code'] = '<input type="hidden" name="code_chk" value="' . $rand . '" /><input type="text" name="code" class="form_field" size="5" maxlength="7"' . $content['to_disabled'] . ' />&nbsp;' . $img;
                        } else {
                                $code = '00000';

-                               $content['captcha_code'] = displayMessage('{--MEMBER_TRANSFER_NO_CODE--}', TRUE);
+                               $content['captcha_code'] = returnMessage('{--MEMBER_TRANSFER_NO_CODE--}');

                        }
 
                        // Init points/reason
                        }
 
                        // Init points/reason

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index 7fa142b3f1dddeb81c48d4464d22a8623cd74c3f..6a8b8efe7852b26a28c941a9bb4a3c28930b4ce3 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -118,10 +118,10 @@ if (sqlNumRows($result) == 1) {
 
                        if (!empty($message)) {
                                // Output message
 
                        if (!empty($message)) {
                                // Output message

-                               $GLOBALS['sponsor_output'] = displayMessage($message, TRUE);
+                               $GLOBALS['sponsor_output'] = returnMessage($message);

                        } else {
                                // No message generated
                        } else {
                                // No message generated

-                               $GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', TRUE);
+                               $GLOBALS['sponsor_output'] = returnMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}');

                        }
                } else {
                        // Output formular
                        }
                } else {
                        // Output formular


@@ -129,11 +129,11 @@ if (sqlNumRows($result) == 1) {
                }
        } else {
                // Locked or so?
                }
        } else {
                // Locked or so?

-               $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}', TRUE);
+               $GLOBALS['sponsor_output'] = returnMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}');

        }
 } else {
        // Sponsor account not found
        }
 } else {
        // Sponsor account not found

-       $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', TRUE);
+       $GLOBALS['sponsor_output'] = returnMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}');

 }
 
 // Free memory
 }
 
 // Free memory

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index bd14fea02fa22858a827ee4fcdaf59bb59bff2be..8ebaa2f87469560c977fb8fd70e0f896c6856efe 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -105,10 +105,10 @@ if (sqlNumRows($result) == 1) {
 
                        if (!empty($message)) {
                                // Output message
 
                        if (!empty($message)) {
                                // Output message

-                               $GLOBALS['sponsor_output'] = displayMessage($message, TRUE);
+                               $GLOBALS['sponsor_output'] = returnMessage($message);

                        } else {
                                // No message generated
                        } else {
                                // No message generated

-                               $GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', TRUE);
+                               $GLOBALS['sponsor_output'] = returnMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}');

                        }
                } else {
                        // Make yes/no selection
                        }
                } else {
                        // Make yes/no selection


@@ -121,11 +121,11 @@ if (sqlNumRows($result) == 1) {
                }
        } else {
                // Locked or so?
                }
        } else {
                // Locked or so?

-               $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}', TRUE);
+               $GLOBALS['sponsor_output'] = returnMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}');

        }
 } else {
        // Sponsor account not found
        }
 } else {
        // Sponsor account not found

-       $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', TRUE);
+       $GLOBALS['sponsor_output'] = returnMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}');

 }
 
 // Free memory
 }
 
 // Free memory

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 4ec0827401bd3a5afe38f0b56b91486e372d27e5..70ffd792b14765771d5d400daa6a14eb4e8e839c 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -1982,15 +1982,27 @@ function translateTimeUnit ($unit) {
 }
 
 // Displays given message in admin_settings_saved template
 }
 
 // Displays given message in admin_settings_saved template

-function displayMessage ($message, $return = FALSE) {
+function displayMessage ($message) {
+       // Call inner function
+       outputHtml(returnMessage($message));
+}
+
+// Returns given message in admin_settings_saved template
+function returnMessage ($message) {
+       // Load the template
+       return loadTemplate('admin_settings_saved', TRUE, $message);
+}
+
+// Displays given error message in admin_settings_unsaved template
+function displayErrorMessage ($message) {

        // Load the template
        // Load the template

-       return loadTemplate('admin_settings_saved', $return, $message);
+       outputHtml(returnErrorMessage($message));

 }
 
 }
 

-// Displays given error message in admin_settings_saved template
-function displayErrorMessage ($message, $return = FALSE) {
+// Displays given error message in admin_settings_unsaved template
+function returnErrorMessage ($message) {

        // Load the template
        // Load the template

-       return loadTemplate('admin_settings_unsaved', $return, $message);
+       return loadTemplate('admin_settings_unsaved', TRUE, $message);

 }
 
 // Generates a selection box for (maybe) given gender
 }
 
 // Generates a selection box for (maybe) given gender

diff --git a/templates/de/emails/admin/admin_sponsor_change_data.tpl b/templates/de/emails/admin/admin_sponsor_change_data.tpl
index 00bc991ec99c3df3ca8659fcb9790db2ca8c2a4e..204177c1ed950cff8424dfc6231e2cd1cbdfa15a 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_change_data.tpl
+++ b/templates/de/emails/admin/admin_sponsor_change_data.tpl
@@ -12,7 +12,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%})
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[new_data][street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[new_data][street_nr2] ($content[street_nr2])
 {--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%})
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[new_data][street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[new_data][street_nr2] ($content[street_nr2])

-{--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $content[new_data][country]-$content[new_data][zip] $content[new_data][city] ($content[country]-$content[zip] $content[city])
+{--SPONSOR_EMAIL_COUNTRY_CODE_ZIP_CITY--}: $content[new_data][country]-$content[new_data][zip] $content[new_data][city] ($content[country]-$content[zip] $content[city])

 ------------------------------
 {--SPONSOR_ENTER_PHONE--}: $content[new_data][phone] ($content[phone])
 {--SPONSOR_ENTER_FAX--}: $content[new_data][fax] ($content[fax])
 ------------------------------
 {--SPONSOR_ENTER_PHONE--}: $content[new_data][phone] ($content[phone])
 {--SPONSOR_ENTER_FAX--}: $content[new_data][fax] ($content[fax])

diff --git a/templates/de/emails/admin/admin_sponsor_change_email.tpl b/templates/de/emails/admin/admin_sponsor_change_email.tpl
index d19c3edd7451611bcb96f81c7e13e4115e39006a..5bf94dd255d1770385b8239806e46de3eebd6515 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_change_email.tpl
+++ b/templates/de/emails/admin/admin_sponsor_change_email.tpl
@@ -12,7 +12,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%})
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[new_data][street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[new_data][street_nr2] ($content[street_nr2])
 {--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%})
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[new_data][street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[new_data][street_nr2] ($content[street_nr2])

-{--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $content[new_data][country]-$content[new_data][zip] $content[new_data][city] ($content[country]-$content[zip] $content[city])
+{--SPONSOR_EMAIL_COUNTRY_CODE_ZIP_CITY--}: $content[new_data][country]-$content[new_data][zip] $content[new_data][city] ($content[country]-$content[zip] $content[city])

 ------------------------------
 {--SPONSOR_ENTER_PHONE--}: $content[new_data][phone] ($content[phone])
 {--SPONSOR_ENTER_FAX--}: $content[new_data][fax] ($content[fax])
 ------------------------------
 {--SPONSOR_ENTER_PHONE--}: $content[new_data][phone] ($content[phone])
 {--SPONSOR_ENTER_FAX--}: $content[new_data][fax] ($content[fax])

diff --git a/templates/de/emails/admin/admin_sponsor_edit.tpl b/templates/de/emails/admin/admin_sponsor_edit.tpl
index 58bbec11f0e14b334e64f43e5d23ca39c202672b..8f66a22789da709196c777d0a4c300fe32d85238 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_edit.tpl
+++ b/templates/de/emails/admin/admin_sponsor_edit.tpl
@@ -16,7 +16,7 @@ Es sind folgende Daten gespeichert:
 {--SURNAME_FAMILY--}: {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[street_nr1]
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[street_nr2]
 {--SURNAME_FAMILY--}: {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[street_nr1]
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[street_nr2]

-{--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $content[country]-$content[zip] $content[city]
+{--SPONSOR_EMAIL_COUNTRY_CODE_ZIP_CITY--}: $content[country]-$content[zip] $content[city]

 ------------------------------
 {--SPONSOR_ENTER_PHONE--}: $content[phone]
 {--SPONSOR_ENTER_FAX--}: $content[fax]
 ------------------------------
 {--SPONSOR_ENTER_PHONE--}: $content[phone]
 {--SPONSOR_ENTER_FAX--}: $content[fax]

diff --git a/templates/de/emails/sponsor/sponsor_change_data.tpl b/templates/de/emails/sponsor/sponsor_change_data.tpl
index 2dbad9c007d19a16234c2ec488e88ebb5ff309a1..6701bd73711401f408b014c3f210e2a25458a467 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_change_data.tpl
+++ b/templates/de/emails/sponsor/sponsor_change_data.tpl
@@ -12,7 +12,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SURNAME_FAMILY--}: $content[surname] $content[family] ({%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%})
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[street_nr1] ({%sponsor,street_nr1=$content[id]%})
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[street_nr2] ({%sponsor,street_nr2=$content[id]%})
 {--SURNAME_FAMILY--}: $content[surname] $content[family] ({%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%})
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[street_nr1] ({%sponsor,street_nr1=$content[id]%})
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[street_nr2] ({%sponsor,street_nr2=$content[id]%})

-{--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $content[country]-$content[zip] $content[city] ({%sponsor,country,determineSponsorCountry=$content[id]%}-{%sponsor,zip,bigintval=$content[id]%} {%sponsor,city=$content[id]%})
+{--SPONSOR_EMAIL_COUNTRY_CODE_ZIP_CITY--}: $content[country]-$content[zip] $content[city] ({%sponsor,country,determineSponsorCountry=$content[id]%}-{%sponsor,zip,bigintval=$content[id]%} {%sponsor,city=$content[id]%})

 ------------------------------
 {--SPONSOR_ENTER_PHONE--}: $content[phone] ($content[phone])
 {--SPONSOR_ENTER_FAX--}: $content[fax] ($content[fax])
 ------------------------------
 {--SPONSOR_ENTER_PHONE--}: $content[phone] ($content[phone])
 {--SPONSOR_ENTER_FAX--}: $content[fax] ($content[fax])

diff --git a/templates/de/html/admin/admin_add_sponsor.tpl b/templates/de/html/admin/admin_add_sponsor.tpl
index 696e1e96adc8f7bff7b4f0a8aa0089ec676a13b9..a241a5c0e0c9ab268b190e61672896b4f70a2c93 100644 (file)
--- a/templates/de/html/admin/admin_add_sponsor.tpl
+++ b/templates/de/html/admin/admin_add_sponsor.tpl
@@ -87,7 +87,7 @@
 </tr>
 <tr>
        <td align="right" valign="top">
 </tr>
 <tr>
        <td align="right" valign="top">

-               {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:
+               {--SPONSOR_ENTER_COUNTRY_CODE_ZIP_CITY--}:

        </td>
        <td>
                <input type="text" class="form_field" name="country" size="2" maxlength="2" value="DE" />-<input type="text" class="form_field" name="zip" size="5" maxlength="6" />
        </td>
        <td>
                <input type="text" class="form_field" name="country" size="2" maxlength="2" value="DE" />-<input type="text" class="form_field" name="zip" size="5" maxlength="6" />

diff --git a/templates/de/html/admin/admin_edit_sponsor_edit.tpl b/templates/de/html/admin/admin_edit_sponsor_edit.tpl
index 941ad76f15c708b93c2d6a075c1164c0290185d7..d023ca4f781c5231a5cd0529df7a4388470574a8 100644 (file)
--- a/templates/de/html/admin/admin_edit_sponsor_edit.tpl
+++ b/templates/de/html/admin/admin_edit_sponsor_edit.tpl
@@ -75,7 +75,7 @@
 </tr>
 <tr>
        <td align="right">
 </tr>
 <tr>
        <td align="right">

-               {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:
+               {--SPONSOR_ENTER_COUNTRY_CODE_ZIP_CITY--}:

        </td>
        <td>
                <input type="text" class="form_field" name="country" size="2" maxlength="2" value="$content[country]" />-<input type="text" class="form_field" name="zip" size="2" maxlength="6" value="$content[zip]" />
        </td>
        <td>
                <input type="text" class="form_field" name="country" size="2" maxlength="2" value="$content[country]" />-<input type="text" class="form_field" name="zip" size="2" maxlength="6" value="$content[zip]" />

diff --git a/templates/de/html/admin/admin_list_sponsor_details.tpl b/templates/de/html/admin/admin_list_sponsor_details.tpl
index f26fe613c8aa5e6566df0e189a2e681bdac0e0e3..fb7121ca42b715f70e1f0dc208973ed38b79b790 100644 (file)
--- a/templates/de/html/admin/admin_list_sponsor_details.tpl
+++ b/templates/de/html/admin/admin_list_sponsor_details.tpl
@@ -54,7 +54,7 @@
 </tr>
 
 <tr>
 </tr>
 
 <tr>

-       <td align="right" class="bottom right">{--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:</td>
+       <td align="right" class="bottom right">{--SPONSOR_ENTER_COUNTRY_CODE_ZIP_CITY--}:</td>

        <td class="bottom">$content[country]-$content[zip]$content[city]</td>
 </tr>
 
        <td class="bottom">$content[country]-$content[zip]$content[city]</td>
 </tr>
 

diff --git a/templates/de/html/guest/guest_registration_select.tpl b/templates/de/html/guest/guest_registration_select.tpl
new file mode 100644 (file)
index 0000000..64e53fd
--- /dev/null
+++ b/templates/de/html/guest/guest_registration_select.tpl
@@ -0,0 +1,16 @@
+<div align="center">
+<div class="table dashed">
+       <div class="table_header bottom">
+               {--GUEST_SELECT_OTHER_REGISTRATION_FORM_TITLE--}
+       </div>
+
+       <div class="bottom" align="left">
+               {%template,GuestRegistrationList%}
+       </div>
+       <div class="table_footer">
+               <div class="notice">
+                       {--GUEST_SELECT_OTHER_REGISTRATION_FORM_NOTICE--}
+               </div>
+       </div>
+</div>
+</div>

diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl
index 61d520219d1ca1233ab20a36032586de02b4b0a0..075005eb24a1b9e1fb2b47bf0eb52af382b57706 100644 (file)
--- a/templates/de/html/guest/guest_sponsor_reg.tpl
+++ b/templates/de/html/guest/guest_sponsor_reg.tpl
@@ -101,7 +101,7 @@
 </tr>
 <tr>
        <td align="right" valign="top">
 </tr>
 <tr>
        <td align="right" valign="top">

-               {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:
+               {--SPONSOR_ENTER_COUNTRY_CODE_ZIP_CITY--}:

        </td>
        <td>
                <input type="text" class="form_field" name="country" size="2" maxlength="2" value="$content[country]" />-<input type="text" class="form_field" name="zip" size="5" maxlength="6" value="$content[zip]" />
        </td>
        <td>
                <input type="text" class="form_field" name="country" size="2" maxlength="2" value="$content[country]" />-<input type="text" class="form_field" name="zip" size="5" maxlength="6" value="$content[zip]" />

diff --git a/templates/de/html/sponsor/sponsor_account_form.tpl b/templates/de/html/sponsor/sponsor_account_form.tpl
index 170b57efad28e3409b0d9399018e0bcc738e0575..f61b5544ae50d06cbf096e1f1aecbb4852b52fd9 100644 (file)
--- a/templates/de/html/sponsor/sponsor_account_form.tpl
+++ b/templates/de/html/sponsor/sponsor_account_form.tpl
@@ -82,7 +82,7 @@
 </tr>
 <tr>
        <td class="bottom right" align="right" height="27">
 </tr>
 <tr>
        <td class="bottom right" align="right" height="27">

-               {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:
+               {--SPONSOR_ENTER_COUNTRY_CODE_ZIP_CITY--}:

        </td>
        <td class="bottom">
                <input type="text" class="form_field" name="country" size="2" maxlength="2" value="{%sponsor,country=$content[id]%}" />-<input type="text" class="form_field" name="zip" size="5" maxlength="6" value="{%sponsor,zip,bigintval=$content[id]%}" />
        </td>
        <td class="bottom">
                <input type="text" class="form_field" name="country" size="2" maxlength="2" value="{%sponsor,country=$content[id]%}" />-<input type="text" class="form_field" name="zip" size="5" maxlength="6" value="{%sponsor,zip,bigintval=$content[id]%}" />