Duplicate message id GUEST_GENDER removed, column type TIMESTAMP in ext-sponsor,

- Duplicate message id GUEST_GENDER removed and rewritten to GENDER
- Database column type TIMESTAMP (VARCHAR(10) is very old) used in ext-sponsor
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 87b0400e2e784509ad90ccf9c6a5c62a996919c5..9f954a217757b33fa972ac772d5daf327df3bd9c 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -49,10 +49,10 @@
 ./inc/functions.php:2255:      // @TODO This is still very static, rewrite it somehow
 ./inc/gen_sql_patches.php:96:// @TODO Rewrite this to a filter
 ./inc/install-functions.php:59:        // @TODO DEACTIVATED: changeDataInFile(getCachePath() . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
-./inc/language/de.php:1117:// @TODO Rewrite these two constants
-./inc/language/de.php:1132:// @TODO Rewrite these three constants
+./inc/language/de.php:1116:// @TODO Rewrite these two constants
+./inc/language/de.php:1131:// @TODO Rewrite these three constants
 ./inc/language/de.php:300:     // @TODO Following two are unused?
-./inc/language/de.php:811:// @TODO Are these constants longer used?
+./inc/language/de.php:810:// @TODO Are these constants longer used?
 ./inc/language-functions.php:234:      // @TODO These are all valid languages, again hard-coded
 ./inc/language-functions.php:46:// @TODO Rewrite all language constants to this function.
 ./inc/language/rallye_de.php:13: * @TODO Naming convention not applied for language strings             *
@@ -73,6 +73,8 @@
 ./inc/libs/register_functions.php:292: // @TODO Rewrite these all to a single filter
 ./inc/libs/register_functions.php:362: // @TODO Rewrite this to a filter
 ./inc/libs/register_functions.php:369: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
+./inc/libs/sponsor_functions.php:162:                                  // @TODO Rewrite this to API function
+./inc/libs/sponsor_functions.php:433:                  // @TODO Rewrite this to API function
 ./inc/libs/surfbar_functions.php:1540:         // @TODO This can be somehow rewritten
 ./inc/libs/surfbar_functions.php:712:// @TODO Can't we use our new expression language instead of this ugly code?
 ./inc/libs/surfbar_functions.php:953:  // @TODO Invalid salt should be refused
@@ -81,9 +83,9 @@
 ./inc/libs/theme_functions.php:95:     // @TODO Can't this be rewritten to an API function?
 ./inc/libs/user_functions.php:146:     // @TODO These two constants are no longer used, maybe we reactivate this code?
 ./inc/libs/user_functions.php:234:// @TODO Double-check configuration entry here
-./inc/libs/user_functions.php:326:                     // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
-./inc/libs/user_functions.php:346:                     // @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
-./inc/libs/user_functions.php:422:     // @TODO We should try to rewrite this to fetchUserData() somehow
+./inc/libs/user_functions.php:327:                     // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
+./inc/libs/user_functions.php:347:                     // @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+./inc/libs/user_functions.php:423:     // @TODO We should try to rewrite this to fetchUserData() somehow
 ./inc/libs/yoomedia_functions.php:116: $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script
 ./inc/load_config.php:77:      // @TODO Rewrite them to avoid this else block
 ./inc/loader/load_cache-extension.php:13: * @TODO Rewrite this whole file to load_cache-extensions.php           *
@@ -146,7 +148,7 @@
 ./inc/modules/admin/what-usr_online.php:51:    // @TODO Add a filter for sponsor
 ./inc/modules/guest/what-beg.php:53:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
 ./inc/modules/guest/what-confirm.php:111:                                      // @TODO Try to rewrite the following unset()
