From 97702d59eb179b54690f9ccc18df66cd981ab0df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 29 Jul 2011 06:28:58 +0000 Subject: [PATCH] Deprecated $DATA renamed: - Deprecated $DATA replaced with $content - TODOs.txt updated --- .gitattributes | 1 + DOCS/TODOs.txt | 97 ++++++++--------- inc/functions.php | 4 +- inc/language/de.php | 3 +- inc/libs/rallye_functions.php | 100 +++++++++--------- inc/modules/admin/what-add_surfbar_url.php | 4 +- inc/modules/admin/what-edit_sponsor.php | 6 +- inc/modules/admin/what-list_links.php | 20 ++-- inc/modules/admin/what-optimize.php | 11 +- inc/modules/guest/what-sponsor_login.php | 10 +- inc/modules/member/what-transfer.php | 16 +-- inc/template-functions.php | 12 +-- templates/de/emails/add-points.tpl | 2 +- templates/de/emails/admin-del_links.tpl | 2 +- templates/de/emails/admin/admin_coupon.tpl | 2 +- .../emails/admin/admin_del_surfbar_urls.tpl | 2 +- .../de/emails/admin/admin_rallye_expired.tpl | 16 +-- .../emails/admin/admin_rallye_expired_no.tpl | 12 +-- .../emails/admin/admin_rallye_no_notify.tpl | 12 +-- .../de/emails/admin/admin_rallye_notify.tpl | 12 +-- .../admin/admin_surfbar_url_depleted.tpl | 2 +- templates/de/emails/back-admin.tpl | 2 +- templates/de/emails/back-member.tpl | 2 +- templates/de/emails/bonus-mail.tpl | 2 +- templates/de/emails/confirm-member.tpl | 2 +- templates/de/emails/confirm-referral.tpl | 2 +- templates/de/emails/del-user.tpl | 2 +- templates/de/emails/done-admin.tpl | 2 +- templates/de/emails/done-member.tpl | 2 +- templates/de/emails/lock-user.tpl | 2 +- templates/de/emails/member/member_coupon.tpl | 2 +- .../emails/member/member_del_surfbar_urls.tpl | 2 +- .../emails/member/member_rallye_expired.tpl | 35 +----- .../member/member_rallye_expired_bronce.tpl | 14 +-- .../member/member_rallye_expired_gold.tpl | 14 +-- .../member/member_rallye_expired_other.tpl | 34 ++++++ .../member/member_rallye_expired_silver.tpl | 14 +-- templates/de/emails/new-pass.tpl | 2 +- templates/de/emails/normal-mail.tpl | 2 +- templates/de/emails/order-accept.tpl | 2 +- templates/de/emails/order-admin.tpl | 2 +- templates/de/emails/order-deleted.tpl | 2 +- templates/de/emails/order-member.tpl | 2 +- templates/de/emails/order-reject.tpl | 2 +- templates/de/emails/register-admin.tpl | 2 +- templates/de/emails/register-member.tpl | 2 +- templates/de/emails/sub-points.tpl | 2 +- templates/de/emails/unlock-user.tpl | 2 +- .../html/admin/admin_list_links_problem.tpl | 2 +- 49 files changed, 244 insertions(+), 259 deletions(-) create mode 100644 templates/de/emails/member/member_rallye_expired_other.tpl diff --git a/.gitattributes b/.gitattributes index 3421fd6faf..0aca48a71b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 689c4ab723..6db624ffc4 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -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 @@ -126,7 +125,7 @@ ./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' , ' "Punkte", 'PROBLEM_POINTS_OVERVIEW_UNAVAILABLE' => "{?POINTS?}-Übersicht derzeit nicht verfügbar.", 'ADMIN_NOTHING_SELECTED_CHANGE' => "Sie haben nichts zum Ändern des Status ausgewä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 %s weisst keine Mitglieder auf.", - 'TEMPLATE_DATA' => "Daten aus $DATA", 'ADMIN_RESET_PASSWORD_SEND_LINK_TITLE' => "1/4: Administratorkennwort zurücksetzen", 'ADMIN_VALIDATE_HASH_TITLE' => "2/4: Validierung Iher Logindaten", diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index faf162d600..5a0cfde17f 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -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 = ''; $end = ''; } // 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 = ''; $end = ''; } // 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 diff --git a/inc/modules/admin/what-add_surfbar_url.php b/inc/modules/admin/what-add_surfbar_url.php index 43d32d83b2..1df52561c4 100644 --- a/inc/modules/admin/what-add_surfbar_url.php +++ b/inc/modules/admin/what-add_surfbar_url.php @@ -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'])) { diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php index 88258c3180..d0699a3f32 100644 --- a/inc/modules/admin/what-edit_sponsor.php +++ b/inc/modules/admin/what-edit_sponsor.php @@ -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--}'); diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php index 34e5aeeb03..0726c0b131 100644 --- a/inc/modules/admin/what-list_links.php +++ b/inc/modules/admin/what-list_links.php @@ -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 = '' . $id . ''; 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 = '' . $id2 . ''; 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 ) ); } diff --git a/inc/modules/admin/what-optimize.php b/inc/modules/admin/what-optimize.php index ff266c741c..6910cacb3e 100644 --- a/inc/modules/admin/what-optimize.php +++ b/inc/modules/admin/what-optimize.php @@ -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; diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php index caaab11357..fe65aaf38e 100644 --- a/inc/modules/guest/what-sponsor_login.php +++ b/inc/modules/guest/what-sponsor_login.php @@ -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--}'); diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index e76413f512..cd9e8a25ed 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -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 diff --git a/inc/template-functions.php b/inc/template-functions.php index ac94882546..d29104fd95 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -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
{--TEMPLATE_CONTENT--}: 
' . print_r($content, true) . '
- {--TEMPLATE_DATA--}: - 
' . print_r($DATA, true) . '
'; // 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'; diff --git a/templates/de/emails/add-points.tpl b/templates/de/emails/add-points.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/add-points.tpl +++ b/templates/de/emails/add-points.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/admin-del_links.tpl b/templates/de/emails/admin-del_links.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/admin-del_links.tpl +++ b/templates/de/emails/admin-del_links.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/admin/admin_coupon.tpl b/templates/de/emails/admin/admin_coupon.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/admin/admin_coupon.tpl +++ b/templates/de/emails/admin/admin_coupon.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/admin/admin_del_surfbar_urls.tpl b/templates/de/emails/admin/admin_del_surfbar_urls.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/admin/admin_del_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_del_surfbar_urls.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/admin/admin_rallye_expired.tpl b/templates/de/emails/admin/admin_rallye_expired.tpl index d8daaf0521..13d4b2f365 100644 --- a/templates/de/emails/admin/admin_rallye_expired.tpl +++ b/templates/de/emails/admin/admin_rallye_expired.tpl @@ -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üßen, Ihr {?MAIN_TITLE?} Script -{?URL?}/admin.php \ No newline at end of file +{?URL?}/admin.php diff --git a/templates/de/emails/admin/admin_rallye_expired_no.tpl b/templates/de/emails/admin/admin_rallye_expired_no.tpl index 3e5cba05f6..fe41229a31 100644 --- a/templates/de/emails/admin/admin_rallye_expired_no.tpl +++ b/templates/de/emails/admin/admin_rallye_expired_no.tpl @@ -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üßen, Ihr {?MAIN_TITLE?} Script -{?URL?}/admin.php \ No newline at end of file +{?URL?}/admin.php diff --git a/templates/de/emails/admin/admin_rallye_no_notify.tpl b/templates/de/emails/admin/admin_rallye_no_notify.tpl index 2d22708327..8079417f99 100644 --- a/templates/de/emails/admin/admin_rallye_no_notify.tpl +++ b/templates/de/emails/admin/admin_rallye_no_notify.tpl @@ -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üßen, Ihr {?MAIN_TITLE?} Script -{?URL?}/admin.php \ No newline at end of file +{?URL?}/admin.php diff --git a/templates/de/emails/admin/admin_rallye_notify.tpl b/templates/de/emails/admin/admin_rallye_notify.tpl index 059c22552a..77a51272cd 100644 --- a/templates/de/emails/admin/admin_rallye_notify.tpl +++ b/templates/de/emails/admin/admin_rallye_notify.tpl @@ -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üßen, Ihr {?MAIN_TITLE?} Script -{?URL?}/admin.php \ No newline at end of file +{?URL?}/admin.php diff --git a/templates/de/emails/admin/admin_surfbar_url_depleted.tpl b/templates/de/emails/admin/admin_surfbar_url_depleted.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/admin/admin_surfbar_url_depleted.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_depleted.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/back-admin.tpl b/templates/de/emails/back-admin.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/back-admin.tpl +++ b/templates/de/emails/back-admin.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/back-member.tpl b/templates/de/emails/back-member.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/back-member.tpl +++ b/templates/de/emails/back-member.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/bonus-mail.tpl b/templates/de/emails/bonus-mail.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/bonus-mail.tpl +++ b/templates/de/emails/bonus-mail.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/confirm-member.tpl b/templates/de/emails/confirm-member.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/confirm-member.tpl +++ b/templates/de/emails/confirm-member.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/confirm-referral.tpl b/templates/de/emails/confirm-referral.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/confirm-referral.tpl +++ b/templates/de/emails/confirm-referral.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/del-user.tpl b/templates/de/emails/del-user.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/del-user.tpl +++ b/templates/de/emails/del-user.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/done-admin.tpl b/templates/de/emails/done-admin.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/done-admin.tpl +++ b/templates/de/emails/done-admin.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/done-member.tpl b/templates/de/emails/done-member.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/done-member.tpl +++ b/templates/de/emails/done-member.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/lock-user.tpl b/templates/de/emails/lock-user.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/lock-user.tpl +++ b/templates/de/emails/lock-user.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/member/member_coupon.tpl b/templates/de/emails/member/member_coupon.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/member/member_coupon.tpl +++ b/templates/de/emails/member/member_coupon.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/member/member_del_surfbar_urls.tpl b/templates/de/emails/member/member_del_surfbar_urls.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/member/member_del_surfbar_urls.tpl +++ b/templates/de/emails/member/member_del_surfbar_urls.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/member/member_rallye_expired.tpl b/templates/de/emails/member/member_rallye_expired.tpl index e24ecc79d9..84d1ed3b8c 100644 --- a/templates/de/emails/member/member_rallye_expired.tpl +++ b/templates/de/emails/member/member_rallye_expired.tpl @@ -1,34 +1 @@ -Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}, - ------------------------------- -Ihre Mitglied-Id lautet: $userid ------------------------------- - -Herzlichen Glü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ür Ihre Bemühungen und Interesse an unserer Rallye und wü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üßen, - Ihr {?MAIN_TITLE?} Team - -{?URL?}/login.php ({?WEBMASTER?}) +@DEPRECATED diff --git a/templates/de/emails/member/member_rallye_expired_bronce.tpl b/templates/de/emails/member/member_rallye_expired_bronce.tpl index aa25d63be8..f6704bcbd9 100644 --- a/templates/de/emails/member/member_rallye_expired_bronce.tpl +++ b/templates/de/emails/member/member_rallye_expired_bronce.tpl @@ -7,16 +7,16 @@ Ihre Mitglied-Id lautet: $userid Herzlichen Glü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ür Ihre Bemühungen und Interesse an unserer Rallye und wünschen Ihnen weiterhin viel Erfolg und viele interessante Webseiten von unseren Mitgliedern. @@ -24,8 +24,8 @@ Wir bedanken uns für Ihre Bemü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üßen, diff --git a/templates/de/emails/member/member_rallye_expired_gold.tpl b/templates/de/emails/member/member_rallye_expired_gold.tpl index 103e580948..a7bac214cc 100644 --- a/templates/de/emails/member/member_rallye_expired_gold.tpl +++ b/templates/de/emails/member/member_rallye_expired_gold.tpl @@ -7,16 +7,16 @@ Ihre Mitglied-Id lautet: $userid Herzlichen Glü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ür Ihre Bemühungen und Interesse an unserer Rallye und wünschen Ihnen weiterhin viel Erfolg und viele interessante Webseiten von unseren Mitgliedern. @@ -24,8 +24,8 @@ Wir bedanken uns für Ihre Bemü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üß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 index 0000000000..0239fd3673 --- /dev/null +++ b/templates/de/emails/member/member_rallye_expired_other.tpl @@ -0,0 +1,34 @@ +Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}, + +------------------------------ +Ihre Mitglied-Id lautet: $userid +------------------------------ + +Herzlichen Glü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ür Ihre Bemühungen und Interesse an unserer Rallye und wü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üßen, + Ihr {?MAIN_TITLE?} Team + +{?URL?}/login.php ({?WEBMASTER?}) diff --git a/templates/de/emails/member/member_rallye_expired_silver.tpl b/templates/de/emails/member/member_rallye_expired_silver.tpl index 9eb7da82e7..e62bd62f52 100644 --- a/templates/de/emails/member/member_rallye_expired_silver.tpl +++ b/templates/de/emails/member/member_rallye_expired_silver.tpl @@ -7,16 +7,16 @@ Ihre Mitglied-Id lautet: $userid Herzlichen Glü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ür Ihre Bemühungen und Interesse an unserer Rallye und wünschen Ihnen weiterhin viel Erfolg und viele interessante Webseiten von unseren Mitgliedern. @@ -24,8 +24,8 @@ Wir bedanken uns für Ihre Bemü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üßen, diff --git a/templates/de/emails/new-pass.tpl b/templates/de/emails/new-pass.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/new-pass.tpl +++ b/templates/de/emails/new-pass.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/normal-mail.tpl b/templates/de/emails/normal-mail.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/normal-mail.tpl +++ b/templates/de/emails/normal-mail.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/order-accept.tpl b/templates/de/emails/order-accept.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/order-accept.tpl +++ b/templates/de/emails/order-accept.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/order-admin.tpl b/templates/de/emails/order-admin.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/order-admin.tpl +++ b/templates/de/emails/order-admin.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/order-deleted.tpl b/templates/de/emails/order-deleted.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/order-deleted.tpl +++ b/templates/de/emails/order-deleted.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/order-member.tpl b/templates/de/emails/order-member.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/order-member.tpl +++ b/templates/de/emails/order-member.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/order-reject.tpl b/templates/de/emails/order-reject.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/order-reject.tpl +++ b/templates/de/emails/order-reject.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/register-admin.tpl b/templates/de/emails/register-admin.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/register-admin.tpl +++ b/templates/de/emails/register-admin.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/register-member.tpl b/templates/de/emails/register-member.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/register-member.tpl +++ b/templates/de/emails/register-member.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/sub-points.tpl b/templates/de/emails/sub-points.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/sub-points.tpl +++ b/templates/de/emails/sub-points.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/emails/unlock-user.tpl b/templates/de/emails/unlock-user.tpl index 11f5d85d80..84d1ed3b8c 100644 --- a/templates/de/emails/unlock-user.tpl +++ b/templates/de/emails/unlock-user.tpl @@ -1 +1 @@ - +@DEPRECATED diff --git a/templates/de/html/admin/admin_list_links_problem.tpl b/templates/de/html/admin/admin_list_links_problem.tpl index 06beae8398..3db391c4a7 100644 --- a/templates/de/html/admin/admin_list_links_problem.tpl +++ b/templates/de/html/admin/admin_list_links_problem.tpl @@ -1,6 +1,6 @@ $content[problem]: - $content[data] + $content[mail_id] -- 2.39.5