More rewrites/fixes (not all is fixed) for ext-sponsor

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 4ad4a8c4051930eb9aad12576556ecc3397ce56e..4156cc1acfe3ea8b197208567b05d1b1fc38247e 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -150,6 +150,7 @@
 ./inc/modules/guest/what-mediadata.php:183:// @TODO Rewrite all these if-blocks to filters
 ./inc/modules/guest/what-mediadata.php:70:     // @TODO Find a better formular than this one
 ./inc/modules/guest/what-rallyes.php:91:       // @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;admin=' . $adminId . '%}">' . $login . '</a>';
+./inc/modules/guest/what-sponsor_reg.php:297:                  // @TODO Maybe a default referal id?
 ./inc/modules/guest/what-stats.php:116:                // @TODO This can be somehow rewritten
 ./inc/modules/guest/what-stats.php:76:// @TODO This can be rewritten in a dynamic include
 ./inc/modules/member/what-beg.php:56:// @TODO Can't this be moved into EL?
@@ -263,6 +264,8 @@
 ./templates/de/html/admin/admin_refbanner_edit.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_refbanner_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_refbanner.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/guest/guest_menu_whats.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/member/member_menu_whats.tpl:1:<!-- @DEPRECATED //-->
 ### ### template-warnings.log follows: ### ###
 Warning: Not parsing JavaScript templates/de/html/js/js_order_send.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_cookies_disabled.tpl.

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index e63855da656b80bb5988419a12cca9a48657acdd..3706a5cb4fbef3636f99066fad21564f065f9d8e 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -1467,7 +1467,7 @@ function initExtensionSqls ($force = false) {
 // Adds SQLs to the SQLs array but "assigns" it with current extension name
 function addExtensionSql ($sql) {
        // Add it
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',ext_version=' . getCurrentExtensionVersion() . ',sql=' . $sql);
+       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',ext_version=' . getCurrentExtensionVersion() . ',sql=' . $sql);
        $GLOBALS['ext_sqls'][getCurrentExtensionName()][getCurrentExtensionVersion()][] = $sql;
 }
 
@@ -1770,7 +1770,7 @@ function addAdminMenuSql ($action, $what, $title, $descr, $sort) {
                addExtensionSql($sql);
        } elseif (isDebugModeEnabled()) {
                // Double menus should be located and fixed!
-               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double admin menu action=%s, what=%s detected.", $action, $what));
+               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double admin menu action=%s,what=%s,title=%s detected.", $action, $what, $title));
        }
 }
 
@@ -1804,7 +1804,7 @@ function addGuestMenuSql ($action, $what, $title, $visible, $locked, $sort) {
                addExtensionSql($sql);
        } elseif (isDebugModeEnabled()) {
                // Double menus should be located and fixed!
-               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double guest menu action=%s, what=%s detected.", $action, $what));
+               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double guest menu action=%s,what=%s,title=%s,active=%s detected.", $action, $what, $title, $active));
        }
 }
 
@@ -1838,7 +1838,7 @@ function addMemberMenuSql ($action, $what, $title, $visible, $locked, $sort) {
                addExtensionSql($sql);
        } elseif (isDebugModeEnabled()) {
                // Double menus should be located and fixed!
-               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double member menu action=%s, what=%s detected.", $action, $what));
+               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double member menu action=%s,what=%s,title=%s,visivle=%s,locked=%s detected.", $action, $what, $title, $visible, $locked));
        }
 }
 
@@ -1870,7 +1870,7 @@ function addSponsorMenuSql ($action, $what, $title, $active, $sort) {
                addExtensionSql($sql);
        } elseif (isDebugModeEnabled()) {
                // Double menus should be located and fixed!
-               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double sponsor menu action=%s, what=%s detected.", $action, $what));
+               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double sponsor menu action=%s,what=%s,title=%s,active=%s detected.", $action, $what, $title, $active));
        }
 }
 

diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php
index d0e0cf08a56785c845729019f4201a822c459021..581cf90c5a55f91842cf8c49cee3a38bcb281ebd 100644 (file)
--- a/inc/extensions/ext-sponsor.php
+++ b/inc/extensions/ext-sponsor.php
@@ -392,7 +392,7 @@ PRIMARY KEY (`id`)
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_sponsor_display_data`');
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='sponsor' OR `what` IN('repr_sponsor','sponsor_medit','sponsor_madd')");
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='sponsor'");
-               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='sponsor'");
+               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what` IN('sponsor_list','sponsor_reg')");
                break;
 
        case 'activate': // Do stuff when admin activates this extension

diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php
index ffeceaf3187590553e8c576f23dbd91cac2c397f..fe7a233b78e39ae9415030d7cc23ae3dd8d839c2 100644 (file)
--- a/inc/language/sponsor_de.php
+++ b/inc/language/sponsor_de.php
@@ -251,7 +251,7 @@ addMessages(array(
        'SPONSOR_UNKNOWN_STATUS' => "Bei der Anmeldung wurde ein unbekannter R&uuml;ckgabewert <span class=\"data\">%s</span> erkannt. Bitte melden Sie dies dem Betreiber dieses {?mt_word2?}!<br />Vielen Dank.",
        'SPONSOR_EMAIL_404' => "Bei der Anmeldung ist uns ein Fehler unterlaufen: Ihr Sponsor-Account mit der EMail-Adresse <span class=\"data\">%s</span> wurde nicht gefunden.",
        'SPONSOR_ACCOUNT_PENDING_FAILED' => "Bei der Umschaltung Ihres Sponorenaccounts auf <em>Wartend</em> trat ein unerwarteter Fehler auf.",
-       'SPONSOR_ACCOUNT_404' => "Sponsorenaccount <span class=\"data\">%s</span> nicht gefunden.",
+       'SPONSOR_ACCOUNT_404' => "Das von Ihnen angegebene Sponsorenaccount <span class=\"data\">%s</span> konnte nicht gefunden werden.",
        'SPONSOR_ACCOUNT_FAILED' => "Sponsorenaccount konnte nicht geladen werden: <span class=\"data\">%s</span>",
        'SPONSOR_ACCOUNT_EMAIL_FAILED' => "Konnten Sponsorenaccount nicht freigeben! Bitte benachrichtigen Sie den Support.",
 

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 46e4a13b0f7c3541ae61fb1429bf914551ef35a2..37c66b190c81df5ad65a370cc0d73da52859b12f 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -250,29 +250,15 @@ function isSponsorRegisteredWithEmail ($email) {
 
 // Wether the current user is a sponsor
 function isSponsor () {
-       // Failed...
+       // Failed is default
        $ret = false;
-       if ((isSessionVariableSet('sponsor_id')) && (isSessionVariableSet('sponsorpass'))) {
-               // Check cookies against database records...
-               $result = SQL_QUERY_ESC("SELECT
-       `id`
-FROM
-       `{?_MYSQL_PREFIX?}_sponsor_data`
-WHERE
-       `id`=%s AND `password`='%s' AND `status`='CONFIRMED'
-LIMIT 1",
-                       array(
-                               bigintval(getSession('sponsor_id')),
-                               getSession('sponsorpass')
-                       ), __FUNCTION__, __LINE__);
-               if (SQL_NUMROWS($result) == 1) {
-                       // All is fine
-                       $ret = true;
-               } // END - if
 
-               // Free memory
-               SQL_FREERESULT($result);
-       } // END - if
+       // Determine it
+       $ret = (
+               (isSessionVariableSet('sponsor_id')) &&
+               (isSessionVariableSet('sponsorpass')) &&
+               (fetchSponsorData(getSession('sponsor_id')))
+       );
 
        // Return status
        return $ret;
@@ -331,10 +317,7 @@ ORDER BY
                                }
 
                                // Prepare data for the main template
-                               $content = array(
-                                       'title' => $content['main_title'],
-                                       'menu'  => $SUB
-                               );
+                               $content['menu'] = $SUB;
 
                                // Load menu template
                                $OUT .= loadTemplate('sponsor_action', true, $content);
@@ -360,18 +343,21 @@ ORDER BY
 
 //
 function addSponsorContent ($what) {
-       $OUT = '';
+       // Init sponsor content
+       $GLOBALS['sponsor_output'] = '';
+
+       // Generate IFN (Include FileName)
        $INC = sprintf("inc/modules/sponsor/%s.php", $what);
        if (isIncludeReadable($INC)) {
-               // Every sponsor action will output nothing directly. It will be written into $OUT!
+               // Every sponsor action will output nothing directly. It will be written into $GLOBALS['sponsor_output']!
                loadIncludeOnce($INC);
        } else {
                // File not found!
-               $OUT .= loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_CONTENT_404', $what));
+               $GLOBALS['sponsor_output'] .= loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_CONTENT_404', $what));
        }
 
        // Return content
-       return $OUT;
+       return $GLOBALS['sponsor_output'];
 }
 
 //
@@ -397,7 +383,7 @@ LIMIT 1",
 
                // This update went fine?
                $login = (SQL_AFFECTEDROWS() == 1);
-       }
+       } // END - if
 
        // Return status
        return $login;
@@ -844,5 +830,14 @@ function getSponsorData ($column) {
        return $GLOBALS['sponsor_data'][getCurrentSponsorId()][$column];
 }
 
+// Determines the country of the given sponsor id
+function determineSponsorCountry ($sponsor_id) {
+       // Then handle it over
+       $country = getSponsorData('country');
+
+       // Return it
+       return $country;
+}
+
 // [EOF]
 ?>

diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index 54fa6cd0d43dc2eb275fcd74bf04f0572b2f9db3..bdcd447680a27533004602c8978c58d890f71da1 100644 (file)
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.php
@@ -70,7 +70,10 @@ if (isGetRequestParameterSet('hash')) {
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
-       `hash='%s' AND (`status`='UNCONFIRMED' OR `status`='EMAIL')
+       `hash`='%s' AND (
+               `status`='UNCONFIRMED' OR
+               `status`='EMAIL'
+       )
 LIMIT 1", array(getRequestParameter('hash')), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Sponsor found, load his data...
@@ -82,10 +85,11 @@ LIMIT 1", array(getRequestParameter('hash')), __FILE__, __LINE__);
                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_sponsor_data`
 SET
-       `status`='PENDING'
+       `status`='PENDING',
+       `hash`=NULL
 WHERE
        `id`=%s AND
-       hash='%s' AND
+       `hash`='%s' AND
        `status`='UNCONFIRMED'
 LIMIT 1",
                                array(
@@ -113,7 +117,8 @@ LIMIT 1",
                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_sponsor_data`
 SET
-       `status`='CONFIRMED'
+       `status`='CONFIRMED',
+       `hash`=NULL
 WHERE
        `id`=%s AND
        `hash`='%s' AND

diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index 8c9f367acc49dcd16726f4a991e66e4808e9cbd6..75af8b376fd92ee24672faab9576be890db7739e 100644 (file)
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('guest', __FILE__);
@@ -51,7 +51,7 @@ if ((!isExtensionActive('sponsor'))) {
 } // END - if
 
 // Create array for form errors (= missing data)
-$FORM_ERRORS = array();
+$formErrors = array();
 
 if (isFormSent()) {
        //
@@ -60,17 +60,17 @@ if (isFormSent()) {
        // 1. Salutation / Surname / family name
        if (!isPostRequestParameterSet('gender')) {
                // Surname is empty
-               $FORM_ERRORS[] = '{--SPONSOR_NO_GENDER_SELECTED--}';
+               $formErrors[] = '{--SPONSOR_NO_GENDER_SELECTED--}';
        } // END - if
 
        if (!isPostRequestParameterSet('surname')) {
                // Surname is empty
-               $FORM_ERRORS[] = '{--SPONSOR_SURNAME_IS_EMPTY--}';
+               $formErrors[] = '{--SPONSOR_SURNAME_IS_EMPTY--}';
        } // END - if
 
        if (!isPostRequestParameterSet('family')) {
                // Surname is empty
-               $FORM_ERRORS[] = '{--SPONSOR_FAMILY_IS_EMPTY--}';
+               $formErrors[] = '{--SPONSOR_FAMILY_IS_EMPTY--}';
        } // END - if
 
        // 2. Company name
@@ -78,128 +78,128 @@ if (isFormSent()) {
        if (((!isPostRequestParameterSet('company')) && ((isPostRequestParameterSet('tax_ident')) || (isPostRequestParameterSet('position')))) || ((isPostRequestParameterSet('company')) && (!isPostRequestParameterSet('tax_ident')))) {
                if (!isPostRequestParameterSet('company')) {
                        // Company name is empty
-                       $FORM_ERRORS[] = '{--SPONSOR_COMPANY_IS_EMPTY--}';
+                       $formErrors[] = '{--SPONSOR_COMPANY_IS_EMPTY--}';
                } elseif (!isPostRequestParameterSet('tax_ident')) {
                        // Tax ident number name is empty
-                       $FORM_ERRORS[] = '{--SPONSOR_TAX_IDENT_IS_EMPTY--}';
+                       $formErrors[] = '{--SPONSOR_TAX_IDENT_IS_EMPTY--}';
                }
 
                if (!isPostRequestParameterSet('position')) {
                        // Not fatal but not nice: position in company is empty
-                       $FORM_ERRORS[] = '{--SPONSOR_POSITION_IS_EMPTY--}';
+                       $formErrors[] = '{--SPONSOR_POSITION_IS_EMPTY--}';
                } // END - if
        } // END - if
 
        // 3. Street and number
        if (!isPostRequestParameterSet('street_nr1')) {
                // Street name and house number are empty
-               $FORM_ERRORS[] = '{--SPONSOR_STREET_NR1_IS_EMPTY--}';
+               $formErrors[] = '{--SPONSOR_STREET_NR1_IS_EMPTY--}';
        } elseif ((isPostRequestParameterSet('street_nr2')) && (!isPostRequestParameterSet('street_nr1'))) {
                // 1st line for street is empty, but 2nd line not
-               $FORM_ERRORS[] = '{--SPONSOR_STREET_NR1_IS_EMPTY_2_NOT--}';
+               $formErrors[] = '{--SPONSOR_STREET_NR1_IS_EMPTY_2_NOT--}';
        }
 
        // 4. Country code
        if (!isPostRequestParameterSet('country')) {
                // Country code is empty
-               $FORM_ERRORS[] = '{--kSPONSOR_COUNTRY_IS_EMPTY--}';
+               $formErrors[] = '{--kSPONSOR_COUNTRY_IS_EMPTY--}';
        } elseif (strlen(postRequestParameter('country')) != 2) {
                // Country code is invalid
-               $FORM_ERRORS[] = '{--SPONSOR_COUNTRY_IS_INVALID--}';
+               $formErrors[] = '{--SPONSOR_COUNTRY_IS_INVALID--}';
        }
 
        // 3. ZIP code
        if (!isPostRequestParameterSet('zip')) {
                // ZIP code is empty
-               $FORM_ERRORS[] = '{--SPONSOR_ZIP_IS_EMPTY--}';
+               $formErrors[] = '{--SPONSOR_ZIP_IS_EMPTY--}';
        } elseif (bigintval(postRequestParameter('zip')) != postRequestParameter('zip')) {
                // ZIP is invalid
-               $FORM_ERRORS[] = '{--SPONSOR_ZIP_IS_INVALID--}';
+               $formErrors[] = '{--SPONSOR_ZIP_IS_INVALID--}';
                setPostRequestParameter('zip', '');
        }
 
        // 4. City
        if (!isPostRequestParameterSet('city')) {
                // City is empty
-               $FORM_ERRORS[] = '{--SPONSOR_CITY_IS_EMPTY--}';
+               $formErrors[] = '{--SPONSOR_CITY_IS_EMPTY--}';
        } // END - if
 
        // 5. Phone number
        if (!isPostRequestParameterSet('phone')) {
                // City is empty
-               $FORM_ERRORS[] = '{--SPONSOR_PHONE_IS_EMPTY--}';
+               $formErrors[] = '{--SPONSOR_PHONE_IS_EMPTY--}';
        } // END - if
 
        // 6. Homepage URL
        if (!isPostRequestParameterSet('url')) {
                // Homepage URL is empty
-               $FORM_ERRORS[] = '{--SPONSOR_URL_IS_EMPTY--}';
+               $formErrors[] = '{--SPONSOR_URL_IS_EMPTY--}';
        } elseif (!isUrlValid(postRequestParameter('url'))) {
                // Homepage URL is invalid
-               $FORM_ERRORS[] = '{--SPONSOR_URL_IS_INVALID--}';
+               $formErrors[] = '{--SPONSOR_URL_IS_INVALID--}';
                setPostRequestParameter('url', '');
        }
 
        // 7. Light validation of email address
        if ((!isPostRequestParameterSet('email')) || (postRequestParameter('email') == '@')) {
                // Email is invalid/empty
-               $FORM_ERRORS[] = '{--SPONSOR_EMAIL_IS_INVALID--}';
+               $formErrors[] = '{--SPONSOR_EMAIL_IS_INVALID--}';
        } elseif (isSponsorRegisteredWithEmail(postRequestParameter('email'))) {
                // Email already found in database!
-               $FORM_ERRORS[] = '{--SPONSOR_EMAIL_IS_ALREADY_REGISTERED--}';
+               $formErrors[] = '{--SPONSOR_EMAIL_IS_ALREADY_REGISTERED--}';
                setPostRequestParameter('email', '');
        }
 
        // 8. Pay type selected?
        if (!isPostRequestParameterSet('pay_type')) {
                // Not pay type selected
-               $FORM_ERRORS[] = '{--SPONSOR_NO_PAYTYPE_SELECTED--}';
+               $formErrors[] = '{--SPONSOR_NO_PAYTYPE_SELECTED--}';
        } // END - if
 
        // 9. Interval of mails
        if (!isPostRequestParameterSet('warning_interval')) {
                // No warning interval selected
-               $FORM_ERRORS[] = '{--SPONSOR_NO_WARNING_INTERVAL_SELECTED--}';
+               $formErrors[] = '{--SPONSOR_NO_WARNING_INTERVAL_SELECTED--}';
        } // END - if
 
        // 10. Mail notifications disabled/enabled
        if (!isPostRequestParameterSet('receive_warnings')) {
                // Option not selected!
-               $FORM_ERRORS[] = '{--SPONSOR_NO_RECEIVE_WARNINGS_SELECTED--}';
+               $formErrors[] = '{--SPONSOR_NO_RECEIVE_WARNINGS_SELECTED--}';
        } // END - if
 
        // Did he enter his password twice?
        if (((!isPostRequestParameterSet('pass1')) || (!isPostRequestParameterSet('pass2'))) || ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')))) {
                if ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2'))) {
                        // Passwords missmatch
-                       $FORM_ERRORS[] = '{--SPONSOR_PASSWORDS_MISMATCH--}';
+                       $formErrors[] = '{--SPONSOR_PASSWORDS_MISMATCH--}';
                } else {
                        if (!isPostRequestParameterSet('pass1')) {
                                // Password 1 is empty
-                               $FORM_ERRORS[] = '{--SPONSOR_PASSWORD1_EMPTY--}';
+                               $formErrors[] = '{--SPONSOR_PASSWORD1_EMPTY--}';
                        }
 
                        if (!isPostRequestParameterSet('pass2')) {
                                // Password 2 is empty
-                               $FORM_ERRORS[] = '{--SPONSOR_PASSWORD2_EMPTY--}';
+                               $formErrors[] = '{--SPONSOR_PASSWORD2_EMPTY--}';
                        }
                }
        } elseif (strlen(postRequestParameter('pass1')) < getConfig('pass_len')) {
                // Password is to short!
-               $FORM_ERRORS[] = '{--SPONSOR_PASSWORD_TOO_SHORT--}';
+               $formErrors[] = '{--SPONSOR_PASSWORD_TOO_SHORT--}';
        }
 
        // Check if he has accepted the terms&conditions
        if (!isPostRequestParameterSet('terms')) {
                // Homepage URL is empty
-               $FORM_ERRORS[] = '{--SPONSOR_TERMS_NOT_ACCEPTED--}';
+               $formErrors[] = '{--SPONSOR_TERMS_NOT_ACCEPTED--}';
        } // END - if
 
        // If there is something wrong/missing stop registration
-       if (count($FORM_ERRORS) > 0) unsetPostRequestParameter('ok');
-}
+       if (count($formErrors) > 0) unsetPostRequestParameter('ok');
+} // END - if
 
-if ((isFormSent()) && (count($FORM_ERRORS) == 0)) {
+if ((isFormSent()) && (count($formErrors) == 0)) {
        // Generate message array
        $messageArray = array(
                'failed' => '{--SPONSOR_REGISTRATION_FAILED--}',
@@ -259,7 +259,7 @@ ORDER BY
                } // END - foreach
 
                // Check for invalid entries
-               if (count($FORM_ERRORS) > 0) {
+               if (count($formErrors) > 0) {
                        // Some found... :-(
                        foreach (array('company','position','tax_ident','surname','family','street_nr1','street_nr2','country','zip','city','phone','fax','cell','email','url') as $entry) {
                                $content[$entry]    = secureString(postRequestParameter($entry));
@@ -282,10 +282,10 @@ ORDER BY
                        $OUT = '';
 
                        // Errors found?
-                       if (count($FORM_ERRORS) > 0) {
+                       if (count($formErrors) > 0) {
                                $OUT = loadTemplate('admin_settings_saved', true, '{--SPONSOR_REGISTER_SOMETHING_MISSING--}');
                                $OUT .= '<ol>';
-                               foreach ($FORM_ERRORS as $error) {
+                               foreach ($formErrors as $error) {
                                        $OUT .= '<li>' . $error . '</li>';
                                } // END - foreach
 
@@ -293,7 +293,15 @@ ORDER BY
                        } // END - if
 
                        $content['form_errors'] = $OUT;
-                       $content['refid']       = bigintval(postRequestParameter('refid'));
+
+                       // @TODO Maybe a default referal id?
+                       $content['refid']       = 0;
+
+                       // Is the referal id valid?
+                       if ((isPostRequestParameterSet('refid')) && (isValidUserId(postRequestParameter('refid')))) {
+                               // Transfer referal id
+                               $content['refid']       = bigintval(postRequestParameter('refid'));
+                       } // END - if
                } // END - if
 
                // Display registration form

diff --git a/inc/modules/sponsor.php b/inc/modules/sponsor.php
index 647357624702117329b40f447f075cdc474547ff..9a84af61a524652883f3f2025c28cfc423922331 100644 (file)
--- a/inc/modules/sponsor.php
+++ b/inc/modules/sponsor.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
        // No sponsor!
        addFatalMessage(__FILE__, __LINE__, '{--SPONSOR_ONLY_AREA_ENTERED--}');
        return;
-} elseif (!isWhatSet()) {
+} elseif ((!isWhatSet()) || (getWhat() == '')) {
        // Empty what value detected!
        setWhat('welcome');
 }

diff --git a/inc/modules/sponsor/.php b/inc/modules/sponsor/.php
index e1beb6300ad13d9534f6e147e96de9433468c16e..85198439aeb66b98d59c72f5b4489abf5d0f2173 100644 (file)
--- a/inc/modules/sponsor/.php
+++ b/inc/modules/sponsor/.php
@@ -48,8 +48,8 @@ if (!defined('__SECURITY')) {
        return;
 }
 
-// Put all HTML code into $OUT!
-// E.g.: $OUT = loadTemplate('sponsor_template', true);
+// Put all HTML code into $GLOBALS['sponsor_output']!
+// E.g.: $GLOBALS['sponsor_output'] = loadTemplate('sponsor_template', true);
 
 // [EOF]
 ?>

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index e76cdacf095c69993abaa7387b61877576e9805d..76889dc415ab0d92a76f80d66cf690575c6974b6 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -51,7 +51,7 @@ if (!defined('__SECURITY')) {
 
 // Data for the formular
 $result = SQL_QUERY_ESC("SELECT
-       `company`, `position`, `tax_ident`,
+       `id`, `company`, `position`, `tax_ident`,
        `gender`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`,
        `phone`, `fax`, `cell`, `email`, `url`,
        `status`, `receive_warnings`
@@ -120,10 +120,10 @@ if (SQL_NUMROWS($result) == 1) {
 
                        if (!empty($message)) {
                                // Output message
-                               $OUT = loadTemplate('admin_settings_saved', true, $message);
+                               $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, $message);
                        } else {
                                // No message generated
-                               $OUT = loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MESSAGE_GENERATED--}');
+                               $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MESSAGE_GENERATED--}');
                        }
                } else {
                        // Init gender
@@ -135,16 +135,16 @@ if (SQL_NUMROWS($result) == 1) {
                        $content['gender_' . strtolower($content['gender'])] = ' selected="selected"';
 
                        // Output formular
-                       $OUT = loadTemplate('sponsor_account_form', true, $content);
+                       $GLOBALS['sponsor_output'] = loadTemplate('sponsor_account_form', true, $content);
                }
        } else {
                // Locked or so?
                $STATUS = sponsorTranslateUserStatus($content['status']);
-               $OUT = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_FAILED', $STATUS));
+               $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_FAILED', $STATUS));
        }
 } else {
        // Sponsor account not found!
-       $OUT = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_404', getSession('sponsor_id')));
+       $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_404', getSession('sponsor_id')));
 }
 
 // Free memory

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index 76f73ac9f62dd6caf73a33dcc19dd2bbc43a47db..636697afcf48a8e2bc92d9ebfd91702210b9efc9 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -101,10 +101,10 @@ if (SQL_NUMROWS($result) == 1) {
 
                        if (!empty($message)) {
                                // Output message
-                               $OUT = loadTemplate('admin_settings_saved', true, $message);
+                               $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, $message);
                        } else {
                                // No message generated
-                               $OUT = loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MESSAGE_GENERATED--}');
+                               $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MESSAGE_GENERATED--}');
                        }
                } else {
                        // Make yes/no selection
@@ -113,16 +113,16 @@ if (SQL_NUMROWS($result) == 1) {
                        $content['receive_warnings_' . strtolower($content['receive_warnings'])] = ' checked="checked"';
 
                        // Output formular
-                       $OUT = loadTemplate('sponsor_settings_form', true, $content);
+                       $GLOBALS['sponsor_output'] = loadTemplate('sponsor_settings_form', true, $content);
                }
        } else {
                // Locked or so?
                $STATUS = sponsorTranslateUserStatus($content['status']);
-               $OUT = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_FAILED', $STATUS));
+               $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_FAILED', $STATUS));
        }
 } else {
        // Sponsor account not found!
-       $OUT = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_404', getSession('sponsor_id')));
+       $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_404', getSession('sponsor_id')));
 }
 
 // Free memory