-./inc/modules/guest/what-login.php:114:        // @TODO Move this HTML code into a template
+./inc/modules/guest/what-login.php:123:        // @TODO Move this HTML code into a template
 ./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>';

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index 34929498f932b1ba54daf6e4bf497e395dadd35c..4fb25ee3af6ce3dea3f9482a39729071b003644c 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -207,7 +207,7 @@ PRIMARY KEY (`network_cache_id`)
 `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `network_reload_lock` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0,
-`network_inserted` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP(),
+`network_inserted` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 UNIQUE `provider_type` (`network_id`,`network_type_id`),
 PRIMARY KEY (`network_reload_id`)
 ) TYPE={?_TABLE_TYPE?} COMMENT='Reload locks'");

diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php
index 581cf90c5a55f91842cf8c49cee3a38bcb281ebd..ac6fc0fb201a0cf1fef295aeeb510b769af96056 100644 (file)
--- a/inc/extensions/ext-sponsor.php
+++ b/inc/extensions/ext-sponsor.php
@@ -83,9 +83,9 @@ switch (getExtensionMode()) {
 `url` VARCHAR(255) NOT NULL DEFAULT '',
 `password` VARCHAR(255) NOT NULL DEFAULT '',
 `remote_addr` VARCHAR(15) NOT NULL DEFAULT '0.0.0.0',
-`sponsor_created` VARCHAR(10) NOT NULL DEFAULT 0,
-`last_online` VARCHAR(10) NOT NULL DEFAULT 0,
-`last_change` VARCHAR(10) NOT NULL DEFAULT 0,
+`sponsor_created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+`last_online` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00',
+`last_change` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00',
 `status` ENUM('UNCONFIRMED','PENDING','CONFIRMED','LOCKED') NOT NULL DEFAULT 'UNCONFIRMED',
 `receive_warnings` ENUM('Y','N') NOT NULL DEFAULT 'Y',
 `warning_interval` BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(getConfig('ONE_DAY')*7)."',
@@ -113,8 +113,8 @@ PRIMARY KEY (`id`)
 `payment_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `pay_count` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `pay_status` ENUM('PENDING','PAYED','UNPAYED','DELETED') NOT NULL DEFAULT 'PENDING',
-`pay_ordered` VARCHAR(10) NOT NULL DEFAULT 0,
-`pay_done` VARCHAR(10) NOT NULL DEFAULT 0,
+`pay_ordered` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+`pay_done` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00',
 INDEX (`payment_id`),
 INDEX (`regid`),
 INDEX (`admin_id`),
@@ -170,7 +170,7 @@ PRIMARY KEY (`id`)
 `admin_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `ext_name` VARCHAR(255) NOT NULL DEFAULT 'sponsor',
 `is_active` ENUM('Y','N') NOT NULL DEFAULT 'N',
-`stamp_added` VARCHAR(10) NOT NULL DEFAULT 0,
+`stamp_added` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 INDEX (`ext_name`),
 INDEX (`admin_id`),
 PRIMARY KEY (`id`)
@@ -214,14 +214,15 @@ PRIMARY KEY (`id`)
 `sponsor_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `admin_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `campaign_name` VARCHAR(255) NOT NULL DEFAULT '',
