]> git.mxchange.org Git - mailer.git/commitdiff
Deprecated $DATA renamed:
authorRoland Häder <roland@mxchange.org>
Fri, 29 Jul 2011 06:28:58 +0000 (06:28 +0000)
committerRoland Häder <roland@mxchange.org>
Fri, 29 Jul 2011 06:28:58 +0000 (06:28 +0000)
- Deprecated $DATA replaced with $content
- TODOs.txt updated

49 files changed:
.gitattributes
DOCS/TODOs.txt
inc/functions.php
inc/language/de.php
inc/libs/rallye_functions.php
inc/modules/admin/what-add_surfbar_url.php
inc/modules/admin/what-edit_sponsor.php
inc/modules/admin/what-list_links.php
inc/modules/admin/what-optimize.php
inc/modules/guest/what-sponsor_login.php
inc/modules/member/what-transfer.php
inc/template-functions.php
templates/de/emails/add-points.tpl
templates/de/emails/admin-del_links.tpl
templates/de/emails/admin/admin_coupon.tpl
templates/de/emails/admin/admin_del_surfbar_urls.tpl
templates/de/emails/admin/admin_rallye_expired.tpl
templates/de/emails/admin/admin_rallye_expired_no.tpl
templates/de/emails/admin/admin_rallye_no_notify.tpl
templates/de/emails/admin/admin_rallye_notify.tpl
templates/de/emails/admin/admin_surfbar_url_depleted.tpl
templates/de/emails/back-admin.tpl
templates/de/emails/back-member.tpl
templates/de/emails/bonus-mail.tpl
templates/de/emails/confirm-member.tpl
templates/de/emails/confirm-referral.tpl
templates/de/emails/del-user.tpl
templates/de/emails/done-admin.tpl
templates/de/emails/done-member.tpl
templates/de/emails/lock-user.tpl
templates/de/emails/member/member_coupon.tpl
templates/de/emails/member/member_del_surfbar_urls.tpl
templates/de/emails/member/member_rallye_expired.tpl
templates/de/emails/member/member_rallye_expired_bronce.tpl
templates/de/emails/member/member_rallye_expired_gold.tpl
templates/de/emails/member/member_rallye_expired_other.tpl [new file with mode: 0644]
templates/de/emails/member/member_rallye_expired_silver.tpl
templates/de/emails/new-pass.tpl
templates/de/emails/normal-mail.tpl
templates/de/emails/order-accept.tpl
templates/de/emails/order-admin.tpl
templates/de/emails/order-deleted.tpl
templates/de/emails/order-member.tpl
templates/de/emails/order-reject.tpl
templates/de/emails/register-admin.tpl
templates/de/emails/register-member.tpl
templates/de/emails/sub-points.tpl
templates/de/emails/unlock-user.tpl
templates/de/html/admin/admin_list_links_problem.tpl

index 3421fd6fafdd73ab809144184e94a542bef20a4d..0aca48a71b19c7190ccb2bd659e4f31abc3032ed 100644 (file)
@@ -940,6 +940,7 @@ templates/de/emails/member/member_profile.tpl svneol=native#text/plain
 templates/de/emails/member/member_rallye_expired.tpl svneol=native#text/plain
 templates/de/emails/member/member_rallye_expired_bronce.tpl svneol=native#text/plain
 templates/de/emails/member/member_rallye_expired_gold.tpl svneol=native#text/plain
+templates/de/emails/member/member_rallye_expired_other.tpl svneol=native#text/plain
 templates/de/emails/member/member_rallye_expired_silver.tpl svneol=native#text/plain
 templates/de/emails/member/member_rallye_notify.tpl svneol=native#text/plain
 templates/de/emails/member/member_refback.tpl svneol=native#text/plain
index 689c4ab723b8e231b0557fec7bd6b8b6c3d753f1..6db624ffc43bd1f0d34c8ca7bee58e352bb57ac5 100644 (file)
@@ -54,8 +54,8 @@
 ./inc/functions.php:2233:      // @TODO Rename column data_type to e.g. mail_status
 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
 ./inc/install-functions.php:57:        // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
-./inc/language/de.php:1072:    // @TODO Rewrite these two constants
-./inc/language/de.php:1088:    // @TODO Rewrite these three constants
+./inc/language/de.php:1071:    // @TODO Rewrite these two constants
+./inc/language/de.php:1087:    // @TODO Rewrite these three constants
 ./inc/language/de.php:757:// @TODO Are these constants longer used?
 ./inc/language-functions.php:255:      // @TODO These are all valid languages, again hard-coded
 ./inc/language-functions.php:44:// @TODO Rewrite all language constants to this function.
@@ -68,7 +68,6 @@
 ./inc/libs/doubler_functions.php:44:// @TODO Lame description
 ./inc/libs/doubler_functions.php:93:                   // @TODO Can't this be moved into EL?
 ./inc/libs/mailid_functions.php:47:            // @TODO Rewrite this to a dynamic include or so
-./inc/libs/rallye_functions.php:439:   // @TODO Deprecated variable and global statement, please try to rewrite this
 ./inc/libs/rallye_functions.php:705:// @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId()
 ./inc/libs/rallye_functions.php:770:   $EXPIRE = 3; // @TODO The hard-coded value...
 ./inc/libs/rallye_functions.php:856:// @TODO Please document this function
 ./inc/modules/admin/what-list_admins_acls.php:108:     // @TODO Rewrite this to a filter
 ./inc/modules/admin/what-list_admins_acls.php:136:     // @TODO Rewrite this to filter 'run_sqls'
 ./inc/modules/admin/what-list_autopurge.php:47:// @TODO Rewrite those lines to filter
-./inc/modules/admin/what-list_bonus.php:139:           // @TODO Can't this be moved into our expression language?
+./inc/modules/admin/what-list_bonus.php:136:           // @TODO Can't this be moved into our expression language?
 ./inc/modules/admin/what-list_cats.php:54:             // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
 ./inc/modules/admin/what-list_cats.php:68:                             // @TODO Rewrite this to countSum.....() function
 ./inc/modules/admin/what-list_links.php:55:            // @TODO Try to rewrite this to a filter
 ./inc/modules/member/what-unconfirmed.php:162: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/member/what-unconfirmed.php:227:                         // @TODO This 'userid' cannot be saved because of encapsulated EL code
 ./inc/modules/order.php:74:            // @TODO Unused: 2,4
-./inc/mysql-manager.php:1270:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/mysql-manager.php:1334:          // @TODO Rewrite these lines to a filter
-./inc/mysql-manager.php:1358:  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1617:                  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1663:// @TODO Fix inconsistency between last_module and getWhat()
+./inc/mysql-manager.php:1275:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/mysql-manager.php:1339:          // @TODO Rewrite these lines to a filter
+./inc/mysql-manager.php:1363:  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1622:                  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1668:// @TODO Fix inconsistency between last_module and getWhat()
 ./inc/mysql-manager.php:387:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:44:// @TODO Can we cache this?
 ./inc/purge/purge-inact.php:55:        // @TODO Rewrite these if() blocks to a filter
 ./inc/revision-functions.php:169:// @TODO This function does also set and get in 'cache_array'