diff --git a/inc/modules/sponsor/welcome.php b/inc/modules/sponsor/welcome.php
index 7aac1a7a2721e5c3f422ce8ff609fe1f6a8ddb3f..88ec34677a712ff04bb47e87f971079186525b20 100644 (file)
--- a/inc/modules/sponsor/welcome.php
+++ b/inc/modules/sponsor/welcome.php
@@ -51,7 +51,7 @@ if (!defined('__SECURITY')) {
 
 // Load some data
 $result = SQL_QUERY_ESC("SELECT
-       `gender`, `surname`, `family`, (`points_amount` - `points_used`) AS points
+       `id`, `gender`, `surname`, `family`, (`points_amount` - `points_used`) AS points
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
@@ -70,7 +70,7 @@ $content = SQL_FETCHARRAY($result);
 SQL_FREERESULT($result);
 
 // Load main template
-$OUT = loadTemplate('sponsor_welcome', true, $content);
+$GLOBALS['sponsor_output'] = loadTemplate('sponsor_welcome', true, $content);
 
 // [EOF]
 ?>

diff --git a/templates/de/emails/admin/admin_sponsor_change_data.tpl b/templates/de/emails/admin/admin_sponsor_change_data.tpl
index e4cdbbaafe43fc1bcab8130d773bc759c7bd06f9..f3749b377fcc69396f9248e75d44e6d2c1d6ecbf 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_change_data.tpl
+++ b/templates/de/emails/admin/admin_sponsor_change_data.tpl
@@ -9,7 +9,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[new_data][tax_ident] ($content[tax_ident])
 ------------------------------
 {--GUEST_GENDER--}: {%pipe,translateGender=$content[new_data][gender]%} ({%pipe,translateGender=$content[gender]%})
-{--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$userid%} {%sponsor,family=$userid%})
+{--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])