-`campaign_start` VARCHAR(10) NOT NULL DEFAULT 0,
-`campaign_end` VARCHAR(10) NOT NULL DEFAULT 0,
+`campaign_created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+`campaign_start` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00',
+`campaign_end` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00',
 `campaign_amount` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
 `campaign_expired` ENUM('Y','N') NOT NULL DEFAULT 'N',
 `campaign_locked` ENUM('Y','N') NOT NULL DEFAULT 'Y',
-`campaign_ended` VARCHAR(10) NOT NULL DEFAULT 0,
+`campaign_ended` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00',
 `locked_reason` TINYTEXT,
-`locked_timestamp` VARCHAR(10) NOT NULL DEFAULT 0,
+`locked_timestamp` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00',
 `status` ENUM('PENDING','ACTIVE','LOCKED') NOT NULL DEFAULT 'PENDING',
 INDEX (`admin_id`),
 INDEX (`sponsor_id`),
@@ -302,7 +303,7 @@ PRIMARY KEY (`id`)
                //
                // Add default entries
                //
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_registry` (`ext_name`, `is_active`, `admin_id`, `stamp_added`) VALUES ('sponsor','N',".getCurrentAdminId().",UNIX_TIMESTAMP())");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_registry` (`ext_name`, `is_active`, `admin_id`, `stamp_added`) VALUES ('sponsor','N',".getCurrentAdminId().",NOW())");
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_action_convert` (`ext_name`, `conv_rate`, `conv_name`) VALUES ('sponsor','10','Mails')");
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_paytypes` (`pay_name`,`pay_min_count`,`pay_rate`,`pay_currency`) VALUES ('Standart-Paket', 5, 1000.00000, '€')");
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_paytypes` (`pay_name`,`pay_min_count`,`pay_rate`,`pay_currency`) VALUES ('Spar-Paket', 1, 200.00000, '€')");

diff --git a/inc/language/de.php b/inc/language/de.php
index a905e24c223f947016308237ebcb65ce74986b75..99d0cc09987a0ac142af4adcb8fb582875b13884 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -318,7 +318,6 @@ addMessages(array(
        'LAST_MODULE' => "Ihr zuletzt ausgewähltes Modul",
        'MEMBER_EDIT_PROFILE' => "Profildaten ändern",
        'GENDER' => "Geschlecht",
-       'GUEST_GENDER' => "Geschlecht",
        'GENDER_M' => "Herr",
        'GENDER_F' => "Frau",
        'GENDER_C' => ""Firma"",

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index faca46db8506fa7d15fb4a6c0c0963c6aff83642..07970d3a29526bb4b2e861968a104b5deb190a7b 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -134,7 +134,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(),
                                $sql = "UPDATE `{?_MYSQL_PREFIX?}_sponsor_data` SET ";
                                foreach ($DATA['keys'] as $k => $v) {
                                        $sql .= $v."='%s', ";
-                               }
+                               } // END - foreach
 
                                // Remove last ", " from SQL string
                                $sql = substr($sql, 0, -2)." WHERE `id`=%s LIMIT 1";
@@ -145,7 +145,6 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(),
                                $ret = 'updated';
                        } elseif (($ALREADY === false) || (($postData['force'] == 1) && (isAdmin()))) {
                                // Add new sponsor, first add more data
-                               $DATA['keys'][] = 'sponsor_created'; $DATA['values'][] = time();
                                $DATA['keys'][] = 'status';
                                if (($update === true) && (isAdmin()) && (getWhat() == 'add_sponsor')) {
                                        // Only allowed for admin
@@ -160,6 +159,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray=array(),
 
                                        // Generate hash code
                                        $DATA['keys'][] = 'hash';
+                                       // @TODO Rewrite this to API function
                                        $DATA['values'][] = md5(session_id().':'.$postData['email'].':'.detectRemoteAddr().':'.detectUserAgent().':'.time());
                                        $DATA['keys'][] = 'remote_addr';
                                        $DATA['values'][] = detectRemoteAddr();
@@ -362,7 +362,7 @@ function updateSponsorLogin () {
                SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_sponsor_data`
 SET
-       `last_online`=UNIX_TIMESTAMP()
+       `last_online`=NOW()
 WHERE
        `id`=%s AND
        `password`='%s'
@@ -430,14 +430,17 @@ function saveSponsorData ($postData, $content) {
                        $sql .= " `status`='EMAIL', `hash`='%s',";
 
                        // Generate hash code
-                       $HASH = md5(session_id().':'.$postData['email'].':'.detectRemoteAddr().':'.detectUserAgent().':'.time());
+                       // @TODO Rewrite this to API function
+                       $HASH = md5(session_id() . ':' . $postData['email'] . ':' . detectRemoteAddr() . ':' . detectUserAgent() . ':' . time());
                        $DATA[] = $HASH;
                } // END - if
        } // END - if
-
        // Remove last commata
        $sql = substr($sql, 0, -1);
 
+       // Add last_change
+       $sql .= ', `last_change`=NOW()';
+
        // Add SQL tail data
        $sql .= " WHERE `id`=%s AND `password`='%s' LIMIT 1";
        $DATA[] = bigintval(getSession('sponsor_id'));

diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php
index f54fd3141b1a41fa7a6f76ffec77f7b325f96b32..b7e6b0b95b9574b59d5e349e953295f7605ac1ed 100644 (file)
--- a/inc/modules/admin/what-del_sponsor.php
+++ b/inc/modules/admin/what-del_sponsor.php
@@ -56,7 +56,6 @@ if (isGetRequestParameterSet('id')) {
                        $content = SQL_FETCHARRAY($result);
 
                        // Prepare data for the template
-                       $content['gender']  = translateGender($content['gender']);
                        $content['reason']  = secureString(postRequestParameter('reason'));
 
                        // Prepare message and send it away

diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php
index 864e6fe6fdbdd50371159856e85019ba915c6d2c..43cf12da70440c3b36c3a24e02eeb6bc62eacf84 100644 (file)
--- a/inc/modules/admin/what-list_sponsor.php
+++ b/inc/modules/admin/what-list_sponsor.php
@@ -50,7 +50,11 @@ if (isGetRequestParameterSet('id')) {
        $result = SQL_QUERY_ESC("SELECT
        `company`, `position`, `gender`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`,
        `phone`, `fax`, `cell`, `email`, `url`, `tax_ident`,
-       `status`, `sponsor_created`, `last_online`, `last_change`, `receive_warnings`,
+       `status`,
+       UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`,
+       UNIX_TIMESTAMP(`last_online`) AS `last_online`,
+       UNIX_TIMESTAMP(`last_change`) AS `last_change`,
+       `receive_warnings`,
        `points_amount`, `points_used`, `remote_addr`, `warning_interval`, `refid`, `ref_count`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
@@ -99,7 +103,9 @@ WHERE
                // Sponsor found so let's list all his referals
                $result = SQL_QUERY_ESC("SELECT
        `id`, `gender`, `surname`, `family`, `email`, `status`,
-       `sponsor_created`, `last_online`, `points_amount`, `points_used`,
+       UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`,
+       UNIX_TIMESTAMP(`last_online`) AS `last_online`,
+       `points_amount`, `points_used`,
        `remote_addr`, `ref_count`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
@@ -125,7 +131,9 @@ ORDER BY
        // List all sponsors
        $result_main = SQL_QUERY("SELECT
        `id`, `gender`, `surname`, `family`, `email`, `status`,
-       `sponsor_created`, `last_online`, `points_amount`, `points_used`, `remote_addr`
+       UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`,
+       UNIX_TIMESTAMP(`last_online`) AS `last_online`,
+       `points_amount`, `points_used`, `remote_addr`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 ORDER BY

diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php
index f1ec7f1407b60895eca708a3b8ef32bcf6c6da8b..b750fae98e866655c817c60ad9ca438c08717763 100644 (file)
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -59,7 +59,9 @@ if (isFormSent()) {
 
                        // Load his personal data
                        $result_main = SQL_QUERY_ESC("SELECT
-       `id`, `gender`, `surname`, `family`, `email`, `remote_addr`, `sponsor_created`, `points_amount`, `points_used`, `refid`
+       `id`, `gender`, `surname`, `family`, `email`, `remote_addr`,
+       UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`,
+       `points_amount`, `points_used`, `refid`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
@@ -78,8 +80,9 @@ LIMIT 1",
 
                                // Check for open payments and close them
                                $result = SQL_QUERY_ESC("SELECT
-       so.admin_id, so.pay_count, so.pay_ordered, so.pay_status,
-       sp.pay_name, sp.pay_rate, sp.pay_currency
+       so.admin_id, so.pay_count,
+       UNIX_TIMESTAMP(so.pay_ordered) AS `pay_ordered`,
+       so.pay_status, sp.pay_name, sp.pay_rate, sp.pay_currency
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_orders` AS so
 LEFT JOIN
@@ -193,7 +196,8 @@ LIMIT 1",
 
 // Begin listing of all pending sponsor accounts
 $result = SQL_QUERY("SELECT
-       `id`, `gender`, `surname`, `family`, `email`, `remote_addr`, `sponsor_created`
+       `id`, `gender`, `surname`, `family`, `email`, `remote_addr`,
+       UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE

diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index 63439de1dbaa74217caaef3a42fcf8cdce7df5aa..85c1595ec94d7cd47d53ab0e77fe484f704a93bb 100644 (file)
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.php
@@ -157,9 +157,15 @@ LIMIT 1",
 
        if (isFormSent()) {
                // Check email
-               $result = SQL_QUERY_ESC("SELECT id, hash, status, remote_addr, gender, surname, family, sponsor_created
-FROM `{?_MYSQL_PREFIX?}_sponsor_data`
-WHERE email='%s' AND (`status`='UNCONFIRMED' OR `status`='EMAIL') LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT
+       `id`, `hash`, `status`, `remote_addr`, `gender`, `surname`, `family`,
+       UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`
+FROM
+       `{?_MYSQL_PREFIX?}_sponsor_data`
+WHERE
+       `email`='%s' AND
+       (`status`='UNCONFIRMED' OR `status`='EMAIL')
+LIMIT 1",
                array(postRequestParameter('email')), __FILE__, __LINE__);
 
                // Entry found?
@@ -203,7 +209,8 @@ WHERE email='%s' AND (`status`='UNCONFIRMED' OR `status`='EMAIL') LIMIT 1",
        if (isFormSent()) {
                // Check email
                $result = SQL_QUERY_ESC("SELECT
-       `id`, `hash`, `remote_addr`, `gender`, `surname`, `family`, `sponsor_created`
+       `id`, `hash`, `remote_addr`, `gender`, `surname`, `family`,
+       UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
@@ -218,12 +225,9 @@ LIMIT 1",
                        // Unconfirmed sponsor account found so let's load the requested data
                        $DATA = SQL_FETCHARRAY($result);
 
-                       // Translate some data
-                       $DATA['gender']          = translateGender($DATA['gender']);
-                       $DATA['sponsor_created'] = generateDateTime($DATA['sponsor_created']);
-
-                       // Generate password
+                       // Generate password/translate some data
                        $DATA['password']        = generatePassword();
+                       $DATA['sponsor_created'] = generateDateTime($DATA['sponsor_created']);
 
                        // Prepare email and send it to the sponsor
                        $message_sponsor = loadEmailTemplate('sponsor_lost', $DATA);

diff --git a/templates/de/emails/admin/admin_sponsor_change_data.tpl b/templates/de/emails/admin/admin_sponsor_change_data.tpl
index 39ca1a77490558bdeb967583d3aa59a8f6cd4419..c67efa93a521f5c0b6c5d6fbabcf1a8145610bf9 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_change_data.tpl
+++ b/templates/de/emails/admin/admin_sponsor_change_data.tpl
@@ -8,7 +8,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $content[new_data][position] ($content[position])
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[new_data][tax_ident] ($content[tax_ident])
 ------------------------------
-{--GUEST_GENDER--}: {%pipe,translateGender=$content[new_data][gender]%} ({%pipe,translateGender=$content[gender]%})
+{--GENDER--}: {%pipe,translateGender=$content[new_data][gender]%} ({%pipe,translateGender=$content[gender]%})
 {--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])

diff --git a/templates/de/emails/admin/admin_sponsor_change_email.tpl b/templates/de/emails/admin/admin_sponsor_change_email.tpl
index cbe9697fe80fc0d624845eb9a79fe6f29c92b1c2..debe1564f80f96219f45c9f57c9a1dadf665ea4a 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_change_email.tpl
+++ b/templates/de/emails/admin/admin_sponsor_change_email.tpl
@@ -8,7 +8,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $content[new_data][position] ($content[position])
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[new_data][tax_ident] ($content[tax_ident])
 ------------------------------
-{--GUEST_GENDER--}: {%pipe,translateGender=$content[new_data][gender]%} ({%pipe,translateGender=$content[gender]%})
+{--GENDER--}: {%pipe,translateGender=$content[new_data][gender]%} ({%pipe,translateGender=$content[gender]%})
 {--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])

diff --git a/templates/de/emails/admin/admin_sponsor_edit.tpl b/templates/de/emails/admin/admin_sponsor_edit.tpl
index 2ab31511f77dde69c43340272080e798f164cfa5..354df0eb8f0586b757ec64860d0b849adccaebe1 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_edit.tpl
+++ b/templates/de/emails/admin/admin_sponsor_edit.tpl
@@ -12,7 +12,7 @@ Es sind nun folgende Daten gesetzt:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $content[position]
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[tax_ident]
 ------------------------------
-{--GUEST_GENDER--}: {%sponsor,gender,translateGender=$content[id]%}
+{--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]

diff --git a/templates/de/emails/sponsor/sponsor_change_data.tpl b/templates/de/emails/sponsor/sponsor_change_data.tpl
index a42af32030c4f8f2f87ff6b1782c61edffb9678c..4165978243d81cbe991113334e9aee12d7b78e75 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_change_data.tpl
+++ b/templates/de/emails/sponsor/sponsor_change_data.tpl
@@ -8,7 +8,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--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]%})
+{--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]%})

diff --git a/templates/de/html/admin/admin_add_sponsor.tpl b/templates/de/html/admin/admin_add_sponsor.tpl
index 61bc5cdbe602f22f0b0aea28611476224b840dd6..eef7cb493267c792ead28305a6cdf8c794eafc5d 100644 (file)
--- a/templates/de/html/admin/admin_add_sponsor.tpl
+++ b/templates/de/html/admin/admin_add_sponsor.tpl
@@ -42,7 +42,7 @@
 </tr>
 <tr>
   <td align="right">
-    {--GUEST_GENDER--}:
+    {--GENDER--}:
   </td>
   <td>
     <select name="gender" class="admin_select" size="1">
@@ -177,10 +177,10 @@
       <option value="0">{--SELECT_NONE--}</option>
       <option value="{%math,Day=1%}">1 {--DAYS--}</option>
       <option value="{%math,Day=3%}">3 {--DAYS--}</option>
-      <option value="{%math,Week=1)%}" selected="selected">1 {--LIFE_WEEKS--}</option>
-      <option value="{%math,Week=2)%}">2 {--LIFE_WEEKS--}</option>
-      <option value="{%math,Week=4)%}">4 {--LIFE_WEEKS--}</option>
-      <option value="{%math,Week=8)%}">8 {--LIFE_WEEKS--}</option>
+      <option value="{%math,Week=1%}" selected="selected">1 {--LIFE_WEEKS--}</option>
+      <option value="{%math,Week=2%}">2 {--LIFE_WEEKS--}</option>
+      <option value="{%math,Week=4%}">4 {--LIFE_WEEKS--}</option>
+      <option value="{%math,Week=8%}">8 {--LIFE_WEEKS--}</option>
     </select>
   </td>
 </tr>

diff --git a/templates/de/html/admin/admin_edit_sponsor_edit.tpl b/templates/de/html/admin/admin_edit_sponsor_edit.tpl
index 8111856ad1716a1a4e7dfa057b702d5b0212365f..5cf4eb7740c3cc5582d95fe8caf8944d56f0eb44 100644 (file)
--- a/templates/de/html/admin/admin_edit_sponsor_edit.tpl
+++ b/templates/de/html/admin/admin_edit_sponsor_edit.tpl
@@ -42,7 +42,7 @@
 </tr>
 <tr>
   <td width="295" align="right" height="21">
-    {--GUEST_GENDER--}:
+    {--GENDER--}:
   </td>
   <td width="255">
     <select name="gender" class="admin_select" size="1">

diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl
index 3ae5673802f20b183a25d4420c962d3b6d896a48..df03a11b46739464048f62588164f7e0eb107bf0 100644 (file)
--- a/templates/de/html/guest/guest_register.tpl
+++ b/templates/de/html/guest/guest_register.tpl
@@ -16,7 +16,7 @@
                <table border="0" cellspacing="0" cellpadding="0" width="100%">
                        <tr>
                                <td class="register_left">
-                                       {--GUEST_GENDER--}$content[must_fillout_gender]:
+                                       {--GENDER--}$content[must_fillout_gender]:
                                </td>
                                <td class="register_right"><select name="gender"
                                        size="1" class="guest_select">

diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl
index 67dc40c24870664ba8137f1a5f88a52fc2c3cf1d..046eb87cb93fed48fa0149f3c34d3baab8bddaef 100644 (file)
--- a/templates/de/html/guest/guest_sponsor_reg.tpl
+++ b/templates/de/html/guest/guest_sponsor_reg.tpl
@@ -54,7 +54,7 @@
 </tr>
 <tr>
   <td align="right">
-    {--GUEST_GENDER--}:
+    {--GENDER--}:
   </td>
   <td>
     <select name="gender" class="guest_select" size="1">

diff --git a/templates/de/html/sponsor/sponsor_account_form.tpl b/templates/de/html/sponsor/sponsor_account_form.tpl
index c104ff0e9b6e65e067d63a3b34e030f111ff4009..70086d026b5baf915de979b8655873677fcb406f 100644 (file)
--- a/templates/de/html/sponsor/sponsor_account_form.tpl
+++ b/templates/de/html/sponsor/sponsor_account_form.tpl
@@ -37,7 +37,7 @@
 </tr>
 <tr>
   <td class="bottom right" align="right" height="27">
-    {--GUEST_GENDER--}:
+    {--GENDER--}:
   </td>
   <td class="bottom">
     <select name="gender" class="guest_select" size="1">