-./inc/template-functions.php:1075:                     // @TODO Deprecate this thing
-./inc/template-functions.php:1086:                     // @TODO Deprecate this thing
-./inc/template-functions.php:1176:     // @TODO This can be easily moved out after the merge from EL branch to this is complete
-./inc/template-functions.php:1209:             // @TODO Add a little more infos here
-./inc/template-functions.php:1535:// @TODO Lame description for this function
-./inc/template-functions.php:1557:                     // @TODO Move this in a filter
+./inc/template-functions.php:1068:                     // @TODO Deprecate this thing
+./inc/template-functions.php:1079:                     // @TODO Deprecate this thing
+./inc/template-functions.php:1169:     // @TODO This can be easily moved out after the merge from EL branch to this is complete
+./inc/template-functions.php:1202:             // @TODO Add a little more infos here
+./inc/template-functions.php:1531:// @TODO Lame description for this function
+./inc/template-functions.php:1553:                     // @TODO Move this in a filter
 ./inc/template-functions.php:184:       * @TODO On some pages this is buggy
 ./inc/template-functions.php:273:              // @TODO Remove this sanity-check if all is fine
-./inc/template-functions.php:436:      // @TODO $DATA is deprecated and should be avoided and replaced with $content
-./inc/template-functions.php:602:// @TODO $simple/$constants are deprecated
-./inc/template-functions.php:628:      // @TODO Do only use $content and deprecate $DATA in templates
+./inc/template-functions.php:596:// @TODO $simple/$constants are deprecated
 ./inc/wrapper-functions.php:512:// @TODO Do some more sanity check here
 ./mailid.php:139:                                      // @TODO Rewrite this to a filter
 ./mailid.php:96:               // @TODO Rewrite this to a filter
 ./mailid_top.php:105:          // @TODO Rewrite this to a filter
-./mailid_top.php:138:                                  // @TODO Rewrite this to a filter
-./mailid_top.php:185:                                                  // @TODO Rewrite this to a filter
+./mailid_top.php:142:                                  // @TODO Rewrite this to a filter
+./mailid_top.php:189:                                                  // @TODO Rewrite this to a filter
 ./mailid_top.php:18: * @TODO Merge this script with mailid.php                              *
-./mailid_top.php:192:                                                                  // @TODO Rewrite this to a filter
-./mailid_top.php:227:                                                                  // @TODO Rewrite these blocks to filter
+./mailid_top.php:196:                                                                  // @TODO Rewrite this to a filter
+./mailid_top.php:231:                                                                  // @TODO Rewrite these blocks to filter
 ./network-check.php:54:// @TODO Add processing of request here
 ./view.php:68:         // @TODO No banner found, output some default banner
 ./templates/de/html/admin/admin_add_country.tpl:23:                    <!-- @TODO Rewrite this selection box to our generic functions //-->
 ./templates/de/html/admin/admin_login_form.tpl:34:     @TODO Doesn't work with sessions
 ./templates/de/html/admin/admin_login_form.tpl:37:             @TODO Try to move the select box to our generic functions
 ./templates/de/html/admin/admin_optimize.tpl:3:        <!-- @TODO Shouldn't we add a title here? //-->
-./templates/de/html/admin/admin_send_bonus_form.tpl:4: <!-- @TODO Maybe add some title? //-->
 ./templates/de/html/guest/guest_login.tpl:21:  @TODO Deactivated feature, try to implement it or remove it.
 ./templates/de/html/guest/guest_nickname_login.tpl:21: @TODO Deactivated feature, try to find a solution for this or remove it.
 ./templates/de/html/guest/guest_stats_member.tpl:21:   @TODO We have to fix these counters.
 ./inc/reset/reset_profile.php:2:// @DEPRECATED
 ./inc/reset/reset_surfbar.php:2:// @DEPRECATED
 ./inc/reset/reset_yoomedia.php:2:// @DEPRECATED
-./templates/de/emails/add-points.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/admin/admin_coupon.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/admin/admin_del_surfbar_urls.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/admin/admin_surfbar_url_depleted.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/admin-del_links.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/back-admin.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/back-member.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/bonus-mail.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/confirm-member.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/confirm-referral.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/del-user.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/done-admin.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/done-member.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/lock-user.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/member/member_coupon.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/member/member_del_surfbar_urls.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/new-pass.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/normal-mail.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/order-accept.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/order-admin.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/order-deleted.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/order-member.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/order-reject.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/register-admin.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/register-member.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/sub-points.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/emails/unlock-user.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/add-points.tpl:1:@DEPRECATED
+./templates/de/emails/admin/admin_coupon.tpl:1:@DEPRECATED
+./templates/de/emails/admin/admin_del_surfbar_urls.tpl:1:@DEPRECATED
+./templates/de/emails/admin/admin_surfbar_url_depleted.tpl:1:@DEPRECATED
+./templates/de/emails/admin-del_links.tpl:1:@DEPRECATED
+./templates/de/emails/back-admin.tpl:1:@DEPRECATED
+./templates/de/emails/back-member.tpl:1:@DEPRECATED
+./templates/de/emails/bonus-mail.tpl:1:@DEPRECATED
+./templates/de/emails/confirm-member.tpl:1:@DEPRECATED
+./templates/de/emails/confirm-referral.tpl:1:@DEPRECATED
+./templates/de/emails/del-user.tpl:1:@DEPRECATED
+./templates/de/emails/done-admin.tpl:1:@DEPRECATED
+./templates/de/emails/done-member.tpl:1:@DEPRECATED
+./templates/de/emails/lock-user.tpl:1:@DEPRECATED
+./templates/de/emails/member/member_coupon.tpl:1:@DEPRECATED
+./templates/de/emails/member/member_del_surfbar_urls.tpl:1:@DEPRECATED
+./templates/de/emails/member/member_rallye_expired.tpl:1:@DEPRECATED
+./templates/de/emails/new-pass.tpl:1:@DEPRECATED
+./templates/de/emails/normal-mail.tpl:1:@DEPRECATED
+./templates/de/emails/order-accept.tpl:1:@DEPRECATED
+./templates/de/emails/order-admin.tpl:1:@DEPRECATED
+./templates/de/emails/order-deleted.tpl:1:@DEPRECATED
+./templates/de/emails/order-member.tpl:1:@DEPRECATED
+./templates/de/emails/order-reject.tpl:1:@DEPRECATED
+./templates/de/emails/register-admin.tpl:1:@DEPRECATED
+./templates/de/emails/register-member.tpl:1:@DEPRECATED
+./templates/de/emails/sub-points.tpl:1:@DEPRECATED
+./templates/de/emails/unlock-user.tpl:1:@DEPRECATED
 ./templates/de/html/admin/admin_admins_contct_select.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_config_admins_del_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_config_admins_del.tpl:1:<!-- @DEPRECATED //-->
