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
./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.
./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&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 //-->
}
// 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 = '';
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
'DEFAULT_POINTS' => "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:",
'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 $DATA",
'ADMIN_RESET_PASSWORD_SEND_LINK_TITLE' => "1/4: Administratorkennwort zurücksetzen",
'ADMIN_VALIDATE_HASH_TITLE' => "2/4: Validierung Iher Logindaten",
array(bigintval($rallye)), __FUNCTION__, __LINE__);
// Load users
- $DATA = array(
+ $content = array(
'userid' => array(),
'ref' => array(),
'cpoints' => array()
}
// 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
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
//
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);
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);
if (($total < $min_prices) || ($total == '0')) {
// Do not end this rallye!
- unset($DATA);
+ unset($content);
return;
} // END - if
// 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
$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');
$prices = countSumTotalData(bigintval($rallye), 'rallye_prices', 'id', 'rallye_id', true);
// Load data
- $DATA = getArrayFromReferalRallyeUsers($rallye);
+ $content = getArrayFromReferalRallyeUsers($rallye);
// Generate table
$OUT = '';
// 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
// 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'])) {
} // 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--}');
// @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...
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') . '&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') . '&bonusid=' . $id2 . '%}" target="_blank">' . $id2 . '</a>';
break;
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);
// Load template for error
$OUT .= loadTemplate('admin_list_links_problem', true,
array(
- 'problem' => $PROBLEM,
- 'data' => $DATA
+ 'problem' => $problemMessage,
+ 'mail_id' => $mailId
)
);
}
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 = '';
}
// Prepare data for the row template
- $content = array(
+ $row = array(
'b1' => $B1,
'b2' => $B2,
'tpl' => $row_array[0],
);
// 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;
// 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
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--}');
// 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
// 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
// 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);
<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
// Remove content and data
unset($content);
- unset($DATA);
// Return content
return $newContent;
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?
$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)) {
// Handle message codes from URL
function handleCodeMessage () {
+ // Is 'code' set?
if (isGetRequestParameterSet('code')) {
// Default extension is 'unknown'
$ext = 'unknown';
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
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
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!
Mit freundlichen Grüßen,
Ihr {?MAIN_TITLE?} Script
-{?URL?}/admin.php
\ No newline at end of file
+{?URL?}/admin.php
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
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
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-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
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.
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,
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.
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,
--- /dev/null
+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?})
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.
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,
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
-<!-- @DEPRECATED //-->
+@DEPRECATED
<tr>
<td align="center" class="{%template,ColorSwitch%} bottom" colspan="4">
<span class="notice large">$content[problem]:</span>
- $content[data]
+ $content[mail_id]
</td>
</tr>
projects / mailer.git / commitdiff