From 60c415b4e890472115cc0ad0f62290e7af71d205 Mon Sep 17 00:00:00 2001 From: quix0r Date: Sun, 20 Jun 2010 20:23:59 +0000 Subject: [PATCH] Next wave of more use of EL, see ticket #176 --- inc/extensions/ext-rallye.php | 2 +- inc/language/de.php | 3 -- inc/language/online_de.php | 4 ++ inc/libs/doubler_functions.php | 13 ++--- inc/libs/refback_functions.php | 14 ++---- inc/libs/surfbar_functions.php | 10 ++-- inc/libs/task_functions.php | 2 +- inc/mails/doubler_mails.php | 8 ++-- inc/modules/admin/what-config_mediadata.php | 2 +- inc/modules/admin/what-list_sponsor_pay.php | 21 ++++---- inc/modules/guest/action-online.php | 8 ++-- inc/modules/guest/what-active.php | 2 +- inc/modules/guest/what-sponsor_infos.php | 12 +---- inc/modules/guest/what-top10.php | 6 +-- inc/modules/guest/what-welcome.php | 19 ++------ inc/modules/member/what-beg.php | 1 + inc/modules/member/what-beg2.php | 30 +++++++----- inc/modules/member/what-bonus.php | 25 +++++----- inc/modules/member/what-payout.php | 5 +- inc/modules/member/what-primera.php | 9 +--- inc/modules/member/what-stats.php | 42 ++++++++-------- inc/modules/member/what-surfbar_book.php | 14 +++--- inc/modules/member/what-surfbar_start.php | 20 ++------ inc/mysql-manager.php | 2 +- inc/pool/pool-bonus.php | 48 +++++++++++-------- inc/pool/pool-user.php | 28 ++++------- inc/wrapper-functions.php | 12 +++++ templates/de/emails/add-points.tpl | 2 +- templates/de/emails/admin/admin_refback.tpl | 16 ++++--- templates/de/emails/back-member.tpl | 2 +- templates/de/emails/bonus-mail.tpl | 8 ++-- templates/de/emails/member/member_doubler.tpl | 4 +- templates/de/emails/member/member_refback.tpl | 6 +-- .../member/member_surfbar_low_points.tpl | 8 ++-- templates/de/emails/normal-mail.tpl | 8 ++-- templates/de/html/guest/guest_active_row.tpl | 2 +- .../de/html/guest/guest_doubler_list_rows.tpl | 2 +- .../de/html/guest/guest_sponsor_pay_row.tpl | 10 ++-- .../de/html/guest/guest_top10_row_earner.tpl | 2 +- .../de/html/guest/guest_top10_row_login.tpl | 4 +- .../de/html/guest/guest_top10_row_refs.tpl | 4 +- templates/de/html/member/member_bonus_row.tpl | 2 +- .../html/member/member_doubler_list_rows.tpl | 2 +- .../de/html/member/member_list_beg_row.tpl | 2 +- .../de/html/member/member_payout_row.tpl | 2 +- .../member/member_primera_mode_list_row.tpl | 4 +- templates/de/html/member/member_stats_row.tpl | 14 +++--- .../member/member_surfbar_book_dynamic.tpl | 21 +++++--- .../member/member_surfbar_start_dynamic.tpl | 38 +++++++++------ .../member/member_surfbar_start_static.tpl | 15 +++--- templates/de/html/online_now.tpl | 20 ++++++-- templates/de/html/welcome.tpl | 4 +- 52 files changed, 286 insertions(+), 278 deletions(-) diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php index c6a84c8db3..f3fc2aed8a 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -331,7 +331,7 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu // @TODO Move this code into rallye_functions.php if (getOutputMode() != 1) { // Get total member count - $total = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true); + $total = getTotalConfirmedUser(); // Add more data on higher versions $ADD1 = ''; $ADD2 = ''; $OR = ''; diff --git a/inc/language/de.php b/inc/language/de.php index 97bfc75aa3..9c261f7db3 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -639,9 +639,6 @@ addMessages(array( 'REF_VIEWS' => "Views", 'REFBANNER_TOTALS' => "Gesamt", 'DAYS' => "Tage", - 'GUESTS_ONLINE' => "Gäste", - 'MEMBERS_ONLINE' => "Mitglieder", - 'ADMINS_ONLINE' => "Administratoren", 'USER_NOW_ONLINE' => "User Online", 'ADMIN_ONLINE_DETAILS' => "Detailierte Statistik für alle Besucher", '_REFID' => "Ref-Id", diff --git a/inc/language/online_de.php b/inc/language/online_de.php index 98bdad07ac..d523bf703a 100644 --- a/inc/language/online_de.php +++ b/inc/language/online_de.php @@ -45,6 +45,10 @@ if (!defined('__SECURITY')) { // Language definitions addMessages(array( 'ONLINE_STATISTICS_DEACTIVATED' => "Online-Statistik deaktivert.", + 'GUESTS_ONLINE' => "Gäste", + 'MEMBERS_ONLINE' => "Mitglieder", + 'ADMINS_ONLINE' => "Administratoren", + 'TOTAL_ONLINE' => "Gesamt", )); // [EOF] diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php index b6eddaf443..c299e11eea 100644 --- a/inc/libs/doubler_functions.php +++ b/inc/libs/doubler_functions.php @@ -91,6 +91,7 @@ LIMIT %s", $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { // Rewrite userid/refid only if admin is in + // @TODO Can't this be moved into EL? if (isAdmin()) { // Set links to admin area if ($content['userid'] > 0) { $content['userid'] = generateUserProfileLink($content['userid']); } else { $content['userid'] = '---'; } @@ -101,7 +102,7 @@ LIMIT %s", $content = array( 'userid' => $content['userid'], 'rid' => $content['refid'], - 'points' => translateComma($content['points']), + 'points' => $content['points'], 'timemark' => generateDateTime($content['timemark'], $DT_MODE), 'sw' => $SW, ); @@ -109,17 +110,17 @@ LIMIT %s", // Load template and switch color $OUT .= loadTemplate($mode . '_doubler_list_rows', true, $content); $SW = 3 - $SW; - } + } // END - while // Free memory SQL_FREERESULT($result); } else { // List no entries - $OUT = " - - ".loadTemplate('admin_settings_saved', true, $message)." + $OUT = ' + + ' . loadTemplate('admin_settings_saved', true, $message) . ' -\n"; +'; } // Return template diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php index 9278ccc555..5dc539c2e7 100644 --- a/inc/libs/refback_functions.php +++ b/inc/libs/refback_functions.php @@ -394,21 +394,16 @@ function updateMemberRefbackPercents ($id, $percents) { } // END - if // Prepare email content - $content = array( - 'percents' => translateComma($percents), - 'refid' => $dummy['refid'], - 'level' => $dummy['level'], - 'points' => translateComma($dummy['points']), - ); + $dummy['percents'] = $percents; // Load member email template - $mail = loadEmailTemplate('member_refback', $content, $dummy['refid']); + $mail = loadEmailTemplate('member_refback', $dummy, $dummy['refid']); // Send email to user sendEmail($dummy['refid'], getMessage('MEMBER_REFBACK_SUBJECT'), $mail); // Send admin notification - sendAdminNotification(getMessage('ADMIN_REFBACK_SUBJECT'), 'admin_refback', $content, getMemberId()); + sendAdminNotification(getMessage('ADMIN_REFBACK_SUBJECT'), 'admin_refback', $dummy, getMemberId()); // All fine! $status['ok'] = true; @@ -417,5 +412,6 @@ function updateMemberRefbackPercents ($id, $percents) { //* DEBUG: */ print("----------------------- ".__FUNCTION__." - EXIT ------------------------
"); return $status; } -// + +// [EOF] ?> diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 2260039884..26f2aef234 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -494,10 +494,8 @@ function SURFBAR_HANDLE_LOW_POINTS () { // Prepare content $content = array( 'userid' => $userid, - 'low' => translateComma(getConfig('surfbar_warn_low_points')), - 'points' => translateComma($userids['points'][$userid]), - 'notified' => generateDateTime($userids['notified'][$userid]), - 'interval' => createFancyTime(getConfig('surfbar_low_interval')) + 'points' => $userids['points'][$userid], + 'notified' => $userids['notified'][$userid] ); // Notify this user @@ -1335,7 +1333,7 @@ function SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE () { $percent = abs(log(getConfig('surfbar_dynamic_percent') / 100 + 1)); // Get total users - $totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true); + $totalUsers = getTotalConfirmedUser(); // Get online users $onlineUsers = SURFBAR_DETERMINE_TOTAL_ONLINE(); @@ -1372,7 +1370,7 @@ function SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE () { $percent = abs(log(getConfig('surfbar_dynamic_percent') / 100 + 1)); // Get total users - $totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true); + $totalUsers = getTotalConfirmedUser(); // Calculate addon $addon += abs($max * $percent * $totalUsers); diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index d4eee50672..4b85d3da37 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -94,7 +94,7 @@ function outputAdvancedOverview (&$result_main) { // First check for all account status seperately // // Confirmed accounts - $value = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true); + $value = getTotalConfirmedUser(); if ($value > 0) { $content['confirmed_members'] = '' . $value . ''; diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php index 9101070df0..975fae07e9 100644 --- a/inc/mails/doubler_mails.php +++ b/inc/mails/doubler_mails.php @@ -177,13 +177,13 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y')) // Prepare array $content = array( // Doubler transmission id - 'id' => $content['id'], + 'id' => $content['id'], // Doubled points - 'points' => translateComma($content['points']), + 'points' => $content['points'], // Timemark - 'when' => generateDateTime($content['timemark'], 2), + 'timemark' => generateDateTime($content['timemark'], 2), // IP number when the member submitted the doubling form - 'ip' => $content['remote_ip'], + 'remote_ip' => $content['remote_ip'], ); // Load mail template and send mail away... diff --git a/inc/modules/admin/what-config_mediadata.php b/inc/modules/admin/what-config_mediadata.php index 3bceffb984..dbacb56b84 100644 --- a/inc/modules/admin/what-config_mediadata.php +++ b/inc/modules/admin/what-config_mediadata.php @@ -63,7 +63,7 @@ if (isFormSent()) { // Convert some data setPostRequestParameter('mt_stage', bigintval(postRequestParameter('mt_stage'))); - if (postRequestParameter('mt_stage') <= countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true)) { + if (postRequestParameter('mt_stage') <= getTotalConfirmedUser()) { // Not enougth! unsetPostRequestParameter('ok'); } diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php index 4d8ed2f88b..eb33c3789f 100644 --- a/inc/modules/admin/what-list_sponsor_pay.php +++ b/inc/modules/admin/what-list_sponsor_pay.php @@ -128,13 +128,13 @@ if (isFormSent('add')) { // Payment type added! $message = getMaskedMessage('ADMIN_SPONSOR_PAYTYPE_ADDED', postRequestParameter('pay_name')); } else { - // Free memory - SQL_FREERESULT($result); - // Entry does already exists $message = getMaskedMessage('ADMIN_SPONSOR_PAYTYPE_ALREADY', postRequestParameter('pay_name')); } + // Free memory + SQL_FREERESULT($result); + // Output message loadTemplate('admin_settings_saved', false, $message); } elseif ((isFormSent('edit')) || (isFormSent('del'))) { @@ -185,8 +185,13 @@ if (isFormSent('add')) { } } else { // Load all payment types - $result = SQL_QUERY("SELECT `id`, `pay_name`, `pay_rate`, `pay_min_count`, `pay_currency` FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` ORDER BY `pay_name` ASC", - __FILE__, __LINE__); + $result = SQL_QUERY("SELECT + `id`, `pay_name`, `pay_rate`, `pay_min_count`, `pay_currency` +FROM + `{?_MYSQL_PREFIX?}_sponsor_paytypes` +ORDER BY + `pay_name` ASC", + __FILE__, __LINE__); // Do we have some paytypes setup? if (SQL_NUMROWS($result) > 0) { @@ -212,9 +217,6 @@ if (isFormSent('add')) { $SW = 3 - $SW; } // END - while - // Free memory - SQL_FREERESULT($result); - // Load list template $content['list_out'] = loadTemplate('admin_list_sponsor_pay', true, $OUT); } else { @@ -222,6 +224,9 @@ if (isFormSent('add')) { $content['list_out'] = loadTemplate('admin_settings_saved', true, getMessage('ADMIN_SPONSOR_NO_PAYTYPES')); } + // Free memory + SQL_FREERESULT($result); + // Add new payment types here $content['add_out'] = loadTemplate('admin_add_sponsor_paytype', true); diff --git a/inc/modules/guest/action-online.php b/inc/modules/guest/action-online.php index 0622b60eb0..db8745d675 100644 --- a/inc/modules/guest/action-online.php +++ b/inc/modules/guest/action-online.php @@ -58,10 +58,10 @@ if (getConfig('mad_count') < $total) { // Prepare content $content = array( - 'guests' => translateComma(countSumTotalData('N', 'online', 'id', 'is_admin', true, " AND `is_member`='N'")), - 'members' => translateComma(countSumTotalData('N', 'online', 'id', 'is_admin', true, " AND `is_member`='Y'")), - 'admins' => translateComma(countSumTotalData('Y', 'online', 'id', 'is_admin', true)), - 'total' => translateComma($total) + 'guests' => countSumTotalData('N', 'online', 'id', 'is_admin', true, " AND `is_member`='N'"), + 'members' => countSumTotalData('N', 'online', 'id', 'is_admin', true, " AND `is_member`='Y'"), + 'admins' => countSumTotalData('Y', 'online', 'id', 'is_admin', true), + 'total' => $total ); // Output table diff --git a/inc/modules/guest/what-active.php b/inc/modules/guest/what-active.php index ec9c844704..bf342cfea8 100644 --- a/inc/modules/guest/what-active.php +++ b/inc/modules/guest/what-active.php @@ -80,7 +80,7 @@ if (SQL_NUMROWS($result) > 0) { 'sw' => $SW, 'userid' => $userid, 'nickname' => $nick2, - 'points' => translateComma(countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'user_data', 'used_points')), + 'points' => (countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'user_data', 'used_points')), 'last_online' => generateDateTime($last, 2), ); diff --git a/inc/modules/guest/what-sponsor_infos.php b/inc/modules/guest/what-sponsor_infos.php index a25f9a99ed..28019f4e7c 100644 --- a/inc/modules/guest/what-sponsor_infos.php +++ b/inc/modules/guest/what-sponsor_infos.php @@ -81,21 +81,13 @@ if (SQL_NUMROWS($result_act) > 0) { } // END - while // Check for pay types - $result_pay = SQL_QUERY('SELECT pay_name, pay_rate, pay_min_count, pay_currency FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` ORDER BY pay_name', __FILE__, __LINE__); + $result_pay = SQL_QUERY('SELECT `pay_name`, `pay_rate`, `pay_min_count`, `pay_currency` FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` ORDER BY `pay_name` ASC', __FILE__, __LINE__); if (SQL_NUMROWS($result_pay) > 0) { // Load all pay types $OUT_PAY = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result_pay)) { // Prepare data for the row template - // @TODO Rewritings: name->pay_name,min->pay_min_count,min->pay_min_count,curr->pay_currency - $content = array( - 'sw' => $SW, - 'name' => $content['pay_name'], - 'rate' => translateComma($content['pay_rate']), - 'min' => $content['pay_min_count'], - 'curr' => $content['pay_currency'], - 'price' => translateComma($content['pay_min_count']), - ); + $content['sw'] => $SW; // Load row template and switch color $OUT_PAY .= loadTemplate('guest_sponsor_pay_row', true, $content); diff --git a/inc/modules/guest/what-top10.php b/inc/modules/guest/what-top10.php index f877c26537..44193f3aff 100644 --- a/inc/modules/guest/what-top10.php +++ b/inc/modules/guest/what-top10.php @@ -80,7 +80,7 @@ while ($content = SQL_FETCHARRAY($result)) { 'userid' => $content['userid'], 'nickname' => $content['nickname'], 'total_logins' => $content['total_logins'], - 'points' => translateComma(countSumTotalData($content['userid'], 'user_points', 'points')), + 'points' => (countSumTotalData($content['userid'], 'user_points', 'points')), 'last_online' => generateDateTime($content['last_online'], 3), ); @@ -147,7 +147,7 @@ while ($content = SQL_FETCHARRAY($result)) { 'cnt' => $cnt, 'userid' => $content['userid'], 'nickname' => $content['nickname'], - 'points' => translateComma($content['points']), + 'points' => $content['points'], 'last_online' => generateDateTime($content['last_online'], 3) ); @@ -215,7 +215,7 @@ while ($content = SQL_FETCHARRAY($result)) { 'userid' => $content['userid'], 'refs' => $content['refs'], 'nickname' => $content['nickname'], - 'points' => translateComma(countSumTotalData($content['userid'], 'user_points', 'points')), + 'points' => (countSumTotalData($content['userid'], 'user_points', 'points')), 'last_online' => generateDateTime($content['last_online'], 3) ); diff --git a/inc/modules/guest/what-welcome.php b/inc/modules/guest/what-welcome.php index 58569f5673..91f3becd65 100644 --- a/inc/modules/guest/what-welcome.php +++ b/inc/modules/guest/what-welcome.php @@ -40,29 +40,16 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Add description as navigation point addMenuDescription('guest', __FILE__); -// Count referal levels -$result = SQL_QUERY("SELECT COUNT(`id`) FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `level` > 0", __FILE__, __LINE__); - -// Fetch rows -list($cnt) = SQL_FETCHROW($result); - -// Free result -SQL_FREERESULT($result); - // Prepare content -$content = array( - 'register' => translateComma(getConfig('points_register')), - 'ref_levels' => $cnt, - 'ref_points' => translateComma(getConfig('points_ref')) -); +$content['ref_levels'] = countSumTotalData('', 'refdepths', 'id', '', true, ' WHERE `level` > 0'); // Load default template -loadTemplate(substr(basename(__FILE__), 5, -4), false, $content); +loadTemplate('welcome', false, $content); // [EOF] ?> diff --git a/inc/modules/member/what-beg.php b/inc/modules/member/what-beg.php index 0780e5e466..624d1483d4 100644 --- a/inc/modules/member/what-beg.php +++ b/inc/modules/member/what-beg.php @@ -53,6 +53,7 @@ if ((!isExtensionActive('beg')) && (!isAdmin())) { } // END - if // Prepare constants +// @TODO Can't this be moved into EL? if ((isExtensionActive('nickname')) && (getUserData('nickname') != '')) { // Get nickname $content['userid'] = getUserData('nickname'); diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php index b448c2f40f..b6632bb791 100644 --- a/inc/modules/member/what-beg2.php +++ b/inc/modules/member/what-beg2.php @@ -59,21 +59,25 @@ $ONLINE = ''; if (isExtensionActive('autopurge')) { // Use last online timestamp to keep inactive members away from here $lastOnline = " AND `last_online` >= (UNIX_TIMESTAMP() - %s)"; - $ONLINE = getConfig('ap_inactive_since'); + $ONLINE = '{?ap_inactive_since?}'; } // END - if // Let's check if there are some points left we can 'pay'... $result = SQL_QUERY_ESC("SELECT - `userid`, `beg_points` AS beg, `last_online` + `userid`, `beg_points` AS points, `last_online` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE - `beg_points` > 0 AND `status`='CONFIRMED'" . $lastOnline . " + `beg_points` > 0 AND + `status`='CONFIRMED' + " . $lastOnline . " ORDER BY - `beg_points` DESC, `last_online` DESC, `userid` ASC LIMIT %s", + `beg_points` DESC, + `last_online` DESC, + `userid` ASC +LIMIT {?beg_ranks?}", array( - $ONLINE, - getConfig('beg_ranks') + $ONLINE ), __FILE__, __LINE__); // Reset temporary variable and check for users @@ -84,11 +88,11 @@ if (SQL_NUMROWS($result) > 0) { while ($content = SQL_FETCHARRAY($result)) { // Prepare data for the template $content = array( - 'sw' => $SW, - 'cnt' => $cnt, - 'userid' => bigintval($content['userid']), - 'points' => translateComma($content['beg']), - 'last_online' => generateDateTime($content['last_online'], 2), + 'sw' => $SW, + 'cnt' => $cnt, + 'userid' => $content['userid'], + 'points' => $content['points'], + 'last_online' => generateDateTime($content['last_online'], 2), ); // Load row template @@ -96,7 +100,7 @@ if (SQL_NUMROWS($result) > 0) { // Count one up and switch colors $cnt++; $SW = 3 - $SW; - } + } // END - while } else { // No one is interested in our "active rallye" ! :-( $OUT = loadTemplate('member_beg_404', true); @@ -111,5 +115,5 @@ SQL_FREERESULT($result); // Load final template loadTemplate('member_list_beg', false, $content); -// +// [EOF] ?> diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php index 8d84a59412..0125ce192d 100644 --- a/inc/modules/member/what-bonus.php +++ b/inc/modules/member/what-bonus.php @@ -68,12 +68,12 @@ if (isExtensionInstalledAndNewer('bonus', '0.6.9')) { } // Autopurge installed? -$lastOnline = "%s"; $ONLINE = ''; +$lastOnline = '%s'; $ONLINE = ''; if (isExtensionActive('autopurge')) { // Use last online timestamp to keep inactive members away from here $lastOnline = " AND `last_online` >= (UNIX_TIMESTAMP() - %s)"; $ONLINE = getConfig('ap_inactive_since'); -} +} // END - if // Let's check if there are some points left we can 'pay'... $result = SQL_QUERY_ESC("SELECT @@ -81,15 +81,16 @@ $result = SQL_QUERY_ESC("SELECT FROM `{?_MYSQL_PREFIX?}_user_data` WHERE - " . $USE . " > 0 AND `status`='CONFIRMED'" . $lastOnline . " + " . $USE . " > 0 AND + `status`='CONFIRMED' + " . $lastOnline . " ORDER BY `points` DESC, last_online DESC, userid ASC -LIMIT %s", +LIMIT {?bonus_ranks?}", array( - $ONLINE, - getConfig('bonus_ranks') + $ONLINE ), __FILE__, __LINE__); // Reset temporary variable and check for users @@ -100,11 +101,11 @@ if (SQL_NUMROWS($result) > 0) { while ($content = SQL_FETCHARRAY($result)) { // Prepare data for the template $content = array( - 'sw' => $SW, - 'cnt' => $cnt, - 'userid' => bigintval($content['userid']), - 'points' => translateComma($content['points']), - 'last_online' => generateDateTime($content['last_online'], 2) + 'sw' => $SW, + 'cnt' => $cnt, + 'userid' => $content['userid'], + 'points' => $content['points'], + 'last_online' => generateDateTime($content['last_online'], 2) ); // Load row template @@ -112,7 +113,7 @@ if (SQL_NUMROWS($result) > 0) { // Count one up and switch colors $cnt++; $SW = 3 - $SW; - } + } // END - while } else { // No one is interested in our "active rallye" ! :-( $OUT = loadTemplate('member_bonus_404', true); diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php index 73ebf494d7..a73ae1afca 100644 --- a/inc/modules/member/what-payout.php +++ b/inc/modules/member/what-payout.php @@ -124,10 +124,11 @@ ORDER BY $content = array( 'sw' => $SW, 'target_account' => $content['target_account'], - 'points' => translateComma($content['payout_total']) . ' ' . $content['type'], + 'payout_total' => $content['payout_total'], 'target_bank' => $content['target_bank'], 'payout_timestamp' => generateDateTime($content['payout_timestamp'], 2), - 'status' => $content['status'] + 'status' => $content['status'], + 'type' => $content['type'], ); // Load row template and switch colors diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php index 854c6f247d..b8f8557b5c 100644 --- a/inc/modules/member/what-primera.php +++ b/inc/modules/member/what-primera.php @@ -83,14 +83,7 @@ if (!isGetRequestParameterSet('mode')) { $content['rows'] = ''; $SW = 2; while ($data = SQL_FETCHARRAY($result)) { // Prepare data for output - $rowContent = array( - 'primera_timestamp' => generateDateTime($data['primera_timestamp'], 2), - 'points' => translateComma($data['primera_amount']), - 'primera_account' => SQL_ESCAPE($data['primera_account']), - 'status' => PRIMERA_TRANSFER_STATUS($data['primera_type']), - 'raw_type' => strtolower($data['primera_type']), - 'sw' => $SW, - ); + $rowContent['primera_timestamp'] = generateDateTime($data['primera_timestamp'], 2); // Load row template $content['rows'] .= loadTemplate('member_primera_mode_list_row', true, $rowContent); diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php index 42cd192d72..fb156eb909 100644 --- a/inc/modules/member/what-stats.php +++ b/inc/modules/member/what-stats.php @@ -56,7 +56,8 @@ $result = SQL_QUERY_ESC("SELECT FROM `{?_MYSQL_PREFIX?}_pool` WHERE - `sender`=%s AND `data_type` != 'SEND' + `sender`=%s AND + `data_type` != 'SEND' ORDER BY `timestamp` DESC", array(getMemberId()), __FILE__, __LINE__); @@ -65,22 +66,22 @@ ORDER BY if (SQL_NUMROWS($result) > 0) { // Load all orders $OUT = ''; $SW = 2; - while ($data = SQL_FETCHARRAY($result)) { + while ($content = SQL_FETCHARRAY($result)) { // Is the ZIP code set? If not, set dashes - if (empty($data['zip'])) $data['zip'] = '---'; + if (empty($content['zip'])) $content['zip'] = '---'; // Prepare content for output $content = array( 'sw' => $SW, - 'id' => $data['id'], - 'cat' => getCategory($data['cat_id']), - 'pay' => getPaymentTitlePrice($data['payment_id']), - 'subject' => $data['subject'], - 'url' => generateDerefererUrl($data['url']), - 'timestamp' => generateDateTime($data['timestamp'], 2), - 'target_send' => $data['target_send'], - 'type' => translatePoolType($data['data_type']), - 'zip' => $data['zip'] + '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'] ); // Load template @@ -116,24 +117,23 @@ if (SQL_NUMROWS($result) > 0) { $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { // Prepare data for the template - // @TODO Rewrite in template: clix->clicks $content = array( 'sw' => $SW, - 'cat' => getCategory($content['cat_id']), - 'pay' => getPaymentTitlePrice($content['payment_id']), - 'url' => generateDerefererUrl($content['url']), + 'cat_id' => $content['cat_id'], + 'payment_id' => $content['payment_id'], + 'url' => $content['url'], 'timestamp_ordered' => generateDateTime($content['timestamp_ordered'], 2), - 'target_send' => $content['max_rec'], - 'sent' => generateDateTime($content['timestamp_send'], 2), - 'clix' => $content['clicks'], + 'max_rec' => $content['max_rec'], + 'timestamp_sent' => generateDateTime($content['timestamp_send'], 2), + 'clicks' => $content['clicks'], 'subject' => $content['subject'], - 'percents' => translateComma($content['clicks'] / $content['max_rec'] * 100)."%", + 'percents' => ($content['clicks'] / $content['max_rec'] * 100), ); // Load row template and switch colors $OUT .= loadTemplate('member_stats_row', true, $content); $SW = 3 - $SW; - } + } // END - if // Load main template $main_content['stats'] = loadTemplate('member_stats_table', true, $OUT); diff --git a/inc/modules/member/what-surfbar_book.php b/inc/modules/member/what-surfbar_book.php index 635640e598..1fb968bbf2 100644 --- a/inc/modules/member/what-surfbar_book.php +++ b/inc/modules/member/what-surfbar_book.php @@ -64,12 +64,12 @@ if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) { setPostRequestParameter('limit', 0); } // END - if - // Register the new URL - $insertId = SURFBAR_MEMBER_ADD_URL(postRequestParameter('url'), postRequestParameter('limit')); - // By default something went wrong $message = getMessage('MEMBER_SURFBAR_URL_NOT_ADDED'); + // Register the new URL + $insertId = SURFBAR_MEMBER_ADD_URL(postRequestParameter('url'), postRequestParameter('limit')); + // Was this fine? if ($insertId > 0) { // URL added and waiting for unlock @@ -81,15 +81,13 @@ if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) { } else { // Prepare some content $content = array( - 'reward' => translateComma(SURFBAR_DETERMINE_REWARD(true)), - 'costs' => translateComma(SURFBAR_DETERMINE_COSTS(true)), - 'max_order' => getConfig('surfbar_max_order'), - 'curr_order' => SURFBAR_GET_TOTAL_USER_URLS() + 'reward' => SURFBAR_DETERMINE_REWARD(true), + 'costs' => SURFBAR_DETERMINE_COSTS(true), ); // Load surfbar order form loadTemplate(sprintf("member_surfbar_book_%s", strtolower(getConfig('surfbar_pay_model'))), false, $content); } -// +// [EOF] ?> diff --git a/inc/modules/member/what-surfbar_start.php b/inc/modules/member/what-surfbar_start.php index 6ce70f50ca..26f8c72523 100644 --- a/inc/modules/member/what-surfbar_start.php +++ b/inc/modules/member/what-surfbar_start.php @@ -54,28 +54,14 @@ if ((!isExtensionActive('surfbar')) && (!isAdmin())) { // Prepare content for output $content = array( - 'surfbar_static_reward' => translateComma(getConfig('surfbar_static_reward')), - 'surfbar_static_time' => createFancyTime(getConfig('surfbar_static_time')), - 'surfbar_static_lock' => createFancyTime(getConfig('surfbar_static_lock')), 'surfbar_total_urls' => SURFBAR_GET_TOTAL_URLS('ACTIVE', 0) ); // In dynamic mode we need some more data if (getConfig('surfbar_pay_model') == 'DYNAMIC') { - // Total URLs + // Prepare content for dynamic surfbar $content = array( - 'surfbar_dynamic_percent' => translateComma(getConfig('surfbar_dynamic_percent')), - 'surfbar_total_urls' => SURFBAR_GET_TOTAL_URLS('ACTIVE', 0), - 'surfbar_user_urls' => SURFBAR_GET_TOTAL_USER_URLS(), - 'surfbar_total_online' => SURFBAR_DETERMINE_TOTAL_ONLINE(), - 'surfbar_total_users' => translateComma(countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true)), - 'surfbar_min_reward' => translateComma(SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE()), - 'surfbar_max_reward' => translateComma(SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE()), - 'surfbar_min_time' => createFancyTime(SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE()), - 'surfbar_max_time' => createFancyTime(SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE()), - 'surfbar_dynamic_lock' => createFancyTime(SURFBAR_CALCULATE_DYNAMIC_LOCK()), - 'surfbar_static_reward' => translateComma(getConfig('surfbar_static_reward')), - 'surfbar_static_time' => createFancyTime(getConfig('surfbar_static_time')) + 'surfbar_total_urls' => SURFBAR_GET_TOTAL_URLS('ACTIVE', 0), ); } // END - if @@ -85,5 +71,5 @@ loadTemplate('member_surfbar_start_' . strtolower(getConfig('surfbar_pay_model') // Load surfbar link template loadTemplate('member_surfbar_link'); -// +// [EOF] ?> diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 1c20fbe726..afd2f1caab 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -1269,7 +1269,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify // Prepare content $content = array( 'text' => getMessage('REASON_DIRECT_PAYMENT'), - 'points' => translateComma($ref_points) + 'points' => $ref_points ); // Load message diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php index 6276de6829..65b4e36774 100644 --- a/inc/pool/pool-bonus.php +++ b/inc/pool/pool-bonus.php @@ -99,18 +99,8 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) { if (isset($DATA[$key])) $DATA['text'] = str_replace($value, $DATA[$key], $DATA['text']); } // END - foreach - // Prepare content - $content = array( - 'id' => $DATA['id'], - 'url' => $DATA['url'], - 'time' => createFancyTime($DATA['time']), - 'points' => translateComma($DATA['points']), - 'category' => getCategory($DATA['cat_id']), - 'text' => $DATA['text'] - ); - // Prepare the mail - $mailText = loadEmailTemplate('bonus-mail', $content, $userid); + $mailText = loadEmailTemplate('bonus-mail', $DATA, $userid); // Send mail away if (isset($DATA['html_msg'])) { @@ -153,8 +143,16 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) { //* DEBUG: */ print("-L:".__LINE__.'/'.countSelection($dummy)."-
"); if (countSelection($dummy) == 0) { // Queue reached! - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_bonus` SET `data_type`='SEND', `target_send`=0, `receivers`='' WHERE `id`=%s LIMIT 1", - array(bigintval($DATA['id'])), __FILE__, __LINE__); + SQL_QUERY_ESC("UPDATE + `{?_MYSQL_PREFIX?}_bonus` +SET + `data_type`='SEND', + `target_send`=0, + `receivers`='' +WHERE + `id`=%s +LIMIT 1", + array(bigintval($DATA['id'])), __FILE__, __LINE__); //* DEBUG: */ print("*L:".__LINE__."*
"); // Update mediadata if version is 0.0.4 or higher @@ -165,22 +163,34 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) { } // END - if } elseif ($GLOBALS['pool_cnt'] >= getConfig('max_send')) { // Update bonus pool - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_bonus` SET `data_type`='NEW', `target_send`=%s, `receivers`='%s' WHERE `id`=%s LIMIT 1", - array(countSelection($dummy), implode(';', $dummy), bigintval($DATA['id'])), __FILE__, __LINE__); + SQL_QUERY_ESC("UPDATE + `{?_MYSQL_PREFIX?}_bonus` +SET + `data_type`='NEW', + `target_send`=%s, + `receivers`='%s' +WHERE + `id`=%s +LIMIT 1", + array( + countSelection($dummy), + implode(';', $dummy), + bigintval($DATA['id']) + ), __FILE__, __LINE__); //* DEBUG: */ print("*L:".__LINE__."
");
 				//* DEBUG: */ print(print_r($dummy, true));
 				//* DEBUG: */ print("
