From d49fe31440f5946f23cd2b4044c6e0256640dde4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 29 Oct 2009 00:49:24 +0000 Subject: [PATCH] Several array indexes renamed, TODOs.txt updated --- DOCS/TODOs.txt | 39 ++++++------- inc/modules/admin/overview-inc.php | 2 +- inc/modules/admin/what-config_payouts.php | 25 ++++---- inc/modules/admin/what-config_points.php | 10 ++-- inc/modules/admin/what-del_email.php | 34 +++++------ inc/modules/admin/what-edit_emails.php | 13 ++--- inc/modules/admin/what-email_archiv.php | 6 +- inc/modules/admin/what-list_links.php | 10 ++-- inc/modules/admin/what-unlock_emails.php | 27 +++++---- inc/modules/member/what-stats.php | 39 ++++++------- .../de/html/admin/admin_add_reflevel.tpl | 23 ++++---- .../admin/admin_config_payouts_del_row.tpl | 2 +- .../admin/admin_config_payouts_edit_row.tpl | 2 +- .../html/admin/admin_config_payouts_row.tpl | 4 +- .../de/html/admin/admin_del_email_bonus.tpl | 2 +- .../de/html/admin/admin_del_email_normal.tpl | 2 +- .../de/html/admin/admin_del_email_notify.tpl | 2 +- templates/de/html/admin/admin_edit_email.tpl | 11 ++-- .../de/html/admin/admin_edit_email_row.tpl | 2 +- .../de/html/admin/admin_email_archiv_row.tpl | 4 +- .../de/html/admin/admin_list_links_row.tpl | 2 +- .../de/html/admin/admin_overview_row.tpl | 2 +- .../de/html/admin/admin_payout_add_new.tpl | 57 +++++++++++-------- .../de/html/admin/admin_unlock_emails_row.tpl | 6 +- templates/de/html/member/member_pool_row.tpl | 2 +- templates/de/html/member/member_stats_row.tpl | 4 +- 26 files changed, 172 insertions(+), 160 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 1d042b9f2c..d06dea0e68 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -3,7 +3,7 @@ ./beg.php:191: // @TODO Opps, what is missing here??? ./birthday_confirm.php:93: // @TODO Try to rewrite the following unset() ./inc/cache/config-local.php:122:// @TODO Rewrite the following three constants, somehow... -./inc/classes/cachesystem.class.php:473: // @TODO Add support for more types which break in last else-block +./inc/classes/cachesystem.class.php:461: // @TODO Add support for more types which break in last else-block ./inc/config-functions.php:157: // @TODO Make this all better... :-/ ./inc/config-functions.php:332: // @TODO Find a way for updating configuration here ./inc/extensions/ext-html_mail.php:140: // @TODO Move these arrays into config @@ -16,20 +16,20 @@ ./inc/extensions-functions.php:370:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) ./inc/extensions-functions.php:481: // @TODO Extension is loaded, what next? ./inc/footer.php:47: // @TODO Rewrite these all into filters -./inc/functions.php:1339: // @TODO Remove this if() block if all is working fine +./inc/functions.php:1346: // @TODO Remove this if() block if all is working fine ./inc/functions.php:222: // @TODO Remove this sanity-check if all is fine ./inc/functions.php:225: // @TODO Try to rewrite all $DATA to $content -./inc/functions.php:2336:// @TODO Try to move this to inc/libs/theme_functions.php -./inc/functions.php:2375: // @TODO The status should never be empty -./inc/functions.php:2507:// @TODO Please describe this function -./inc/functions.php:2525: searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time); -./inc/functions.php:2610: // @TODO Add a little more infos here -./inc/functions.php:2621: // @TODO This cannot be rewritten to app_die(), try to find a solution for this. +./inc/functions.php:2343:// @TODO Try to move this to inc/libs/theme_functions.php +./inc/functions.php:2382: // @TODO The status should never be empty +./inc/functions.php:2514:// @TODO Please describe this function +./inc/functions.php:2532: searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time); +./inc/functions.php:2617: // @TODO Add a little more infos here +./inc/functions.php:2628: // @TODO This cannot be rewritten to app_die(), try to find a solution for this. ./inc/functions.php:264: // @TODO Find all templates which are using these direct variables and rewrite them. ./inc/functions.php:265: // @TODO After this step is done, this else-block is history -./inc/functions.php:2703: // @TODO Rewrite this old lost code to a template -./inc/functions.php:2822: // @TODO Are these convertions still required? -./inc/functions.php:2840:// @TODO Rewrite this function to use readFromFile() and writeToFile() +./inc/functions.php:2710: // @TODO Rewrite this old lost code to a template +./inc/functions.php:2829: // @TODO Are these convertions still required? +./inc/functions.php:2847:// @TODO Rewrite this function to use readFromFile() and writeToFile() ./inc/functions.php:581: // @TODO Extension 'msg' does not exist ./inc/functions.php:658:// @TODO Rewrite this to an extension 'smtp' ./inc/install-functions.php:62: // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0); @@ -44,7 +44,7 @@ ./inc/language/sponsor_de.php:118:// @TODO Rewrite these four constants to one and use sprintf() ./inc/libs/admins_functions.php:418: // @TODO This can be, somehow, rewritten ./inc/libs/beg_functions.php:57: // @TODO Try to rewrite the following unset() -./inc/libs/bonus_functions.php:187: // @TODO Try to find a way for rewriting this constant +./inc/libs/bonus_functions.php:206: // @TODO Try to find a way for rewriting this constant ./inc/libs/doubler_functions.php:45:// @TODO Lame description ./inc/libs/rallye_functions.php:699: $EXPIRE = 3; // @TODO The hard-coded value... ./inc/libs/rallye_functions.php:763: // @TODO Rewrite this to our API function @@ -86,12 +86,10 @@ ./inc/modules/admin/what-chk_regs.php:65: // @TODO Rewritings: surname->surname,family->family,ip->REMOTE_ADDR,ref->refid,hash->user_hash in template ./inc/modules/admin/what-config_admins.php:148: // @TODO Rewrite this to filter 'run_sqls' ./inc/modules/admin/what-config_mods.php:137: // @TODO Rewritings: mod->module in template -./inc/modules/admin/what-config_payouts.php:215: // @TODO Rewrite in template: mpoi->min_points,from->from_account ./inc/modules/admin/what-config_rallye_prices.php:202: // @TODO Rewritings: level->price_level, infos->info in template ./inc/modules/admin/what-config_rallye_prices.php:219: // @TODO Rewrite these two constants ./inc/modules/admin/what-config_rallye_prices.php:254: // @TODO Rewritings: admin_id->admin_id, alogin->login in template ./inc/modules/admin/what-config_register.php:67: // @TODO Move this HTML code into a template -./inc/modules/admin/what-edit_emails.php:99: // @TODO Rewritings: subj->subject in template ./inc/modules/admin/what-edit_user.php:20: * @TODO Add support for ext-country * ./inc/modules/admin/what-email_archiv.php:91: // @TODO Rewrite to SQL_FETCHARRAY() ./inc/modules/admin/what-email_stats.php:47:// @TODO Unused at the moment @@ -132,7 +130,6 @@ ./inc/modules/admin/what-payments.php:151: // @TODO Rewritings: title->mail_title, pay->payment in template ./inc/modules/admin/what-refbanner.php:145: // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template ./inc/modules/admin/what-unlock_emails.php:101: // @TODO Rewrite these if-blocks to a filter -./inc/modules/admin/what-unlock_emails.php:211: // @TODO Rewrite in template: subj->subject,ordered->timestamp,tsend->target_send ./inc/modules/admin/what-unlock_sponsor.php:191: // @TODO Rewritings: remote->remote_addr, created->sponsor_created in template ./inc/modules/admin/what-usage.php:87: // @TODO This code is double, see LOAD_TEMPLATE and loadEmailTemplate in functions.php ./inc/modules/admin/what-usage.php:98: // @TODO Disabled due to too much trouble @@ -183,13 +180,13 @@ ./inc/wrapper-functions.php:134:// @TODO Implement $decompress ./inc/wrapper-functions.php:396:// @TODO Do some more sanity check here ./mailid.php:135: // @TODO Rewrite this to a filter -./mailid.php:216: // @TODO Rewrite this to a dynamic include or so +./mailid.php:215: // @TODO Rewrite this to a dynamic include or so ./mailid.php:94: // @TODO Rewrite this to a filter -./mailid_top.php:139: // @TODO Rewrite this to a filter -./mailid_top.php:187: // @TODO Rewrite this to a filter -./mailid_top.php:194: // @TODO Rewrite this to a filter -./mailid_top.php:230: // @TODO Rewrite these blocks to filter -./mailid_top.php:265: // @TODO Try to rewrite the following unset() +./mailid_top.php:135: // @TODO Rewrite this to a filter +./mailid_top.php:182: // @TODO Rewrite this to a filter +./mailid_top.php:189: // @TODO Rewrite this to a filter +./mailid_top.php:225: // @TODO Rewrite these blocks to filter +./mailid_top.php:260: // @TODO Try to rewrite the following unset() ./mailid_top.php:92: // @TODO Rewrite this to a filter ./view.php:72: // @TODO No banner found, output some default banner ### ### DEPRECATION FOLLOWS: ### ### diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 957e836586..eb26099948 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -261,7 +261,7 @@ LIMIT 1", // Prepare array for the template $content = array( 'sw' => $SW, - 'subj' => $subj, + 'subject' => $subj, 'add' => $add, 'text' => $text, 'created' => generateDateTime($created, '1'), diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php index 526b80d334..b0c094b86a 100644 --- a/inc/modules/admin/what-config_payouts.php +++ b/inc/modules/admin/what-config_payouts.php @@ -58,7 +58,7 @@ VALUES ('%s', %d, %d,'%s','%s','%s','%s','%s','%s','%s')", array( postRequestElement('title'), bigintval(postRequestElement('rate')), - bigintval(postRequestElement('mpoi')), + bigintval(postRequestElement('min_points')), postRequestElement('yacc'), postRequestElement('ypass'), postRequestElement('yurl'), @@ -106,7 +106,7 @@ WHERE `id`='".$id."' LIMIT 1", array( postRequestElement('title', $id), convertCommaToDot(postRequestElement('rate', $id)), - convertCommaToDot(postRequestElement('mpoi' , $id)), + convertCommaToDot(postRequestElement('min_points' , $id)), postRequestElement('allow', $id), ),__FILE__, __LINE__, false)); } @@ -124,7 +124,7 @@ WHERE `id`='".$id."' LIMIT 1", // Load data $result = SQL_QUERY_ESC("SELECT type, rate, min_points, allow_url FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); - list($title, $rate, $mpoi, $allow) = SQL_FETCHROW($result); + list($title, $rate, $min_points, $allow) = SQL_FETCHROW($result); SQL_FREERESULT($result); // Prepare data for the row template @@ -133,7 +133,7 @@ WHERE `id`='".$id."' LIMIT 1", 'id' => $id, 'title' => $title, 'rate' => translateComma($rate), - 'mpoi' => translateComma($mpoi), + 'min_points' => translateComma($min_points), 'allow' => addSelectionBox('yn', $allow, "allow[".$id."]"), ); @@ -172,7 +172,7 @@ WHERE `id`='".$id."' LIMIT 1", // Load data $result = SQL_QUERY_ESC("SELECT type, rate, min_points FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1", array($id), __FILE__, __LINE__); - list($title, $rate, $mpoi) = SQL_FETCHROW($result); + list($title, $rate, $min_points) = SQL_FETCHROW($result); SQL_FREERESULT($result); // Prepare data for the row template @@ -181,7 +181,7 @@ WHERE `id`='".$id."' LIMIT 1", 'id' => $id, 'title' => $title, 'rate' => translateComma($rate), - 'mpoi' => translateComma($mpoi), + 'min_points' => translateComma($min_points), ); // Load row template and switch color @@ -212,14 +212,13 @@ if ((SQL_NUMROWS($result_type) > 0) && ($display)) { $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result_type)) { // Prepare data for the row template - // @TODO Rewrite in template: mpoi->min_points,from->from_account $content = array( - 'sw' => $SW, - 'id' => $content['id'], - 'from' => $content['from_account'], - 'type' => $content['type'], - 'rate' => translateComma($content['rate']), - 'mpoi' => translateComma($content['min_points']), + 'sw' => $SW, + 'id' => $content['id'], + 'from_account' => $content['from_account'], + 'type' => $content['type'], + 'rate' => translateComma($content['rate']), + 'min_points' => translateComma($content['min_points']), ); // Load row template and switch color diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php index 53cbc18472..d45ef8dc92 100644 --- a/inc/modules/admin/what-config_points.php +++ b/inc/modules/admin/what-config_points.php @@ -59,7 +59,7 @@ if (isGetRequestElementSet('sub')) { case 'ref': if (isGetRequestElementSet('do')) { - if (((!isPostRequestElementSet(('level'))) || (!isPostRequestElementSet(('perc')))) && (getRequestElement('do') == 'add')) { + if (((!isPostRequestElementSet(('level'))) || (!isPostRequestElementSet(('percents')))) && (getRequestElement('do') == 'add')) { unsetPostRequestElement('ok'); } } @@ -81,7 +81,7 @@ if (isFormSent()) { switch (getRequestElement('do')) { case 'add': - addSql("INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (level, percents) VALUES ('".postRequestElement('level')."','".postRequestElement('perc')."')"); + addSql("INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`, `percents`) VALUES ('".postRequestElement('level')."','".postRequestElement('percents')."')"); break; case 'edit': // Change entries @@ -90,11 +90,11 @@ if (isFormSent()) { $id = bigintval($id); // Revert german commata - setRequestPostElement('perc', array($id => convertCommaToDot(postRequestElement('perc', $id)))); + setRequestPostElement('percents', array($id => convertCommaToDot(postRequestElement('percents', $id)))); // Update entry - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refdepths` SET level='%s', percents='%s' WHERE `id`=%s LIMIT 1", - array(bigintval($value), postRequestElement('perc', $id), $id), __FILE__, __LINE__); + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refdepths` SET `level`='%s', `percents`='%s' WHERE `id`=%s LIMIT 1", + array(bigintval($value), postRequestElement('percents', $id), $id), __FILE__, __LINE__); } $message = getMessage('REF_DEPTHS_SAVED'); break; diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php index b4ede2da86..42bb935ebc 100644 --- a/inc/modules/admin/what-del_email.php +++ b/inc/modules/admin/what-del_email.php @@ -60,12 +60,12 @@ if (isGetRequestElementSet('mid')) { $price = getPaymentPoints($payId, 'price'); // Prepare data for the template - $content['id'] = $id; - $content['sender'] = generateUserProfileLink($sender); - $content['subject'] = $subject; - $content['url'] = generateDerefererUrl($url); - $content['url_raw'] = $url; - $content['ordered'] = generateDateTime($timestamp, '0'); + $content['id'] = $id; + $content['sender'] = generateUserProfileLink($sender); + $content['subject'] = $subject; + $content['url'] = generateDerefererUrl($url); + $content['url_raw'] = $url; + $content['timestamp'] = generateDateTime($timestamp, '0'); // Load template loadTemplate('admin_del_email_normal', false, $content); @@ -161,7 +161,7 @@ LIMIT 1", } elseif (isGetRequestElementSet('pid')) { // Remove stats entries SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1", - array(bigintval(getRequestElement('pid'))), __FILE__, __LINE__); + array(bigintval(getRequestElement('pid'))), __FILE__, __LINE__); // Output message loadTemplate('admin_settings_saved', false, getMessage('ADMIN_USER_STATS_REMOVED')); @@ -190,11 +190,11 @@ LIMIT 1", $cnt += SQL_AFFECTEDROWS(); // Prepare data for the template - $content['id'] = $id; - $content['subject'] = $subject; - $content['url'] = generateDerefererUrl($url); - $content['ordered'] = generateDateTime($timestamp, '0'); - $content['cnt'] = $cnt; + $content['id'] = $id; + $content['subject'] = $subject; + $content['url'] = generateDerefererUrl($url); + $content['timestamp'] = generateDateTime($timestamp, '0'); + $content['cnt'] = $cnt; // Load template loadTemplate('admin_del_email_bonus', false, $content); @@ -227,11 +227,11 @@ LIMIT 1", $cnt += SQL_AFFECTEDROWS(); // Prepare data for the template - $content['id'] = $id; - $content['subject'] = $subject; - $content['url'] = generateDerefererUrl($url); - $content['ordered'] = generateDateTime($timestamp, '0'); - $content['cnt'] = $cnt; + $content['id'] = $id; + $content['subject'] = $subject; + $content['url'] = generateDerefererUrl($url); + $content['timestamp'] = generateDateTime($timestamp, '0'); + $content['cnt'] = $cnt; // Load template loadTemplate('admin_del_email_notify', false, $content); diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php index c03be85a37..314bab2569 100644 --- a/inc/modules/admin/what-edit_emails.php +++ b/inc/modules/admin/what-edit_emails.php @@ -77,7 +77,7 @@ WHERE `id`=%s LIMIT 1", array( - postRequestElement('subj'), + postRequestElement('subject'), postRequestElement('text'), postRequestElement('url'), bigintval(postRequestElement('id')), @@ -96,14 +96,13 @@ LIMIT 1", $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { // Prepare data for the row template - // @TODO Rewritings: subj->subject in template $content = array( - 'sw' => $SW, - 'id' => $content['id'], - 'subj' => $content['subject'], + 'sw' => $SW, + 'id' => $content['id'], + 'subject' => $content['subject'], 'userid' => generateUserProfileLink($content['sender']), - 'pay' => getPaymentTitlePrice($content['payment_id']), - 'cat' => getCategory($content['cat_id']), + 'pay' => getPaymentTitlePrice($content['payment_id']), + 'cat' => getCategory($content['cat_id']), ); // Load row template and switch colors diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php index 6474a7a1a4..8456d5e1ef 100644 --- a/inc/modules/admin/what-email_archiv.php +++ b/inc/modules/admin/what-email_archiv.php @@ -107,15 +107,15 @@ if (SQL_NUMROWS($result) > 0) { $row = array( 'sw' => $SW, 'u_link' => generateUserProfileLink($pool[1]), - 'subj' => $pool[2], + 'subject' => $pool[2], 'text' => $pool[3], 'pay' => getPaymentTitlePrice($pool[5]), 'cat' => getCategory($pool[10]), 'sent' => $sent, - 'ruserids' => str_replace(';', ", ", $pool[4]), + 'ruserids' => str_replace(';', ", ", $pool[4]), 'unconfirmed' => $unconfirmed, 'type' => translatePoolType($pool[6]), - 'tsend' => $pool[9], + 'target_send' => $pool[9], 'frametester' => generateFrametesterUrl($pool[8]), 'url' => $pool[8], 'stamp' => generateDateTime($pool[7], '0'), diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php index 6e9ad7d1e2..ed6be560fc 100644 --- a/inc/modules/admin/what-list_links.php +++ b/inc/modules/admin/what-list_links.php @@ -131,11 +131,11 @@ if (isGetRequestElementSet('userid')) { // Prepare data for the row template $content = array( - 'sw' => $SW, - 'link' => $LINK, - 'subj' => $subject, - 'stamp' => generateDateTime($timestamp, '0'), - 'cat' => getCategory($cat), + 'sw' => $SW, + 'link' => $LINK, + 'subject' => $subject, + 'stamp' => generateDateTime($timestamp, '0'), + 'cat' => getCategory($cat), ); // Load row template diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php index 658d487883..fc99d0e760 100644 --- a/inc/modules/admin/what-unlock_emails.php +++ b/inc/modules/admin/what-unlock_emails.php @@ -208,21 +208,20 @@ LIMIT 1", $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result_main)) { // Prepare data for the template - // @TODO Rewrite in template: subj->subject,ordered->timestamp,tsend->target_send $content = array( - 'sw' => $SW, - 'id' => $content['id'], - 'sender' => $content['sender'], - 'u_link' => generateUserProfileLink($content['sender']), - 'subj' => $content['subject'], - 'tester' => generateFrametesterUrl($content['url']), - 'url' => $content['url'], - 'cat_title' => str_replace("\"", '"', getCategory($content['category'])), - 'cat_link' => $content['category'], - 'pay_title' => str_replace("\"", '"', getPaymentTitlePrice($content['payment'], true)), - 'pay_link' => $content['payment'], - 'ordered' => generateDateTime($content['timestamp'], '2'), - 'tsend' => $content['target_send'], + 'sw' => $SW, + 'id' => $content['id'], + 'sender' => $content['sender'], + 'u_link' => generateUserProfileLink($content['sender']), + 'subject' => $content['subject'], + 'tester' => generateFrametesterUrl($content['url']), + 'url' => $content['url'], + 'cat_title' => str_replace("\"", '"', getCategory($content['category'])), + 'cat_link' => $content['category'], + 'pay_title' => str_replace("\"", '"', getPaymentTitlePrice($content['payment'], true)), + 'pay_link' => $content['payment'], + 'timestamp' => generateDateTime($content['timestamp'], '2'), + 'target_send' => $content['target_send'], ); // Load row template and switch colors diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php index 14178a2238..03242c07ab 100644 --- a/inc/modules/member/what-stats.php +++ b/inc/modules/member/what-stats.php @@ -67,16 +67,16 @@ if (SQL_NUMROWS($result) > 0) { // Prepare content for output // @TODO Rewrite in template subj->subject,stamp->timestamp,recs->target_send $content = array( - 'sw' => $SW, - 'id' => $data['id'], - 'cat' => getCategory($data['cat_id']), - 'pay' => getPaymentTitlePrice($data['payment_id']), - 'subj' => $data['subject'], - 'url' => generateDerefererUrl($data['url']), - 'stamp' => generateDateTime($data['timestamp'], '2'), - 'recs' => $data['target_send'], - 'type' => translatePoolType($data['data_type']), - 'zip' => $data['zip'] + 'sw' => $SW, + 'id' => $data['id'], + 'cat' => getCategory($data['cat_id']), + 'pay' => getPaymentTitlePrice($data['payment_id']), + 'subject' => $data['subject'], + 'url' => generateDerefererUrl($data['url']), + 'stamp' => generateDateTime($data['timestamp'], '2'), + 'recs' => $data['target_send'], + 'type' => translatePoolType($data['data_type']), + 'zip' => $data['zip'] ); // Load template @@ -114,15 +114,16 @@ if (SQL_NUMROWS($result) > 0) { // Prepare data for the template // @TODO Rewrite in template: stamp->timestamp_ordered,recs->max_rec,clix->clicks,perc->percents $content = array( - 'sw' => $SW, - 'cat' => getCategory($content['cat_id']), - 'pay' => getPaymentTitlePrice($content['payment_id']), - 'url' => generateDerefererUrl($content['url']), - 'stamp' => generateDateTime($content['timestamp_ordered'], '2'), - 'recs' => $content['max_rec'], - 'sent' => generateDateTime($content['timestamp_send'], '2'), - 'clix' => $content['clicks'], - 'perc' => ($content['clicks'] / $content['max_rec'] * 100)."%", + 'sw' => $SW, + 'cat' => getCategory($content['cat_id']), + 'pay' => getPaymentTitlePrice($content['payment_id']), + 'url' => generateDerefererUrl($content['url']), + 'stamp' => generateDateTime($content['timestamp_ordered'], '2'), + 'recs' => $content['max_rec'], + 'sent' => generateDateTime($content['timestamp_send'], '2'), + 'clix' => $content['clicks'], + 'subject' => $content['subject'], + 'percents' => translateComma($content['clicks'] / $content['max_rec'] * 100)."%", ); // Load row template and switch colors diff --git a/templates/de/html/admin/admin_add_reflevel.tpl b/templates/de/html/admin/admin_add_reflevel.tpl index fbb4b5f87d..35276cab51 100644 --- a/templates/de/html/admin/admin_add_reflevel.tpl +++ b/templates/de/html/admin/admin_add_reflevel.tpl @@ -2,7 +2,8 @@ - @@ -13,8 +14,9 @@ - + @@ -24,8 +26,9 @@ - + @@ -33,11 +36,11 @@ - +
 {--ADD_NEW_REFDEPTH--} + + {--ADD_NEW_REFDEPTH--}  
  {--ENTER_REF_LVL--}:   + +  
  {--ENTER_REF_PERCENTS--}:  % + % +  
  - + + +  
- \ No newline at end of file + diff --git a/templates/de/html/admin/admin_config_payouts_del_row.tpl b/templates/de/html/admin/admin_config_payouts_del_row.tpl index 8e7be54e94..5e34a3f7a1 100644 --- a/templates/de/html/admin/admin_config_payouts_del_row.tpl +++ b/templates/de/html/admin/admin_config_payouts_del_row.tpl @@ -10,6 +10,6 @@ $content[rate] - $content[mpoi] + $content[min_points] diff --git a/templates/de/html/admin/admin_config_payouts_edit_row.tpl b/templates/de/html/admin/admin_config_payouts_edit_row.tpl index 4fe3d9c496..6eb5d785e2 100644 --- a/templates/de/html/admin/admin_config_payouts_edit_row.tpl +++ b/templates/de/html/admin/admin_config_payouts_edit_row.tpl @@ -10,7 +10,7 @@ - + $content[allow] diff --git a/templates/de/html/admin/admin_config_payouts_row.tpl b/templates/de/html/admin/admin_config_payouts_row.tpl index 1b66f085fa..29623bc01f 100644 --- a/templates/de/html/admin/admin_config_payouts_row.tpl +++ b/templates/de/html/admin/admin_config_payouts_row.tpl @@ -3,7 +3,7 @@ -  $content[from] +  $content[from_account]  $content[type] @@ -12,6 +12,6 @@  $content[rate] -  $content[mpoi] +  $content[min_points] diff --git a/templates/de/html/admin/admin_del_email_bonus.tpl b/templates/de/html/admin/admin_del_email_bonus.tpl index 2d0dec0b15..1c142688d6 100644 --- a/templates/de/html/admin/admin_del_email_bonus.tpl +++ b/templates/de/html/admin/admin_del_email_bonus.tpl @@ -17,7 +17,7 @@ {--ADMIN_TEST_URL--} - $content[ordered] + $content[timestamp] $content[cnt] diff --git a/templates/de/html/admin/admin_del_email_normal.tpl b/templates/de/html/admin/admin_del_email_normal.tpl index 15fc8780cf..6f231b3659 100644 --- a/templates/de/html/admin/admin_del_email_normal.tpl +++ b/templates/de/html/admin/admin_del_email_normal.tpl @@ -18,6 +18,6 @@ $content[subject] {--ADMIN_TEST_URL--} - $content[ordered] + $content[timestamp] diff --git a/templates/de/html/admin/admin_del_email_notify.tpl b/templates/de/html/admin/admin_del_email_notify.tpl index 1e01861400..f1f7ac7f3a 100644 --- a/templates/de/html/admin/admin_del_email_notify.tpl +++ b/templates/de/html/admin/admin_del_email_notify.tpl @@ -16,7 +16,7 @@ $content[subject] {--ADMIN_TEST_URL--} - $content[ordered] + $content[timestamp] $content[cnt] diff --git a/templates/de/html/admin/admin_edit_email.tpl b/templates/de/html/admin/admin_edit_email.tpl index fcb4225e4b..da4364aa8f 100644 --- a/templates/de/html/admin/admin_edit_email.tpl +++ b/templates/de/html/admin/admin_edit_email.tpl @@ -9,7 +9,8 @@   - {--EDIT_URL--}: + + {--EDIT_URL--}:   @@ -19,17 +20,19 @@   - {--EMAIL_EDIT_SUBJ--}: + + {--EMAIL_EDIT_SUBJ--}:   - +     - {--EMAIL_EDIT_TEXT--}: + + {--EMAIL_EDIT_TEXT--}:   diff --git a/templates/de/html/admin/admin_edit_email_row.tpl b/templates/de/html/admin/admin_edit_email_row.tpl index f958cd02c8..27cad9afac 100644 --- a/templates/de/html/admin/admin_edit_email_row.tpl +++ b/templates/de/html/admin/admin_edit_email_row.tpl @@ -5,7 +5,7 @@   - $content[subj] + $content[subject] ({--EMAIL_SENDER--}: $content[userid]; $content[pay]; $content[cat])   diff --git a/templates/de/html/admin/admin_email_archiv_row.tpl b/templates/de/html/admin/admin_email_archiv_row.tpl index 1dd1e5d46b..43bb71e56d 100644 --- a/templates/de/html/admin/admin_email_archiv_row.tpl +++ b/templates/de/html/admin/admin_email_archiv_row.tpl @@ -5,7 +5,7 @@ {--EMAIL_SUBJECT--}:
- $content[subj] + $content[subject] {--EMAIL_TEXT--}:
@@ -49,7 +49,7 @@ {--EMAIL_TSEND--}:
- $content[tsend] + $content[target_send] {--EMAIL_URL--}:
diff --git a/templates/de/html/admin/admin_list_links_row.tpl b/templates/de/html/admin/admin_list_links_row.tpl index ffebdf78c4..cf010b710f 100644 --- a/templates/de/html/admin/admin_list_links_row.tpl +++ b/templates/de/html/admin/admin_list_links_row.tpl @@ -1,6 +1,6 @@ $content[link] - $content[subj] + $content[subject] $content[stamp] $content[cat] diff --git a/templates/de/html/admin/admin_overview_row.tpl b/templates/de/html/admin/admin_overview_row.tpl index 5916d9b51d..16af152dbf 100644 --- a/templates/de/html/admin/admin_overview_row.tpl +++ b/templates/de/html/admin/admin_overview_row.tpl @@ -1,7 +1,7 @@