From: Roland Häder Date: Sat, 19 Jun 2010 13:20:19 +0000 (+0000) Subject: Even more rewrites to make use of the EL X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=222b9cab2b3fb3c8fb01ff524f5d1d7cfbcb61e7;p=mailer.git Even more rewrites to make use of the EL --- diff --git a/inc/libs/other_functions.php b/inc/libs/other_functions.php index df627d4505..811ff5fa27 100644 --- a/inc/libs/other_functions.php +++ b/inc/libs/other_functions.php @@ -50,9 +50,6 @@ function displayDebugSqls () { // Translate/add some data $content['sw'] = $SW; $content['i'] = $i; - $content['num_rows'] = translateComma($content['num_rows']); - $content['affected'] = translateComma($content['affected']); - $content['sql_str'] = secureString($content['sql_str']); $content['timing'] = translateComma($content['timing'] * 1000); // Load row template diff --git a/inc/modules/admin/what-list_network_array_translation.php b/inc/modules/admin/what-list_network_array_translation.php index 112bf491e0..6981e3c8cb 100644 --- a/inc/modules/admin/what-list_network_array_translation.php +++ b/inc/modules/admin/what-list_network_array_translation.php @@ -108,7 +108,7 @@ ORDER BY // List all entries $OUT = ''; $SW = 2; while ($row = SQL_FETCHARRAY($result)) { - // Add/translate some data + // Add color switching $row['sw'] = $SW; // Add it to network if the type matches selected diff --git a/inc/modules/admin/what-list_network_params.php b/inc/modules/admin/what-list_network_params.php index 93fcab6108..461604c52b 100644 --- a/inc/modules/admin/what-list_network_params.php +++ b/inc/modules/admin/what-list_network_params.php @@ -102,7 +102,7 @@ ORDER BY // List all entries $OUT = ''; $SW = 2; while ($row = SQL_FETCHARRAY($result)) { - // Add/translate some data + // Add color switching $row['sw'] = $SW; // Add it to network if the type matches selected diff --git a/inc/modules/admin/what-list_network_translations.php b/inc/modules/admin/what-list_network_translations.php index e88d8f945b..372c2ee0ee 100644 --- a/inc/modules/admin/what-list_network_translations.php +++ b/inc/modules/admin/what-list_network_translations.php @@ -87,7 +87,7 @@ ORDER BY // List all entries $OUT = ''; $SW = 2; while ($row = SQL_FETCHARRAY($result)) { - // Add/translate some data + // Add color switching $row['sw'] = $SW; // Add it to network if the type matches selected diff --git a/inc/modules/admin/what-list_networks.php b/inc/modules/admin/what-list_networks.php index 9e59591977..fd99cc6563 100644 --- a/inc/modules/admin/what-list_networks.php +++ b/inc/modules/admin/what-list_networks.php @@ -76,7 +76,7 @@ if (SQL_NUMROWS($result) > 0) { // List all $SW = 2; $OUT = ''; while ($content = SQL_FETCHARRAY($result)) { - // Add/translate entries + // Add color switching $content['sw'] = $SW; // Load row template diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php index 9a2541368f..50980e5d69 100644 --- a/inc/modules/admin/what-list_payouts.php +++ b/inc/modules/admin/what-list_payouts.php @@ -265,16 +265,9 @@ ORDER BY if (empty($content['target_bank'])) $content['target_bank'] = '---'; } - // Remember data in array for the template - $content = array( - 'sw' => $SW, - 'ulink' => generateUserProfileLink($content['userid']), - 'ptype' => translateComma($content['payout_total']) . ' ' . $content['type'], - 'account' => $content['target_account'], - 'bank' => $content['target_bank'], - 'tstamp' => generateDateTime($content['payout_timestamp'], 2), - 'status' => $content['status'], - ); + // Add/Translate some data + $content['sw'] = $SW; + $content['payout_timestamp'] = generateDateTime($content['payout_timestamp'], 2); // Add row and switch color $OUT .= loadTemplate('admin_list_payouts_row', true, $content); diff --git a/inc/modules/admin/what-list_primera.php b/inc/modules/admin/what-list_primera.php index 34610aa895..cb9969bc2d 100644 --- a/inc/modules/admin/what-list_primera.php +++ b/inc/modules/admin/what-list_primera.php @@ -40,14 +40,20 @@ // Some security stuff... if ((!defined('__SECURITY')) || (!isAdmin())) { die(); -} +} // END - if // Add description as navigation point addMenuDescription('admin', __FILE__); // Check for entries -$result = SQL_QUERY("SELECT id, userid, primera_account, primera_amount, primera_timestamp, primera_type, primera_api_message, primera_api_status FROM `{?_MYSQL_PREFIX?}_user_primera` ORDER BY primera_timestamp DESC, id DESC", -__FILE__, __LINE__); +$result = SQL_QUERY("SELECT + `id`, `userid`, `primera_account`, `primera_amount`, `primera_timestamp`, `primera_type`, `primera_api_message`, `primera_api_status` +FROM + `{?_MYSQL_PREFIX?}_user_primera` +ORDER BY + `primera_timestamp` DESC, + `id` DESC", + __FILE__, __LINE__); // Are there some entries to display? if (SQL_NUMROWS($result) > 0) { @@ -56,11 +62,7 @@ if (SQL_NUMROWS($result) > 0) { while ($content = SQL_FETCHARRAY($result)) { // Translate some data and add color $content['sw'] = $SW; - $content['link'] = generateUserProfileLink($content['userid']); - $content['primera_amount'] = translateComma($content['primera_amount']); $content['primera_timestamp'] = generateDateTime($content['primera_timestamp'], 2); - $content['raw_type'] = strtolower($content['primera_type']); - $content['primera_type'] = PRIMERA_TRANSFER_STATUS($content['primera_type']); // Fix empty message and status if (empty($content['primera_api_message'])) $content['primera_api_message'] = '---'; diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php index 51d355d999..7176644729 100644 --- a/inc/modules/admin/what-list_sponsor.php +++ b/inc/modules/admin/what-list_sponsor.php @@ -40,7 +40,7 @@ // Some security stuff... if ((!defined('__SECURITY')) || (!isAdmin())) { die(); -} +} // END - if // Add description as navigation point addMenuDescription('admin', __FILE__); @@ -60,37 +60,19 @@ WHERE `id`='%s' LIMIT 1", // Check if an entry is empty foreach ($content as $k => $v) { if (empty($v)) $content[$k] = '---'; - } - - // Check for sponsor's orders (only count) - $result_orders = SQL_QUERY_ESC("SELECT COUNT(id) FROM `{?_MYSQL_PREFIX?}_sponsor_orders` WHERE sponsorid='%s'", - array(bigintval(getRequestParameter('id'))), __FILE__, __LINE__); - list($orders) = SQL_FETCHROW($result_orders); - SQL_FREERESULT($result_orders); - if (empty($orders)) $orders = '0'; + } // END - foreach // Prepare all data for the template // Sponsor's id - $content['id'] = getRequestParameter('id'); - // Personal data - $content['gender'] = translateGender($content['gender']); + $content['id'] = getRequestParameter('id'); // Contact data $content['email_link'] = generateEmailLink($content['email'], 'sponsor_data'); - $content['url'] = generateDerefererUrl($content['url']); // Timestamps $content['created'] = generateDateTime($content['sponsor_created'], 2); $content['last_online'] = generateDateTime($content['last_online'], 2); $content['last_change'] = generateDateTime($content['last_change'], 2); - // Sponsor points - $content['points_amount'] = translateComma($content['points_amount']); - $content['points_used'] = translateComma($content['points_used']); - // Warning because low points - $content['receive_warnings'] = translateYesNo($content['receive_warnings']); - $content['warning_interval'] = createFancyTime($content['warning_interval']); // Orders total - $content['orders'] = $orders; - // Other data - $content['status'] = sponsorTranslateUserStatus($content['status']); + $content['orders'] = countSumTotalData(bigintval(getRequestParameter('id')), 'sponsor_orders', 'id', 'sponsorid', true); // Load template loadTemplate('admin_list_sponsor_details', false, $content); @@ -146,19 +128,18 @@ ORDER BY $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result_main)) { // Transfer data to array - // @TODO Rewritings: surname->surname,family->family,ip->remote_addr in template $content = array( - 'id' => $content['id'], - 'sw' => $SW, - 'gender' => translateGender($content['gender']), - 'surname' => $content['surname'], - 'family' => $content['family'], - 'email' => generateEmailLink($content['email'], 'sponsor_data'), - 'status' => sponsorTranslateUserStatus($content['status']), - 'created' => generateDateTime($content['sponsor_created'], 2), - 'last_online' => generateDateTime($content['last_online'], 2), - 'points' => translateComma($content['points_amount'] - $content['points_used']), - 'ip' => $content['remote_addr'], + 'id' => $content['id'], + 'sw' => $SW, + 'gender' => $content['gender'], + 'surname' => $content['surname'], + 'family' => $content['family'], + 'email' => generateEmailLink($content['email'], 'sponsor_data'), + 'status' => $content['status'], + 'created' => generateDateTime($content['sponsor_created'], 2), + 'last_online' => generateDateTime($content['last_online'], 2), + 'points' => translateComma($content['points_amount'] - $content['points_used']), + 'remote_addr' => $content['remote_addr'], ); // Load row template diff --git a/inc/modules/admin/what-list_surfbar_actions.php b/inc/modules/admin/what-list_surfbar_actions.php index 4d36b16d4e..04f45266b6 100644 --- a/inc/modules/admin/what-list_surfbar_actions.php +++ b/inc/modules/admin/what-list_surfbar_actions.php @@ -63,7 +63,6 @@ if (SQL_NUMROWS($result) > 0) { $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { // "Translate" some data - $content['actions_status'] = translateSurfbarUrlStatus($content['actions_status']); $content['actions_action'] = getMessage(sprintf("MEMBER_SURFBAR_ACTION_%s_SUBMIT", $content['actions_action'])); // New status set? diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index b27461d464..ea74ef7da4 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -140,11 +140,8 @@ LIMIT 1", // Prepare data for template $content['admin_links'] = generateMemberAdminActionLinks($userid, $content['status']); - $content['gender'] = translateGender($content['gender']); $content['email_link'] = generateEmailLink($content['email'], 'user_data'); - $content['status'] = translateUserStatus($content['status']); $content['last_online'] = generateDateTime($content['last_online'], 0); - $content['used_points'] = translateComma($content['used_points']); if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $userid . '%}">' . translateComma($content['emails_sent']) . ']'; $content['joined'] = generateDateTime($content['joined'], 0); $content['last_update'] = generateDateTime($content['last_update'], 0); @@ -178,10 +175,6 @@ LIMIT 1", $content['click_rate'] = translateComma($content['mails_confirmed'] / $content['emails_received'] * 100); } // END - if - // "Translate" more data - $content['mails_confirmed'] = translateComma($content['mails_confirmed']); - $content['emails_received'] = translateComma($content['emails_received']); - // Is the extension 'country' installed? if (isExtensionActive('country')) { // Then overwrite country information diff --git a/inc/modules/admin/what-surfbar_stats.php b/inc/modules/admin/what-surfbar_stats.php index 62a5ca2c73..271754365d 100644 --- a/inc/modules/admin/what-surfbar_stats.php +++ b/inc/modules/admin/what-surfbar_stats.php @@ -40,7 +40,7 @@ // Some security stuff... if ((!defined('__SECURITY')) || (!isAdmin())) { die(); -} +} // END - if // Add description as navigation point addMenuDescription('admin', __FILE__); @@ -69,8 +69,6 @@ ORDER BY $visits += $content['total_visits']; // "Translate" some data - $content['stats_userid'] = generateUserProfileLink($content['stats_userid']); - $content['total_visits'] = translateComma($content['total_visits']); $content['last_surfed'] = generateDateTime($content['last_surfed'], 2); $content['sw'] = $SW; @@ -112,14 +110,10 @@ ORDER BY $OUT = ''; $SW = 2; $urlArray = '0'; $visits = '0'; while ($content = SQL_FETCHARRAY($result)) { // Count totals - $urlArray += $content['visited_urls']; - $visits += $content['total_visits']; + $urlArray += $content['visited_urls']; + $visits += $content['total_visits']; - // "Translate" some data - // @TODO Can't all these translation blocks moved into templates? This code looks ugly. - $content['stats_userid'] = generateUserProfileLink($content['stats_userid']); - $content['visited_urls'] = translateComma($content['visited_urls']); - $content['total_visits'] = translateComma($content['total_visits']); + // Add color switch $content['sw'] = $SW; // Load row template @@ -146,5 +140,5 @@ ORDER BY // Free result SQL_FREERESULT($result); -// +// [EOF] ?> diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php index 280246d776..d25521cfe9 100644 --- a/inc/modules/admin/what-unlock_sponsor.php +++ b/inc/modules/admin/what-unlock_sponsor.php @@ -40,7 +40,7 @@ // Some security stuff... if ((!defined('__SECURITY')) || (!isAdmin())) { die(); -} +} // END - if // Add description as navigation point addMenuDescription('admin', __FILE__); @@ -58,9 +58,14 @@ if (isFormSent()) { ); // Load his personal data - $result_main = SQL_QUERY_ESC("SELECT gender, surname, family, email, remote_addr, sponsor_created, points_amount, refid -FROM `{?_MYSQL_PREFIX?}_sponsor_data` -WHERE `status`='PENDING' AND id='%s' LIMIT 1", + $result_main = SQL_QUERY_ESC("SELECT + `gender`, `surname`, `family`, `email`, `remote_addr`, `sponsor_created`, `points_amount`, `refid` +FROM + `{?_MYSQL_PREFIX?}_sponsor_data` +WHERE + `status`='PENDING' AND + `id`=%s +LIMIT 1", array($content['id']), __FILE__, __LINE__); if (SQL_NUMROWS($result_main) == 1) { @@ -68,14 +73,20 @@ WHERE `status`='PENDING' AND id='%s' LIMIT 1", $content = SQL_FETCHARRAY($result_main); // Check for open payments and close them - $result = SQL_QUERY_ESC("SELECT so.admin_id, so.pay_count, so.pay_ordered, so.pay_status, -sp.pay_name, sp.pay_rate, sp.pay_currency -FROM `{?_MYSQL_PREFIX?}_sponsor_orders` AS so -LEFT JOIN `{?_MYSQL_PREFIX?}_sponsor_paytypes` AS sp -ON sp.id=so.payid -WHERE so.sponsorid='%s' -ORDER BY sp.pay_name", - array($content['id']), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT + so.admin_id, so.pay_count, so.pay_ordered, so.pay_status, + sp.pay_name, sp.pay_rate, sp.pay_currency +FROM + `{?_MYSQL_PREFIX?}_sponsor_orders` AS so +LEFT JOIN + `{?_MYSQL_PREFIX?}_sponsor_paytypes` AS sp +ON + sp.id=so.payid +WHERE + so.sponsorid='%s' +ORDER BY + sp.pay_name ASC", + array($content['id']), __FILE__, __LINE__); if (SQL_NUMROWS($result) > 0) { // Payment does exist while ($content2 = SQL_FETCHARRAY($result)) { @@ -91,10 +102,10 @@ ORDER BY sp.pay_name", // Transfer data to array $data = array( - 'admin_id' => $content['email'], - 'order' => ($content['pay_count'] * $content['pay_rate']) . ' ' . $content['pay_currency'], - 'stamp' => generateDateTime($content['pay_ordered'], 2), - 'pname' => $content['pay_name'], + 'admin_id' => $content['email'], + 'order' => ($content['pay_count'] * $content['pay_rate']) . ' ' . $content['pay_currency'], + 'stamp' => generateDateTime($content['pay_ordered'], 2), + 'pname' => $content['pay_name'], ); // Load email template @@ -113,8 +124,14 @@ ORDER BY sp.pay_name", SQL_FREERESULT($result_main); // Unlock sponsor account - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_sponsor_data` SET `status`='CONFIRMED' -WHERE `id`='%s' AND `status`='PENDING' LIMIT 1", + SQL_QUERY_ESC("UPDATE + `{?_MYSQL_PREFIX?}_sponsor_data` +SET + `status`='CONFIRMED' +WHERE + `id`=%s AND + `status`='PENDING' +LIMIT 1", array($content['id']), __FILE__, __LINE__); // Update, if applyable, referal count and points @@ -125,54 +142,49 @@ WHERE `id`='%s' AND `status`='PENDING' LIMIT 1", SET `points_amount`=`points_amount`+{?sponsor_ref_points?}, `ref_count`=`ref_count`+1 WHERE - `id`='%s' + `id`=%s LIMIT 1", array(bigintval($content['refid'])), __FILE__, __LINE__); // Whas that update fine? if (SQL_AFFECTEDROWS() == 1) { // Load referal's data - $result = SQL_QUERY_ESC("SELECT id, gender, surname, family, email, -(points_amount - points_used) AS points, receive_warnings, ref_count AS refs -FROM `{?_MYSQL_PREFIX?}_sponsor_data` -WHERE `id`='%s' LIMIT 1", + $result = SQL_QUERY_ESC("SELECT + `id`, `gender`, `surname`, `family`, `email`, + (`points_amount` - `points_used`) AS points, + `receive_warnings`, `ref_count` AS refs +FROM + `{?_MYSQL_PREFIX?}_sponsor_data` +WHERE + `id`=%s +LIMIT 1", array(bigintval($content['refid'])), __FILE__, __LINE__); $REFERAL = SQL_FETCHARRAY($result); // Send warnings out? if ($REFERAL['receive_warnings'] == 'Y') { - // Translate some data - $REFERAL['points'] = translateComma($REFERAL['points']); - $REFERAL['ref_points'] = translateComma(getConfig('sponsor_ref_points')); - $REFERAL['gender'] = translateGender($REFERAL['gender']); - // Send notification to referal $REF_MSG = loadEmailTemplate('sponsor_ref_notify', $REFERAL); sendEmail($REFERAL['email'], getMessage('SPONSOR_REF_NOTIFY_SUBJ'), $REF_MSG); - } + } // END - if // Free memory SQL_FREERESULT($result); - } - } + } // END - if + } // END - if // Transfer data to array - $content['gender'] = translateGender($content['gender']); - $content['sponsor'] = $content['id']; $content['points'] = translateComma($content['points_amount']); // So let's send the email away $message = loadEmailTemplate('sponsor_unlocked', $content); sendEmail($content['email'], getMessage('SPONSOR_UNLOCKED_SUBJ'), $message); - } + } // END - foreach } else { // Nothing selected loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SPONSOR_NONE_SELECTED_UNLOCK')); } - - // Add seperator - outputHtml('
'); -} +} // END - if // Begin listing of all pending sponsor accounts $result = SQL_QUERY("SELECT @@ -204,7 +216,7 @@ if (SQL_NUMROWS($result) > 0) { // Load row template and switch colors $OUT .= loadTemplate('admin_unlock_sponsor_row', true, $content); $SW = 3 - $SW; - } + } // END - while // Load template loadTemplate('admin_unlock_sponsor', false, $OUT); diff --git a/templates/de/emails/sponsor/sponsor_ref_notify.tpl b/templates/de/emails/sponsor/sponsor_ref_notify.tpl index 0501eae161..f6048435a7 100644 --- a/templates/de/emails/sponsor/sponsor_ref_notify.tpl +++ b/templates/de/emails/sponsor/sponsor_ref_notify.tpl @@ -4,9 +4,11 @@ Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%s Ihre Sponsor-Id lautet: $content[id] ------------------------------ -Soeben haben uns einen weiteren Sponsoren gebracht! Dafür haben wir Ihrem Sponsor-Account einmalig $content[ref_points] {?POINTS?} gutgeschrieben. +Soeben haben uns einen weiteren Sponsoren gebracht! Dafür haben wir Ihrem Sponsor-Account einmalig {%config,translateComma=sponsor_ref_points%} {?POINTS?} gutgeschrieben. -Sie haben jetzt ein Guthaben von $content[points] {?POINTS?} und uns schon $content[refs] neue Sponsoren gebracht. Vielen Dank für Ihre Mitarbeit! +Sie haben jetzt ein Guthaben von {%pipe,translateComma=$content[points]%} {?POINTS?} und uns schon $content[refs] neue Sponsoren gebracht. + +Vielen Dank für Ihre Mitarbeit! Mit freundlichen Grüßen, Ihr {?MAIN_TITLE?} Team diff --git a/templates/de/emails/sponsor/sponsor_unlocked.tpl b/templates/de/emails/sponsor/sponsor_unlocked.tpl index bf5a339c59..473b404b97 100644 --- a/templates/de/emails/sponsor/sponsor_unlocked.tpl +++ b/templates/de/emails/sponsor/sponsor_unlocked.tpl @@ -1,10 +1,10 @@ Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%}, ------------------------------ -Ihre Sponsor-Id lautet: $content[sponsor] +Ihre Sponsor-Id lautet: $content[id] ------------------------------ -Wir haben soeben Ihr Sponsoren-Account freigegeben! Sie können sich nun mit der Sponsor-Id und Ihrem Passwort (welches hier nicht genannt werden kann) im Sponsorenbereich einloggen und Ihre $content[points] {?POINTS?} zum Buchen von Aktionen benutzen. +Wir haben soeben Ihr Sponsoren-Account freigegeben! Sie können sich nun mit der Sponsor-Id und Ihrem Passwort (welches hier nicht genannt werden kann) im Sponsorenbereich einloggen und Ihre {%pipe,translateComma=$content[points]%} {?POINTS?} zum Buchen von Aktionen benutzen. Hinweis: ------------------------------ diff --git a/templates/de/html/admin/admin_list_payouts_row.tpl b/templates/de/html/admin/admin_list_payouts_row.tpl index aa17a853cc..141ec93eff 100644 --- a/templates/de/html/admin/admin_list_payouts_row.tpl +++ b/templates/de/html/admin/admin_list_payouts_row.tpl @@ -1,8 +1,8 @@ - $content[ulink] - $content[ptype] - $content[account] - $content[bank] - $content[tstamp] + {%pipe,generateUserProfileLink=$content[userid]%} + {%pipe,translateComma=$content[payout_total]%} $content[type] + $content[target_account] + $content[target_bank] + $content[payout_timestamp] $content[status] - \ No newline at end of file + diff --git a/templates/de/html/admin/admin_list_primera_row.tpl b/templates/de/html/admin/admin_list_primera_row.tpl index 48af8e9aee..d4505735c5 100644 --- a/templates/de/html/admin/admin_list_primera_row.tpl +++ b/templates/de/html/admin/admin_list_primera_row.tpl @@ -1,10 +1,10 @@ $content[id] - $content[link] + {%pipe,generateUserProfileLink=$content[userid]%} $content[primera_account] - $content[primera_amount] + {%pipe,translateComma=$content[primera_amount]%} $content[primera_timestamp] - $content[primera_type] + {%pipe,PRIMERA_TRANSFER_STATUS=$content[primera_type]%} $content[primera_api_message] $content[primera_api_status] diff --git a/templates/de/html/admin/admin_list_sponsor_details.tpl b/templates/de/html/admin/admin_list_sponsor_details.tpl index 9033704808..acda431b67 100644 --- a/templates/de/html/admin/admin_list_sponsor_details.tpl +++ b/templates/de/html/admin/admin_list_sponsor_details.tpl @@ -7,7 +7,7 @@ {--SPONSOR_ID--}:  - $content[id] [$content[status]] + $content[id] [{%pipe,sponsorTranslateUserStatus=$content[status]%}] @@ -33,7 +33,7 @@ {--SURNAME_FAMILY--}: - $content[gender] $content[surname] $content[family] + {%pipe,translateGender=$content[gender]%} $content[surname] $content[family] {--SPONSOR_ENTER_STREET_NR1--}: @@ -65,7 +65,7 @@ {--SPONSOR_ENTER_URL--}: - [{--ADMIN_TEST_URL--}] + [{--ADMIN_TEST_URL--}] @@ -74,19 +74,19 @@ {--SPONSOR_RECEIVE_WARNINGS_SHORT--}: - $content[receive_warnings] + {%pipe,translateYesNo=$content[receive_warnings]%} {--SPONSOR_WARNING_INTERVAL_SHORT--}: - $content[warning_interval] + {%pipe,createFancyTime=$content[warning_interval]%} {--SPONSOR_POINTS_AMOUNT--}: - [$content[points_amount]] + [{%pipe,translateComma=$content[points_amount]%}] {--SPONSOR_POINTS_USED--}: - [$content[points_used]] + [{%pipe,translateComma=$content[points_used]%}] diff --git a/templates/de/html/admin/admin_list_sponsor_row.tpl b/templates/de/html/admin/admin_list_sponsor_row.tpl index 7fcfdb13d8..f8308ed4c7 100644 --- a/templates/de/html/admin/admin_list_sponsor_row.tpl +++ b/templates/de/html/admin/admin_list_sponsor_row.tpl @@ -8,7 +8,7 @@ [$content[id]] - $content[gender] $content[surname] $content[family] + {%pipe,translateGender=$content[gender]%} $content[surname] $content[family] [$content[points]] @@ -24,7 +24,7 @@ - [$content[status]] + [{%pipe,sponsorTranslateUserStatus=$content[status]%}] $content[created] @@ -33,6 +33,6 @@ $content[last_online] - $content[ip] + $content[remote_addr] diff --git a/templates/de/html/admin/admin_list_surfbar_actions_row.tpl b/templates/de/html/admin/admin_list_surfbar_actions_row.tpl index afdb904efd..277c2dabd9 100644 --- a/templates/de/html/admin/admin_list_surfbar_actions_row.tpl +++ b/templates/de/html/admin/admin_list_surfbar_actions_row.tpl @@ -3,7 +3,7 @@ - $content[actions_status] + {%pipe,translateSurfbarUrlStatus=$content[actions_status]%} $content[actions_action] diff --git a/templates/de/html/admin/admin_other_sqls_row.tpl b/templates/de/html/admin/admin_other_sqls_row.tpl index 6b48265786..ebb0e92792 100644 --- a/templates/de/html/admin/admin_other_sqls_row.tpl +++ b/templates/de/html/admin/admin_other_sqls_row.tpl @@ -1,6 +1,6 @@
- SQL-Abfrage: $content[sql_str] - (numRows=$content[num_rows],affected=$content[affected]) | + SQL-Abfrage: {%pipe,secureString=$content[sql_str]%} + (numRows={%pipe,translateComma=$content[num_rows]%},affected={%pipe,translateComma=$content[affected]%}) | Script: $content[file] | Zeile: $content[line] | Zeit: $content[timing]ms diff --git a/templates/de/html/admin/admin_surfbar_stats_row.tpl b/templates/de/html/admin/admin_surfbar_stats_row.tpl index 6f92d20bc8..0e864ead93 100644 --- a/templates/de/html/admin/admin_surfbar_stats_row.tpl +++ b/templates/de/html/admin/admin_surfbar_stats_row.tpl @@ -1,5 +1,5 @@ - $content[stats_userid] - $content[visited_urls] - $content[total_visits] + {%pipe,generateUserProfileLink=$content[stats_userid]%} + {%pipe,translateComma=$content[visited_urls]%} + {%pipe,translateComma=$content[total_visits]%} diff --git a/templates/de/html/admin/admin_surfbar_url_stats_row.tpl b/templates/de/html/admin/admin_surfbar_url_stats_row.tpl index 51a4d81575..dc54b15b2b 100644 --- a/templates/de/html/admin/admin_surfbar_url_stats_row.tpl +++ b/templates/de/html/admin/admin_surfbar_url_stats_row.tpl @@ -1,5 +1,5 @@ - [$content[url_userid]] - $content[total_visits] + [{%pipe,generateUserProfileLink=$content[url_userid]%}] + {%pipe,translateComma=$content[total_visits]%} $content[last_surfed] diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl index 410d777e02..9d8f352196 100644 --- a/templates/de/html/admin/admin_user_details.tpl +++ b/templates/de/html/admin/admin_user_details.tpl @@ -7,7 +7,7 @@ {--GENDER--}:
- $content[gender] + {%pipe,translateGender=$content[gender]%} {--SURNAME--}:
@@ -47,7 +47,7 @@ {--ACCOUNT_STATUS--}:
- $content[status] + {%pipe,translateUserStatus=$content[status]%} {--RECEIVE_MAILS--}:
@@ -97,7 +97,7 @@ {--USED_POINTS--}:
- $content[used_points] + {%pipe,translateComma$content[used_points]%} {--TOTAL_POINTS--}:
@@ -145,13 +145,13 @@ {--EMAILS_RECEIVED--}:
- $content[emails_received] + {%pipe,translateComma=$content[emails_received]%} {--MAILS_CONFIRMED--}:
- $content[mails_confirmed] + {%pipe,translateComma=$content[mails_confirmed]%} {--RAND_CONFIRMED--}: