From: Roland Häder Date: Tue, 29 Jun 2010 03:04:17 +0000 (+0000) Subject: Even more rewrites to make usage of EL X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7e17864b7d07fb5123b1b1d68f83db28ea5394ef;p=mailer.git Even more rewrites to make usage of EL --- diff --git a/.gitattributes b/.gitattributes index 6211e9b59f..654153e867 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1117,6 +1117,7 @@ templates/de/html/admin/admin_list_notify_emails_row.tpl -text templates/de/html/admin/admin_list_online.tpl -text templates/de/html/admin/admin_list_online_row.tpl -text templates/de/html/admin/admin_list_payments.tpl -text +templates/de/html/admin/admin_list_payments_row.tpl -text templates/de/html/admin/admin_list_payouts.tpl -text templates/de/html/admin/admin_list_payouts_banner.tpl -text templates/de/html/admin/admin_list_payouts_row.tpl -text diff --git a/inc/libs/optimize_functions.php b/inc/libs/optimize_functions.php index d97c738ab4..6fae587174 100644 --- a/inc/libs/optimize_functions.php +++ b/inc/libs/optimize_functions.php @@ -91,16 +91,12 @@ function repairOptimizeDatabase () { array($total_gain), __FUNCTION__, __LINE__); // Get total runs and total optimization count - $result = SQL_QUERY("SELECT COUNT(`id`) AS rows, SUM(`gain`) AS opti FROM `{?_MYSQL_PREFIX?}_optimize_gain`", __FUNCTION__, __LINE__); - list($total_rows, $total_opti) = SQL_FETCHROW($result); + $result = SQL_QUERY("SELECT COUNT(`id`) AS `total_rows`, SUM(`gain`) AS `total_optimized` FROM `{?_MYSQL_PREFIX?}_optimize_gain`", __FUNCTION__, __LINE__); + $ret = merge_array($ret, SQL_FETCHARRAY($result)); // Free memory SQL_FREERESULT($result); - // Transfer data - $ret['total_rows'] = $total_rows; - $ret['total_opti'] = $total_opti; - // Return array return $ret; } diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 89539ff546..4c5c05aeeb 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -418,7 +418,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF $content = array( 'hash' => $hash, 'userid' => $userid, - 'gender' => translateGender(postRequestParameter('gender')), + 'gender' => SQL_ESCAPE(postRequestParameter('gender')), 'surname' => SQL_ESCAPE(postRequestParameter('surname')), 'family' => SQL_ESCAPE(postRequestParameter('family')), 'email' => SQL_ESCAPE(postRequestParameter('email')), @@ -434,7 +434,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF $content = array( 'hash' => $hash, 'userid' => $userid, - 'gender' => translateGender(postRequestParameter('gender')), + 'gender' => SQL_ESCAPE(postRequestParameter('gender')), 'surname' => SQL_ESCAPE(postRequestParameter('surname')), 'family' => SQL_ESCAPE(postRequestParameter('family')), 'email' => SQL_ESCAPE(postRequestParameter('email')), diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 09e25ee441..02c9c01cfa 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -596,7 +596,6 @@ function SURFBAR_REGISTER_URL ($url, $userid, $status = 'PENDING', $addMode = 'r // Prepare content $content = merge_array($extraFields, array( 'url' => $url, - 'frametester' => generateFrametesterUrl($url), 'url_userid' => $userid, 'url_status' => $status, )); diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php index ffb1121bd9..10d2b4e4ec 100644 --- a/inc/mails/doubler_mails.php +++ b/inc/mails/doubler_mails.php @@ -175,16 +175,7 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y')) $DOUBLER_POINTS -= $content['points']; // Prepare array - $content = array( - // Doubler transmission id - 'id' => $content['id'], - // Doubled points - 'points' => $content['points'], - // Timemark - 'timemark' => generateDateTime($content['timemark'], 2), - // IP number when the member submitted the doubling form - 'remote_ip' => $content['remote_ip'], - ); + $content['timemark'] = generateDateTime($content['timemark'], 2); // Load mail template and send mail away... $message = loadEmailTemplate('member_doubler', $content, $content['userid']); diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php index 640dc3aa5a..de84bf55b0 100644 --- a/inc/modules/admin/what-config_payouts.php +++ b/inc/modules/admin/what-config_payouts.php @@ -54,8 +54,8 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('title')) && (postRequestP if (SQL_HASZERONUMS($result)) { // Add now SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_payout_types` -(type, rate, min_points, from_account, from_pass, engine_url, engine_ret_ok, engine_ret_failed, pass_enc, allow_url) -VALUES ('%s', %d, %d,'%s','%s','%s','%s','%s','%s','%s')", +(`type`, `rate`, `min_points`, `from_account`, `from_pass`, `engine_url`, `engine_ret_ok`, `engine_ret_failed`, `pass_enc`, `allow_url`) +VALUES ('%s', %s, %s,'%s','%s','%s','%s','%s','%s','%s')", array( postRequestParameter('title'), bigintval(postRequestParameter('rate')), @@ -107,10 +107,10 @@ WHERE `id`=%s LIMIT 1", array( - postRequestParameter('title', $id), + postRequestParameter('type', $id), convertCommaToDot(postRequestParameter('rate', $id)), convertCommaToDot(postRequestParameter('min_points' , $id)), - postRequestParameter('allow', $id), + postRequestParameter('allow_url', $id), bigintval($id) ),__FILE__, __LINE__, false)); } @@ -126,19 +126,13 @@ LIMIT 1", $OUT = ''; foreach (postRequestParameter('sel') as $id => $sel) { // 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, $min_points, $allow) = SQL_FETCHROW($result); + $result = SQL_QUERY_ESC("SELECT `id`, `type`, `rate`, `min_points`, `allow_url` FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1", + array(bigintval($id)), __FILE__, __LINE__); + $content = SQL_FETCHARRAY($result); SQL_FREERESULT($result); // Prepare data for the row template - $content = array( - 'id' => $id, - 'title' => $title, - 'rate' => translateComma($rate), - 'min_points' => translateComma($min_points), - 'allow' => addSelectionBox('yn', $allow, 'allow[' . $id . ']'), - ); + $content['allow_url'] = addSelectionBox('yn', $content['allow_url'], 'allow_url[' . $content['id'] . ']'); // Load row template and switch color $OUT .= loadTemplate('admin_config_payouts_edit_row', true, $content); @@ -156,7 +150,7 @@ LIMIT 1", // Delete entries foreach (postRequestParameter('sel') as $id => $sel) { addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__, false)); + array(bigintval($id)), __FILE__, __LINE__, false)); } // END - foreach // Run all SQLs @@ -172,19 +166,11 @@ LIMIT 1", $id = bigintval($id); // 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, $min_points) = SQL_FETCHROW($result); + $result = SQL_QUERY_ESC("SELECT `id`, `type`, `rate`, `min_points` FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1", + array($id), __FILE__, __LINE__); + $content = SQL_FETCHARRAY($result); SQL_FREERESULT($result); - // Prepare data for the row template - $content = array( - 'id' => $id, - 'title' => $title, - 'rate' => translateComma($rate), - 'min_points' => translateComma($min_points), - ); - // Load row template and switch color $OUT .= loadTemplate('admin_config_payouts_del_row', true, $content); } // END - foreach @@ -211,15 +197,6 @@ if ((SQL_NUMROWS($result_type) > 0) && ($display)) { // List all payout types $OUT = ''; while ($content = SQL_FETCHARRAY($result_type)) { - // Prepare data for the row template - $content = array( - '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 $OUT .= loadTemplate('admin_config_payouts_row', true, $content); } // END - while diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php index 5a3bb6996d..20f6d0f0ee 100644 --- a/inc/modules/admin/what-config_points.php +++ b/inc/modules/admin/what-config_points.php @@ -94,8 +94,8 @@ if (isFormSent()) { setPostRequestParameter('percents', array($id => convertCommaToDot(postRequestParameter('percents', $id)))); // Update entry - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refdepths` SET `level`='%s', `percents`='%s' WHERE `id`=%s LIMIT 1", - array(bigintval($value), postRequestParameter('percents', $id), $id), __FILE__, __LINE__); + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refdepths` SET `level`=%s, `percents`=%s WHERE `id`=%s LIMIT 1", + array(bigintval($value), convertCommaToDot(postRequestParameter('percents', $id)), $id), __FILE__, __LINE__); } $message = '{--REF_DEPTHS_SAVED--}'; break; @@ -188,18 +188,11 @@ WHERE `mails_confirmed` < %s", $REF, $REF)); // Delete entries $OUT = ''; foreach (postRequestParameter('sel') as $id => $value) { - $result = SQL_QUERY_ESC("SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1", + $result = SQL_QUERY_ESC("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); $content = SQL_FETCHARRAY($result); SQL_FREERESULT($result); - // Prepare data for the row template - $content = array( - 'id' => $id, - 'level' => $content['level'], - 'percents' => translateComma($content['percents']), - ); - // Load row template and switch color $OUT .= loadTemplate('admin_points_del_row', true, $content); } // END - foreach @@ -210,18 +203,11 @@ WHERE `mails_confirmed` < %s", $REF, $REF)); // Edit entries $OUT = ''; foreach (postRequestParameter('sel') as $id => $value) { - $result = SQL_QUERY_ESC("SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1", + $result = SQL_QUERY_ESC("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); $content = SQL_FETCHARRAY($result); SQL_FREERESULT($result); - // Prepare data for the row template - $content = array( - 'id' => $id, - 'level' => $content['level'], - 'percents' => translateComma($content['percents']), - ); - // Load row template and switch color $OUT .= loadTemplate('admin_points_edit_row', true, $content); } // END - foreach diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php index 5c12d48717..c25ef8fe42 100644 --- a/inc/modules/admin/what-extensions.php +++ b/inc/modules/admin/what-extensions.php @@ -252,16 +252,22 @@ switch ($do) { case 'overview': // List all registered extensions if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) { // Load extension data with CSS informations - $result = SQL_QUERY("SELECT `id` AS ext_id, `ext_name`, `ext_active`, `ext_has_css` AS ext_css, `ext_version` -FROM `{?_MYSQL_PREFIX?}_extensions` + $result = SQL_QUERY("SELECT + `id` AS ext_id, `ext_name`, `ext_active`, `ext_has_css` AS ext_css, `ext_version` +FROM + `{?_MYSQL_PREFIX?}_extensions` ".$where." -ORDER BY `ext_name` ASC", __FILE__, __LINE__); +ORDER BY + `ext_name` ASC", __FILE__, __LINE__); } else { // Load extension data without CSS informations - $result = SQL_QUERY("SELECT `id` AS ext_id, `ext_name`, `ext_active`, `id`, `ext_version` -FROM `{?_MYSQL_PREFIX?}_extensions` + $result = SQL_QUERY("SELECT + `id` AS ext_id, `ext_name`, `ext_active, `ext_version` +FROM + `{?_MYSQL_PREFIX?}_extensions` ".$where." -ORDER BY `ext_name` ASC", __FILE__, __LINE__); +ORDER BY + `ext_name` ASC", __FILE__, __LINE__); } // Are there some entries? @@ -274,15 +280,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__); if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) $cssSelection = translateYesNo($content['ext_css']); // Prepare data for the row template - // @TODO Rewrite in template: id->ext_id,name->ext_name,active->ext_active,ver->ext_ver - $content = array( - 'id' => $content['ext_id'], - 'name' => $content['ext_name'], - 'active' => translateYesNo($content['ext_active']), - 'act_val' => $content['ext_active'], - 'css' => $cssSelection, - 'ver' => $content['ext_version'], - ); + $content['ext_css'] = $cssSelection; // Load row template and switch color $OUT .= loadTemplate('admin_extensions_row', true, $content); diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php index 3d375c350f..667017a36d 100644 --- a/inc/modules/admin/what-list_links.php +++ b/inc/modules/admin/what-list_links.php @@ -129,7 +129,7 @@ if (isGetRequestParameterSet('userid')) { 'link' => $LINK, 'subject' => $content['subject'], 'timestamp' => generateDateTime($content['timestamp'], 0), - 'cat' => getCategory($content['cat_id']), + 'cat_id' => $content['cat_id'], ); // Load row template diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php index 7a32072205..1fd3ed5270 100644 --- a/inc/modules/admin/what-list_sponsor.php +++ b/inc/modules/admin/what-list_sponsor.php @@ -143,7 +143,7 @@ ORDER BY 'status' => $content['status'], 'sponsor_created' => generateDateTime($content['sponsor_created'], 2), 'last_online' => generateDateTime($content['last_online'], 2), - 'points' => translateComma($content['points_amount'] - $content['points_used']), + 'points' => ($content['points_amount'] - $content['points_used']), 'remote_addr' => $content['remote_addr'], ); diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php index 3709b0f646..7375e79285 100644 --- a/inc/modules/admin/what-list_sponsor_pay.php +++ b/inc/modules/admin/what-list_sponsor_pay.php @@ -142,21 +142,11 @@ if (isFormSent('add')) { $OUT = ''; foreach (postRequestParameter('id') as $id => $sel) { // Load entry - $result = SQL_QUERY_ESC("SELECT `pay_name`, `pay_rate`, `pay_min_count`, `pay_currency` FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` WHERE `id`='%s' LIMIT 1", + $result = SQL_QUERY_ESC("SELECT `id`, `pay_name`, `pay_rate`, `pay_min_count`, `pay_currency` FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` WHERE `id`=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Load data - list($name, $rate, $min, $curr) = SQL_FETCHROW($result); - SQL_FREERESULT($result); - - // Transfer data to array - $content = array( - 'id' => bigintval($id), - 'name' => htmlspecialchars($name), - 'rate' => translateComma($rate), - 'min' => bigintval($min), - 'curr' => htmlspecialchars($curr) - ); + $content = SQL_FETCHARRAY($result); if (isFormSent('edit')) { // Edit entry @@ -169,6 +159,9 @@ if (isFormSent('add')) { // Entry invalid $OUT .= loadTemplate('admin_list_sponsor_pay_404', true, $id); } + + // Free result + SQL_FREERESULT($result); } // END - foreach // Load main template depending on mode (edit/delete) @@ -196,15 +189,6 @@ ORDER BY // List alle found payment types while ($content = SQL_FETCHARRAY($result)) { - // Remember data in array - $content = array( - 'id' => $content['id'], - 'name' => $content['pay_name'], - 'rate' => translateComma($content['pay_rate']), - 'min' => $content['pay_min_count'], - 'currency' => $content['pay_currency'] - ); - // Add row $OUT .= loadTemplate('admin_list_sponsor_pay_row', true, $content); } // END - while diff --git a/inc/modules/admin/what-optimize.php b/inc/modules/admin/what-optimize.php index cbf68bdaeb..2f73c933e6 100644 --- a/inc/modules/admin/what-optimize.php +++ b/inc/modules/admin/what-optimize.php @@ -77,8 +77,8 @@ foreach ($DATA['tables'] as $row_array) { 'tpl' => $row_array[0], 'rep' => $REP, 'opt' => $OPT, - 'sum' => translateComma($row_array[3]), - 'sav' => translateComma($row_array[4]), + 'sum' => $row_array[3], + 'sav' => $row_array[4], ); // Load row template and switch color @@ -88,13 +88,9 @@ foreach ($DATA['tables'] as $row_array) { // Remember rows $content['rows'] = $OUT; -// Prepare data for the template -$content['total_tabs'] = $DATA['total_tabs']; -$content['total_size'] = translateComma($DATA['total_size']); -$content['total_rows'] = $DATA['total_rows']; -$content['total_optimized'] = translateComma($DATA['total_opti']); +// Transfer data to $content for template +$content = merge_array($content, $DATA); $content['now_optimized'] = $gain_tabs; -$content['now_saved'] = translateComma($DATA['total_gain']); // Load main template loadTemplate('admin_optimize', false, $content); diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php index e5bf264a68..7edb41e4b9 100644 --- a/inc/modules/admin/what-payments.php +++ b/inc/modules/admin/what-payments.php @@ -144,18 +144,8 @@ if (isFormSent()) { // List already existing categories for editing while ($content = SQL_FETCHARRAY($result)) { - // Prepare array for the row template - // @TODO Rewritings: title->mail_title in template - $content = array( - 'id' => $content['id'], - 'time' => $content['time'], - 'title' => $content['mail_title'], - 'payment' => translateComma($content['payment']), - 'price' => translateComma($content['price']) - ); - // Load row template and switch colors - $OUT .= loadTemplate('admin_payments_list_row', true, $content); + $OUT .= loadTemplate('admin_list_payments_row', true, $content); } // END - switch // Free memory diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php index 7332b032cd..33635e8eef 100644 --- a/inc/modules/admin/what-refbanner.php +++ b/inc/modules/admin/what-refbanner.php @@ -57,17 +57,23 @@ if (isFormSent()) { switch (getRequestParameter('mode')) { case 'add': // Check if banner is already added - $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE url='%s' LIMIT 1", - array(postRequestParameter('url')), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `url`='%s' LIMIT 1", + array(postRequestParameter('url')), __FILE__, __LINE__); + + // Was the banner found? if (SQL_HASZERONUMS($result)) { // Add banner - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_refbanner` (url, alternate, visible) + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_refbanner` (`url`, `alternate`, `visible`) VALUES ('%s','%s','%s')", - array(postRequestParameter('url'), postRequestParameter('alternate'), postRequestParameter('visible')), __FILE__, __LINE__); - } else { - // Free memory - SQL_FREERESULT($result); - } + array( + postRequestParameter('url'), + postRequestParameter('alternate'), + postRequestParameter('visible') + ), __FILE__, __LINE__); + } // END - if + + // Free memory + SQL_FREERESULT($result); break; case 'edit': // Update banner @@ -76,7 +82,7 @@ VALUES ('%s','%s','%s')", $id = bigintval($id); // Update entry - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET url='%s', alternate='%s', `visible`='%s' WHERE `id`=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET `url`='%s', `alternate`='%s', `visible`='%s' WHERE `id`=%s LIMIT 1", array( postRequestParameter('url', $id), postRequestParameter('alternate', $id), @@ -103,18 +109,13 @@ VALUES ('%s','%s','%s')", $OUT = ''; foreach (postRequestParameter('sel') as $id => $sel) { // Load data - $result = SQL_QUERY_ESC("SELECT url, alternate, visible FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `id`=%s LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); - list($url, $alt, $vis) = SQL_FETCHROW($result); + $result = SQL_QUERY_ESC("SELECT `url`, `alternate`, `visible` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `id`=%s LIMIT 1", + array(bigintval($id)), __FILE__, __LINE__); + $content = SQL_FETCHARRAY($result); SQL_FREERESULT($result); // Preapre data for the row - $content = array( - 'id' => $id, - 'url' => $url, - 'alt' => $alt, - 'vis' => addSelectionBox('yn', $vis , 'visible'), - ); + $content['visible'] => addSelectionBox('yn', $content['visible'], 'visible'); // Load row template and switch color $OUT .= loadTemplate('admin_refbanner_edit_row', true, $content); @@ -132,24 +133,13 @@ VALUES ('%s','%s','%s')", } // END - if // Referal levels - $result = SQL_QUERY("SELECT id, url, alternate, visible, counter, clicks FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY url", __FILE__, __LINE__); + $result = SQL_QUERY('SELECT `id`, `url`, `alternate`, `visible`, `counter`, `clicks` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `url` ASC', __FILE__, __LINE__); // Entries found? if (SQL_NUMROWS($result) > 0) { // Make referal banner editable and deletable $OUT = ''; while ($content = SQL_FETCHARRAY($result)) { - // Preapre data for the row - // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template - $content = array( - 'id' => $content['id'], - 'url' => $content['url'], - 'alt' => $content['alternate'], - 'vis' => translateYesNo($content['visible']), - 'cnt' => $content['counter'], - 'clx' => $content['clicks'] - ); - // Load row template and switch color $OUT .= loadTemplate('admin_refbanner_row', true, $content); } // END - while @@ -159,7 +149,7 @@ VALUES ('%s','%s','%s')", // Load main template loadTemplate('admin_refbanner', false, $OUT); - } + } // END - if // Form for adding new referal levels loadTemplate('admin_add_banner'); diff --git a/inc/modules/admin/what-repair_lang.php b/inc/modules/admin/what-repair_lang.php index cb65b59a0a..dadf87c610 100644 --- a/inc/modules/admin/what-repair_lang.php +++ b/inc/modules/admin/what-repair_lang.php @@ -102,9 +102,8 @@ foreach ($validLanguages as $lang) { // Prepare content $content = array( + 'inc' => $INC, 'source' => $langFile, - 'target' => basename($INC), - 'diff_count' => translateComma(getLanguageComparisonDifference($INC)), 'diff_content' => $diffContent, ); @@ -114,8 +113,8 @@ foreach ($validLanguages as $lang) { } else { // Not readable, prepare content $content = array( - 'file' => basename($INC), - 'lang' => $lang, + 'inc' => $INC, + 'lang' => $lang, ); // Load template @@ -127,9 +126,9 @@ foreach ($validLanguages as $lang) { // Preapre content $content = array( 'rows' => $OUT, - 'file_count' => translateComma(count($langFiles)), - 'total_diff' => translateComma($GLOBALS['lang_diff_count']['total']), - 'total_msgs' => translateComma($GLOBALS['msg_count'][getCurrentLanguage()]), + 'file_count' => count($langFiles), + 'total_diff' => $GLOBALS['lang_diff_count']['total'], + 'total_msgs' => $GLOBALS['msg_count'][getCurrentLanguage()], ); // Load main template diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php index 804b4191fe..36b4b8a9ad 100644 --- a/inc/modules/guest/what-mediadata.php +++ b/inc/modules/guest/what-mediadata.php @@ -185,7 +185,7 @@ if (isExtensionActive('beg')) { // Clicks on beg links $data = array( 'lang' => '{--MEDIA_BEG_CLICKS--}', - 'value' => countSumTotalData('0', 'user_data', 'beg_clicks', 'userid', false, " AND `beg_clicks` > 0") + 'value' => countSumTotalData('0', 'user_data', 'beg_clicks', 'userid', false, ' AND `beg_clicks` > 0') ); $OUT_EXTRA .= loadTemplate('mediadata_extra_row', true, $data); } @@ -197,24 +197,24 @@ if (isExtensionActive('doubler')) { // Add first line (count) $data = array( 'lang' => '{--MEDIA_DOUBLER_COUNT--}', - 'value' => countSumTotalData('Y','doubler','id','completed', true, " AND `points` > 0"), + 'value' => countSumTotalData('Y','doubler','id','completed', true, ' AND `points` > 0'), ); // Add points $OUT_SPECIAL .= loadTemplate('mediadata_extra_row2', true, $data); $data = array( 'lang' => '{--MEDIA_DOUBLER_CPOINTS--}', - 'value' => translateComma(countSumTotalData('Y','doubler','id','completed', false, " AND `points` > 0")) + 'value' => countSumTotalData('Y','doubler','id','completed', false, ' AND `points` > 0') ); $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data); $data = array( 'lang' => '{--MEDIA_DOUBLER_WAITING--}', - 'value' => translateComma(countSumTotalData('N','doubler','id','completed', true, " AND `points` > 0")) + 'value' => countSumTotalData('N','doubler','id','completed', true, ' AND `points` > 0') ); $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data); $data = array( 'lang' => '{--MEDIA_DOUBLER_WPOINTS--}', - 'value' => translateComma(countSumTotalData('N','doubler','id','completed', false, " AND `points` > 0")) + 'value' => countSumTotalData('N','doubler','id','completed', false, ' AND `points` > 0') ); $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data); } @@ -277,7 +277,7 @@ ON t.userid=d.userid", $OUT_SPECIAL .= loadTemplate('mediadata_extra_row2', true, $data); $data = array( 'lang' => '{--MEDIA_TRANSFER_IN_POINTS--}', - 'value' => translateComma($points_in) + 'value' => $points_in ); $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data); $data = array( @@ -287,7 +287,7 @@ ON t.userid=d.userid", $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data); $data = array( 'lang' => '{--MEDIA_TRANSFER_OUT_POINTS--}', - 'value' => translateComma($points_out) + 'value' => $points_out ); $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data); } // END - if diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php index 400537f495..510dc049db 100644 --- a/inc/modules/member/what-stats.php +++ b/inc/modules/member/what-stats.php @@ -67,22 +67,8 @@ if (SQL_NUMROWS($result) > 0) { // Load all orders $OUT = ''; while ($content = SQL_FETCHARRAY($result)) { - // Is the ZIP code set? If not, set dashes - if (empty($content['zip'])) $content['zip'] = '---'; - // Prepare content for output - // @TODO More usage of EL at this array - $content = array( - 'id' => $content['id'], - 'cat' => getCategory($content['cat_id']), - 'pay' => getPaymentTitlePrice($content['payment_id']), - 'subject' => $content['subject'], - 'url' => generateDerefererUrl($content['url']), - 'timestamp' => generateDateTime($content['timestamp'], 2), - 'target_send' => $content['target_send'], - 'type' => translatePoolType($content['data_type']), - 'zip' => $content['zip'] - ); + $content['timestamp'] = generateDateTime($content['timestamp'], 2); // Load template $OUT .= loadTemplate('member_pool_row', true, $content); diff --git a/inc/template-functions.php b/inc/template-functions.php index ac4d85671b..1733c35b7e 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -1155,7 +1155,7 @@ function displayParsingTime () { // @TODO This can be easily moved out after the merge from EL branch to this is complete $content = array( 'run_time' => $runTime, - 'sql_time' => translateComma(getConfig('sql_time') * 1000), + 'sql_time' => (getConfig('sql_time') * 1000), ); // Load the template diff --git a/mailid.php b/mailid.php index b744732582..1c4762dab2 100644 --- a/mailid.php +++ b/mailid.php @@ -182,7 +182,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe 'userid' => $url_userid, 'type' => $type, 'data' => $urlId, - 'url' => generateDerefererUrl($URL) + 'url' => $URL ); // Load template diff --git a/templates/de/emails/admin/admin_edit_surfbar_urls.tpl b/templates/de/emails/admin/admin_edit_surfbar_urls.tpl index 9c3a239600..ab961164cc 100644 --- a/templates/de/emails/admin/admin_edit_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_edit_surfbar_urls.tpl @@ -8,7 +8,7 @@ Gebuchte URL: $content[url] Neue URL: $content[url] ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Mitglieder-Id: $content[url_userid] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl b/templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl index f2bd4695d9..cfb93af6d7 100644 --- a/templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl @@ -7,7 +7,7 @@ Hier sind alle Daten dazu: URL: $content[url] ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Mitglieder-Id: $content[url_userid] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl b/templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl index 0f191cd9d7..fbb685cf96 100644 --- a/templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl @@ -7,7 +7,7 @@ Hier sind alle Daten dazu: URL: $content[url] ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Mitglieder-Id: $content[url_userid] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl index e6a4fed350..f507f117cb 100644 --- a/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl @@ -17,7 +17,7 @@ ID in der Surfbar: $content[url_id] URL angemeldet: $content[url_registered] ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_confirmed.tpl b/templates/de/emails/admin/admin_surfbar_url_confirmed.tpl index 4257d3d0b0..8024ef5252 100644 --- a/templates/de/emails/admin/admin_surfbar_url_confirmed.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_confirmed.tpl @@ -7,7 +7,7 @@ Hier sind alle Daten von der URL: Gebuchte URL: $content[url] ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Mitglieder-Id: $content[url_userid] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_depleted.tpl b/templates/de/emails/admin/admin_surfbar_url_depleted.tpl index 0bfba32a45..6120511e4d 100644 --- a/templates/de/emails/admin/admin_surfbar_url_depleted.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_depleted.tpl @@ -9,7 +9,7 @@ Gebuchte URL: $content[url] Email: {%user,email=$userid%} ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Mitglieder-Id: $content[url_userid] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl index d2f0a747a8..45acebda85 100644 --- a/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl @@ -17,7 +17,7 @@ ID in der Surfbar: $content[url_id] URL angemeldet: $content[url_registered] ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_migrate.tpl b/templates/de/emails/admin/admin_surfbar_url_migrate.tpl index d598612b7b..c29bf28e9f 100644 --- a/templates/de/emails/admin/admin_surfbar_url_migrate.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_migrate.tpl @@ -9,7 +9,7 @@ Gebuchte URL: $content[url] Email: {%user,email=$userid%} ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Mitglieder-Id: $content[url_userid] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_pending.tpl index 4d2051f37f..9f7561a420 100644 --- a/templates/de/emails/admin/admin_surfbar_url_pending.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_pending.tpl @@ -9,7 +9,7 @@ Gebuchte URL: $content[url] Email: {%user,email=$userid%} ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Mitglieder-Id: $content[url_userid] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_pending_active.tpl b/templates/de/emails/admin/admin_surfbar_url_pending_active.tpl index bb62b7f30e..d917c59171 100644 --- a/templates/de/emails/admin/admin_surfbar_url_pending_active.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_pending_active.tpl @@ -17,7 +17,7 @@ ID in der Surfbar: $content[url_id] URL angemeldet: $content[url_registered] ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl index 9283019038..f47a481c45 100644 --- a/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl @@ -17,7 +17,7 @@ ID in der Surfbar: $content[url_id] URL angemeldet: $content[url_registered] ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl b/templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl index d6298bb23e..f5148e9805 100644 --- a/templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl @@ -17,7 +17,7 @@ ID in der Surfbar: $content[url_id] URL angemeldet: $content[url_registered] ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_reg.tpl b/templates/de/emails/admin/admin_surfbar_url_reg.tpl index 41c71e8dbe..eb5cc1dd52 100644 --- a/templates/de/emails/admin/admin_surfbar_url_reg.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_reg.tpl @@ -9,7 +9,7 @@ Gebuchte URL: $content[url] Email: {%user,email=$userid%} ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Mitglieder-Id: $content[url_userid] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_rejected.tpl b/templates/de/emails/admin/admin_surfbar_url_rejected.tpl index d9d31011d6..70819514d3 100644 --- a/templates/de/emails/admin/admin_surfbar_url_rejected.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_rejected.tpl @@ -7,7 +7,7 @@ Hier sind alle Daten von der URL: Gebuchte URL: $content[url] ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Mitglieder-Id: $content[url_userid] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl index 8ab181872c..f4ab7b52db 100644 --- a/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl @@ -17,7 +17,7 @@ ID in der Surfbar: $content[url_id] URL angemeldet: $content[url_registered] ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_unlock.tpl b/templates/de/emails/admin/admin_surfbar_url_unlock.tpl index 6110c92bdb..ef9794c4bd 100644 --- a/templates/de/emails/admin/admin_surfbar_url_unlock.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_unlock.tpl @@ -7,7 +7,7 @@ Hier sind alle Daten aus der Mail: Gebuchte URL: $content[url] ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_undelete_active_surfbar_urls.tpl b/templates/de/emails/admin/admin_undelete_active_surfbar_urls.tpl index 40f99408fd..fcad34d6be 100644 --- a/templates/de/emails/admin/admin_undelete_active_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_undelete_active_surfbar_urls.tpl @@ -7,7 +7,7 @@ Hier sind alle Daten dazu: URL: $content[url] ------------------------------------------ Framekiller-Test: -$content[frametester] +{%pipe,generateFrametesterUrl=$content[url]%} ------------------------------------------ Mitglieder-Id: $content[url_userid] ------------------------------------------ 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 4897d49ee0..e4d72ce4db 100644 --- a/templates/de/html/admin/admin_config_payouts_del_row.tpl +++ b/templates/de/html/admin/admin_config_payouts_del_row.tpl @@ -4,12 +4,12 @@ - $content[title] + $content[type] - $content[rate] + {%pipe,translateComma=$content[rate]%} - $content[min_points] + {%pipe,translateComma=$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 e4a29cb7ae..8bdafaa2bc 100644 --- a/templates/de/html/admin/admin_config_payouts_edit_row.tpl +++ b/templates/de/html/admin/admin_config_payouts_edit_row.tpl @@ -4,15 +4,15 @@ - + - + - + - $content[allow] + $content[allow_url] diff --git a/templates/de/html/admin/admin_config_payouts_row.tpl b/templates/de/html/admin/admin_config_payouts_row.tpl index 1bac739f42..1266e3d55e 100644 --- a/templates/de/html/admin/admin_config_payouts_row.tpl +++ b/templates/de/html/admin/admin_config_payouts_row.tpl @@ -3,15 +3,15 @@ -  $content[from_account] + $content[from_account] -  $content[type] + $content[type] -  $content[rate] + {%pipe,translateComma=$content[rate]%} -  $content[min_points] + {%pipe,translateComma=$content[min_points]%} diff --git a/templates/de/html/admin/admin_extensions_row.tpl b/templates/de/html/admin/admin_extensions_row.tpl index 9881110db9..c3785a6fd5 100644 --- a/templates/de/html/admin/admin_extensions_row.tpl +++ b/templates/de/html/admin/admin_extensions_row.tpl @@ -1,17 +1,17 @@ - + -   $content[name] + $content[ext_name] - $content[css] + $content[ext_css] - $content[active] + {%pipe,translateYesNo=$content[ext_active]%} -   v$content[ver] + v$content[ext_version] diff --git a/templates/de/html/admin/admin_list_links_row.tpl b/templates/de/html/admin/admin_list_links_row.tpl index 404e2061be..ad3ea264cd 100644 --- a/templates/de/html/admin/admin_list_links_row.tpl +++ b/templates/de/html/admin/admin_list_links_row.tpl @@ -2,5 +2,5 @@ $content[link] $content[subject] $content[timestamp] - $content[cat] + {%pipe,getCategory=$content[cat_id]%} diff --git a/templates/de/html/admin/admin_list_payments_row.tpl b/templates/de/html/admin/admin_list_payments_row.tpl new file mode 100644 index 0000000000..9c9376966e --- /dev/null +++ b/templates/de/html/admin/admin_list_payments_row.tpl @@ -0,0 +1,17 @@ + + + + + + $content[time] {--_SECONDS--} + + + {%pipe,translateComma=$content[payment]%} + + + {%pipe,translateComma=$content[price]%} + + + $content[mail_title] + + diff --git a/templates/de/html/admin/admin_list_sponsor_pay_del_row.tpl b/templates/de/html/admin/admin_list_sponsor_pay_del_row.tpl index 9ef5bbf588..56edab981a 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay_del_row.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay_del_row.tpl @@ -3,15 +3,15 @@ -  $content[name] + {%pipe,encodeEntities=$content[pay_name]%} -  $content[rate] + {%pipe,translateComma=$content[pay_rate]%} -  $content[min] + {%pipe,translateComma=$content[pay_min_count]%} -  $content[curr] + {%pipe,encodeEntities=$content[pay_currency]%} diff --git a/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl b/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl index 109145a0a1..34f58226f1 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl @@ -4,15 +4,15 @@ -   +   -   +   -   +   -   +   - \ No newline at end of file + diff --git a/templates/de/html/admin/admin_list_sponsor_pay_row.tpl b/templates/de/html/admin/admin_list_sponsor_pay_row.tpl index 2cbe8ad1ee..56edab981a 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay_row.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay_row.tpl @@ -3,15 +3,15 @@ -  $content[name] + {%pipe,encodeEntities=$content[pay_name]%} -  $content[rate] + {%pipe,translateComma=$content[pay_rate]%} -  $content[min] + {%pipe,translateComma=$content[pay_min_count]%} -  $content[currency] + {%pipe,encodeEntities=$content[pay_currency]%} diff --git a/templates/de/html/admin/admin_list_sponsor_row.tpl b/templates/de/html/admin/admin_list_sponsor_row.tpl index 731d151424..2588a4c109 100644 --- a/templates/de/html/admin/admin_list_sponsor_row.tpl +++ b/templates/de/html/admin/admin_list_sponsor_row.tpl @@ -11,7 +11,7 @@ {%pipe,translateGender=$content[gender]%} $content[surname] $content[family] - [$content[points]] + [{%pipe,translateComma=$content[points]%}] diff --git a/templates/de/html/admin/admin_optimize.tpl b/templates/de/html/admin/admin_optimize.tpl index 0e4dd50d34..f67c421e93 100644 --- a/templates/de/html/admin/admin_optimize.tpl +++ b/templates/de/html/admin/admin_optimize.tpl @@ -12,11 +12,11 @@ {--OPTIMIZE_DB_TOTAL_TABLES--}: $content[total_tabs]
- {--OPTIMIZE_DB_TOTAL_SIZE--}: $content[total_size] {--KBYTES--}
+ {--OPTIMIZE_DB_TOTAL_SIZE--}: {%pipe,translateComma=$content[total_size]%} {--KBYTES--}
{--OPTIMIZE_DB_TOTAL_OPTIMIZE--}: $content[total_rows]
- {--OPTIMIZE_DB_TOTAL_OPTI--}: $content[total_optimized] {--KBYTES--}
+ {--OPTIMIZE_DB_TOTAL_OPTI--}: {%pipe,translateComma=$content[total_optimized]%} {--KBYTES--}
{--OPTIMIZE_DB_TOTAL_GAIN_TABLES--}: $content[now_optimized]
- {--OPTIMIZE_DB_TOTAL_GAIN_SIZE--}: $content[now_saved] {--KBYTES--} + {--OPTIMIZE_DB_TOTAL_GAIN_SIZE--}: {%pipe,translateComma=$content[total_gain]%} {--KBYTES--} diff --git a/templates/de/html/admin/admin_optimize_row.tpl b/templates/de/html/admin/admin_optimize_row.tpl index 45fb79dc64..4f71237617 100644 --- a/templates/de/html/admin/admin_optimize_row.tpl +++ b/templates/de/html/admin/admin_optimize_row.tpl @@ -2,6 +2,6 @@ $content[b1]$content[tpl]$content[b2] $content[b1]$content[rep]$content[b2] $content[b1]$content[opt]$content[b2] - $content[b1]$content[sum]$content[b2] - $content[b1]$content[sav]$content[b2] + $content[b1]{%pipe,translateComma=$content[sum]%}$content[b2] + $content[b1]{%pipe,translateComma=$content[sav]%}$content[b2] diff --git a/templates/de/html/admin/admin_payments_list_row.tpl b/templates/de/html/admin/admin_payments_list_row.tpl index 84d163389d..11f5d85d80 100644 --- a/templates/de/html/admin/admin_payments_list_row.tpl +++ b/templates/de/html/admin/admin_payments_list_row.tpl @@ -1,17 +1 @@ - - - - - - $content[time] {--_SECONDS--} - - - {%pipe,translateComma=$content[pay]%} - - - $content[price] - - - $content[title] - - + diff --git a/templates/de/html/admin/admin_points_del_row.tpl b/templates/de/html/admin/admin_points_del_row.tpl index c0efe41e0a..970d53bd41 100644 --- a/templates/de/html/admin/admin_points_del_row.tpl +++ b/templates/de/html/admin/admin_points_del_row.tpl @@ -5,7 +5,7 @@ - $content[percents]% ({--ID_SELECT--} $content[id]) + {%pipe,translateComma=$content[percents]%}% ({--ID_SELECT--} $content[id]) diff --git a/templates/de/html/admin/admin_points_edit_row.tpl b/templates/de/html/admin/admin_points_edit_row.tpl index 0a304caacf..54d76f2c3c 100644 --- a/templates/de/html/admin/admin_points_edit_row.tpl +++ b/templates/de/html/admin/admin_points_edit_row.tpl @@ -12,6 +12,6 @@ {--REF_PERCENT--}:  - % + % diff --git a/templates/de/html/admin/admin_refbanner_edit_row.tpl b/templates/de/html/admin/admin_refbanner_edit_row.tpl index 14b7106ec4..284c3020bf 100644 --- a/templates/de/html/admin/admin_refbanner_edit_row.tpl +++ b/templates/de/html/admin/admin_refbanner_edit_row.tpl @@ -8,10 +8,10 @@ {--ADMIN_EDIT_ALTERNATE--}: - + {--ADMIN_SELECT_BANNER_ACTIVE--}: - $content[vis] + $content[visible] diff --git a/templates/de/html/admin/admin_refbanner_row.tpl b/templates/de/html/admin/admin_refbanner_row.tpl index 1364e053d5..6985e4c66b 100644 --- a/templates/de/html/admin/admin_refbanner_row.tpl +++ b/templates/de/html/admin/admin_refbanner_row.tpl @@ -6,15 +6,15 @@ $content[alt] - $content[alt] + $content[alternate] - $content[cnt] + {%pipe,translateComma=$content[cnt]%} - $content[clx] + {%pipe,translateComma=$content[clicks]%} - $content[vis] + {%pipe,translateYesNo=$content[visible]%} diff --git a/templates/de/html/admin/admin_repair_lang.tpl b/templates/de/html/admin/admin_repair_lang.tpl index 19cbc104ce..be556ed16e 100644 --- a/templates/de/html/admin/admin_repair_lang.tpl +++ b/templates/de/html/admin/admin_repair_lang.tpl @@ -7,9 +7,9 @@ $content[rows]
- Es wurden $content[file_count] Sprachdateien - analysiert. Dabei wurden $content[total_msgs] - Sprachelemente untersucht und $content[total_diff] + Es wurden {%pipe,translateComma=$content[file_count]%} Sprachdateien + analysiert. Dabei wurden {%pipe,translateComma=$content[total_msgs]%} + Sprachelemente untersucht und {%pipe,translateComma=$content[total_diff]%} Unterschiede an allen gefundenen Dateien entdeckt.
diff --git a/templates/de/html/admin/admin_repair_lang_row_404.tpl b/templates/de/html/admin/admin_repair_lang_row_404.tpl index 128a5cbe43..bf8b413c31 100644 --- a/templates/de/html/admin/admin_repair_lang_row_404.tpl +++ b/templates/de/html/admin/admin_repair_lang_row_404.tpl @@ -1,6 +1,8 @@
- Das Sprachpaket $content[file] (Sprache: - $content[lang]) wurde nicht gefunden. + Das Sprachpaket + {%pipe,basename=$content[inc]%} + (Sprache: $content[lang]) + wurde nicht gefunden.
diff --git a/templates/de/html/admin/admin_repair_lang_row_diff.tpl b/templates/de/html/admin/admin_repair_lang_row_diff.tpl index 5295a164c0..9f65a812fd 100644 --- a/templates/de/html/admin/admin_repair_lang_row_diff.tpl +++ b/templates/de/html/admin/admin_repair_lang_row_diff.tpl @@ -1,6 +1,6 @@
- Das Sprachpaket $content[target] hat $content[diff_count] Unterschiede zu $content[source]: + Das Sprachpaket {%pipe,basename=$content[inc]%} hat {%pipe,getLanguageComparisonDifference,translateComma=$content[inc]%} Unterschiede zu $content[source]:
Nicht gefundene Sprachelemente: diff --git a/templates/de/html/mailid/mailid_frames.tpl b/templates/de/html/mailid/mailid_frames.tpl index 99315fae34..d2a119bfbf 100644 --- a/templates/de/html/mailid/mailid_frames.tpl +++ b/templates/de/html/mailid/mailid_frames.tpl @@ -1,6 +1,6 @@ - + Ihr Browser unterst&uuml;tzt keine frames! diff --git a/templates/de/html/mediadata_extra_row.tpl b/templates/de/html/mediadata_extra_row.tpl index 8d78b9ccab..d221fe9997 100644 --- a/templates/de/html/mediadata_extra_row.tpl +++ b/templates/de/html/mediadata_extra_row.tpl @@ -1,4 +1,4 @@ <tr> <td class="bottom media_left" align="right">$content[lang]:</td> - <td class="bottom media_right">$content[value]</td> + <td class="bottom media_right">{%pipe,translateComma=$content[value]%}</td> </tr> diff --git a/templates/de/html/mediadata_extra_row2.tpl b/templates/de/html/mediadata_extra_row2.tpl index 8d78b9ccab..d221fe9997 100644 --- a/templates/de/html/mediadata_extra_row2.tpl +++ b/templates/de/html/mediadata_extra_row2.tpl @@ -1,4 +1,4 @@ <tr> <td class="bottom media_left" align="right">$content[lang]:</td> - <td class="bottom media_right">$content[value]</td> + <td class="bottom media_right">{%pipe,translateComma=$content[value]%}</td> </tr> diff --git a/templates/de/html/member/member_pool_row.tpl b/templates/de/html/member/member_pool_row.tpl index 785ddb08ad..053c2ee469 100644 --- a/templates/de/html/member/member_pool_row.tpl +++ b/templates/de/html/member/member_pool_row.tpl @@ -15,15 +15,15 @@ <tr> <td align="center" class="switch_mem$content[sw] top right"> {--EMAIL_PAYMENT--}:<br /> - <strong>{%pipe,translateComma=$content[pay]%}</strong> + <strong>{%pipe,translateComma=$content[payment_id]%}</strong> </td> <td align="center" class="switch_mem$content[sw] top right"> {--EMAIL_CATEGORY--}:<br /> - <strong>$content[cat]</strong> + <strong>{%pipe,getCategory=$content[cat_id]%}</strong> </td> <td align="center" class="switch_mem$content[sw] top"> {--EMAIL_URL--}:<br /> - <strong><a href="$content[url]" target="_blank">{--MEMBER_TEST_URL--}</a></strong> + <strong><a href="{%pipe,generateDerefererUrl=$content[url]%}" target="_blank">{--MEMBER_TEST_URL--}</a></strong> </td> </tr> <tr> @@ -33,10 +33,10 @@ </td> <td align="center" class="switch_mem$content[sw] top right"> {--EMAIL_TYPE--}:<br /> - <strong>$content[type]</strong> + <strong>{%pipe,translatePoolType=$content[data_type]%}</strong> </td> <td align="center" class="switch_mem$content[sw] top"> {--EMAIL_ZIP--}:<br /> - <strong>$content[zip]</strong> + <strong>{%pipe,fixEmptyContentToDashes=$content[zip]%}</strong> </td> </tr> diff --git a/templates/de/html/show_timings.tpl b/templates/de/html/show_timings.tpl index cfa2d464da..5e888f6414 100644 --- a/templates/de/html/show_timings.tpl +++ b/templates/de/html/show_timings.tpl @@ -10,7 +10,7 @@ </span></li> <li class="show_timings_column" style="margin-left: 2px"><span class="show_timings_column"> {--SHOW_TIMINGS_SQL_TIME--} - <span class="show_timings_data">$content[sql_time] ms</span> + <span class="show_timings_data">{%pipe,translateComma=$content[sql_time]%} ms</span> </span></li> <li class="show_timings_column" style="margin-right: 2px"><span class="show_timings_column"> {--SHOW_TIMINGS_NUM_TEMPLATES--}