diff --git a/templates/de/emails/admin/admin_sponsor_change_email.tpl b/templates/de/emails/admin/admin_sponsor_change_email.tpl
index 351b9558021159a2cab7981be98f92cdda675ae3..30b7b835e75bcbeaaf102e2ce907a07971a2fe36 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_change_email.tpl
+++ b/templates/de/emails/admin/admin_sponsor_change_email.tpl
@@ -9,7 +9,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[new_data][tax_ident] ($content[tax_ident])
 ------------------------------
 {--GUEST_GENDER--}: {%pipe,translateGender=$content[new_data][gender]%} ({%pipe,translateGender=$content[gender]%})
-{--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$userid%} {%sponsor,family=$userid%})
+{--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])

diff --git a/templates/de/emails/admin/admin_sponsor_edit.tpl b/templates/de/emails/admin/admin_sponsor_edit.tpl
index eefa78d06f4f2fec86dc236b97d98ce1df909dfa..90871c2ea354026abeb3af2eb5d57d559d552c12 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_edit.tpl
+++ b/templates/de/emails/admin/admin_sponsor_edit.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
+Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 ------------------------------
 Ihre Sponsor-Id lautet: $content[id]
@@ -12,8 +12,8 @@ Es sind nun folgende Daten gesetzt:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $content[position]
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[tax_ident]
 ------------------------------