index d5a17008139e5d4db190787747aba6cba8a791ea..0f96686c20698392812a06755c7db34096dde385 100644 (file)
@@ -1465,7 +1465,7 @@ function handleExtraValues ($filterFunction, $value, $extraValue) {
 }
 
 // Converts timestamp selections into a timestamp
-function convertSelectionsToEpocheTime (array &$postData, array &$DATA, &$id, &$skip) {
+function convertSelectionsToEpocheTime (array &$postData, array &$content, &$id, &$skip) {
        // Init test variable
        $skip  = false;
        $test2 = '';
@@ -1480,7 +1480,7 @@ function convertSelectionsToEpocheTime (array &$postData, array &$DATA, &$id, &$
                if ((isset($postData[$test.'_ye'])) && (isset($postData[$test.'_mo'])) && (isset($postData[$test.'_we'])) && (isset($postData[$test.'_da'])) && (isset($postData[$test.'_ho'])) && (isset($postData[$test.'_mi'])) && (isset($postData[$test.'_se'])) && ($test != $test2)) {
                        // Generate timestamp
                        $postData[$test] = createEpocheTimeFromSelections($test, $postData);
-                       $DATA[] = sprintf("`%s`='%s'", $test, $postData[$test]);
+                       $content[] = sprintf("`%s`='%s'", $test, $postData[$test]);
                        $GLOBALS['skip_config'][$test] = true;
 
                        // Remove data from array
index 17f6a4b657b7dc31207093780cc5561158db27c3..fd514fe9d84b61ca06278677c0c1f7ee42f64460 100644 (file)
@@ -909,7 +909,7 @@ addMessages(array(
        'DEFAULT_POINTS' => "Punkte",
        'PROBLEM_POINTS_OVERVIEW_UNAVAILABLE' => "{?POINTS?}-&Uuml;bersicht derzeit nicht verf&uuml;gbar.",
        'ADMIN_NOTHING_SELECTED_CHANGE' => "Sie haben nichts zum &Auml;ndern des Status ausgew&auml;hlt.",
-       'TEMPLATE_CONTENT' => "Templatedaten",
+       'TEMPLATE_CONTENT' => "Template-Daten",
        'MESSAGE_HEADER' => "Hinweis:",
        'WARNING_MESSAGE_HEADER' => "Warnung:",
        'ADMIN_ALPHA_SELCTION' => "Alphabetische Suche:",
@@ -962,7 +962,6 @@ addMessages(array(
        'APP_DIE_TITLE' => "Bug im Script erkannt!",
        'ADMIN_CONTACT_LINK_TITLE' => "Kontakt zum Administrator",
        'ADMIN_MAIL_NOTHING_DELETED' => "Die Mail mit der Id <span class=\"data\">%s</span> weisst keine Mitglieder auf.",
-       'TEMPLATE_DATA' => "Daten aus &#36;DATA",
 
        'ADMIN_RESET_PASSWORD_SEND_LINK_TITLE' => "1/4: Administratorkennwort zur&uuml;cksetzen",
        'ADMIN_VALIDATE_HASH_TITLE' => "2/4: Validierung Iher Logindaten",
index faf162d6002a6e56648f2782dd70d44c0edcdb6d..5a0cfde17fb54d87f028579488d45bb9807093f4 100644 (file)
@@ -250,7 +250,7 @@ ORDER BY
                array(bigintval($rallye)), __FUNCTION__, __LINE__);
 
        // Load users
-       $DATA = array(
+       $content = array(
                'userid'  => array(),
                'ref'     => array(),
                'cpoints' => array()
@@ -299,9 +299,9 @@ LIMIT 1",
                }
 
                // Save values to array
-               $DATA['userid'][]   = $userid;
-               $DATA['ref'][]      = $count;
-               $DATA['cpoints'][]  = $content['curr_points'];
+               $content['userid'][]   = $userid;
+               $content['ref'][]      = $count;
+               $content['cpoints'][]  = $content['curr_points'];
                $min_users  = $content['min_users'];
                $min_prices = $content['min_prices'];
        } // END - while
@@ -310,30 +310,30 @@ LIMIT 1",
        SQL_FREERESULT($result);
 
        // Sort whole array
-       array_pk_sort($DATA, array('ref', 'cpoints'), 0, 1, true);
+       array_pk_sort($content, array('ref', 'cpoints'), 0, 1, true);
 
        // Generate table
        $OUT = '';
        for ($idx = '0'; $idx < $prices; $idx++) {
                // Prepare marking of default (maybe current user's) id
                $start = ''; $end = '';
-               if (($DATA['userid'][$idx] == $default) && ($default > 0)) {
+               if (($content['userid'][$idx] == $default) && ($default > 0)) {
                        $start = '<strong>';
                        $end   = '</strong>';
                } // END - if
 
                // Prepare content
-               $content = array(
+               $row = array(
                        'idx'    => ($idx + 1),
                        'start'  => $start,
                        'end'    => $end,
-                       'userid' => $DATA['userid'][$idx],
-                       'ref'    => $DATA['ref'][$idx],
+                       'userid' => $content['userid'][$idx],
+                       'ref'    => $content['ref'][$idx],
                        'infos'  => ''
                );
 
                // Load row template and switch color
-               $OUT .= loadTemplate($mode . '_list_rallye_row', true, $content);
+               $OUT .= loadTemplate($mode . '_list_rallye_row', true, $row);
        } // END - for
 
        // Add min_prices/users
@@ -436,9 +436,6 @@ LIMIT 1",
 
 //
 function markReferalRallyesAsExpired ($result) {
-       // @TODO Deprecated variable and global statement, please try to rewrite this
-       global $DATA;
-
        // Load rallye data
        list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result);
 
@@ -446,13 +443,13 @@ function markReferalRallyesAsExpired ($result) {
        SQL_FREERESULT($result);
 
        // Init array
-       $DATA = array();
+       $content = array();
        $count = '0';
        $users = array();
-       $DATA['title']  = $title;
-       $DATA['start']  = generateDateTime($start, 1);
-       $DATA['end']    = generateDateTime($end  , 1);
-       $DATA['now_t']  = generateDateTime(time(), 1);
+       $content['title']  = $title;
+       $content['start']  = generateDateTime($start, 1);
+       $content['end']    = generateDateTime($end  , 1);
+       $content['now_t']  = generateDateTime(time(), 1);
 
        // Load users array (!) with assigned prices
        $prices = getArrayFromReferalRallyeUsers($id);
@@ -475,7 +472,7 @@ function markReferalRallyesAsExpired ($result) {
 
        if (($total < $min_prices) || ($total == '0')) {
                // Do not end this rallye!
-               unset($DATA);
+               unset($content);
                return;
        } // END - if
 
@@ -488,54 +485,54 @@ function markReferalRallyesAsExpired ($result) {
                // Allow valid and active users with at least one ref to get points
                if ((isValidUserId($userid)) && ($prices['ref'][$key] > 0) && ($prices['active'][$key] == 1) && ($prices['cpoints'][$key] > 0)) {
                        // Transfer data to array for the mail template
-                       $DATA['level']  = $prices['level'][$key];
-                       $DATA['points'] = $prices['points'][$key];
-                       $DATA['info']   = $prices['info'][$key];
-                       $DATA['ref']    = $prices['ref'][$key];
+                       $content['level']  = $prices['level'][$key];
+                       $content['points'] = $prices['points'][$key];
+                       $content['info']   = $prices['info'][$key];
+                       $content['ref']    = $prices['ref'][$key];
 
                        // Default is other
                        $winnerLevel = 'other';
 
                        // Determine winner level
-                       if ($DATA['level'] == 1) {
+                       if ($content['level'] == 1) {
                                // The winner!
                                $winnerLevel = 'gold';
-                       } elseif ($DATA['level'] == 2) {
+                       } elseif ($content['level'] == 2) {
                                // The vice winner!
                                $winnerLevel = 'silver';
-                       } elseif ($DATA['level'] == 3) {
+                       } elseif ($content['level'] == 3) {
                                // The bronce winner
                                $winnerLevel = 'bronce';
                        }
 
-                       if ($DATA['points'] > 0) {
+                       if ($content['points'] > 0) {
                                // Add points directly to user's account
                                initReferalSystem();
-                               addPointsThroughReferalSystem('rallye_winner:' . $winnerLevel, $userid, $DATA['points']);
+                               addPointsThroughReferalSystem('rallye_winner:' . $winnerLevel, $userid, $content['points']);
                        } // END - if
 
                        if ($notify == 'Y') {
                                // Prepare infos for the mail template
-                               if (!empty($DATA['info'])) {
+                               if (!empty($content['info'])) {
                                        // Take direct infos
-                                       $DATA['infos'] = $DATA['info'];
+                                       $content['infos'] = $content['info'];
                                } else {
                                        // Take points
-                                       $DATA['infos'] = $DATA['points'] . ' {?POINTS?}';
+                                       $content['infos'] = $content['points'] . ' {?POINTS?}';
                                }
 
                                // Add suffix to template name
-                               $template = 'member_rallye_expired' . $winnerLevel;
+                               $template = 'member_rallye_expired_' . $winnerLevel;
 
                                // Load template
-                               $message = loadEmailTemplate($template, $DATA, $userid);
-                               sendEmail($userid, '{%message,RALLYE_MEMBER_EXPIRED_SUBJECT=' . $DATA['level'] . '%}', $message);
+                               $message = loadEmailTemplate($template, $content, $userid);
+                               sendEmail($userid, '{%message,RALLYE_MEMBER_EXPIRED_SUBJECT=' . $content['level'] . '%}', $message);
                        } // END - if
 
                        // Count userid
                        $count++;
                        $users['userid'][$userid] = $userid;
-                       $users['poi'][$userid] = $DATA['infos'];
+                       $users['poi'][$userid] = $content['infos'];
                } // END - if
        } // END - foreach
 
@@ -547,8 +544,11 @@ function markReferalRallyesAsExpired ($result) {
                $count = getReferalRallyeUserDataFromArray($users);
        }
 
+       // Add count
+       $content['count'] = $count;
+
        // Send mail to admin
-       sendAdminNotification('{%message,RALLYE_ADMIN_EXPIRED_SUBJECT=' . $title . '%}', $templ, $count);
+       sendAdminNotification('{%message,RALLYE_ADMIN_EXPIRED_SUBJECT=' . $title . '%}', $templ, $content);
 
        // Add task (we ignore the task id here)
        createNewTask('{--RALLYE_ADMIN_EXPIRED--}: ' . $title, '{--RALLYE_ADMIN_EXPIRED_TEXT--}', 'RALLYE_EXPIRED');
@@ -708,7 +708,7 @@ function addReferalRallyeWinners ($mode, $rallye, $default=0) {
        $prices = countSumTotalData(bigintval($rallye), 'rallye_prices', 'id', 'rallye_id', true);
 
        // Load data
-       $DATA = getArrayFromReferalRallyeUsers($rallye);
+       $content = getArrayFromReferalRallyeUsers($rallye);
 
        // Generate table
        $OUT = '';
@@ -716,41 +716,41 @@ function addReferalRallyeWinners ($mode, $rallye, $default=0) {
                // Check status
                //   active = 1: account is still confirmed
                //   active = 0: account is deleted or locked
-               $active = countSumTotalData($DATA['userid'][$idx], 'user_data', 'userid', 'userid', true, " AND `status`='CONFIRMED'");
+               $active = countSumTotalData($content['userid'][$idx], 'user_data', 'userid', 'userid', true, " AND `status`='CONFIRMED'");
 
-               if ((empty($DATA['ref'][$idx])) || ($DATA['ref'][$idx] == '0') || ($active == '0') || ('' . round($DATA['cpoints'][$idx]) . '' == '0') || (empty($DATA['cpoints'][$idx]))) {
+               if ((empty($content['ref'][$idx])) || ($content['ref'][$idx] == '0') || ($active == '0') || ('' . round($content['cpoints'][$idx]) . '' == '0') || (empty($content['cpoints'][$idx]))) {
                        // Allow valid and active users with at least one ref to get points
-                       $DATA['ref'][$idx]   = '---';
-                       $DATA['userid'][$idx]   = '---';
+                       $content['ref'][$idx]   = '---';
+                       $content['userid'][$idx]   = '---';
                } // END - if
 
-               if (!empty($DATA['info'][$idx])) {
+               if (!empty($content['info'][$idx])) {
                        // Take direct infos
-                       $DATA['infos'][$idx] = $DATA['info'][$idx];
+                       $content['infos'][$idx] = $content['info'][$idx];
                } else {
                        // Take ppints
-                       $DATA['infos'][$idx] = $DATA['points'][$idx] . ' {?POINTS?}';
+                       $content['infos'][$idx] = $content['points'][$idx] . ' {?POINTS?}';
                }
 
                // Prepare marking of default (maybe current user's) id
                $start = ''; $end = '';
-               if (($DATA['userid'][$idx] == $default) && ($default > 0)) {
+               if (($content['userid'][$idx] == $default) && ($default > 0)) {
                        $start = '<strong>';
                        $end   = '</strong>';
                } // END - if
 
                // Prepare content
-               $content = array(
+               $row = array(
                        'idx'    => ($idx + 1),
-                       'userid' => $DATA['userid'][$idx],
-                       'ref'    => $DATA['ref'][$idx],
-                       'infos'  => $DATA['infos'][$idx],
+                       'userid' => $content['userid'][$idx],
+                       'ref'    => $content['ref'][$idx],
+                       'infos'  => $content['infos'][$idx],
                        'start'  => $start,
                        'end'    => $end
                );
 
                // Load row template
-               $OUT .= loadTemplate($mode . '_list_rallye_row', true, $content);
+               $OUT .= loadTemplate($mode . '_list_rallye_row', true, $row);
        } // END - for
 
        // Prepare content
index 43d32d83b25a2998955876817213de13cbe4837d..1df52561c4f381252591154ba4781acc295fab9a 100644 (file)
@@ -46,14 +46,14 @@ addYouAreHereLink('admin', __FILE__);
 // Was an URL added?
 if ((isFormSent('add')) && (isPostRequestParameterSet('url'))) {
        // Initialize variables
-       $DATA = array();
+       $content = array();
        $id = 'reload_ye';
        $skip = false;
        $postData = postRequestArray();
 
        // Convert the "reload selections"
        // @TODO Find all convertSelectionsToEpocheTime() calls and rewrite postRequestParameter() calls to $postData
-       convertSelectionsToEpocheTime($postData, $DATA, $id, $skip);
+       convertSelectionsToEpocheTime($postData, $content, $id, $skip);
 
        // Then add this URL
        if (SURFBAR_ADMIN_ADD_URL($postData['url'], $postData['limit'], $postData['reload'])) {
index 88258c3180de4eeb607cee8191085300ca726374..d0699a3f321f23de776937a5a7eb58e56de6c30b 100644 (file)
@@ -128,14 +128,14 @@ LIMIT 1",
                                        } // END - if
 
                                        // Convert time selection
-                                       $DATA = array(); $id = 'warning_interval_ye'; $skip = false;
-                                       convertSelectionsToEpocheTime(postRequestArray(), $DATA, $id, $skip);
+                                       $content = array(); $id = 'warning_interval_ye'; $skip = false;
+                                       convertSelectionsToEpocheTime(postRequestArray(), $content, $id, $skip);
 
                                        // Save the sponsor
                                        handleSponsorRequest(postRequestArray());
 
                                        // Convert some data for the email template
-                                       postRequestParameter('gender'          , '{%pipe,translateComma=' . postRequestParameter('gender') . '%}');
+                                       postRequestParameter('gender'          , '{%pipe,translateGender=' . postRequestParameter('gender') . '%}');
                                        postRequestParameter('warning_interval', '{%pipe,createFancyTime=' . postRequestParameter('warning_interval') . '%}');
 
                                        if ($PASS === false) setPostRequestParameter('pass1', '{--SPONSOR_PASS_UNCHANGED--}');
index 34e5aeeb039410a2b73404bc4399291202f04caf..0726c0b1316a26a028c512ed38d8af3d40d2570b 100644 (file)
@@ -85,8 +85,8 @@ if (isGetRequestParameterSet('userid')) {
                                // @TODO Find a way to rewrite this. See some lines above for different queries
                                while (list($id, $id2, $type) = SQL_FETCHROW($result)) {
                                        // Initializes all variables
-                                       $DATA = '';
-                                       $PROBLEM = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
+                                       $mailId = '';
+                                       $problemMessage = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
                                        $result_data = false;
 
                                        // Load data from stats table...
@@ -95,14 +95,14 @@ if (isGetRequestParameterSet('userid')) {
                                                case 'NORMAL':
                                                        $result_data = SQL_QUERY_ESC("SELECT `subject`,`timestamp_ordered` AS `timestamp`,`cat_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
                                                                array(bigintval($id)), __FILE__, __LINE__);
-                                                       $type = 'mailid'; $DATA = $id; $PROBLEM = '{--NORMAL_MAIL_PROBLEM--}';
+                                                       $type = 'mailid'; $mailId = $id; $problemMessage = '{--NORMAL_MAIL_PROBLEM--}';
                                                        $LINK = '<a href="{%url=mailid.php?userid=' . getRequestParameter('userid') . '&amp;mailid=' . $id . '%}" target="_blank">' . $id . '</a>';
                                                        break;
 
                                                case 'BONUS':
                                                        $result_data = SQL_QUERY_ESC("SELECT `subject`,`timestamp`,`cat_id` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                                                                array(bigintval($id2)), __FILE__, __LINE__);
-                                                       $type = 'bonusid'; $DATA = $id2; $PROBLEM = '{--BONUS_MAIL_PROBLEM--}';
+                                                       $type = 'bonusid'; $mailId = $id2; $problemMessage = '{--BONUS_MAIL_PROBLEM--}';
                                                        $LINK = '<a href="{%url=mailid.php?userid=' . getRequestParameter('userid') . '&amp;bonusid=' . $id2 . '%}" target="_blank">' . $id2 . '</a>';
                                                        break;
 
@@ -121,12 +121,8 @@ if (isGetRequestParameterSet('userid')) {
                                                if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
 
                                                // Prepare data for the row template
-                                               $content = array(
-                                                       'link'      => $LINK,
-                                                       'subject'   => $content['subject'],
-                                                       'timestamp' => generateDateTime($content['timestamp'], 0),
-                                                       'cat_id'    => $content['cat_id'],
-                                               );
+                                               $content['link']      = $LINK;
+                                               $content['timestamp'] = generateDateTime($content['timestamp'], 0);
 
                                                // Load row template
                                                $OUT .= loadTemplate('admin_list_links_row', true, $content);
@@ -134,8 +130,8 @@ if (isGetRequestParameterSet('userid')) {
                                                // Load template for error
                                                $OUT .= loadTemplate('admin_list_links_problem', true,
                                                        array(
-                                                               'problem'       => $PROBLEM,
-                                                               'data'          => $DATA
+                                                               'problem' => $problemMessage,
+                                                               'mail_id' => $mailId
                                                        )
                                                );
                                        }
index ff266c741ca34543d5c1401f878e1c7d019f0424..6910cacb3e5cf82af36e21d0c97e2935436f1db2 100644 (file)
@@ -44,11 +44,11 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Optimize and repair database and return the result as a multi-dimensional array
-$DATA = repairOptimizeDatabase();
+$content = repairOptimizeDatabase();
 
 // Output rows
 $gain_tabs = '0'; $OUT = '';
-foreach ($DATA['tables'] as $row_array) {
+foreach ($content['tables'] as $row_array) {
        // Init variables
        $B1 = ''; $B2 = '';
 
@@ -68,7 +68,7 @@ foreach ($DATA['tables'] as $row_array) {
        }
 
        // Prepare data for the row template
-       $content = array(
+       $row = array(
                'b1'  => $B1,
                'b2'  => $B2,
                'tpl' => $row_array[0],
@@ -79,12 +79,9 @@ foreach ($DATA['tables'] as $row_array) {
        );
 
        // Load row template and switch color
-       $OUT .= loadTemplate('admin_optimize_row', true, $content);
+       $OUT .= loadTemplate('admin_optimize_row', true, $row);
 } // END - foreach
 
-// Transfer main data
-$content = $DATA;
-
 // Remember rows
 $content['rows'] = $OUT;
 
index caaab113579a429136f15defa03c6464dbcda65c..fe65aaf38ed2d71d21f00de8180e11c7302c3fdb 100644 (file)
@@ -221,14 +221,14 @@ LIMIT 1",
                // Entry found?
                if (SQL_NUMROWS($result) == 1) {
                        // Unconfirmed sponsor account found so let's load the requested data
-                       $DATA = SQL_FETCHARRAY($result);
+                       $content = SQL_FETCHARRAY($result);
 
                        // Generate password/translate some data
-                       $DATA['password']        = generatePassword();
-                       $DATA['sponsor_created'] = generateDateTime($DATA['sponsor_created']);
+                       $content['password']        = generatePassword();
+                       $content['sponsor_created'] = generateDateTime($content['sponsor_created']);
 
                        // Prepare email and send it to the sponsor
-                       $message_sponsor = loadEmailTemplate('sponsor_lost', $DATA);
+                       $message_sponsor = loadEmailTemplate('sponsor_lost', $content);
                        sendEmail(postRequestParameter('email'), '{--SPONSOR_LOST_PASSWORD_SUBJECT--}', $message_sponsor);
 
                        // Update password
@@ -239,7 +239,7 @@ SET
 WHERE
        `id`=%s
 LIMIT 1",
-                               array(md5($DATA['password']), bigintval($DATA['id'])), __FILE__, __LINE__);
+                               array(md5($content['password']), bigintval($content['id'])), __FILE__, __LINE__);
 
                        // Output message
                        displayMessage('{--SPONSOR_LOST_PASSWORD_SENT--}');
index e76413f51297c87d844f411ff92819a0aff5eff5..cd9e8a25edae03538bbafb524c4b5ea6df90eabf 100644 (file)
@@ -360,10 +360,10 @@ INDEX (`party_userid`)
                // Let's begin with the incoming list
                $result = SQL_QUERY_ESC("SELECT `trans_id`,`from_userid`,`points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `id` ASC LIMIT {?transfer_max?}",
                        array(getMemberId()), __FILE__, __LINE__);
-               while ($DATA = SQL_FETCHROW($result)) {
-                       $DATA[] = 'IN';
-                       $DATA = implode("','", $DATA);
-                       $res_temp = SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_%s_transfers_tmp` (`trans_id`,`party_userid`,`points`,`reason`,`time_trans`,`trans_type`) VALUES ('" . $DATA . "')", array(getMemberId()), __FILE__, __LINE__);
+               while ($content = SQL_FETCHROW($result)) {
+                       $content[] = 'IN';
+                       $content = implode("','", $content);
+                       $res_temp = SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_%s_transfers_tmp` (`trans_id`,`party_userid`,`points`,`reason`,`time_trans`,`trans_type`) VALUES ('" . $content . "')", array(getMemberId()), __FILE__, __LINE__);
                } // END - while
 
                // Free memory
@@ -372,10 +372,10 @@ INDEX (`party_userid`)
                // As the last table transfer data from outgoing table to temporary
                $result = SQL_QUERY_ESC("SELECT `trans_id`,`to_userid`,`points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `id` LIMIT {?transfer_max?}",
                        array(getMemberId()), __FILE__, __LINE__);
-               while ($DATA = SQL_FETCHROW($result)) {
-                       $DATA[] = 'OUT';
-                       $DATA = implode("','", $DATA);
-                       $res_temp = SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_%s_transfers_tmp` (`trans_id`,`party_userid`,`points`,`reason`,`time_trans`,`trans_type`) VALUES ('" . $DATA . "')", array(getMemberId()), __FILE__, __LINE__);
+               while ($content = SQL_FETCHROW($result)) {
+                       $content[] = 'OUT';
+                       $content = implode("','", $content);
+                       $res_temp = SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_%s_transfers_tmp` (`trans_id`,`party_userid`,`points`,`reason`,`time_trans`,`trans_type`) VALUES ('" . $content . "')", array(getMemberId()), __FILE__, __LINE__);
                } // END - while
 
                // Free memory
index ac94882546bef37c686c798d7851fedf0c609dc8..d29104fd9517c65f6927ae6d1f5d079f75307a5c 100644 (file)
@@ -433,9 +433,6 @@ function detectExtraTemplatePath ($template) {
 
 // Loads an email template and compiles it
 function loadEmailTemplate ($template, $content = array(), $userid = NULL, $loadUserData = true) {
-       // @TODO $DATA is deprecated and should be avoided and replaced with $content
-       global $DATA;
-
        // Make sure all template names are lowercase!
        $template = strtolower($template);
 
@@ -516,8 +513,6 @@ function loadEmailTemplate ($template, $content = array(), $userid = NULL, $load
 <div class="para">
        {--TEMPLATE_CONTENT--}:
        <pre>' . print_r($content, true) . '</pre>
-       {--TEMPLATE_DATA--}:
-       <pre>' . print_r($DATA, true) . '</pre>
 </div>';
 
                // Debug mode not active? Then remove the HTML tags
@@ -541,7 +536,6 @@ function loadEmailTemplate ($template, $content = array(), $userid = NULL, $load
 
        // Remove content and data
        unset($content);
-       unset($DATA);
 
        // Return content
        return $newContent;
@@ -598,7 +592,7 @@ function compileCode ($code, $simple = false, $constants = true, $full = true, $
        return $code;
 }
 
-// Compiles the code (use compileCode() only for HTML because of the comments)
+// Compiles the code
 // @TODO $simple/$constants are deprecated
 function compileRawCode ($code, $simple = false, $constants = true, $full = true, $compileCode = true) {
        // Is the code a string or shall we not compile?
@@ -625,8 +619,7 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
        $code = str_replace($secChars['to'], $secChars['from'], $code);
 
        // Find $content[bla][blub] entries
-       // @TODO Do only use $content and deprecate $DATA in templates
-       preg_match_all('/\$(content|DATA)((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches);
+       preg_match_all('/\$content((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches);
 
        // Are some matches found?
        if ((count($matches) > 0) && (count($matches[0]) > 0)) {
@@ -1259,6 +1252,7 @@ function compileUriCode ($code, $simple = true) {
 
 // Handle message codes from URL
 function handleCodeMessage () {
+       // Is 'code' set?
        if (isGetRequestParameterSet('code')) {
                // Default extension is 'unknown'
                $ext = 'unknown';
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index d8daaf0521088f41d758ed3cf357f6aabd711746..13d4b2f365d01b35147daf3f98c9210a14350690 100644 (file)
@@ -4,22 +4,22 @@ Soeben ist eine Rallye automatisch beendet worden.
 
 Hier alle Infos zur Rallye:
 ------------------------------
-Titel: $DATA[title]
+Titel: $content[title]
 ------------------------------
-Beginn der Rallye: $DATA[start] Uhr
-Ende der Rallye: $DATA[end] Uhr
-Server-Zeit: $DATA[now_t] Uhr
+Beginn der Rallye: $content[start] Uhr
+Ende der Rallye: $content[end] Uhr
+Server-Zeit: $content[now_t] Uhr
 ------------------------------
 
-Es wurden bereits alle $content Gewinner informiert!
+Es wurden bereits alle {%pipe,translateComma=$content[count]%} Gewinner informiert!
 
 Wichtige Hinweise:
 -----------------------------
-- $DATA[min_users]
-- $DATA[min_prices]
+- $content[min_users]
+- $content[min_prices]
 -----------------------------
 
 Mit freundlichen Gr&uuml;&szlig;en,
   Ihr {?MAIN_TITLE?} Script
 
-{?URL?}/admin.php
\ No newline at end of file
+{?URL?}/admin.php
index 3e5cba05f678d8a164101d67a5ff4048b0616d29..fe41229a31d56fa36cdf591f544f456cca9cfad1 100644 (file)
@@ -4,17 +4,17 @@ Soeben ist eine Rallye automatisch beendet worden.
 
 Hier alle Infos zur Rallye:
 ------------------------------
-Titel: $DATA[title]
+Titel: $content[title]
 ------------------------------
-Beginn der Rallye: $DATA[start] Uhr
-Ende der Rallye: $DATA[end] Uhr
-Server-Zeit: $DATA[now_t] Uhr
+Beginn der Rallye: $content[start] Uhr
+Ende der Rallye: $content[end] Uhr
+Server-Zeit: $content[now_t] Uhr
 ------------------------------
 
 Bitte informieren Sie Ihre Mitglieder nun selber:
 
 ------------------------------
-$content
+{%pipe,translateComma=$content[count]%}
 ------------------------------
 
 Die {?POINTS?} wurden bereits aufgebucht. Bitte nicht erneut aufbauen!
@@ -22,4 +22,4 @@ Die {?POINTS?} wurden bereits aufgebucht. Bitte nicht erneut aufbauen!
 Mit freundlichen Gr&uuml;&szlig;en,
   Ihr {?MAIN_TITLE?} Script
 
-{?URL?}/admin.php
\ No newline at end of file
+{?URL?}/admin.php
index 2d227083276cfb8997fea0293138ce2df3c74863..8079417f99fbdd11163d912ced6f3621a81d057c 100644 (file)
@@ -4,18 +4,18 @@ Soeben wurde automatisch eine neue Referal-Rallye gestartet!
 
 Hier alle Infos zur Rallye:
 ------------------------------
-Titel: $DATA[title]
+Titel: $content[title]
 ------------------------------
-Beginn der Rallye: $DATA[start] Uhr
-Ende der Rallye: $DATA[end] Uhr
-Server-Zeit: $DATA[now_t] Uhr
+Beginn der Rallye: $content[start] Uhr
+Ende der Rallye: $content[end] Uhr
+Server-Zeit: $content[now_t] Uhr
 ------------------------------
 
 $content
-Die automatische Benachrichtigung war abgeschaltet. Bitte teilen Sie Ihren $DATA[userid_cnt] Mitgliedern mit, dass die Rallye am Laufen ist!
+Die automatische Benachrichtigung war abgeschaltet. Bitte teilen Sie Ihren {%pipe,translateComma=$content[userid_cnt]%} Mitgliedern mit, dass die Rallye am Laufen ist!
 ------------------------------
 
 Mit freundlichen Gr&uuml;&szlig;en,
   Ihr {?MAIN_TITLE?} Script
 
-{?URL?}/admin.php
\ No newline at end of file
+{?URL?}/admin.php
index 059c22552a0f2d06c888b9d9270a659e6a254046..77a51272cd29e9e281c8dfb5060d32d729927deb 100644 (file)
@@ -4,18 +4,18 @@ Soeben wurde automatisch eine neue Referal-Rallye gestartet!
 
 Hier alle Infos zur Rallye:
 ------------------------------
-Titel: $DATA[title]
+Titel: $content[title]
 ------------------------------
-Beginn der Rallye: $DATA[start] Uhr
-Ende der Rallye: $DATA[end] Uhr
-Server-Zeit: $DATA[now_t] Uhr
+Beginn der Rallye: $content[start] Uhr
+Ende der Rallye: $content[end] Uhr
+Server-Zeit: $content[now_t] Uhr
 ------------------------------
 
 $content
-Es wurden bereits alle Ihre $DATA[userid_cnt] Mitglieder informiert!
+Es wurden bereits alle Ihre {%pipe,translateComma=$content[userid_cnt]%} Mitglieder informiert!
 ------------------------------
 
 Mit freundlichen Gr&uuml;&szlig;en,
   Ihr {?MAIN_TITLE?} Script
 
-{?URL?}/admin.php
\ No newline at end of file
+{?URL?}/admin.php
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index e24ecc79d9a79911bf99ec2a71c285fb1445d625..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1,34 +1 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
-
-------------------------------
-Ihre Mitglied-Id lautet: $userid
-------------------------------
-
-Herzlichen Gl&uuml;ckwunsch, Sie haben soeben den $DATA[level]. Platz in unserer aktuellen Referal-Rallye gemacht!
-
-------------------------------
-Ihr Gewinn: $DATA[infos]
-------------------------------
-
-Hier alle Infos zur Rallye:
-------------------------------
-Titel: $DATA[title]
-------------------------------
-Beginn der Rallye: $DATA[start] Uhr
-Ende der Rallye: $DATA[end] Uhr
-Server-Zeit: $DATA[now_t] Uhr
-------------------------------
-
-Wir bedanken uns f&uuml;r Ihre Bem&uuml;hungen und Interesse an unserer Rallye und w&uuml;nschen Ihnen weiterhin viel Erfolg und viele interessante Webseiten von unseren Mitgliedern.
-
-Wichtige Hinweise:
---------------------------------
-- Es werden nur aktive User gewertet. Der Rechtsweg ist ausgeschlossen.
-- $DATA[min_users]
-- $DATA[min_prices]
---------------------------------
-
-Mit freundlichen Gr&uuml;&szlig;en,
-  Ihr {?MAIN_TITLE?} Team
-
-{?URL?}/login.php ({?WEBMASTER?})
+@DEPRECATED
index aa25d63be8e61581e27fcc847da7e638c76db6f6..f6704bcbd9fc1f62b4b5648a5e1fa14ce61fa99a 100644 (file)
@@ -7,16 +7,16 @@ Ihre Mitglied-Id lautet: $userid
 Herzlichen Gl&uuml;ckwunsch, Sie sind der Bronze-Gewinner unserer Referal-Rallye!
 
 ------------------------------
-Ihr Gewinn: $DATA[infos]
+Ihr Gewinn: $content[infos]
 ------------------------------
 
 Hier alle Infos zur Rallye:
 ------------------------------
-Titel: $DATA[title]
+Titel: $content[title]
 ------------------------------
-Beginn der Rallye: $DATA[start] Uhr
-Ende der Rallye: $DATA[end] Uhr
-Server-Zeit: $DATA[now_t] Uhr
+Beginn der Rallye: $content[start] Uhr
+Ende der Rallye: $content[end] Uhr
+Server-Zeit: $content[now_t] Uhr
 ------------------------------
 
 Wir bedanken uns f&uuml;r Ihre Bem&uuml;hungen und Interesse an unserer Rallye und w&uuml;nschen Ihnen weiterhin viel Erfolg und viele interessante Webseiten von unseren Mitgliedern.
@@ -24,8 +24,8 @@ Wir bedanken uns f&uuml;r Ihre Bem&uuml;hungen und Interesse an unserer Rallye u
 Wichtige Hinweise:
 -----------------------------
 - Es werden nur aktive User gewertet. Der Rechtsweg ist ausgeschlossen.
-- $DATA[min_users]
-- $DATA[min_prices]
+- $content[min_users]
+- $content[min_prices]
 -----------------------------
 
 Mit freundlichen Gr&uuml;&szlig;en,
index 103e580948bb82ec42fe5179c34546e91bfa9428..a7bac214cc7224db298e298584a273739dfbfa1b 100644 (file)
@@ -7,16 +7,16 @@ Ihre Mitglied-Id lautet: $userid
 Herzlichen Gl&uuml;ckwunsch, Sie sind der Gold-Gewinner unserer Referal-Rallye!
 
 ------------------------------
-Ihr Gewinn: $DATA[infos]
+Ihr Gewinn: $content[infos]
 ------------------------------
 
 Hier alle Infos zur Rallye:
 ------------------------------
-Titel: $DATA[title]
+Titel: $content[title]
 ------------------------------
-Beginn der Rallye: $DATA[start] Uhr
-Ende der Rallye: $DATA[end] Uhr
-Server-Zeit: $DATA[now_t] Uhr
+Beginn der Rallye: $content[start] Uhr
+Ende der Rallye: $content[end] Uhr
+Server-Zeit: $content[now_t] Uhr
 ------------------------------
 
 Wir bedanken uns f&uuml;r Ihre Bem&uuml;hungen und Interesse an unserer Rallye und w&uuml;nschen Ihnen weiterhin viel Erfolg und viele interessante Webseiten von unseren Mitgliedern.
@@ -24,8 +24,8 @@ Wir bedanken uns f&uuml;r Ihre Bem&uuml;hungen und Interesse an unserer Rallye u
 Wichtige Hinweise:
 -----------------------------
 - Es werden nur aktive User gewertet. Der Rechtsweg ist ausgeschlossen.
-- $DATA[min_users]
-- $DATA[min_prices]
+- $content[min_users]
+- $content[min_prices]
 -----------------------------
 
 Mit freundlichen Gr&uuml;&szlig;en,
diff --git a/templates/de/emails/member/member_rallye_expired_other.tpl b/templates/de/emails/member/member_rallye_expired_other.tpl
new file mode 100644 (file)
index 0000000..0239fd3
--- /dev/null
@@ -0,0 +1,34 @@
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+
+------------------------------
+Ihre Mitglied-Id lautet: $userid
+------------------------------
+
+Herzlichen Gl&uuml;ckwunsch, Sie haben soeben den $content[level]. Platz in unserer aktuellen Referal-Rallye gemacht!
+
+------------------------------
+Ihr Gewinn: $content[infos]
+------------------------------
+
+Hier alle Infos zur Rallye:
+------------------------------
+Titel: $content[title]
+------------------------------
+Beginn der Rallye: $content[start] Uhr
+Ende der Rallye: $content[end] Uhr
+Server-Zeit: $content[now_t] Uhr
+------------------------------
+
+Wir bedanken uns f&uuml;r Ihre Bem&uuml;hungen und Interesse an unserer Rallye und w&uuml;nschen Ihnen weiterhin viel Erfolg und viele interessante Webseiten von unseren Mitgliedern.
+
+Wichtige Hinweise:
+--------------------------------
+- Es werden nur aktive User gewertet. Der Rechtsweg ist ausgeschlossen.
+- $content[min_users]
+- $content[min_prices]
+--------------------------------
+
+Mit freundlichen Gr&uuml;&szlig;en,
+  Ihr {?MAIN_TITLE?} Team
+
+{?URL?}/login.php ({?WEBMASTER?})
index 9eb7da82e7df6e5e23856f7dbd461873405b2cb8..e62bd62f521f26c373d19bcaf72a71033a349439 100644 (file)
@@ -7,16 +7,16 @@ Ihre Mitglied-Id lautet: $userid
 Herzlichen Gl&uuml;ckwunsch, Sie sind der Silber-Gewinner unserer Referal-Rallye!
 
 ------------------------------
-Ihr Gewinn: $DATA[infos]
+Ihr Gewinn: $content[infos]
 ------------------------------
 
 Hier alle Infos zur Rallye:
 ------------------------------
-Titel: $DATA[title]
+Titel: $content[title]
 ------------------------------
-Beginn der Rallye: $DATA[start] Uhr
-Ende der Rallye: $DATA[end] Uhr
-Server-Zeit: $DATA[now_t] Uhr
+Beginn der Rallye: $content[start] Uhr
+Ende der Rallye: $content[end] Uhr
+Server-Zeit: $content[now_t] Uhr
 ------------------------------
 
 Wir bedanken uns f&uuml;r Ihre Bem&uuml;hungen und Interesse an unserer Rallye und w&uuml;nschen Ihnen weiterhin viel Erfolg und viele interessante Webseiten von unseren Mitgliedern.
@@ -24,8 +24,8 @@ Wir bedanken uns f&uuml;r Ihre Bem&uuml;hungen und Interesse an unserer Rallye u
 Wichtige Hinweise:
 -----------------------------
 - Es werden nur aktive User gewertet. Der Rechtsweg ist ausgeschlossen.
-- $DATA[min_users]
-- $DATA[min_prices]
+- $content[min_users]
+- $content[min_prices]
 -----------------------------
 
 Mit freundlichen Gr&uuml;&szlig;en,
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f..84d1ed3b8c770f702d44f3f65fc969cf97cfed41 100644 (file)
@@ -1 +1 @@
-<!-- @DEPRECATED //-->
+@DEPRECATED
index 06beae83981334af63876e5a9c6fbb68e13d58ec..3db391c4a77efcfdfd42f032a2f2daf2151cf814 100644 (file)
@@ -1,6 +1,6 @@
 <tr>
        <td align="center" class="{%template,ColorSwitch%} bottom" colspan="4">
                <span class="notice large">$content[problem]:</span>
-               $content[data]
+               $content[mail_id]
        </td>
 </tr>