\n!!!
"); break; } - } - } + } // END - while + } // END - if // Free memory SQL_FREERESULT($result_bonus); // Remove variable unset($mailText); -} +} // END - if -// +// [EOF] ?> diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php index b29d3fb625..744fb6b3ee 100644 --- a/inc/pool/pool-user.php +++ b/inc/pool/pool-user.php @@ -122,9 +122,6 @@ if (SQL_NUMROWS($result_main) > 0) { case 'done': // Prepare the mail $DATA['stats_id'] = bigintval($stats_id); - $DATA['surname'] = getUserData('surname'); - $DATA['family'] = getUserData('family'); - $DATA['gender'] = translateGender(getUserData('gender')); // Replace text variables foreach ($GLOBALS['replacer'] as $key => $value) { @@ -132,18 +129,11 @@ if (SQL_NUMROWS($result_main) > 0) { } // END - if // Prepare content - $content = array( - 'id' => $DATA['stats_id'], - 'url' => $DATA['url'], - 'sender_userid' => $DATA['sender'], - 'category' => getCategory($DATA['cat_id']), - 'time' => createFancyTime(getPaymentPoints($DATA['payment_id'], 'time')), - 'points' => translateComma(getPaymentPoints($DATA['payment_id'], 'payment')), - 'text' => $DATA['text'] - ); + $DATA['time'] = getPaymentPoints($DATA['payment_id'], 'time'); + $DATA['points'] = getPaymentPoints($DATA['payment_id'], 'payment'); // Load message template - $mailText = loadEmailTemplate('normal-mail', $content, bigintval($userid)); + $mailText = loadEmailTemplate('normal-mail', $DATA, bigintval($userid)); // Send mail away sendEmail(getUserData('email'), $DATA['subject'], $mailText, $HTML); @@ -268,9 +258,9 @@ if (SQL_NUMROWS($result_main) > 0) { SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `receivers`='%s' WHERE `id`=%s LIMIT 1", array(implode(';', $dummy), bigintval($DATA['id'])), __FILE__, __LINE__); } - } - } - } + } // END - foreach + } // END - if + } // END - while // Do we have points to "pay back"? if ((count($pointsBack) > 0) && (!empty($pointsBack[0]))) { @@ -280,7 +270,7 @@ if (SQL_NUMROWS($result_main) > 0) { if (($PB > 0) && ($userid > 0)) { // Prepare content $content = array( - 'points' => translateComma($PB) + 'points' => $PB ); // We have to pay back some points to the sender (we add them directly :-P) @@ -300,7 +290,7 @@ if (SQL_NUMROWS($result_main) > 0) { } // END - if } // END - foreach } // END - if -} +} // END - if // Free memory SQL_FREERESULT($result_main); @@ -308,5 +298,5 @@ SQL_FREERESULT($result_main); // Remove variable unset($mailText); -// +// [EOF] ?> diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index cee610df47..89ebde56c9 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -1032,5 +1032,17 @@ function determineCountry ($userid) { return $country; } +// "Getter" for total confirmed user accounts +function getTotalConfirmedUser () { + // Is it cached? + if (!isset($GLOBALS['total_confirmed_users'])) { + // Then do it + $GLOBALS['total_confirmed_users'] = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true); + } // END - if + + // Return cached value + return $GLOBALS['total_confirmed_users']; +} + // [EOF] ?> diff --git a/templates/de/emails/add-points.tpl b/templates/de/emails/add-points.tpl index 9c2f7b5e92..f3a83da89a 100644 --- a/templates/de/emails/add-points.tpl +++ b/templates/de/emails/add-points.tpl @@ -1,6 +1,6 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}, -Einer unserer Administratoren hat Ihnen soeben $content[points] {?POINTS?} gutgeschrieben! +Einer unserer Administratoren hat Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} gutgeschrieben! Grund dazu war folgender: ------------------------------ diff --git a/templates/de/emails/admin/admin_refback.tpl b/templates/de/emails/admin/admin_refback.tpl index 844e70fe08..ac37176630 100644 --- a/templates/de/emails/admin/admin_refback.tpl +++ b/templates/de/emails/admin/admin_refback.tpl @@ -2,17 +2,19 @@ Hallo Administrator, Das Mitglied $userid hat soeben Ref-Back für ein anderes Mitglied eingestellt. ------------------------------- +----------------------------------- Mitglied-Id: {%user,refid,bigintval=$userid%} (der den Ref-Back bekommt) ------------------------------- +----------------------------------- Vorname: {%user,surname=$userid%} ------------------------------- +----------------------------------- Familienname: {%user,family=$userid%} ------------------------------- +----------------------------------- Email-Adresse: {%user,email=$userid%} ------------------------------- -Ref-Back: $content[percents]% ------------------------------- +----------------------------------- +Ref-Back: {%pipe,translateComma=$content[percents]%}% +----------------------------------- +Bereits erhalten: {%pipe,translateComma=$content[points]%} {?POINTS?} +----------------------------------- Mit freundlichen Grüßen, Ihr {?MAIN_TITLE?} Team diff --git a/templates/de/emails/back-member.tpl b/templates/de/emails/back-member.tpl index f8357fcf8e..448c19ef20 100644 --- a/templates/de/emails/back-member.tpl +++ b/templates/de/emails/back-member.tpl @@ -1,6 +1,6 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}, -Eine Buchung von Ihnen konnte nich vollständig ausgesendet werden. Wir haben Ihnen $content[points] {?POINTS?} wieder gutgeschrieben! +Eine Buchung von Ihnen konnte nich vollständig ausgesendet werden. Wir haben Ihnen {%pipe,translateComma=$content[points]%} {?POINTS?} wieder gutgeschrieben! Mit freundlichen Grüßen, Ihr {?MAIN_TITLE?} Team diff --git a/templates/de/emails/bonus-mail.tpl b/templates/de/emails/bonus-mail.tpl index 8498c28ca1..c50331fef7 100644 --- a/templates/de/emails/bonus-mail.tpl +++ b/templates/de/emails/bonus-mail.tpl @@ -9,17 +9,17 @@ $content[text] ---------------- Verfallszeit: $content[expiration] ---------------- -Verguetung: $content[points] {?POINTS?} +Vergütung: {%pipe,translateComma=$content[points]%} {?POINTS?} ---------------- -Bestaetigungszeit: $content[time] +Bestätigungszeit: {%pipe,createFancyTime=$content[time]%} ---------------- -Beworbene Kategorie: $content[category] +Beworbene Kategorie: {%pipe,getCategory=$content[cat_id]%} ---------------- Beworbene URL: $content[url] ---------------- Hinweis: Angesammelte {?POINTS?} können versteigert oder verkauft werden, jedoch muß der Käufer bei {?MAIN_TITLE?} Mitglied sein oder werden. -Um Ihre $content[points] {?POINTS?} gutgeschrieben zu bekommen, klicken Sie bitte auf folgenden Link: +Um Ihre {%pipe,translateComma=$content[points]%} {?POINTS?} gutgeschrieben zu bekommen, klicken Sie bitte auf folgenden Link: {?URL?}/mailid.php?userid=$userid&bonusid=$content[id] Wichtig! Achten Sie darauf das Ihr Mailserver immer empfangbereit ist. Sollte Ihr Mailserver nicht empfangbereit sein (z.B. voll usw.), werden wir Ihren Account sperren! Sie haben nun innerhalb von 10 Tagen die möglichkeit sich bei uns zu melden zwecks Freischaltung, erfolgt dieses nicht, wird Ihr Account gelöscht! Bei dieser Sperrung erhalten Sie von uns keine Mitteilung, sollten Sie keine Mails von uns bekommen, prüfen Sie Ihren Account! diff --git a/templates/de/emails/member/member_doubler.tpl b/templates/de/emails/member/member_doubler.tpl index 025c1150ca..bca7305f67 100644 --- a/templates/de/emails/member/member_doubler.tpl +++ b/templates/de/emails/member/member_doubler.tpl @@ -1,11 +1,11 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}, -Wir haben Ihnen soeben $content[points] {?POINTS?} durch eine Verdoppelung vom $content[when] Ihrem Account gutgeschrieben! +Wir haben Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} durch eine Verdoppelung vom $content[timemark] Ihrem Account gutgeschrieben! ------------------------------ Ihre Mitglied-Id lautet: $userid Doppler-Transaktionsnummer: $content[id] -Ihre IP-Nummer lautete: $content[ip] +Ihre IP-Nummer lautete: $content[remote_ip] ------------------------------ Mit freundlichen Grüßen, diff --git a/templates/de/emails/member/member_refback.tpl b/templates/de/emails/member/member_refback.tpl index 06da7bff2c..9217303ee4 100644 --- a/templates/de/emails/member/member_refback.tpl +++ b/templates/de/emails/member/member_refback.tpl @@ -1,14 +1,14 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}, -Das Mitglied $content[refid] hat Ihnen soeben $content[percents]% Ref-Back eingestellt. Sie erhalten also anteilig {?POINTS?} von seinen Referal-Gutschriften die Sie ihm/ihr bringen ebenfalls gutgeschrieben. +Das Mitglied $content[refid] hat Ihnen soeben {%pipe,translateComma=$content[percents]%}% Ref-Back eingestellt. Sie erhalten also anteilig {?POINTS?} von seinen Referal-Gutschriften die Sie ihm/ihr bringen ebenfalls gutgeschrieben. ------------------------------ Ihr Mitglieder-Id ist: $userid ------------------------------ -Ref-Back: $content[percents]% +Ref-Back: {%pipe,translateComma=$content[percents]%}% ------------------------------ -Sie haben bereits $content[points] {?POINTS?} Ref-Back-Vergütung an das Mitglied abgegeben. +Sie haben bereits {%pipe,translateComma=$content[points]%} {?POINTS?} Ref-Back-Vergütung an das Mitglied abgegeben. Mit freundlichen Grüßen, Ihr {?MAIN_TITLE?} Team diff --git a/templates/de/emails/member/member_surfbar_low_points.tpl b/templates/de/emails/member/member_surfbar_low_points.tpl index 0a964121fa..32d53896d1 100644 --- a/templates/de/emails/member/member_surfbar_low_points.tpl +++ b/templates/de/emails/member/member_surfbar_low_points.tpl @@ -6,13 +6,13 @@ Hier sind alle Daten: ------------------------------------------ Ihre Mitglieder-Id: $content[userid] ------------------------------------------ -Ihr aktuelles Guthaben: $content[points] {?POINTS?} +Ihr aktuelles Guthaben: {%pipe,translateComma=$content[points]%} {?POINTS?} ------------------------------------------ -Warnung wird versendet ab: $content[low] {?POINTS?} und niedriger +Warnung wird versendet ab: {%config,translateComma=surfbar_warn_low_points%} {?POINTS?} und niedriger ------------------------------------------ -Zuletzt wegen niedrigem Kontostand gewarnt: $content[notified] +Zuletzt wegen niedrigem Kontostand gewarnt: {%pipe,generateDateTime=$content[notified]%} ------------------------------------------ -Mindestversendeinterval dieser Mail: $content[interval] +Mindestversendeinterval dieser Mail: {%config,createFancyTime=surfbar_low_interval%} ------------------------------------------ Mit freundlichen Grüßen, diff --git a/templates/de/emails/normal-mail.tpl b/templates/de/emails/normal-mail.tpl index caf7210023..335fd0c153 100644 --- a/templates/de/emails/normal-mail.tpl +++ b/templates/de/emails/normal-mail.tpl @@ -9,17 +9,19 @@ $content[text] ---------------- Werber: $content[sender_userid] ---------------- +Vergütung: {%pipe,translateComma=$content[points]%} {?POINTS?} +---------------- Verfallszeit: $content[expiration] ---------------- -Beworbene Kategorie: $content[category] +Beworbene Kategorie: {%pipe,getCategory=$content[cat_id]%} ---------------- -Wartezeit: $content[time] +Wartezeit: {%pipe,createFancyTime=$content[time]%} ---------------- Beworbene URL: $content[url] ---------------- Hinweis: Angesammelte {?POINTS?} können versteigert oder verkauft werden, jedoch muß der Käufer bei {?MAIN_TITLE?} Mitglied sein oder werden. -Um Ihre $content[points] {?POINTS?} gutgeschrieben zu bekommen, klicken Sie bitte auf folgenden Link: +Um Ihre {%pipe,translateComma=$content[points]%} {?POINTS?} gutgeschrieben zu bekommen, klicken Sie bitte auf folgenden Link: {?URL?}/mailid.php?userid=$userid&mailid=$content[id] Wichtig! Achten Sie darauf das Ihr Mailserver immer empfangbereit ist. Sollte Ihr Mailserver nicht empfangbereit sein (z.B. voll usw.), werden wir Ihren Account sperren! Sie haben nun innerhalb von 10 Tagen die möglichkeit sich bei uns zu melden zwecks Freischaltung, erfolgt dieses nicht, wird Ihr Account gelöscht! Bei dieser Sperrung erhalten Sie von uns keine Mitteilung, sollten Sie keine Mails von uns bekommen, prüfen Sie Ihren Account! diff --git a/templates/de/html/guest/guest_active_row.tpl b/templates/de/html/guest/guest_active_row.tpl index e0c462c901..512e8a1634 100644 --- a/templates/de/html/guest/guest_active_row.tpl +++ b/templates/de/html/guest/guest_active_row.tpl @@ -1,5 +1,5 @@ $content[userid] ($content[nickname]) - $content[points] + {%pipe,translateComma=$content[points]%} $content[last_online] diff --git a/templates/de/html/guest/guest_doubler_list_rows.tpl b/templates/de/html/guest/guest_doubler_list_rows.tpl index 0b85214323..e83f10857e 100644 --- a/templates/de/html/guest/guest_doubler_list_rows.tpl +++ b/templates/de/html/guest/guest_doubler_list_rows.tpl @@ -3,7 +3,7 @@ $content[userid] - $content[points] + {%pipe,translateComma=$content[points]%} $content[timemark] diff --git a/templates/de/html/guest/guest_sponsor_pay_row.tpl b/templates/de/html/guest/guest_sponsor_pay_row.tpl index 537c8e3206..09712bdbed 100644 --- a/templates/de/html/guest/guest_sponsor_pay_row.tpl +++ b/templates/de/html/guest/guest_sponsor_pay_row.tpl @@ -1,17 +1,17 @@ - $content[name]: + $content[pay_name]: - {--SPONSOR_PAYTYPE_COUNT--}:  + {--SPONSOR_PAYTYPE_COUNT--}: -
$content[rate] {?POINTS?}
+
{%pipe,translateComma=$content[pay_rate]%} {?POINTS?}
- {--SPONSOR_PAYTYPE_VALUE--}:  + {--SPONSOR_PAYTYPE_VALUE--}: -
$content[price] $content[curr]
+
{%pipe,translateComma=$content[pay_min_count]%} $content[pay_currency]
diff --git a/templates/de/html/guest/guest_top10_row_earner.tpl b/templates/de/html/guest/guest_top10_row_earner.tpl index 53c4faa501..701eef7b3b 100644 --- a/templates/de/html/guest/guest_top10_row_earner.tpl +++ b/templates/de/html/guest/guest_top10_row_earner.tpl @@ -1,6 +1,6 @@ $content[cnt] $content[userid]($content[nickname]) - $content[points] + {%pipe,translateComma=$content[points]%} $content[last_online] diff --git a/templates/de/html/guest/guest_top10_row_login.tpl b/templates/de/html/guest/guest_top10_row_login.tpl index 9d74e1fa81..9900377452 100644 --- a/templates/de/html/guest/guest_top10_row_login.tpl +++ b/templates/de/html/guest/guest_top10_row_login.tpl @@ -1,7 +1,7 @@ $content[cnt] $content[userid]($content[nickname]) - $content[total_logins] - $content[points] + {%pipe,translateComma=$content[total_logins]%} + {%pipe,translateComma=$content[points]%} $content[last_online] diff --git a/templates/de/html/guest/guest_top10_row_refs.tpl b/templates/de/html/guest/guest_top10_row_refs.tpl index f42ec91643..4792750e78 100644 --- a/templates/de/html/guest/guest_top10_row_refs.tpl +++ b/templates/de/html/guest/guest_top10_row_refs.tpl @@ -1,7 +1,7 @@ $content[cnt] $content[userid]($content[nickname]) - $content[refs] - $content[points] + {%pipe,translateComma=$content[refs]%} + {%pipe,translateComma=$content[points]%} $content[last_online] diff --git a/templates/de/html/member/member_bonus_row.tpl b/templates/de/html/member/member_bonus_row.tpl index 793bf4fd04..759650f8a5 100644 --- a/templates/de/html/member/member_bonus_row.tpl +++ b/templates/de/html/member/member_bonus_row.tpl @@ -1,6 +1,6 @@ $content[cnt] $content[userid] - $content[points] + {%pipe,translateComma=$content[points]%} $content[last_online] diff --git a/templates/de/html/member/member_doubler_list_rows.tpl b/templates/de/html/member/member_doubler_list_rows.tpl index 992321779e..92af06aba3 100644 --- a/templates/de/html/member/member_doubler_list_rows.tpl +++ b/templates/de/html/member/member_doubler_list_rows.tpl @@ -6,7 +6,7 @@ $content[rid] - $content[points] + {%pipe,translateComma=$content[points]%} $content[timemark] diff --git a/templates/de/html/member/member_list_beg_row.tpl b/templates/de/html/member/member_list_beg_row.tpl index 793bf4fd04..759650f8a5 100644 --- a/templates/de/html/member/member_list_beg_row.tpl +++ b/templates/de/html/member/member_list_beg_row.tpl @@ -1,6 +1,6 @@ $content[cnt] $content[userid] - $content[points] + {%pipe,translateComma=$content[points]%} $content[last_online] diff --git a/templates/de/html/member/member_payout_row.tpl b/templates/de/html/member/member_payout_row.tpl index 5bfab6ed70..948aa1bc8e 100644 --- a/templates/de/html/member/member_payout_row.tpl +++ b/templates/de/html/member/member_payout_row.tpl @@ -1,5 +1,5 @@ - $content[points] + {%pipe,translateComma=$content[payout_total]%} $content[type] $content[target_account] $content[target_bank] $content[payout_timestamp] diff --git a/templates/de/html/member/member_primera_mode_list_row.tpl b/templates/de/html/member/member_primera_mode_list_row.tpl index 40ffa1fd1f..cc56baf4da 100644 --- a/templates/de/html/member/member_primera_mode_list_row.tpl +++ b/templates/de/html/member/member_primera_mode_list_row.tpl @@ -1,6 +1,6 @@ - $content[points] Primera + {%pipe,translateComma=$content[primera_amount]%} Primera $content[primera_account] $content[primera_timestamp] - $content[status] + {%pipe,PRIMERA_TRANSFER_STATUS=$content[primera_type]%} diff --git a/templates/de/html/member/member_stats_row.tpl b/templates/de/html/member/member_stats_row.tpl index b0b36f0986..e370f26cef 100644 --- a/templates/de/html/member/member_stats_row.tpl +++ b/templates/de/html/member/member_stats_row.tpl @@ -11,34 +11,34 @@ {--EMAIL_PAYMENT--}:
- {%pipe,translateComma=$content[pay]%} + {%pipe,getPaymentTitlePrice,translateComma=$content[payment_id]%} {--EMAIL_CATEGORY--}:
- $content[cat] + {%pipe,getCategory=$content[cat_id]%} {--EMAIL_URL--}:
- {--MEMBER_TEST_URL--} + {--MEMBER_TEST_URL--} {--EMAIL_END_SEND--}:
- $content[sent] + $content[timestamp_sent] {--EMAIL_RECEIVERS--}:
- $content[target_send] + {%pipe,translateComma=$content[max_rec]%} {--EMAIL_CONFIRMED--}:
- $content[clix] + {%pipe,translateComma=$content[clicks]%} {--EMAIL_PERCENT--}:
- $content[percents] + {%pipe,translateComma=$content[percents]%}% diff --git a/templates/de/html/member/member_surfbar_book_dynamic.tpl b/templates/de/html/member/member_surfbar_book_dynamic.tpl index 02303572aa..8e94c98910 100644 --- a/templates/de/html/member/member_surfbar_book_dynamic.tpl +++ b/templates/de/html/member/member_surfbar_book_dynamic.tpl @@ -19,13 +19,20 @@
- Jeder Seiten-Aufruf durch andere Mitglieder kostet Ihnen mindestens - $content[costs] {?POINTS?}. Surfen Sie mit der Surfbar - erhalten Sie mindestens $content[reward] {?POINTS?} auf - Ihr Konto gutgeschrieben.
-
- Sie haben bereits $content[curr_order] von maximal - $content[max_order] erlaubten URLs gebucht. +
+ Jeder Seiten-Aufruf durch andere Mitglieder kostet Ihnen mindestens + {%pipe,translateComma=$content[costs]%} {?POINTS?}. + Surfen Sie mit der Surfbar erhalten Sie mindestens + {%pipe,translateComma=$content[reward]%} {?POINTS?} + auf Ihr Konto gutgeschrieben. +
+
+ Sie haben bereits + {%pipe,SURFBAR_GET_TOTAL_USER_URLS,translateComma%} + von maximal + {%config,translateComma=surfbar_max_order%} + erlaubten URLs gebucht. +
diff --git a/templates/de/html/member/member_surfbar_start_dynamic.tpl b/templates/de/html/member/member_surfbar_start_dynamic.tpl index 6d280ad67f..82522e8fc3 100644 --- a/templates/de/html/member/member_surfbar_start_dynamic.tpl +++ b/templates/de/html/member/member_surfbar_start_dynamic.tpl @@ -5,30 +5,38 @@
Bei der dynamischen Vergütung werden Ihnen derzeit mindestens - $content[surfbar_min_reward] und maximal - $content[surfbar_max_reward] {?POINTS?} Aufschlag - zum Basispreis für jede besuchte Seite vergütet. Diese - müssen Sie mindestens $content[surfbar_min_time] - und maximal $content[surfbar_max_time] zusätzlich - zur Basiszeit angesehen haben und können die selbe Seite erst nach - zusätzlichen $content[surfbar_dynamic_lock] wieder - aufrufen. + {%pipe,SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE,translateComma%} + und maximal {%pipe,SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE,translateComma%} + {?POINTS?} Aufschlag zum Basispreis für jede besuchte + Seite vergütet. Diese müssen Sie mindestens + {%pipe,SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE,createFancyTime%} + und maximal + {%pipe,SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE,createFancyTime%} + zusätzlich zur Basiszeit angesehen haben und können die selbe + Seite erst nach zusätzlichen + {%pipe,SURFBAR_CALCULATE_DYNAMIC_LOCK,createFancyTime%} + wieder aufrufen.
Einige Hinweise zur Berechnung: Die derzeige Mitgliederanzahl von - $content[surfbar_total_users], die derzeit die Surfbar - nutzenden $content[surfbar_total_online] Mitglieder, - die gesamt in der Surfbar gebuchten $content[surfbar_total_urls] + {%pipe,getTotalConfirmedUser,translateComma%}, die + derzeit die Surfbar nutzenden + {%pipe,SURFBAR_DETERMINE_TOTAL_ONLINE%} Mitglieder, die + gesamt in der Surfbar gebuchten + {%pipe,translateComma=$content[surfbar_total_urls]%} URLs (ohne von unseren Sponsoren), sowie Ihre gebuchten - $content[surfbar_user_urls] URLs werden als + {%pipe,SURFBAR_GET_TOTAL_USER_URLS%} URLs werden als Berechnungsgrundlage verwendet. Sie erhalten allerdings nur einen - reduzierten Anteil von $content[surfbar_dynamic_percent]%. + reduzierten Anteil von + {%config,translateComma=surfbar_dynamic_percent%}%.
Der Basispreis und die Basiszeit sind die Einstellungen aus dem - statischen Vergütungsmodell: $content[surfbar_static_reward] - {?POINTS?} bzw. $content[surfbar_static_time]. + statischen Vergütungsmodell: + {%config,translateComma=surfbar_static_reward%} + {?POINTS?} bzw. + {%config,createFancyTime=surfbar_static_time%}.
diff --git a/templates/de/html/member/member_surfbar_start_static.tpl b/templates/de/html/member/member_surfbar_start_static.tpl index dca3388c0e..cb84124c58 100644 --- a/templates/de/html/member/member_surfbar_start_static.tpl +++ b/templates/de/html/member/member_surfbar_start_static.tpl @@ -4,12 +4,13 @@
Bei der statischen Vergütung werden Ihnen derzeit - $content[surfbar_static_reward] {?POINTS?} für - jede besuchte Seite vergütet. Diese müssen Sie - $content[surfbar_static_time] lang angesehen haben - und können die selbe Seite erst nach - $content[surfbar_static_lock] wieder aufrufen. Es sind - insgesamt $content[surfbar_total_urls] URLs in der - Surfbar. + {%config,translateComma=surfbar_static_reward%} + {?POINTS?} für jede besuchte Seite vergütet. Diese + müssen Sie + {%config,createFancyTime=surfbar_static_time%} lang + angesehen haben und können die selbe Seite erst nach + {%config,createFancyTime=surfbar_static_lock%} wieder + aufrufen. Es sind insgesamt + $content[surfbar_total_urls] URLs in der Surfbar.
diff --git a/templates/de/html/online_now.tpl b/templates/de/html/online_now.tpl index 95048ed6fc..664ae18ffe 100644 --- a/templates/de/html/online_now.tpl +++ b/templates/de/html/online_now.tpl @@ -4,7 +4,7 @@ @@ -16,7 +16,7 @@
-
$content[guests]
+
{%pipe,translateComma=$content[guests]%}
 {--GUESTS_ONLINE--}
@@ -28,11 +28,23 @@
-
$content[members]
+
{%pipe,translateComma=$content[members]%}
 {--MEMBERS_ONLINE--}
-
$content[admins]
+
{%pipe,translateComma=$content[admins]%}
 {--ADMINS_ONLINE--}
- \ No newline at end of file + + + + + + + +
+
{%pipe,translateComma=$content[total]%}
+ 		{--TOTAL_ONLINE--}
+ + + diff --git a/templates/de/html/welcome.tpl b/templates/de/html/welcome.tpl index c74fef8d6f..336c9b0eba 100644 --- a/templates/de/html/welcome.tpl +++ b/templates/de/html/welcome.tpl @@ -17,12 +17,12 @@ verpflichtet Sie zu nichts!
Als Startguthaben erhalten Sie von uns für Ihre kostenlose Anmeldung derzeit -$content[register] {?POINTS?}! +{%config,translateComma=points_register%} {?POINTS?}!
Für jeden User, den Sie geworben haben erhalten Sie -$content[ref_points] {?POINTS?} +{%config,translateComma=points_ref%} {?POINTS?} plus prozentualen Verdienst über $content[ref_levels] Referal-Ebenen hinweg!
-- 2.39.5