-{--GUEST_GENDER--}: {%sponsor,gender,translateGender=$userid%}
-{--SURNAME_FAMILY--}: {%sponsor,surname=$userid%} {%sponsor,family=$userid%}
+{--GUEST_GENDER--}: {%sponsor,gender,translateGender=$content[id]%}
+{--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]

diff --git a/templates/de/emails/admin/admin_sponsor_pending.tpl b/templates/de/emails/admin/admin_sponsor_pending.tpl
index cc5a08e37db0f1df81cb198626ee7e25cad86dd3..b7086cc993dc1854dec94efb7059d8bc24804bfc 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_pending.tpl
+++ b/templates/de/emails/admin/admin_sponsor_pending.tpl
@@ -18,9 +18,9 @@ Ihre Sponsor-Id lautet: $content[id]
 ------------------------------
 Anrede: {%pipe,translateGender=$content[gender]%}
 ------------------------------
-Vorname: {%sponsor,surname=$userid%}
+Vorname: {%sponsor,surname=$content[id]%}
 ------------------------------
-Nachname: {%sponsor,family=$userid%}
+Nachname: {%sponsor,family=$content[id]%}
 ------------------------------
 -- Firmendaten:             --
 ------------------------------

diff --git a/templates/de/emails/del_sponsor.tpl b/templates/de/emails/del_sponsor.tpl
index cc4d16e98a403cfbfcd8caef2674c776ba4ed62e..c2e7502b3ee299b49296ee4fe37e05d1d04cd593 100644 (file)
--- a/templates/de/emails/del_sponsor.tpl
+++ b/templates/de/emails/del_sponsor.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
+Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Einer unserer Administratoren hat soeben Ihren Account gelöscht!
 
@@ -6,7 +6,7 @@ Grund der Loeschung war folgender:
 ------------------------------------
 $content[reason]
 ------------------------------------
-Ihre Sponsor-Id war: $userid
+Ihre Sponsor-Id war: $content[id]
 ------------------------------------
 
 Wir wünschen Ihnen weiterhin noch alles Gute und können Sie vielleicht irgentwann einmal wieder als Sponsor begruessen.

diff --git a/templates/de/emails/lock_sponsor.tpl b/templates/de/emails/lock_sponsor.tpl
index 40c9a3ff589a673dd1b8d8a448fc4ed96cc994cd..366b019a37061487ac38bd37e2bea2a864d3c736 100644 (file)
--- a/templates/de/emails/lock_sponsor.tpl
+++ b/templates/de/emails/lock_sponsor.tpl
@@ -1,7 +1,7 @@
-Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
+Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 --------------------------
-Ihre Sponsor-Id bei uns: $userid
+Ihre Sponsor-Id bei uns: $content[id]
 --------------------------
 
 $content[message]

diff --git a/templates/de/emails/sponsor/sponsor_activate.tpl b/templates/de/emails/sponsor/sponsor_activate.tpl
index 12226be3eb68771ab06cf20fe7fd56f2eda71889..1255ee69f5677a6751e6feca28145172a993ddc9 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_activate.tpl
+++ b/templates/de/emails/sponsor/sponsor_activate.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
+Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%}) haben soeben Ihren Bestätigungslink erneut angefordert.
 

diff --git a/templates/de/emails/sponsor/sponsor_add_points.tpl b/templates/de/emails/sponsor/sponsor_add_points.tpl
index 945f2d245f76758873c0fd9c7577a5c89c2acef8..0151bb5804f3e5426a284266618a8066a10bf1af 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_add_points.tpl
+++ b/templates/de/emails/sponsor/sponsor_add_points.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
+Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Einer unserer Administratoren hat Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} Ihrem Sponsoren-Account mit der id $content[id] gutgeschrieben!
 

diff --git a/templates/de/emails/sponsor/sponsor_change_data.tpl b/templates/de/emails/sponsor/sponsor_change_data.tpl
index 9442472c1d78afd9bcefe19c5512eef5cbb266ee..1ab83fbe03a5c2a1ee6f6a4de8d075c5c9200562 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_change_data.tpl
+++ b/templates/de/emails/sponsor/sponsor_change_data.tpl
@@ -4,15 +4,15 @@ Sie haben heute Ihre Daten geaendert.
 
 Hier sind alle neuen (und in Klammern alten) Daten:
 ------------------------------
-{--SPONSOR_ENTER_COMPANY_TITLE--}: $content[company] ({%sponsor,company=$userid%})
-{--SPONSOR_ENTER_COMPANY_POSITION--}: $content[position] ({%sponsor,position=$userid%})
-{--SPONSOR_ENTER_TAX_IDENT--}: $content[tax_ident] ({%sponsor,tax_ident=$userid%})
-------------------------------
-{--GUEST_GENDER--}: $content[gender] ({%sponsor,gender,translateGender=$userid%})
-{--SURNAME_FAMILY--}: $content[surname] $content[family] ({%sponsor,surname=$userid%} {%sponsor,family=$userid%})
-{--SPONSOR_EMAIL_STREET_NR1--}: $content[street_nr1] ({%sponsor,street_nr1=$userid%})
-{--SPONSOR_EMAIL_STREET_NR2--}: $content[street_nr2] ({%sponsor,street_nr2=$userid%})
-{--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $content[country]-$content[zip] $content[city] ({%sponsor,country,determineCountry=$userid%}-{%sponsor,zip,bigintval=$userid%} {%sponsor,city=$userid%})
+{--SPONSOR_ENTER_COMPANY_TITLE--}: $content[company] ({%sponsor,company=$content[id]%})
+{--SPONSOR_ENTER_COMPANY_POSITION--}: $content[position] ({%sponsor,position=$content[id]%})
+{--SPONSOR_ENTER_TAX_IDENT--}: $content[tax_ident] ({%sponsor,tax_ident=$content[id]%})
+------------------------------
+{--GUEST_GENDER--}: $content[gender] ({%sponsor,gender,translateGender=$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_ENTER_PHONE--}: $content[phone] ($content[phone])
 {--SPONSOR_ENTER_FAX--}: $content[fax] ($content[fax])

diff --git a/templates/de/emails/sponsor/sponsor_confirm.tpl b/templates/de/emails/sponsor/sponsor_confirm.tpl
index 112316a99969e58a774999e2aeb2476b893aad73..6023a4c90affdbf6b80c369971358a6cf408b786 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_confirm.tpl
+++ b/templates/de/emails/sponsor/sponsor_confirm.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
+Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%}) haben sich soeben als Sponsor zu unserem {?mt_word?} angemeldet. Sie haben somit den ersten Schritt zu uns getan wofür wir uns sehr bedanken.
 

diff --git a/templates/de/emails/sponsor/sponsor_email.tpl b/templates/de/emails/sponsor/sponsor_email.tpl
index 0535d99cb342f42903ab17770fc8da2c00b04707..90b15d069ba0134f957c01f6bc7e36435ca9bfd7 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_email.tpl
+++ b/templates/de/emails/sponsor/sponsor_email.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
+Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Sie hatten bei uns Ihre EMail-Adresse geändert und den Bestätigungslink erneut angefordert. Hier sind nun alle nötigen Daten dazu.
 

diff --git a/templates/de/emails/sponsor/sponsor_lost.tpl b/templates/de/emails/sponsor/sponsor_lost.tpl
index d3e246943ad80e3bc4c38094be705eaac4eb9a14..84700abcadf1c6ffabff206457e1fe60dc543fae 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_lost.tpl
+++ b/templates/de/emails/sponsor/sponsor_lost.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
+Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%}) haben soeben ein neues Passwort angefordert.
 

diff --git a/templates/de/emails/sponsor/sponsor_pending.tpl b/templates/de/emails/sponsor/sponsor_pending.tpl
index fd034d774e83a1788e776d4ed3f3a8a9b2331d26..dad61edde543a76ffe6d51e2f0e609aa00b9d97d 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_pending.tpl
+++ b/templates/de/emails/sponsor/sponsor_pending.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
+Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Sie haben soeben Ihre EMail-Adresse bestätigt. Dies wurde von der IP-Nummer {%server,remote_addr%} aus durchgefuehrt.
 
@@ -17,31 +17,31 @@ Ihre Sponsor-Id lautet: $content[id]
 ------------------------------
 -- Persoenliche Daten:      --
 ------------------------------
-Anrede: {%sponsor,gender,translateGender=$userid%}
+Anrede: {%sponsor,gender,translateGender=$content[id]%}
 ------------------------------
-Vorname: {%sponsor,surname=$userid%}
+Vorname: {%sponsor,surname=$content[id]%}
 ------------------------------
-Nachname: {%sponsor,family=$userid%}
+Nachname: {%sponsor,family=$content[id]%}
 ------------------------------
 -- Firmendaten:             --
 ------------------------------
-Firmenname: {%sponsor,company=$userid%}
+Firmenname: {%sponsor,company=$content[id]%}
 ------------------------------
-Position: {%sponsor,position=$userid%}
+Position: {%sponsor,position=$content[id]%}
 ------------------------------
-Ust-Ident-Nr.: {%sponsor,tax_ident=$userid%}
+Ust-Ident-Nr.: {%sponsor,tax_ident=$content[id]%}
 ------------------------------
 -- Kontaktdaten:            --
 ------------------------------
-Strasse, Zeile 1: {%sponsor,street_nr1=$userid%}
+Strasse, Zeile 1: {%sponsor,street_nr1=$content[id]%}
 ------------------------------
-Strasse, Zeile 2: {%sponsor,street_nr2=$userid%}
+Strasse, Zeile 2: {%sponsor,street_nr2=$content[id]%}
 ------------------------------
-Ländercode: {%sponsor,country,determineCountry=$userid%}
+Ländercode: {%sponsor,country,determineSponsorCountry=$content[id]%}
 ------------------------------
-Postleitzahl: {%sponsor,zip,bigintval=$userid%}
+Postleitzahl: {%sponsor,zip,bigintval=$content[id]%}
 ------------------------------
-Wohnort: {%sponsor,city=$userid%}
+Wohnort: {%sponsor,city=$content[id]%}
 ------------------------------
 Telefonnummer: $content[phone]
 ------------------------------

diff --git a/templates/de/emails/sponsor/sponsor_ref_notify.tpl b/templates/de/emails/sponsor/sponsor_ref_notify.tpl
index f6048435a7b139416f21d3c4f556567d6996bfac..bedb5dfd724fe11b859f00c8b16bb3106f825fa8 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_ref_notify.tpl
+++ b/templates/de/emails/sponsor/sponsor_ref_notify.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
+Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 ------------------------------
 Ihre Sponsor-Id lautet: $content[id]

diff --git a/templates/de/emails/sponsor/sponsor_settings.tpl b/templates/de/emails/sponsor/sponsor_settings.tpl
index a0ec011bd7c4be18d81b7287d592225da4b276cc..103f348c8e585ca5fe4067aeb8269f4c440d9d36 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_settings.tpl
+++ b/templates/de/emails/sponsor/sponsor_settings.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
+Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Sie haben heute Ihre Einstellungen geaendert.
 

diff --git a/templates/de/emails/sponsor/sponsor_sub_points.tpl b/templates/de/emails/sponsor/sponsor_sub_points.tpl
index 28f1e6e5f5545b4889224a67403ba6ab323a1b11..55f0e08ce9cf3da1b6929635a05d11141dd2721f 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_sub_points.tpl
+++ b/templates/de/emails/sponsor/sponsor_sub_points.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
+Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Einer unserer Administratoren hat Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} von Ihrem Sponsoren-Account mit der id $content[id] abgezogen!
 

diff --git a/templates/de/emails/sponsor/sponsor_unlock.tpl b/templates/de/emails/sponsor/sponsor_unlock.tpl
index 12226be3eb68771ab06cf20fe7fd56f2eda71889..1255ee69f5677a6751e6feca28145172a993ddc9 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_unlock.tpl
+++ b/templates/de/emails/sponsor/sponsor_unlock.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
+Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%}) haben soeben Ihren Bestätigungslink erneut angefordert.
 

diff --git a/templates/de/emails/sponsor/sponsor_unlocked.tpl b/templates/de/emails/sponsor/sponsor_unlocked.tpl
index 473b404b974376faca78b11654a7ea223fb92e27..077bf4987585f90771a5abab675d5e6b0fddc5f7 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_unlocked.tpl
+++ b/templates/de/emails/sponsor/sponsor_unlocked.tpl
@@ -1,4 +1,4 @@
-Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
+Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%},
 
 ------------------------------
 Ihre Sponsor-Id lautet: $content[id]

diff --git a/templates/de/html/guest/guest_menu_whats.tpl b/templates/de/html/guest/guest_menu_whats.tpl
index 9bf5b19391b69d5855695c8cea8aaf10230a738b..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
--- a/templates/de/html/guest/guest_menu_whats.tpl
+++ b/templates/de/html/guest/guest_menu_whats.tpl
@@ -1,8 +1 @@
-<tr>
-       <td class="guest_menu_whats {%pipe,getMenuCssClasses=$content[visible]|$content[locked]%}">
-               <div class="{%pipe,getMenuCssClasses=$content[visible]|$content[locked]%}">
-                       <strong><big>&middot;</big></strong>
-                       $content
-               </div>
-       </td>
-</tr>
+<!-- @DEPRECATED //-->

diff --git a/templates/de/html/member/member_menu_whats.tpl b/templates/de/html/member/member_menu_whats.tpl
index 68b8776a7a58eda83b8cd63d8122ea58888390d2..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
--- a/templates/de/html/member/member_menu_whats.tpl
+++ b/templates/de/html/member/member_menu_whats.tpl
@@ -1,8 +1 @@
-<tr>
-       <td class="member_menu_whats {%pipe,getMenuCssClasses=$content[visible]|$content[locked]%}">
-               <div class="{%pipe,getMenuCssClasses=$content[visible]|$content[locked]%}">
-                       <strong><big>&middot;</big></strong>
-                       $content
-               </div>
-       </td>
-</tr>
+<!-- @DEPRECATED //-->

diff --git a/templates/de/html/sponsor/sponsor_account_form.tpl b/templates/de/html/sponsor/sponsor_account_form.tpl
index e266275811f93e0341f5bb5009c33e53f67553e4..c104ff0e9b6e65e067d63a3b34e030f111ff4009 100644 (file)
--- a/templates/de/html/sponsor/sponsor_account_form.tpl
+++ b/templates/de/html/sponsor/sponsor_account_form.tpl
@@ -11,7 +11,7 @@
     {--SPONSOR_ENTER_COMPANY_TITLE--}:
   </td>
   <td class="bottom">
-    <input type="text" name="company" class="guest_normal" size="20" maxlength="255" value="{%sponsor,company=$userid%}" />
+    <input type="text" name="company" class="guest_normal" size="20" maxlength="255" value="{%sponsor,company=$content[id]%}" />
   </td>
 </tr>
 <tr>
@@ -19,7 +19,7 @@
     {--SPONSOR_ENTER_COMPANY_POSITION--}:
   </td>
   <td class="bottom">
-    <input type="text" name="position" class="guest_normal" size="20" maxlength="255" value="{%sponsor,position=$userid%}" />
+    <input type="text" name="position" class="guest_normal" size="20" maxlength="255" value="{%sponsor,position=$content[id]%}" />
   </td>
 </tr>
 <tr>
@@ -27,7 +27,7 @@
     {--SPONSOR_ENTER_TAX_IDENT--}:
   </td>
   <td class="bottom">
-    <input type="text" name="tax_ident" class="guest_normal" size="20" maxlength="255" value="{%sponsor,tax_ident=$userid%}" />
+    <input type="text" name="tax_ident" class="guest_normal" size="20" maxlength="255" value="{%sponsor,tax_ident=$content[id]%}" />
   </td>
 </tr>
 <tr>
@@ -52,7 +52,7 @@
     {--GUEST_SURNAME--}:
   </td>
   <td class="bottom">
-    <input type="text" name="surname" class="guest_normal" size="20" maxlength="255" value="{%sponsor,surname=$userid%}" />
+    <input type="text" name="surname" class="guest_normal" size="20" maxlength="255" value="{%sponsor,surname=$content[id]%}" />
   </td>
 </tr>
 <tr>
@@ -60,7 +60,7 @@
     {--GUEST_FAMILY--}:
   </td>
   <td class="bottom">
-    <input type="text" name="family" class="guest_normal" size="20" maxlength="255" value="{%sponsor,family=$userid%}" />
+    <input type="text" name="family" class="guest_normal" size="20" maxlength="255" value="{%sponsor,family=$content[id]%}" />
   </td>
 </tr>
 <tr>
@@ -73,7 +73,7 @@
     {--SPONSOR_ENTER_STREET_NR1--}:
   </td>
   <td class="bottom">
-    <input type="text" name="street_nr1" class="guest_normal" size="20" maxlength="255" value="{%sponsor,street_nr1=$userid%}" />
+    <input type="text" name="street_nr1" class="guest_normal" size="20" maxlength="255" value="{%sponsor,street_nr1=$content[id]%}" />
   </td>
 </tr>
 <tr>
@@ -81,7 +81,7 @@
     {--SPONSOR_ENTER_STREET_NR2--}:
   </td>
   <td class="bottom">
-    <input type="text" name="street_nr2" class="guest_normal" size="20" maxlength="255" value="{%sponsor,street_nr2=$userid%}" />
+    <input type="text" name="street_nr2" class="guest_normal" size="20" maxlength="255" value="{%sponsor,street_nr2=$content[id]%}" />
   </td>
 </tr>
 <tr>
@@ -89,8 +89,8 @@
     {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:
   </td>
   <td class="bottom">
-    <input type="text" name="country" class="guest_normal" size="2" maxlength="2" value="{%sponsor,country,determineCountry=$userid%}" />-<input type="text" name="zip" class="guest_normal" size="5" maxlength="6" value="{%sponsor,zip,bigintval=$userid%}" />
-    <input type="text" name="city" class="guest_normal" size="10" maxlength="255" value="{%sponsor,city=$userid%}" />
+    <input type="text" name="country" class="guest_normal" size="2" maxlength="2" value="{%sponsor,country=$content[id]%}" />-<input type="text" name="zip" class="guest_normal" size="5" maxlength="6" value="{%sponsor,zip,bigintval=$content[id]%}" />
+    <input type="text" name="city" class="guest_normal" size="10" maxlength="255" value="{%sponsor,city=$content[id]%}" />
   </td>
 </tr>
 <tr>

diff --git a/templates/de/html/sponsor/sponsor_action.tpl b/templates/de/html/sponsor/sponsor_action.tpl
index 70275b57a2940495353bd89a80009e8f9b7c6f45..81feff45694305bd658894a5e68cc10811ce4932 100644 (file)
--- a/templates/de/html/sponsor/sponsor_action.tpl
+++ b/templates/de/html/sponsor/sponsor_action.tpl
@@ -1,4 +1,5 @@
-<table border="0" cellspacing="0" cellpadding="0" width="100%">
+<div align="left">
+<table border="0" cellspacing="0" cellpadding="0" class="sponsor_menu">
 <tr>
   <td class="sponsor_action bottom left right" align="center">
     <strong>$content[title]</strong>
@@ -6,3 +7,4 @@
 </tr>
 $content[menu]
 </table>
+</div>

diff --git a/templates/de/html/sponsor/sponsor_header.tpl b/templates/de/html/sponsor/sponsor_header.tpl
index d47a0c007381f5151c7bd6b2f3229b5da82c9749..5b2c21c549b4911f5471aff7acb3064926e2bddf 100644 (file)
--- a/templates/de/html/sponsor/sponsor_header.tpl
+++ b/templates/de/html/sponsor/sponsor_header.tpl
@@ -1,3 +1,3 @@
-<div class="para big">
+<div class="big">
        Willkommen zum Sponsorenbereich von {?MAIN_TITLE?}
 </div>

diff --git a/templates/de/html/sponsor/sponsor_welcome.tpl b/templates/de/html/sponsor/sponsor_welcome.tpl
index 90cdd38a8e1922ae146577c5c10ab5c5add3772b..dc214fed8fb38e75e579f49c60cd2665e2d4a275 100644 (file)
--- a/templates/de/html/sponsor/sponsor_welcome.tpl
+++ b/templates/de/html/sponsor/sponsor_welcome.tpl
@@ -1,11 +1,11 @@
 <div class="para">
-Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%}!
+       Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}!
 </div>
 
 <div class="para">
-Sch&ouml;n, dass wir Sie wieder in unserem Sponsorenbereich begr&uuml;ssen d&uuml;rfen!
+       Sch&ouml;n, dass wir Sie wieder in unserem Sponsorenbereich begr&uuml;ssen d&uuml;rfen!
 </div>
 
 <div class="para">
-Sie haben noch <strong>{%pipe,translateComma=$content[points]%} {?POINTS?}</strong> f&uuml;r weitere Sponsorenaktionen &uuml;brig.
+       Sie haben noch <strong>{%pipe,translateComma=$content[points]%} {?POINTS?}</strong> f&uuml;r weitere Sponsorenaktionen &uuml;brig.
 </div>

diff --git a/templates/de/html/sponsor/sponsor_what.tpl b/templates/de/html/sponsor/sponsor_what.tpl
index d493cc88bf5a4df7df019be6c967ba4e5502f57d..4dceaefee742839204f0e4247104d1da21daec3b 100644 (file)
--- a/templates/de/html/sponsor/sponsor_what.tpl
+++ b/templates/de/html/sponsor/sponsor_what.tpl
@@ -1,6 +1,8 @@
 <tr>
        <td class="sponsor_what bottom left right">
-               <strong><big>&middot;</big></strong>
-               <a class="menu_blur" href="{%url=modules.php?module=sponsor&amp;what=$content[what]%}">$content[title]</a>
+               <a class="menu_blur" href="{%url=modules.php?module=sponsor&amp;what=$content[what]%}">
+                       <strong><big>&middot;</big></strong>
+                       $content[title]
+               </a>
        </td>
 </tr>

diff --git a/theme/business/css/general.css b/theme/business/css/general.css
index e7cd475405117269dbc094faf91e9109811fd2f5..fd405cb6c30535a09556cf1ad2147bcf5e99083d 100644 (file)
--- a/theme/business/css/general.css
+++ b/theme/business/css/general.css
@@ -292,8 +292,7 @@ a.admin_logout {
        border: 1px solid #000000;
 }
 
-.guest_menu_row, .guest_menu_bottom, .member_menu_row, .member_menu_bottom
-       {
+.guest_menu_row, .guest_menu_bottom, .member_menu_row, .member_menu_bottom {
        border: 1px solid #000000;
        border-top: 0px;
        background-color: #ffffff;

diff --git a/theme/business/css/sponsor.css b/theme/business/css/sponsor.css
index 5e51c8bd5a14d4f7bbdc2e505eb9e2c72fb8f64b..4b609d83b9892aea2ffa2f85698af84e3fd5d96c 100644 (file)
--- a/theme/business/css/sponsor.css
+++ b/theme/business/css/sponsor.css
@@ -3,7 +3,7 @@
 }
 
 .sponsor_what {
-       height: 24px;
+       height: 22px;
 }
 
 .sponsor_header, .sponsor_footer {
@@ -12,5 +12,11 @@
 
 .sponsor_action {
        background-color: #EEEEFF;
-       height: 25px;
+       height: 22px;
+}
+
+.sponsor_menu {
+       margin: 0px;
+       padding: 0px;
+       width: 200px;
 }

diff --git a/theme/default/css/general.css b/theme/default/css/general.css
index 3292bbcf39969acad8bc254fd9ac6de0903f27e5..ec294ad5981a0f43c97bd31fd4f42fd624185c13 100644 (file)
--- a/theme/default/css/general.css
+++ b/theme/default/css/general.css
@@ -324,8 +324,7 @@ a.admin_logout {
        border: 1px solid #00aa44;
 }
 
-.guest_menu_row, .guest_menu_bottom, .member_menu_row, .member_menu_bottom
-       {
+.guest_menu_row, .guest_menu_bottom, .member_menu_row, .member_menu_bottom {
        border: 1px solid #00aa44;
        border-top: 0px;
        background-color: #eeffbc;

diff --git a/theme/default/css/sponsor.css b/theme/default/css/sponsor.css
index 924d6d0fec81396429d3f9e4132ab210d482aedf..3e2ad862f08f7cc65c57582936df2b5ae05560d1 100644 (file)
--- a/theme/default/css/sponsor.css
+++ b/theme/default/css/sponsor.css
@@ -8,9 +8,15 @@
 
 .sponsor_action {
        background-color: #CCDDCC;
-       height: 25px;
+       height: 22px;
 }
 
 .sponsor_what {
-       height: 24px;
+       height: 22px;
+}
+
+.sponsor_menu {
+       margin: 0px;
+       padding: 0px;
+       width: 200px;
 }

diff --git a/theme/desert/css/sponsor.css b/theme/desert/css/sponsor.css
index 4ae7594bff0e59238e57ebaaea7cd4b81619762a..5cd65ae4e1e346872f5023fdd6690db34e996c2d 100644 (file)
--- a/theme/desert/css/sponsor.css
+++ b/theme/desert/css/sponsor.css
@@ -4,7 +4,7 @@
 
 .sponsor_action {
        background-color: #DDDDAA;
-       height: 25px;
+       height: 22px;
 }
 
 .sponsor_header, .sponsor_footer {
@@ -13,16 +13,11 @@
 
 .sponsor_what {
        background-color: #FFFFCC;
-       height: 24px;
+       height: 22px;
 }
 
-TR.sponsor_row_blur:hover {
-       background-color: #DDDDAA;
+.sponsor_menu {
+       margin: 0px;
+       padding: 0px;
+       width: 200px;
 }
-
-A.sponsor_blur {
-       display: block;
-       height: 33px;
-       padding-top: 9px;
-       padding-left: 7px;
-}
\ No newline at end of file

diff --git a/theme/org/css/sponsor.css b/theme/org/css/sponsor.css
index d703841371fdb4bc2a5290f34c966e9ebfe31663..3e2ad862f08f7cc65c57582936df2b5ae05560d1 100644 (file)
--- a/theme/org/css/sponsor.css
+++ b/theme/org/css/sponsor.css
@@ -1,25 +1,22 @@
 .sponsor_table {
-       background-color        : #DDEEDD;
+       background-color: #DDEEDD;
 }
 
 .sponsor_header, .sponsor_footer {
-       background-color        : #CCDDCC;
+       background-color: #CCDDCC;
 }
 
 .sponsor_action {
-       background-color        : #CCDDCC;
-       height                  : 27px;
+       background-color: #CCDDCC;
+       height: 22px;
 }
 
 .sponsor_what {
-       height                  : 24px;
+       height: 22px;
 }
 
-.sponsor_menu_blur {
-     display             : block;
-       height                  : 24px;
-}
-
-.sponsor_menu_blur:hover {
-     background-color    : #CCDDCC;
+.sponsor_menu {
+       margin: 0px;
+       padding: 0px;
+       width: 200px;
 }