From 04b69ac9f33369cbf654396c4a42cb1fff710ff4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 28 Jun 2010 07:07:51 +0000 Subject: [PATCH] Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten: - Deprecated variables $nick and $email removed from loadEmailTemplate() - More rewrites for usage of EL - getMessage() lesser used (saves a lot calls while execution of include file) - Some internal TODOs closed - TODOs.txt updated --- DOCS/TODOs.txt | 51 ++++++++-------- doubler.php | 21 ++----- inc/extensions-functions.php | 2 +- inc/extensions/ext-doubler.php | 28 +++++---- inc/functions.php | 10 +--- inc/libs/admins_functions.php | 2 +- inc/libs/doubler_functions.php | 7 ++- inc/libs/register_functions.php | 4 +- inc/libs/sponsor_functions.php | 35 +++++------ inc/libs/user_functions.php | 2 +- inc/mails/doubler_mails.php | 2 +- inc/modules/admin.php | 10 ++-- inc/modules/admin/admin-inc.php | 10 ++-- inc/modules/admin/what-add_points.php | 4 +- inc/modules/admin/what-add_rallye.php | 4 +- inc/modules/admin/what-add_surfbar_url.php | 4 +- inc/modules/admin/what-admin_add.php | 4 +- inc/modules/admin/what-adminedit.php | 6 +- inc/modules/admin/what-admins_add.php | 2 +- inc/modules/admin/what-admins_contct.php | 4 +- inc/modules/admin/what-admins_mails.php | 4 +- inc/modules/admin/what-cache_stats.php | 13 ++--- inc/modules/admin/what-chk_regs.php | 2 +- inc/modules/admin/what-config_admins.php | 4 +- inc/modules/admin/what-config_doubler.php | 16 +---- inc/modules/admin/what-config_mods.php | 4 +- inc/modules/admin/what-config_payouts.php | 2 +- inc/modules/admin/what-config_proxy.php | 2 +- .../admin/what-config_rallye_prices.php | 19 +++--- inc/modules/admin/what-config_session.php | 2 +- inc/modules/admin/what-config_yoomedia.php | 2 +- inc/modules/admin/what-del_email.php | 14 ++--- inc/modules/admin/what-del_holiday.php | 8 +-- inc/modules/admin/what-del_sponsor.php | 2 +- inc/modules/admin/what-del_transfer.php | 2 +- inc/modules/admin/what-del_user.php | 2 +- inc/modules/admin/what-edit_sponsor.php | 4 +- inc/modules/admin/what-email_archiv.php | 2 +- inc/modules/admin/what-email_details.php | 2 +- inc/modules/admin/what-extensions.php | 15 ++--- inc/modules/admin/what-guest_add.php | 4 +- inc/modules/admin/what-guestedit.php | 8 +-- inc/modules/admin/what-list_autopurge.php | 2 +- inc/modules/admin/what-list_bank_package.php | 19 +++--- inc/modules/admin/what-list_beg.php | 6 +- inc/modules/admin/what-list_bonus.php | 15 +++-- inc/modules/admin/what-list_holiday.php | 2 +- inc/modules/admin/what-list_links.php | 2 +- .../admin/what-list_network_params.php | 2 +- inc/modules/admin/what-list_networks.php | 2 +- inc/modules/admin/what-list_notifications.php | 2 +- inc/modules/admin/what-list_payouts.php | 14 ++--- inc/modules/admin/what-list_primera.php | 2 +- inc/modules/admin/what-list_rallyes.php | 6 +- inc/modules/admin/what-list_refs.php | 4 +- inc/modules/admin/what-list_sponsor.php | 2 +- inc/modules/admin/what-list_sponsor_pay.php | 2 +- inc/modules/admin/what-list_sponsor_pays.php | 6 +- .../admin/what-list_surfbar_actions.php | 2 +- inc/modules/admin/what-list_surfbar_urls.php | 4 +- inc/modules/admin/what-list_transfer.php | 2 +- inc/modules/admin/what-list_unconfirmed.php | 8 +-- inc/modules/admin/what-list_user.php | 18 ++---- inc/modules/admin/what-list_wernis.php | 2 +- inc/modules/admin/what-list_yoomedia_tm.php | 4 +- inc/modules/admin/what-logs.php | 2 +- inc/modules/admin/what-mem_add.php | 6 +- inc/modules/admin/what-memedit.php | 4 +- inc/modules/admin/what-overview.php | 2 +- inc/modules/admin/what-send_newsletter.php | 2 +- inc/modules/admin/what-sub_points.php | 4 +- inc/modules/admin/what-surfbar_stats.php | 4 +- inc/modules/admin/what-theme_edit.php | 2 +- inc/modules/admin/what-theme_import.php | 2 +- inc/modules/admin/what-unlock_emails.php | 10 ++-- inc/modules/admin/what-unlock_sponsor.php | 21 ++++--- .../admin/what-unlock_surfbar_urls.php | 10 ++-- inc/modules/admin/what-updates.php | 2 +- inc/modules/admin/what-usage.php | 2 +- inc/modules/admin/what-user_contct.php | 2 +- inc/modules/admin/what-usr_online.php | 2 +- inc/modules/guest/what-doubler.php | 19 ------ inc/modules/guest/what-register.php | 2 +- inc/modules/guest/what-sponsor_infos.php | 6 +- inc/modules/guest/what-sponsor_login.php | 33 ++++++----- inc/modules/guest/what-sponsor_reg.php | 4 +- inc/modules/guest/what-stats.php | 4 +- inc/modules/member/what-categories.php | 10 ++-- inc/modules/member/what-doubler.php | 25 +------- inc/modules/member/what-holiday.php | 10 ++-- inc/modules/member/what-html_mail.php | 2 +- inc/modules/member/what-mydata.php | 6 +- inc/modules/member/what-order.php | 11 ++-- inc/modules/member/what-payout.php | 8 +-- inc/modules/member/what-points.php | 58 +++++++------------ inc/modules/member/what-primera.php | 16 ++--- inc/modules/member/what-refback.php | 14 ++--- inc/modules/member/what-reflinks.php | 2 +- inc/modules/member/what-reflist.php | 2 +- inc/modules/member/what-stats.php | 4 +- inc/modules/member/what-surfbar_book.php | 2 +- inc/modules/member/what-surfbar_list.php | 8 +-- inc/modules/member/what-themes.php | 16 ++--- inc/modules/member/what-transfer.php | 14 ++--- inc/modules/member/what-unconfirmed.php | 2 +- inc/modules/member/what-wernis.php | 20 +++---- inc/modules/sponsor/account.php | 2 +- inc/modules/sponsor/settings.php | 2 +- inc/mysql-manager.php | 2 +- mailid_top.php | 2 +- .../admin/admin_sponsor_change_data.tpl | 2 +- .../admin/admin_sponsor_change_email.tpl | 2 +- .../emails/admin/admin_sponsor_settings.tpl | 4 +- .../de/emails/sponsor/sponsor_change_data.tpl | 28 ++++----- .../emails/sponsor/sponsor_change_email.tpl | 2 +- .../de/emails/sponsor/sponsor_settings.tpl | 4 +- templates/de/html/admin/admin_cache_stats.tpl | 18 ++++-- .../de/html/admin/admin_config_doubler.tpl | 10 ++-- .../de/html/admin/admin_edit_sponsor_edit.tpl | 2 +- .../admin/admin_list_bank_package_row.tpl | 8 +-- .../html/admin/admin_unlock_sponsor_row.tpl | 6 +- .../de/html/admin/admin_user_details.tpl | 18 +++--- templates/de/html/doubler/doubler_index.tpl | 14 ++--- templates/de/html/guest/guest_doubler.tpl | 20 +++---- templates/de/html/member/member_doubler.tpl | 16 ++--- templates/de/html/member/member_points.tpl | 8 +-- .../html/member/member_points_bonus_rows.tpl | 2 +- 127 files changed, 467 insertions(+), 553 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 237437fde3..c6424c7d17 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -41,22 +41,22 @@ ./inc/extensions-functions.php:143: // @TODO Do we still need this? setExtensionUpdateNotes(''); ./inc/extensions-functions.php:422:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) ./inc/extensions-functions.php:538: // @TODO Extension is loaded, what next? -./inc/functions.php:1078:// @TODO $simple/$constants are deprecated -./inc/functions.php:1105: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates -./inc/functions.php:2382: // @TODO This can be easily moved out after the merge from EL branch to this is complete -./inc/functions.php:2531: // @TODO Add a little more infos here -./inc/functions.php:2615: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? -./inc/functions.php:2638: // @TODO Rewrite this old lost code to a template +./inc/functions.php:1072:// @TODO $simple/$constants are deprecated +./inc/functions.php:1099: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates +./inc/functions.php:2379: // @TODO This can be easily moved out after the merge from EL branch to this is complete +./inc/functions.php:2528: // @TODO Add a little more infos here +./inc/functions.php:2612: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? +./inc/functions.php:2635: // @TODO Rewrite this old lost code to a template ./inc/functions.php:266: // @TODO Remove this sanity-check if all is fine ./inc/functions.php:269: // @TODO Try to rewrite all $DATA to $content -./inc/functions.php:2728: // @TODO Are these convertions still required? -./inc/functions.php:2746:// @TODO Rewrite this function to use readFromFile() and writeToFile() -./inc/functions.php:3622:// @TODO Lame description for this function -./inc/functions.php:3641: // @TODO Move this in a filter -./inc/functions.php:3765: // @TODO This is still very static, rewrite it somehow -./inc/functions.php:482: // @TODO Do only use $content, not $DATA or raw variables -./inc/functions.php:555: // @TODO Extension 'msg' does not exist -./inc/functions.php:618:// @TODO Rewrite this to an extension 'smtp' +./inc/functions.php:2725: // @TODO Are these convertions still required? +./inc/functions.php:2743:// @TODO Rewrite this function to use readFromFile() and writeToFile() +./inc/functions.php:3619:// @TODO Lame description for this function +./inc/functions.php:3638: // @TODO Move this in a filter +./inc/functions.php:3762: // @TODO This is still very static, rewrite it somehow +./inc/functions.php:476: // @TODO Do only use $content, not $DATA or raw variables +./inc/functions.php:549: // @TODO Extension 'msg' does not exist +./inc/functions.php:612:// @TODO Rewrite this to an extension 'smtp' ./inc/install-functions.php:63: // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0); ./inc/language/de.php:1143:// @TODO Rewrite these two constants ./inc/language/de.php:1158:// @TODO Rewrite these three constants @@ -119,22 +119,23 @@ ./inc/modules/admin/what-config_admins.php:146: // @TODO Rewrite this to filter 'run_sqls' ./inc/modules/admin/what-config_mods.php:57: // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function ./inc/modules/admin/what-config_points.php:113: // @TODO Rewrite this to a filter -./inc/modules/admin/what-config_rallye_prices.php:209: // @TODO Rewritings: level->price_level, infos->info in template -./inc/modules/admin/what-config_rallye_prices.php:226: // @TODO Rewrite these two constants +./inc/modules/admin/what-config_rallye_prices.php:212: // @TODO Rewritings: level->price_level, infos->info in template +./inc/modules/admin/what-config_rallye_prices.php:229: // @TODO Rewrite these two constants ./inc/modules/admin/what-config_register.php:78: // @TODO Move this HTML code into a template ./inc/modules/admin/what-del_email.php:60: // @TODO Unused: $price = getPaymentPoints($content['payment_id'], 'price'); ./inc/modules/admin/what-del_email.php:61: // @TODO Unused: cat_id, payment_id ./inc/modules/admin/what-edit_user.php:20: * @TODO Add support for ext-country * ./inc/modules/admin/what-email_stats.php:48:// @TODO Unused at the moment -./inc/modules/admin/what-extensions.php:362: // @TODO Rewrite this to a filter +./inc/modules/admin/what-extensions.php:282: // @TODO Rewrite in template: id->ext_id,name->ext_name,active->ext_active,ver->ext_ver +./inc/modules/admin/what-extensions.php:363: // @TODO Rewrite this to a filter ./inc/modules/admin/what-guest_add.php:137: // @TODO This can be somehow rewritten to a function ./inc/modules/admin/what-guest_add.php:69: // @TODO Cant this be rewritten? ./inc/modules/admin/what-guest_add.php:85: // @TODO This can be somehow rewritten to a function ./inc/modules/admin/what-holiday_list.php:48:// @TODO Unused at the moment ./inc/modules/admin/what-list_autopurge.php:49:// @TODO Rewrite those lines to filter -./inc/modules/admin/what-list_bonus.php:136: // @TODO Can't this be moved into our expression language? +./inc/modules/admin/what-list_bonus.php:135: // @TODO Can't this be moved into our expression language? ./inc/modules/admin/what-list_cats.php:56: // @TODO No longer needed? define('__CATS_BASE' , 'mail_title, pay->payment in template ./inc/modules/admin/what-refbanner.php:145: // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template ./inc/modules/admin/what-unlock_emails.php:89: // @TODO Rewrite these if-blocks to a filter -./inc/modules/admin/what-unlock_sponsor.php:204: // @TODO Rewritings: remote->remote_addr, created->sponsor_created in template ./inc/modules/admin/what-usage.php:88: // @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php ./inc/modules/admin/what-usr_online.php:51: // @TODO Add a filter for sponsor ./inc/modules/guest/what-beg.php:60:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout'))); @@ -175,13 +175,12 @@ ./inc/modules/member/what-beg.php:65:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout'))); ./inc/modules/member/what-bonus.php:57: // @TODO Rewrite this to a filter ./inc/modules/member/what-categories.php:129: // @TODO Rewrite this to use $OUT .= ... -./inc/modules/member/what-doubler.php:56:// @TODO The '*100' is in the way to get moved into the template -./inc/modules/member/what-order.php:458: // @TODO Rewrite this to a filter +./inc/modules/member/what-order.php:457: // @TODO Rewrite this to a filter ./inc/modules/member/what-order.php:65:// @TODO Rewrite this to a filter ./inc/modules/member/what-payout.php:222: // @TODO Rewrite this to a filter ./inc/modules/member/what-points.php:55:// @TODO Should we rewrite this to a filter? ./inc/modules/member/what-rallyes.php:91: // @TODO Reactivate this: $content['admin'] = '' . $content['login'] . ''; -./inc/modules/member/what-refback.php:130: // @TODO UNUSED: $refRow['status'] = translateUserStatus($refRow['status']); +./inc/modules/member/what-refback.php:128: // @TODO UNUSED: $refRow['status'] = translateUserStatus($refRow['status']); ./inc/modules/member/what-reflinks.php:54:// @TODO Move this into a filter ./inc/modules/member/what-transfer.php:132: // @TODO Rewrite this to a filter ./inc/modules/member/what-transfer.php:222: // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries diff --git a/doubler.php b/doubler.php index 7e3f9a27e7..f53908359a 100644 --- a/doubler.php +++ b/doubler.php @@ -80,7 +80,7 @@ if (isFormSent()) { // Is the data valid? if (!isUserDataValid()) { // Output message that the userid is not okay - loadTemplate('admin_settings_saved', false, getMessage('DOUBLER_USERID_INVALID')); + loadTemplate('admin_settings_saved', false, '{--DOUBLER_USERID_INVALID--}'); } // END - if // Remove any dots and unwanted chars from the points @@ -98,7 +98,7 @@ if (isFormSent()) { $points = countSumTotalData(getUserData('userid'), 'user_points', 'points') - countSumTotalData(getUserData('userid'), 'user_data', 'used_points'); // So let's continue with probing his points amount - if (($points - getConfig('doubler_left') - postRequestParameter('points') * getConfig('doubler_charge')) >= 0) { + if (($points - getConfig('doubler_left') - postRequestParameter('points') * getConfig('doubler_charge') / 100) >= 0) { // Enough points are left so let's continue with the doubling process // Create doubling "account" width *DOUBLED* points SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`, `refid`, `points`, `remote_ip`, `timemark`, `completed`, `is_ref`) VALUES ('%s','%s','%s','".detectRemoteAddr()."', UNIX_TIMESTAMP(), 'N','N')", @@ -108,7 +108,7 @@ if (isFormSent()) { subtractPoints('doubler', getUserData('userid'), postRequestParameter('points')); // Add points to "total payed" including charge - $points = postRequestParameter('points') - postRequestParameter('points') * getConfig('doubler_charge'); + $points = postRequestParameter('points') - postRequestParameter('points') * getConfig('doubler_charge') / 100; updateConfiguration('doubler_points', $points, '+'); incrementConfigEntry('doubler_points', $points); @@ -118,7 +118,7 @@ if (isFormSent()) { SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`, `refid`, `points`, `remote_ip`, `timemark`, `completed`, `is_ref`) VALUES ('%s',0,'%s','".detectRemoteAddr()."',UNIX_TIMESTAMP(),'N','Y')", array( determineReferalId(), - bigintval(postRequestParameter('points') * 2 * getConfig('doubler_ref')) + bigintval(postRequestParameter('points') * 2 * getConfig('doubler_ref') / 100) ), __FILE__, __LINE__); // And that's why we don't want to you more than one referal level of doubler-points. ^^^ @@ -188,13 +188,6 @@ if (isUserDataValid()) { $content['refid'] = determineReferalId(); } -// Percent values etc. -$content['charge'] = translateComma(getConfig('doubler_charge') * 100); -$content['ref'] = translateComma(getConfig('doubler_ref') * 100); -$content['total'] = translateComma(getConfig('doubler_points')); -$content['min'] = translateComma(getConfig('doubler_min')); -$content['max'] = translateComma(getConfig('doubler_max')); - // Text "Enter login" if (isExtensionActive('nickname')) { // Choose login/nickname @@ -210,12 +203,6 @@ $content['payout_time'] = getMessage('DOUBLER_PAYOUT_TIME_' . getConfig('doubler // Generate table with already payed out doubles $content['payout_history'] = generateDoublerTable(0, 'Y', 'N', 'DESC'); -// Generate timemark -$content['timeout_mark'] = createFancyTime(getConfig('doubler_timeout')); - -// Points left to doubler -$content['left'] = translateComma(DOUBLER_GET_TOTAL_POINTS_LEFT()); - // Output neccessary form for this loadTemplate('doubler_index', false, $content); diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index 06a2c16f56..8c52528550 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.php @@ -772,7 +772,7 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false $OUT = loadTemplate('admin_ext_sql_table', true, $content); } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.0.7')) && (getConfig('verbose_sql') == 'Y')) { // No addional SQL commands to run - $OUT = loadTemplate('admin_settings_saved', true, getMessage('ADMIN_NO_ADDITIONAL_SQLS')); + $OUT = loadTemplate('admin_settings_saved', true, '{--ADMIN_NO_ADDITIONAL_SQLS--}'); } // END - if // Return output diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php index 3b43bb01d3..8181c9e06f 100644 --- a/inc/extensions/ext-doubler.php +++ b/inc/extensions/ext-doubler.php @@ -43,10 +43,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.1.6'); +setThisExtensionVersion('0.1.7'); // Version history array (add more with , '0.1.0' and so on) -setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6')); +setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7')); switch (getExtensionMode()) { case 'register': // Do stuff when installation is running (modules.php?module=admin is called) @@ -89,17 +89,17 @@ PRIMARY KEY (`id`) // --> This also means who fast the doubled points will be payed out! addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD doubler_send_mode ENUM('DIRECT','RESET') NOT NULL DEFAULT 'DIRECT'"); // Timeout for entries to be purged (default: one week) - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD doubler_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('ONE_DAY')*7).""); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `doubler_timeout` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('ONE_DAY')*7).""); // Number of newest entries to display - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD doubler_display_new TINYINT(3) UNSIGNED NOT NULL DEFAULT 10"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `doubler_display_new` TINYINT(3) UNSIGNED NOT NULL DEFAULT 10"); // Number of entries which will be payed out soon - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD doubler_display_pay TINYINT(3) UNSIGNED NOT NULL DEFAULT 10"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `doubler_display_pay` TINYINT(3) UNSIGNED NOT NULL DEFAULT 10"); // Number of entries which are already payed out - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD doubler_display_old TINYINT(3) UNSIGNED NOT NULL DEFAULT 10"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `doubler_display_old` TINYINT(3) UNSIGNED NOT NULL DEFAULT 10"); // Points used by every member - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD doubler_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `doubler_points` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000"); // Counter for usage of the doubler - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD doubler_counter BIGINT(20) UNSIGNED NOT NULL DEFAULT 0"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `doubler_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0"); // // --- MENU SYSTEMS --- @@ -231,7 +231,15 @@ PRIMARY KEY (`id`) // Update notes (these will be set as task text!) setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert."); break; - } + + case '0.1.7': // SQL queries for v0.1.7 + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_config` SET `doubler_charge`=`doubler_charge`*100"); + addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_config` SET `doubler_ref`=`doubler_ref`*100"); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert."); + break; + } // END - switch break; case 'modify': // When the extension got modified @@ -246,7 +254,7 @@ PRIMARY KEY (`id`) default: // Unknown extension mode logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName())); break; -} +} // END - switch // [EOF] ?> diff --git a/inc/functions.php b/inc/functions.php index 3ce992eb42..7dfee36d0b 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -432,12 +432,6 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') { // Make sure all template names are lowercase! $template = strtolower($template); - // Default 'nickname' if extension is not installed - $nick = '---'; - - // Neutral email address is default - $email = getConfig('WEBMASTER'); - // Is content an array? if (is_array($content)) { // Add expiration to array @@ -3045,10 +3039,10 @@ function addNewBonusMail ($data, $mode = '', $output=true) { ); // Mail inserted into bonus pool - if ($output) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_SEND')); + if ($output) loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_SEND--}'); } elseif ($output) { // More entered than can be reached! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_MORE_SELECTED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_MORE_SELECTED--}'); } else { // Debug log logDebugMessage(__FUNCTION__, __LINE__, "cat={$data['cat']},receiver={$data['receiver']},data=".base64_encode(serialize($data))." More selected, than available!"); diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php index dd8d99dcbf..2b9a008104 100644 --- a/inc/libs/admins_functions.php +++ b/inc/libs/admins_functions.php @@ -365,7 +365,7 @@ function adminsDeleteAdminAccount ($postData) { loadTemplate('admin_del_admins', false, $OUT); } else { // Cannot delete last account! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ADMINS_CANNOT_DELETE_LAST')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_ADMINS_CANNOT_DELETE_LAST--}'); } } diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php index 13690c1b03..71b43ae3db 100644 --- a/inc/libs/doubler_functions.php +++ b/inc/libs/doubler_functions.php @@ -127,8 +127,8 @@ LIMIT %s", return loadTemplate($mode . '_doubler_list', true, $OUT); } -// -function DOUBLER_GET_TOTAL_POINTS_LEFT() { +// Get total points left in doubler pot +function getDoublerTotalPointsLeft() { // Initialize variables $points = '0'; @@ -153,5 +153,6 @@ function DOUBLER_GET_TOTAL_POINTS_LEFT() { // Return value return $points; } -// + +// [EOF] ?> diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 006be6f123..4a58e2355b 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -118,7 +118,7 @@ function registerGenerateCategoryTable ($mode, $return=false) { SQL_FREERESULT($result); } else { // No categories setted up so far... - $OUT .= loadTemplate('admin_settings_saved', true, getMessage('NO_CATEGORIES_VISIBLE')); + $OUT .= loadTemplate('admin_settings_saved', true, '{--NO_CATEGORIES_VISIBLE--}'); } if ($return === true) { @@ -365,7 +365,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF // Did this work? if ($userid == '0') { // Something bad happened! - loadTemplate('admin_settings_saved', false, getMessage('USER_NOT_REGISTERED')); + loadTemplate('admin_settings_saved', false, '{--USER_NOT_REGISTERED--}'); // Stop here return; diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index 180086fc8c..ab624167ce 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -317,7 +317,7 @@ ORDER BY `sort`", $OUT .= loadTemplate('sponsor_action', true, $content); } else { // No sub menus active - $OUT .= loadTemplate('admin_settings_saved', true, getMessage('SPONSOR_NO_SUB_MENUS_ACTIVE')); + $OUT .= loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_SUB_MENUS_ACTIVE--}'); } // Free memory @@ -325,7 +325,7 @@ ORDER BY `sort`", } } else { // No main menus active - $OUT .= loadTemplate('admin_settings_saved', true, getMessage('SPONSOR_NO_MAIN_MENUS_ACTIVE')); + $OUT .= loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MAIN_MENUS_ACTIVE--}'); } // Free memory @@ -442,31 +442,28 @@ function saveSponsorData ($postData, $content) { switch (getWhat()) { case 'account': // Change account data if ($EMAIL === true) { - $message = getMessage('SPONSOR_ACCOUNT_EMAIL_CHANGED'); - $templ = 'admin_sponsor_change_email'; - $subj = getMessage('ADMIN_SPONSOR_ACC_EMAIL_SUBJ'); + $message = getMessage('SPONSOR_ACCOUNT_EMAIL_CHANGED'); + $templ = 'admin_sponsor_change_email'; + $subj = getMessage('ADMIN_SPONSOR_ACC_EMAIL_SUBJ'); } else { - $message = getMessage('SPONSOR_ACCOUNT_DATA_SAVED'); - $templ = 'admin_sponsor_change_data'; - $subj = getMessage('ADMIN_SPONSOR_ACC_DATA_SUBJ'); + $message = getMessage('SPONSOR_ACCOUNT_DATA_SAVED'); + $templ = 'admin_sponsor_change_data'; + $subj = getMessage('ADMIN_SPONSOR_ACC_DATA_SUBJ'); } break; case 'settings': // Change settings - // Translate some data - $content['receive'] = translateYesNo($content['receive_warnings']); - $content['interval'] = createFancyTime($content['warning_interval']); - // Set message template and subject for admin - $message = getMessage('SPONSOR_SETTINGS_SAVED'); - $templ = 'admin_sponsor_settings'; - $subj = getMessage('ADMIN_SPONSOR_SETTINGS_SUBJ'); + $message = getMessage('SPONSOR_SETTINGS_SAVED'); + $templ = 'admin_sponsor_settings'; + $subj = getMessage('ADMIN_SPONSOR_SETTINGS_SUBJ'); break; default: // Unknown sponsor what value! logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown sponsor module (what) %s detected.", getWhat())); $message = getMaskedMessage('SPONSOR_UNKNOWN_WHAT', getWhat()); - $templ = ''; $subj = ''; + $templ = ''; + $subj = ''; break; } // END - switch @@ -480,12 +477,6 @@ function saveSponsorData ($postData, $content) { // Add all data to content $content['new_data'] = $postData; - // Translate some data - if (isset($content['gender'])) $content['gender'] = translateGender($content['gender']); - if (isset($content['new_data']['gender'])) $content['new_data']['gender'] = translateGender($content['new_data']['gender']); - if (isset($content['receive_warnings'])) $content['new_data']['receive'] = translateYesNo($content['new_data']['receive_warnings']); - if (isset($content['warning_interval'])) $content['new_data']['interval'] = createFancyTime($content['new_data']['warning_interval']); - // Send email to admins sendAdminNotification($subj, $templ, $content); diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 075f755ea7..8d9d74d72f 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -456,7 +456,7 @@ function doNewUserPassword ($email, $userid) { sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message); // Output note to user - loadTemplate('admin_settings_saved', false, getMessage('GUEST_NEW_PASSWORD_SEND')); + loadTemplate('admin_settings_saved', false, '{--GUEST_NEW_PASSWORD_SEND--}'); } else { // Account is locked or unconfirmed $errorCode = generateErrorCodeFromUserStatus($status); diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php index d2cca8e044..a26123480e 100644 --- a/inc/mails/doubler_mails.php +++ b/inc/mails/doubler_mails.php @@ -52,7 +52,7 @@ $jackpotPoints = '0'; $userPoints = '0'; if (isExtensionActive('jackpot')) $jackpotPoints = getJackpotPoints(); // Get total points of the doubler itself -$DOUBLER_POINTS = DOUBLER_GET_TOTAL_POINTS_LEFT(); +$DOUBLER_POINTS = getDoublerTotalPointsLeft(); if ($DOUBLER_POINTS == '0') { // Exit here to prevent some SQL errors (SQL_QUERY_ESC doen't insert zeros! We need to fix this...) return; diff --git a/inc/modules/admin.php b/inc/modules/admin.php index 593dec32bc..05deff7ed5 100644 --- a/inc/modules/admin.php +++ b/inc/modules/admin.php @@ -160,7 +160,7 @@ if (!isAdminRegistered()) { } // END - if // Output message in seperate template - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ACCOUNT_NOT_REGISTERED_YET')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}'); // Load register template loadTemplate('admin_reg_form', false, $content); @@ -189,7 +189,7 @@ if (!isAdminRegistered()) { loadTemplate('admin_reset_password_form', false, $content); } else { // Cannot validate the login data and hash - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}'); } } elseif ((isPostRequestParameterSet('reset_pass')) && (isPostRequestParameterSet('hash')) && (isPostRequestParameterSet('login')) && (isPostRequestParameterSet('pass1')) && (postRequestParameter('pass1') == postRequestParameter('pass2'))) { // Okay, we shall the admin password here. So first revalidate the hash @@ -198,7 +198,7 @@ if (!isAdminRegistered()) { loadTemplate('admin_reset_pass_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1'))); } else { // Validation failed - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}'); } } else { // Output reset password form @@ -213,7 +213,7 @@ if (!isAdminRegistered()) { if (isGetRequestParameterSet('register')) { // Registration of first admin is done - if (getRequestParameter('register') == 'done') loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REGISTER_DONE')); + if (getRequestParameter('register') == 'done') loadTemplate('admin_settings_saved', false, '{--ADMIN_REGISTER_DONE--}'); } // END - if // Check if the admin has submitted data or not @@ -395,7 +395,7 @@ if (!isAdminRegistered()) { case 'pass': // Wrong password setPostRequestParameter('ok', $ret); - loadTemplate('admin_settings_saved', false, getMessage('WRONG_PASS')); + loadTemplate('admin_settings_saved', false, '{--WRONG_PASS--}'); destroyAdminSession(); break; diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 14d8cbb144..d2fc10212b 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -570,7 +570,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement rebuildCache('config', 'config'); // Settings saved, so display message? - if ($displayMessage === true) loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED')); + if ($displayMessage === true) loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}'); // Return affected rows return $affected; @@ -715,7 +715,7 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') { loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_STATUS_CHANGED'), $cnt, count($IDs))); } else { // Nothing selected! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NOTHING_SELECTED_CHANGE')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NOTHING_SELECTED_CHANGE--}'); } } @@ -955,7 +955,7 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFun // Was this fine? if (SQL_AFFECTEDROWS() == count($IDs)) { // All deleted - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ALL_ENTRIES_REMOVED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_REMOVED--}'); } else { // Some are still there :( loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs))); @@ -1044,7 +1044,7 @@ function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunct // Was this fine? if ($affected == count($IDs)) { // All deleted - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ALL_ENTRIES_EDITED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_EDITED--}'); } else { // Some are still there :( loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs))); @@ -1346,7 +1346,7 @@ function doVerifyExpertSettings () { // Output message for other status than ask/agreed if (($return != 'ask') && ($return != 'agreed')) { // Output message - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return))); + loadTemplate('admin_settings_saved', false, '{--ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return) . '--}'); } // END - if // Return status diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php index 5d31043b18..5c64717b9e 100644 --- a/inc/modules/admin/what-add_points.php +++ b/inc/modules/admin/what-add_points.php @@ -81,7 +81,7 @@ if (getRequestParameter('userid') == 'all') { SQL_FREERESULT($result_main); // Output message - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ALL_POINTS_ADDED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_POINTS_ADDED--}'); } else { // Display form add points loadTemplate('admin_add_points_all'); @@ -106,7 +106,7 @@ if (getRequestParameter('userid') == 'all') { $message = loadEmailTemplate('add-points', $content, bigintval(getRequestParameter('userid'))); sendEmail(bigintval(getRequestParameter('userid')), getMessage('ADMIN_ADD_SUBJ'), $message); - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}'); } else { // Prepare content $content['user'] = '' . $content['surname'] . ' ' . $content['family'] . ''; diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php index 0cb4d2e5ae..4ddb85bf33 100644 --- a/inc/modules/admin/what-add_rallye.php +++ b/inc/modules/admin/what-add_rallye.php @@ -81,14 +81,14 @@ VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')", redirectToUrl('modules.php?module=admin&what=config_rallye_prices&rallye='.$id); } else { // Problem detected... - loadTemplate('admin_settings_saved', false, getMessage('RALLYE_PROBLEM_CREATE')); + loadTemplate('admin_settings_saved', false, '{--RALLYE_PROBLEM_CREATE--}'); } } else { // Free memory SQL_FREERESULT($result); // Overlapping detected - loadTemplate('admin_settings_saved', false, getMessage('RALLYE_OVERLAP_TIMES')); + loadTemplate('admin_settings_saved', false, '{--RALLYE_OVERLAP_TIMES--}'); } } diff --git a/inc/modules/admin/what-add_surfbar_url.php b/inc/modules/admin/what-add_surfbar_url.php index 2ee7b2d951..2dede7b9a4 100644 --- a/inc/modules/admin/what-add_surfbar_url.php +++ b/inc/modules/admin/what-add_surfbar_url.php @@ -60,10 +60,10 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('url'))) { // Then add this URL if (SURFBAR_ADMIN_ADD_URL($postData['url'], $postData['limit'], $postData['reload'])) { // URL was added - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_URL_ADDED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_URL_ADDED--}'); } else { // Not added - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_URL_NOT_ADDED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_URL_NOT_ADDED--}'); } } // END - if diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php index f4155ec8c9..ae6c292bd2 100644 --- a/inc/modules/admin/what-admin_add.php +++ b/inc/modules/admin/what-admin_add.php @@ -185,10 +185,10 @@ if (!isFormSent()) { ), __FILE__, __LINE__ ); } - loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED')); + loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}'); } else { // Is demo login! - loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED')); + loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}'); } // [EOF] diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php index f8b06dfb28..d41753b54a 100644 --- a/inc/modules/admin/what-adminedit.php +++ b/inc/modules/admin/what-adminedit.php @@ -169,7 +169,7 @@ WHERE ".$AND." AND `id`=%s LIMIT 1", } // Load template - loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED')); + loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}'); break; case 'del': // Delete menu @@ -179,7 +179,7 @@ WHERE ".$AND." AND `id`=%s LIMIT 1", } // END - foreach // Load template - loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED')); + loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}'); break; default: // Unexpected action @@ -281,7 +281,7 @@ WHERE ".$AND." AND `id`=%s LIMIT 1", loadTemplate('admin_amenu_edit', false, $content); } else { // Menu entries are missing... (???) - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}'); } } diff --git a/inc/modules/admin/what-admins_add.php b/inc/modules/admin/what-admins_add.php index cc758a14ba..c1218df72e 100644 --- a/inc/modules/admin/what-admins_add.php +++ b/inc/modules/admin/what-admins_add.php @@ -58,7 +58,7 @@ if (isFormSent('add')) { $FORM = false; // Admin login saved - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ADMINS_ADD_DONE')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_ADMINS_ADD_DONE--}'); // Run filter chain runFilterChain('post_admin_added', postRequestArray()); diff --git a/inc/modules/admin/what-admins_contct.php b/inc/modules/admin/what-admins_contct.php index 833bf3158b..9203b250af 100644 --- a/inc/modules/admin/what-admins_contct.php +++ b/inc/modules/admin/what-admins_contct.php @@ -61,7 +61,7 @@ if ((isFormSent()) && (isGetRequestParameterSet('admin'))) { } // Mail / message dropped - loadTemplate('admin_settings_saved', false, getMessage('ADMINS_ADMIN_CONTACTED')); + loadTemplate('admin_settings_saved', false, '{--ADMINS_ADMIN_CONTACTED--}'); } elseif (isGetRequestParameterSet('admin')) { // Load contact form template $content['admin'] = getRequestParameter('admin'); @@ -78,7 +78,7 @@ if ((isFormSent()) && (isGetRequestParameterSet('admin'))) { loadTemplate('admin_admins_contct_form', false, $content); } else { // Please select an admin! - loadTemplate('admin_settings_saved', false, getMessage('ADMINS_SELECT_ADMIN')); + loadTemplate('admin_settings_saved', false, '{--ADMINS_SELECT_ADMIN--}'); } // [EOF] diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php index ec939a6d1e..c3ad9a6333 100644 --- a/inc/modules/admin/what-admins_mails.php +++ b/inc/modules/admin/what-admins_mails.php @@ -102,7 +102,7 @@ if (isFormSent('edit')) { loadTemplate('admin_admins_mails_edit', false, $rows); } else { // Nothing selected - loadTemplate('admin_settings_saved', false, getMessage('ADMINS_NO_MAIL_CHECKED')); + loadTemplate('admin_settings_saved', false, '{--ADMINS_NO_MAIL_CHECKED--}'); } } else { // Load all assigned mails @@ -187,7 +187,7 @@ ORDER BY loadTemplate('admin_admins_mails_list', false, $OUT); } else { // No entries found - loadTemplate('admin_settings_saved', false, getMessage('ADMINS_MAILS_NO_ENTRIES')); + loadTemplate('admin_settings_saved', false, '{--ADMINS_MAILS_NO_ENTRIES--}'); } } diff --git a/inc/modules/admin/what-cache_stats.php b/inc/modules/admin/what-cache_stats.php index ba73224b8f..aafc8a7484 100644 --- a/inc/modules/admin/what-cache_stats.php +++ b/inc/modules/admin/what-cache_stats.php @@ -47,20 +47,17 @@ addMenuDescription('admin', __FILE__); // Activated? if (getConfig('STATS_ENABLED') == 'Y') { - // Calculate total hits - $totalHits = (getStatsEntry('db_hits') + getStatsEntry('cache_hits')); - // Prepare data for the template - $content['db_hits'] = translateComma(getStatsEntry('db_hits')); - $content['cache_hits'] = translateComma(getStatsEntry('cache_hits')); - $content['total_hits'] = translateComma($totalHits); - $content['cache_perc'] = translateComma((getStatsEntry('cache_hits') / $totalHits * 100)); + $content['db_hits'] = getStatsEntry('db_hits'); + $content['cache_hits'] = getStatsEntry('cache_hits'); + $content['total_hits'] = (getStatsEntry('db_hits') + getStatsEntry('cache_hits')); + $content['cache_perc'] = (getStatsEntry('cache_hits') / $content['total_hits'] * 100); // Load template loadTemplate('admin_cache_stats', false, $content); } else { // Deactivated, which is good for performance - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_CACHE_DB_STATS_DEACTIVATED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_CACHE_DB_STATS_DEACTIVATED--}'); } // [EOF] diff --git a/inc/modules/admin/what-chk_regs.php b/inc/modules/admin/what-chk_regs.php index a21d404b95..55ccb05287 100644 --- a/inc/modules/admin/what-chk_regs.php +++ b/inc/modules/admin/what-chk_regs.php @@ -81,7 +81,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_list_chk_reg', false, $OUT); } else { // No registrations left - or all has confirmed their email address... :-) - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ALL_CONFIRMED_EMAIL')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_CONFIRMED_EMAIL--}'); } // Free memory diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php index 99d8f8a3ad..f8b9eac5f0 100644 --- a/inc/modules/admin/what-config_admins.php +++ b/inc/modules/admin/what-config_admins.php @@ -103,7 +103,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0)) { } // END - if // Entries changed - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ADMINS_ENTRIES_CHANGED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_ADMINS_ENTRIES_CHANGED--}'); } elseif ((isFormSent('del')) && (countPostSelection() > 0)) { // Delete ACLs $OUT = ''; $SW = 2; @@ -155,7 +155,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0)) { } // END - if // Entries deleted - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ADMINS_ENTRIES_DELETED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_ADMINS_ENTRIES_DELETED--}'); } elseif (isFormSent('add')) { // Check if everything is fine... $mode = getAdminDefaultAcl(bigintval(postRequestParameter('admin_id'))); diff --git a/inc/modules/admin/what-config_doubler.php b/inc/modules/admin/what-config_doubler.php index 8f375d51c8..1b3365b7db 100644 --- a/inc/modules/admin/what-config_doubler.php +++ b/inc/modules/admin/what-config_doubler.php @@ -47,8 +47,8 @@ addMenuDescription('admin', __FILE__); if (isFormSent()) { // Replace commata with decimal dot - setPostRequestParameter('doubler_charge', (convertCommaToDot(postRequestParameter('doubler_charge')) / 100)); - setPostRequestParameter('doubler_ref' , (convertCommaToDot(postRequestParameter('doubler_ref')) / 100)); + setPostRequestParameter('doubler_charge', convertCommaToDot(postRequestParameter('doubler_charge'))); + setPostRequestParameter('doubler_ref' , convertCommaToDot(postRequestParameter('doubler_ref'))); setPostRequestParameter('doubler_min' , convertCommaToDot(postRequestParameter('doubler_min'))); setPostRequestParameter('doubler_max' , convertCommaToDot(postRequestParameter('doubler_max'))); setPostRequestParameter('doubler_left' , convertCommaToDot(postRequestParameter('doubler_left'))); @@ -56,18 +56,6 @@ if (isFormSent()) { // Save settings adminSaveSettingsFromPostData(); } else { - // Prepare data for the template - // - Charge rate - $content['charge'] = translateComma((getConfig('doubler_charge') * 100), false); - // - Referal rate - $content['referal'] = translateComma((getConfig('doubler_ref') * 100), false); - // - Minimum points to double - $content['minimum'] = translateComma(getConfig('doubler_min'), false); - // - Maximum points to double - $content['maximum'] = translateComma(getConfig('doubler_max'), false); - // - Points left on users account after doubling - $content['left'] = translateComma(getConfig('doubler_left'), false); - // Init all Y/N selections foreach (array('jackpot','own','sent_all') as $entry) { $content[$entry . '_y'] = ''; diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php index dee6e47d26..b4a0a3d234 100644 --- a/inc/modules/admin/what-config_mods.php +++ b/inc/modules/admin/what-config_mods.php @@ -84,7 +84,7 @@ if (isFormSent('edit')) { loadTemplate('admin_mods_edit', false, $OUT); } else { // Nothing selected - loadTemplate('admin_settings_saved', false, getMessage('MODS_NOTHING_SELECTED')); + loadTemplate('admin_settings_saved', false, '{--MODS_NOTHING_SELECTED--}'); // Remove maybe confusing data unsetPostRequestParameter('edit'); @@ -120,7 +120,7 @@ if (isFormSent('edit')) { } // END - if // Entries updated - loadTemplate('admin_settings_saved', false, getMessage('MODS_CHANGED')); + loadTemplate('admin_settings_saved', false, '{--MODS_CHANGED--}'); } if (countPostSelection() == 0) { diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php index b3ce3c631e..c0b4fc7c94 100644 --- a/inc/modules/admin/what-config_payouts.php +++ b/inc/modules/admin/what-config_payouts.php @@ -243,7 +243,7 @@ if ((SQL_NUMROWS($result_mem) > 0) && ($display)) { loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_LIST_REQUESTS--}'); } elseif ($display) { // No member requests so far - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_NO_MEMBER_REQUESTS')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_NO_MEMBER_REQUESTS--}'); } // Free result diff --git a/inc/modules/admin/what-config_proxy.php b/inc/modules/admin/what-config_proxy.php index 5566979b1c..94882452fb 100644 --- a/inc/modules/admin/what-config_proxy.php +++ b/inc/modules/admin/what-config_proxy.php @@ -52,7 +52,7 @@ if (isFormSent()) { adminSaveSettingsFromPostData(); } else { // Invalid! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PROXY_SETTINGS_INVALID')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_PROXY_SETTINGS_INVALID--}'); } } else { // Load template diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php index ce08c0b4c8..617b0349be 100644 --- a/inc/modules/admin/what-config_rallye_prices.php +++ b/inc/modules/admin/what-config_rallye_prices.php @@ -55,21 +55,24 @@ if (isGetRequestParameterSet('rallye')) { if (SQL_HASZERONUMS($result)) { // Ok, new price level entered! - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_rallye_prices` (rallye_id, price_level, points, info) -VALUES ('%s','%s','%s','%s')", + SQL_QUERY_ESC("INSERT INTO + `{?_MYSQL_PREFIX?}_rallye_prices` +(`rallye_id`, `price_level`, `points`, `info`) + VALUES +(%s, %s, '%s', '%s')", array( bigintval(getRequestParameter('rallye')), bigintval(postRequestParameter('level')), postRequestParameter('points'), postRequestParameter('info') ), __FILE__, __LINE__); - loadTemplate('admin_settings_saved', false, getMessage('RALLYE_PRICE_LEVEL_SAVED')); + loadTemplate('admin_settings_saved', false, '{--RALLYE_PRICE_LEVEL_SAVED--}'); } else { // Free memory SQL_FREERESULT($result); // Price level found! - loadTemplate('admin_settings_saved', false, getMessage('RALLYE_PRICE_ALREADY_FOUND')); + loadTemplate('admin_settings_saved', false, '{--RALLYE_PRICE_ALREADY_FOUND--}'); } } } elseif (isFormSent('remove')) { @@ -82,9 +85,9 @@ VALUES ('%s','%s','%s','%s')", } // END - foreach // Output message - loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_DELETED')); + loadTemplate('admin_settings_saved', false, '{--RALLYE_ENTRIES_DELETED--}'); } else { - loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_NOT_DELETED')); + loadTemplate('admin_settings_saved', false, '{--RALLYE_ENTRIES_NOT_DELETED--}'); } } elseif (isFormSent('change')) { // Change entries @@ -113,7 +116,7 @@ LIMIT 1", } // Output message - loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_CHANGED')); + loadTemplate('admin_settings_saved', false, '{--RALLYE_ENTRIES_CHANGED--}'); } if (isFormSent('edit')) { @@ -278,7 +281,7 @@ ORDER BY loadTemplate('admin_list_rallye_prices', false, $OUT); } else { // No rallyes setup so far - loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SETUP')); + loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SETUP--}'); } } diff --git a/inc/modules/admin/what-config_session.php b/inc/modules/admin/what-config_session.php index 40fefe0bd2..19c11e34f1 100644 --- a/inc/modules/admin/what-config_session.php +++ b/inc/modules/admin/what-config_session.php @@ -52,7 +52,7 @@ if (isFormSent()) { adminSaveSettingsFromPostData(); } else { // Invalid! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SESSION_SAVE_PATH_INVALID')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SESSION_SAVE_PATH_INVALID--}'); } } else { // Prepare content diff --git a/inc/modules/admin/what-config_yoomedia.php b/inc/modules/admin/what-config_yoomedia.php index c151303b2b..e3fed6b162 100644 --- a/inc/modules/admin/what-config_yoomedia.php +++ b/inc/modules/admin/what-config_yoomedia.php @@ -58,7 +58,7 @@ if (isFormSent()) { adminSaveSettingsFromPostData(); } else { // Config not saved - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_CONFIG_YOOMEDIA_TEST_FAILED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_CONFIG_YOOMEDIA_TEST_FAILED--}'); } } else { // Erotic selection diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php index c5abb43616..c2d870f324 100644 --- a/inc/modules/admin/what-del_email.php +++ b/inc/modules/admin/what-del_email.php @@ -99,7 +99,7 @@ LIMIT 1", // Shall we pay the points back to the user? if ($totalPoints == 0) { // No points repayed! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_POINTS_REPAYED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_POINTS_REPAYED--}'); } elseif (getConfig('repay_deleted_mails') != 'SHRED') { //* DEBUG: */ debugOutput($stats_id.':'.$totalPoints.'/'.$links.'/'.$price); // Shall we payback to user or jackpot? @@ -150,7 +150,7 @@ LIMIT 1", outputHtml(getMaskedMessage('ADMIN_DELETED_MAILS_COUNT', $cnt)); } else { // Mail already deleted! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NORMAL_MAIL_ALREADY_DELETED--}'); } // Free result @@ -161,7 +161,7 @@ LIMIT 1", array(bigintval(getRequestParameter('pid'))), __FILE__, __LINE__); // Output message - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_USER_STATS_REMOVED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_USER_STATS_REMOVED--}'); } elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) { // Load data from bonus mail $result = SQL_QUERY_ESC("SELECT `id`, `subject`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s", @@ -195,7 +195,7 @@ LIMIT 1", loadTemplate('admin_del_email_bonus', false, $content); } else { // Mail already deleted! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_MAIL_ALREADY_DELETED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_MAIL_ALREADY_DELETED--}'); } // Free result @@ -230,15 +230,15 @@ LIMIT 1", loadTemplate('admin_del_email_notify', false, $content); } else { // Mail already deleted! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NOTIFY_MAIL_ALREADY_DELETED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NOTIFY_MAIL_ALREADY_DELETED--}'); } // Free result SQL_FREERESULT($result); } else { // No mail orders fond - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WRONG_CALL')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_WRONG_CALL--}'); } -// +// [EOF] ?> diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php index 4ce7616761..19d0175533 100644 --- a/inc/modules/admin/what-del_holiday.php +++ b/inc/modules/admin/what-del_holiday.php @@ -94,7 +94,7 @@ LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); loadTemplate('admin_settings_saved', false, getMaskedMessage('HOLIDAY_ADMIN_MULTI_DEL', $cnt)); } elseif (isGetRequestParameterSet('userid')) { // Set default message - $message = getMessage('HOLIDAY_ADMIN_SINGLE_404'); + $message = '{--HOLIDAY_ADMIN_SINGLE_404--}'; // Fetch data $result_load = SQL_QUERY_ESC("SELECT @@ -121,8 +121,8 @@ LIMIT 1", array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__); sendEmail(getRequestParameter('userid'), getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $message); // Set message - $message = getMessage('HOLIDAY_ADMIN_SINGLE_DELETED'); - } + $message = '{--HOLIDAY_ADMIN_SINGLE_DELETED--}'; + } // END - if // Free memory SQL_FREERESULT($result_load); @@ -131,7 +131,7 @@ LIMIT 1", array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__); loadTemplate('admin_settings_saved', false, $message); } else { // Please call me over other scripts... ;) - loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_NO_DIRECT_CALL')); + loadTemplate('admin_settings_saved', false, '{--HOLIDAY_NO_DIRECT_CALL--}'); } // [EOF] diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php index a4b6ac2946..c1c493d81a 100644 --- a/inc/modules/admin/what-del_sponsor.php +++ b/inc/modules/admin/what-del_sponsor.php @@ -96,7 +96,7 @@ if (isGetRequestParameterSet('id')) { SQL_FREERESULT($result); } else { // Not called by what-list_sponsor.php - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_CALL_NOT_DIRECTLY')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_CALL_NOT_DIRECTLY--}'); } // [EOF] diff --git a/inc/modules/admin/what-del_transfer.php b/inc/modules/admin/what-del_transfer.php index b4fc851c70..bd575c1f0c 100644 --- a/inc/modules/admin/what-del_transfer.php +++ b/inc/modules/admin/what-del_transfer.php @@ -95,7 +95,7 @@ if (SQL_NUMROWS($result) > 0) { // Nothing for in and out $OUT = ' - ' . loadTemplate('admin_settings_saved', true, getMessage('TRANSFER_NO_INOUT_TRANSFERS')) . ' + ' . loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_INOUT_TRANSFERS--}') . ' '; } diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php index 17973ef9d8..0bc3544533 100644 --- a/inc/modules/admin/what-del_user.php +++ b/inc/modules/admin/what-del_user.php @@ -53,7 +53,7 @@ if ((isFormSent()) || ((isFormSent('del')) && (isPostRequestParameterSet(('reaso deleteUserAccount(getRequestParameter('userid'), postRequestParameter('reason')); // Output message - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_DEL_COMPLETED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_DEL_COMPLETED--}'); } else { // Account does not exists! loadTemplate('admin_settings_saved', false, '
' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '
'); diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php index 1230f036bc..d6f091d76a 100644 --- a/inc/modules/admin/what-edit_sponsor.php +++ b/inc/modules/admin/what-edit_sponsor.php @@ -76,7 +76,7 @@ LIMIT 1", // Warning because low points $content['receive_warnings'] = addSelectionBox('yn', $content['receive_warnings'], 'receive_warning'); - $content['interval'] = createTimeSelections($content['warning_interval'], 'warning_interval', 'MWDh'); + $content['warning_interval'] = createTimeSelections($content['warning_interval'], 'warning_interval', 'MWDh'); // Init variables here $TPL = sprintf("admin_edit_sponsor_%s", getRequestParameter('mode')); @@ -188,7 +188,7 @@ LIMIT 1", SQL_FREERESULT($result_main); } else { // Not called by what-list_sponsor.php - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_CALL_NOT_DIRECTLY')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_CALL_NOT_DIRECTLY--}'); } // [EOF] diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php index 6dd6352fc0..b4df32c746 100644 --- a/inc/modules/admin/what-email_archiv.php +++ b/inc/modules/admin/what-email_archiv.php @@ -119,7 +119,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_email_archiv', false, $content); } else { // No mail orders fond - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}'); } // Free memory diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php index 9f0435abfb..14f7e44c50 100644 --- a/inc/modules/admin/what-email_details.php +++ b/inc/modules/admin/what-email_details.php @@ -228,7 +228,7 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) { if ($MAIL === false) { // No mail orders fond - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}'); } // END - if // [EOF] diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php index 1b26990c86..24f0716a65 100644 --- a/inc/modules/admin/what-extensions.php +++ b/inc/modules/admin/what-extensions.php @@ -279,6 +279,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( 'sw' => $SW, 'id' => $content['ext_id'], @@ -301,7 +302,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__); loadTemplate('admin_extensions', false, $OUT); } else { // No extensions are registered - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_EXTENSION_REGISTERED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_EXTENSION_REGISTERED--}'); } break; @@ -369,30 +370,30 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__); } // END - if } elseif (isExtensionInstalled($ext_name)) { // Notify the admin that we have a problem here... - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_EXTENSION_REGISTRATION_FAILED_ALREADY')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ALREADY--}'); } else { // Notify the admin that we have a problem here... loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_REGISTRATION_FAILED_404', $ext_name)); } } else { // Motify the admin that we have a problem here... - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_EXTENSION_REGISTRATION_FAILED_DEPRECATED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_DEPRECATED--}'); } } else { // Extension was not found in task management - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_EXTENSION_REGISTRATION_FAILED_ID_404')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ID_404--}'); } } elseif ($task_found == '0') { // No longer assigned or old task - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_EXTENSION_REGISTRATION_FAILED_ASSIGED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ASSIGED--}'); } else { // id is invalid - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_EXTENSION_REGISTRATION_FAILED_INVALID')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_INVALID--}'); } break; case 'demo': - loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED')); + loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}'); break; } // END - switch diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php index 4ebead8c23..423415b7bb 100644 --- a/inc/modules/admin/what-guest_add.php +++ b/inc/modules/admin/what-guest_add.php @@ -202,10 +202,10 @@ ORDER BY `sort` ASC", postRequestParameter('active'), ), __FILE__, __LINE__); } - loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED')); + loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}'); } else { // Demo mode! - loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED')); + loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}'); } // [EOF] diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php index 032a86eefa..6e80602f5a 100644 --- a/inc/modules/admin/what-guestedit.php +++ b/inc/modules/admin/what-guestedit.php @@ -154,7 +154,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1", array($menu, postRequestParameter('sel_action', $sel), postRequestParameter('sel_what', $sel), $sel),__FILE__, __LINE__); } // END - foreach - loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED')); + loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}'); break; case 'del': // Delete menu @@ -163,7 +163,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE ".$AND." AND `id`=%s LIMIT 1", array(bigintval($sel)), __FILE__, __LINE__); } // END - foreach - loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED')); + loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}'); break; case 'status': // Change access levels @@ -175,7 +175,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1", array(postRequestParameter('visible', $sel), postRequestParameter('locked', $sel), $sel), __FILE__, __LINE__); } // END - foreach - loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED')); + loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}'); break; default: // Unexpected action @@ -326,7 +326,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) loadTemplate('admin_gmenu_edit', false, $content); } else { // Menu entries are missing... (???) - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}'); } } diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php index 50b09a99be..027187be6d 100644 --- a/inc/modules/admin/what-list_autopurge.php +++ b/inc/modules/admin/what-list_autopurge.php @@ -102,7 +102,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_list_autopurge', false, $content); } else { // All members are active or you don't have any registered - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_AUTOPURGE_ALL_ACTIVE')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_AUTOPURGE_ALL_ACTIVE--}'); } // [EOF] diff --git a/inc/modules/admin/what-list_bank_package.php b/inc/modules/admin/what-list_bank_package.php index 55c60fa016..385b3c2d39 100644 --- a/inc/modules/admin/what-list_bank_package.php +++ b/inc/modules/admin/what-list_bank_package.php @@ -79,20 +79,19 @@ if ((isPostRequestParameterSet('id')) && (is_array(postRequestParameter('id'))) if ($show === false) return; // Load all banking packages from DB -$result = SQL_QUERY("SELECT id, title, description, account_fee AS 'fee', package_active AS 'active', interest_plus AS 'plus', interest_minus AS 'minus' -FROM `{?_MYSQL_PREFIX?}_bank_packages` -ORDER BY `id` ASC", __FILE__, __LINE__); +$result = SQL_QUERY("SELECT + `id`, `title`, `description`, `account_fee`, `package_active`, `interest_plus`, `interest_minus` +FROM + `{?_MYSQL_PREFIX?}_bank_packages` +ORDER BY + `id` ASC", __FILE__, __LINE__); // Is there at lease one package? if (SQL_NUMROWS($result) > 0) { // List all packages $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { - // "Translate" some data - $content['active'] = translateYesNo($content['active']); - $content['fee'] = translateComma($content['fee']); - $content['plus'] = translateComma($content['plus']); - $content['minus'] = translateComma($content['minus']); + // Add color switch $content['sw'] = $SW; // Load row template @@ -104,11 +103,11 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_list_bank_package', false, $OUT); } else { // No packages found! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BANK_NO_PACKAGES_FOUND')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_BANK_NO_PACKAGES_FOUND--}'); } // Free the result SQL_FREERESULT($result); -// +// [EOF] ?> diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php index 7bf2f906c7..f7d401e299 100644 --- a/inc/modules/admin/what-list_beg.php +++ b/inc/modules/admin/what-list_beg.php @@ -52,7 +52,7 @@ if (getConfig('beg_rallye') == 'Y') { $curr = date('m', time()) - 1; if (strlen($curr) == 1) $curr = '0' . $curr; updateConfiguration('last_month', $curr); - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_WITHDRAW_PREPARED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_WITHDRAW_PREPARED--}'); } // END - if // Autopurge installed? @@ -128,11 +128,11 @@ ORDER BY loadTemplate('admin_list_beg', false, $content); } else { // No one has joined the begging rallye... - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_NO_RALLYE')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_NO_RALLYE--}'); } } else { // Rallye deactivated - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_RALLYE_DEACTIVATED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_RALLYE_DEACTIVATED--}'); } // [EOF] diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php index 021a2e8638..a2d500a129 100644 --- a/inc/modules/admin/what-list_bonus.php +++ b/inc/modules/admin/what-list_bonus.php @@ -52,7 +52,7 @@ if (getConfig('bonus_active') == 'Y') { $curr = date('m', time()) - 1; if (strlen($curr) == 1) $curr = '0' . $curr; updateConfiguration('last_month', $curr); - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_WITHDRAW_PREPARED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_WITHDRAW_PREPARED--}'); } // END - if if (isExtensionInstalledAndNewer('bonus', '0.6.9')) { @@ -66,16 +66,15 @@ if (getConfig('bonus_active') == 'Y') { $USE .= ')'; } else { // Old version ??? - $USE = 'turbo_bonus'; + $USE = '`turbo_bonus`'; } // 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'); - } + $lastOnline = " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})"; + } // END - if // Check if at least one is in the active rallye $result = SQL_QUERY_ESC("SELECT @@ -144,11 +143,11 @@ ORDER BY loadTemplate('admin_list_bonus', false, $content); } else { // No one has become an "activity bonus"... - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_NO_ACTIVE_RALLYE')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_NO_ACTIVE_RALLYE--}'); } } else { // Aktive-Rallye not activated - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_RALLYE_DEACTIVATED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_RALLYE_DEACTIVATED--}'); } // [EOF] diff --git a/inc/modules/admin/what-list_holiday.php b/inc/modules/admin/what-list_holiday.php index 9845488bc9..d23b431eb1 100644 --- a/inc/modules/admin/what-list_holiday.php +++ b/inc/modules/admin/what-list_holiday.php @@ -88,7 +88,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_list_holiday', false, $OUT); } else { // No holiday requests found - loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_ADMIN_NOTHING_FOUND')); + loadTemplate('admin_settings_saved', false, '{--HOLIDAY_ADMIN_NOTHING_FOUND--}'); } // [EOF] diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php index c74ec6ca25..b0c69441bb 100644 --- a/inc/modules/admin/what-list_links.php +++ b/inc/modules/admin/what-list_links.php @@ -80,7 +80,7 @@ if (isGetRequestParameterSet('userid')) { sendEmail(getUserData('email'), getMessage('ADMIN_DEL_LINK_SUBJ'), $message); // Display message - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_LINKS_DELETED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_LINKS_DELETED--}'); } else { // Init variables $OUT = ''; $SW = 2; diff --git a/inc/modules/admin/what-list_network_params.php b/inc/modules/admin/what-list_network_params.php index 461604c52b..a09cae196e 100644 --- a/inc/modules/admin/what-list_network_params.php +++ b/inc/modules/admin/what-list_network_params.php @@ -78,7 +78,7 @@ if (isGetRequestParameterSet('network')) { $ADD = sprintf(" AND p.`network_type_id`=%s", bigintval(postRequestParameter('network_type_id'))); // Display message - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_LIST_LIMITED_TO_TYPE')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_LIMITED_TO_TYPE--}'); } // END - if // Load all advert types for given network diff --git a/inc/modules/admin/what-list_networks.php b/inc/modules/admin/what-list_networks.php index fd99cc6563..2d931e8944 100644 --- a/inc/modules/admin/what-list_networks.php +++ b/inc/modules/admin/what-list_networks.php @@ -90,7 +90,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_list_networks', false, $OUT); } else { // Display a message that there are sponsor networks supported, yet - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_NONE_SUPPORTED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NETWORK_NONE_SUPPORTED--}'); } // Free result diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php index f10a81ac98..5509489086 100644 --- a/inc/modules/admin/what-list_notifications.php +++ b/inc/modules/admin/what-list_notifications.php @@ -111,7 +111,7 @@ if ((isExtensionActive('bonus')) && (SQL_NUMROWS($result_max) > 0) && (!empty($S } } elseif ((SQL_NUMROWS($result_max) === 0) && (is_resource($result_max))) { // No notifications found - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_NOTIFICATIONS')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_NOTIFICATIONS--}'); } // [EOF] diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php index bef227701f..4f4d42c43d 100644 --- a/inc/modules/admin/what-list_payouts.php +++ b/inc/modules/admin/what-list_payouts.php @@ -62,7 +62,7 @@ if (isGetRequestParameterSet(('pid'))) { if (empty($task)) $task = '0'; } elseif ((empty($userid)) || ($userid == '0')) { // Cannot obtain member id! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_FAILED_OBTAIN_USERID')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_USERID--}'); } else { // Get task id from URL $task = getRequestParameter('task'); @@ -145,10 +145,10 @@ LIMIT 1", // Output message if ($data['allow_url'] == 'Y') { // Banner / Textlink request - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_BANNER_ACCEPTED_NOTIFIED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_BANNER_ACCEPTED_NOTIFIED--}'); } else { // Normal request - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_ACCEPTED_NOTIFIED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_ACCEPTED_NOTIFIED--}'); } // Finally send mail @@ -189,7 +189,7 @@ LIMIT 1", $message = loadEmailTemplate('member_payout_rejected', postRequestParameter('text'), $userid); // Output message - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_REJECTED_NOTIFIED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_REJECTED_NOTIFIED--}'); // Finally send mail sendEmail(getUserData('email'), getMessage('MEMBER_PAYOUT_REJECTED_SUBJECT'), $message); @@ -206,11 +206,11 @@ LIMIT 1", } } else { // Cannot load user data - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_FAILED_OBTAIN_USERDATA')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_USERDATA--}'); } } elseif ((empty($task)) || ($task == '0')) { // Failed loading task id - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_FAILED_OBTAIN_TASK_ID')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_TASK_ID--}'); } } else { if (getRequestParameter('do') == 'delete') { @@ -281,7 +281,7 @@ ORDER BY loadTemplate('admin_list_payouts', false, $OUT); } else { // No payout requests are sent so far - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_NO_REQUESTS_FOUND')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_NO_REQUESTS_FOUND--}'); } } diff --git a/inc/modules/admin/what-list_primera.php b/inc/modules/admin/what-list_primera.php index cb9969bc2d..f7e11891e7 100644 --- a/inc/modules/admin/what-list_primera.php +++ b/inc/modules/admin/what-list_primera.php @@ -77,7 +77,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_list_primera_main', false, $OUT); } else { // Nothing to display! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PRIMERA_NO_TRANSFERS')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_PRIMERA_NO_TRANSFERS--}'); } // Free the result diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php index 7f6f64a147..205d3c2139 100644 --- a/inc/modules/admin/what-list_rallyes.php +++ b/inc/modules/admin/what-list_rallyes.php @@ -230,7 +230,7 @@ LIMIT 1", loadTemplate('admin_edit_rallyes', false, $OUT); } else { // Nothing selected to edit - loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SELECTED')); + loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SELECTED--}'); } } elseif ((getRequestParameter('sub') == 'users') && (getRequestParameter('rallye') > 0)) { // List users and their refs before start and current @@ -288,7 +288,7 @@ ORDER BY loadTemplate('admin_list_rallye_usr', false, $content); } else { // No entries found? - loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ADMIN_USERS_404')); + loadTemplate('admin_settings_saved', false, '{--RALLYE_ADMIN_USERS_404--}'); } } else { // Start listing rallyes @@ -400,7 +400,7 @@ ORDER BY loadTemplate('admin_list_rallyes', false, $content); } else { // No rallyes setup so far - loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SETUP')); + loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SETUP--}'); } } diff --git a/inc/modules/admin/what-list_refs.php b/inc/modules/admin/what-list_refs.php index a763a391b4..227f507f83 100644 --- a/inc/modules/admin/what-list_refs.php +++ b/inc/modules/admin/what-list_refs.php @@ -191,10 +191,10 @@ ORDER BY } } elseif (isExtensionActive('refback')) { // No levels found, very bad! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_REF_LEVELS')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_REF_LEVELS--}'); } else { // No refs made so far - loadTemplate('admin_settings_saved', false, getMessage('USER_REF_404')); + loadTemplate('admin_settings_saved', false, '{--USER_REF_404--}'); } // Free result diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php index 7176644729..9a82dde5db 100644 --- a/inc/modules/admin/what-list_sponsor.php +++ b/inc/modules/admin/what-list_sponsor.php @@ -154,7 +154,7 @@ ORDER BY loadTemplate('admin_list_sponsor', false, $OUT); } else { // No sponsors registered so far - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SPONSOR_NONE_REGISTERED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SPONSOR_NONE_REGISTERED--}'); } } diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php index eb33c3789f..f0874d6a17 100644 --- a/inc/modules/admin/what-list_sponsor_pay.php +++ b/inc/modules/admin/what-list_sponsor_pay.php @@ -221,7 +221,7 @@ ORDER BY $content['list_out'] = loadTemplate('admin_list_sponsor_pay', true, $OUT); } else { // Noting setup so far! - $content['list_out'] = loadTemplate('admin_settings_saved', true, getMessage('ADMIN_SPONSOR_NO_PAYTYPES')); + $content['list_out'] = loadTemplate('admin_settings_saved', true, '{--ADMIN_SPONSOR_NO_PAYTYPES--}'); } // Free memory diff --git a/inc/modules/admin/what-list_sponsor_pays.php b/inc/modules/admin/what-list_sponsor_pays.php index 7a9d71333c..c9d3dc3c10 100644 --- a/inc/modules/admin/what-list_sponsor_pays.php +++ b/inc/modules/admin/what-list_sponsor_pays.php @@ -40,7 +40,7 @@ // Some security stuff... if ((!defined('__SECURITY')) || (!isAdmin())) { die(); -} +} // END - if // Add description as navigation point addMenuDescription('admin', __FILE__); @@ -59,8 +59,8 @@ if (isGetRequestParameterSet('id')) { } } else { // Not called by what-list_sponsor.php - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_CALL_NOT_DIRECTLY')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_CALL_NOT_DIRECTLY--}'); } -// +// [EOF] ?> diff --git a/inc/modules/admin/what-list_surfbar_actions.php b/inc/modules/admin/what-list_surfbar_actions.php index 04f45266b6..60c3948e53 100644 --- a/inc/modules/admin/what-list_surfbar_actions.php +++ b/inc/modules/admin/what-list_surfbar_actions.php @@ -88,7 +88,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_list_surfbar_actions', false, $OUT); } else { // No entries found, very bad! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_NO_ACTIONS')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_NO_ACTIONS--}'); } // Free result diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php index 248d360c81..8c7e9493fd 100644 --- a/inc/modules/admin/what-list_surfbar_urls.php +++ b/inc/modules/admin/what-list_surfbar_urls.php @@ -51,7 +51,7 @@ $show = true; // Check for 'url_id' element if ((countRequestPost() > 0) && ((!isPostRequestParameterSet('url_id')) || (!is_array(postRequestParameter('url_id'))) || (count(postRequestParameter('url_id')) == 0))) { // Not found so output message - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_NO_SELECTIONS')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_NO_SELECTIONS--}'); // Abort here return; @@ -196,7 +196,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_list_surfbar_urls', false, $OUT); } else { // No URLs in surfbar - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_NO_URLS_FOUND')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_NO_URLS_FOUND--}'); } // Free result diff --git a/inc/modules/admin/what-list_transfer.php b/inc/modules/admin/what-list_transfer.php index 799d9ab25f..7413805395 100644 --- a/inc/modules/admin/what-list_transfer.php +++ b/inc/modules/admin/what-list_transfer.php @@ -74,7 +74,7 @@ if (SQL_NUMROWS($result) > 0) { // Nothing for in and out $OUT = ' - ' . loadTemplate('admin_settings_saved', true, getMessage('TRANSFER_NO_INOUT_TRANSFERS')) . ' + ' . loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_INOUT_TRANSFERS--}') . ' '; } diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php index 679b5bc7e1..920c3cd20d 100644 --- a/inc/modules/admin/what-list_unconfirmed.php +++ b/inc/modules/admin/what-list_unconfirmed.php @@ -86,7 +86,7 @@ LIMIT 1"; $listed = true; $DATA = $ID; $LINK = 'bonusid'; } else { // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_CALL_NOT_DIRECTLY')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_CALL_NOT_DIRECTLY--}'); } // Shall I display links or not? @@ -166,7 +166,7 @@ LIMIT %s", SQL_FREERESULT($result); } else { // All links are confirmed... strange, you shall normally not get a link to this place in this scenario... hmmm. - $OUT = loadTemplate('admin_settings_saved', true, getMessage('ADMIN_UNCONFIRMED_NO_LINK_LEFT')); + $OUT = loadTemplate('admin_settings_saved', true, '{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}'); } // Prepare content @@ -197,7 +197,7 @@ LIMIT %s", loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNCONFIRMED_STATS_MISSING', $ID)); } else { // both or link is invalid - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_UNCONFIRMED_INVALID_LINK--}'); } // Free memory @@ -205,7 +205,7 @@ LIMIT %s", SQL_FREERESULT($result2); } elseif (isGetRequestParameterSet('bid')) { // Data in bonus table not found - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_UNCONFIRMED_INVALID_LINK--}'); } // Free result diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index ba6f073cd1..5c8220c823 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -72,7 +72,7 @@ if (isExtensionInstalledAndNewer('user', '0.3.4')) { // Add lock reason? if (isExtensionInstalledAndNewer('user', '0.3.5')) { // Add them... - $MORE .= ", `lock_reason`, UNIX_TIMESTAMP(`lock_timestamp`) AS lock_timestamp"; + $MORE .= ", `lock_reason`, UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`"; } // END - if } // END - if @@ -145,8 +145,8 @@ LIMIT 1", $content['joined'] = generateDateTime($content['joined'], 0); $content['last_update'] = generateDateTime($content['last_update'], 0); $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], 0); - $content['total'] = translateComma(countSumTotalData($userid, 'user_points', 'points')); - $content['locked'] = translateComma(countSumTotalData($userid, 'user_points', 'locked_points')); + $content['total'] = countSumTotalData($userid, 'user_points', 'points'); + $content['locked'] = countSumTotalData($userid, 'user_points', 'locked_points'); $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2); // Is the lock reason not set? @@ -162,16 +162,10 @@ LIMIT 1", $content['nickname'] = getMessage('EXT_NICKNAME_404'); } - // Is the user extension newer? - if (isExtensionInstalledAndNewer('user', '0.3.4')) { - // Then "translate" the number - $content['rand_confirmed'] = translateComma($content['rand_confirmed']); - } // END - if - // Clickrate $content['click_rate'] = '0'; if ($content['emails_received'] > 0) { - $content['click_rate'] = translateComma($content['mails_confirmed'] / $content['emails_received'] * 100); + $content['click_rate'] = ($content['mails_confirmed'] / $content['emails_received'] * 100); } // END - if // Is the extension 'country' installed? @@ -242,7 +236,7 @@ LIMIT 1", // Calculate page count (0.5 fixes a bug with page count) if (getConfig('user_limit') == '0') { setConfigEntry('user_limit', 100); - loadTemplate('admin_settings_saved', false, getMessage('EXTENSION_WARNING_USER_LIMIT')); + loadTemplate('admin_settings_saved', false, '{--EXTENSION_WARNING_USER_LIMIT--}'); } // END - if // Activate the extension please! @@ -357,7 +351,7 @@ LIMIT 1", loadTemplate('admin_list_user', false, $content); } else { // No one as registered so far! :-( - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_NONE_REGISTERED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_NONE_REGISTERED--}'); } // Free memory diff --git a/inc/modules/admin/what-list_wernis.php b/inc/modules/admin/what-list_wernis.php index 9ef5489abb..9d921bda87 100644 --- a/inc/modules/admin/what-list_wernis.php +++ b/inc/modules/admin/what-list_wernis.php @@ -77,7 +77,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_list_wernis_main', false, $OUT); } else { // Nothing to display! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WERNIS_NO_TRANSFERS')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_WERNIS_NO_TRANSFERS--}'); } // Free the result diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php index 925b7b0837..617f41263e 100644 --- a/inc/modules/admin/what-list_yoomedia_tm.php +++ b/inc/modules/admin/what-list_yoomedia_tm.php @@ -71,7 +71,7 @@ if (isFormSent()) { // Enougth queries left? if (getConfig('yoomedia_requests_remain') == '0') { // Output message - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_YOOMEDIA_REQUESTS_DEPLETED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_YOOMEDIA_REQUESTS_DEPLETED--}'); // Abort here! return false; @@ -83,7 +83,7 @@ $result = YOOMEDIA_GET_PARSED_RESULT_TEXTMAILS(); // Sanity-check on result array if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id']))) { // Invalid result - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_YOOMEDIA_INVALID_RESULT')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_YOOMEDIA_INVALID_RESULT--}'); return false; } elseif (count($result[0]) < 7) { // Error received so prepare error code diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php index 0b9c0f65c8..829bc839ba 100644 --- a/inc/modules/admin/what-logs.php +++ b/inc/modules/admin/what-logs.php @@ -109,7 +109,7 @@ if (isGetRequestParameterSet('access')) { outputHtml(''); } else { // logs directory does not exist - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_LOGS_DIR_404')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_LOGS_DIR_404--}'); } } diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php index 14bde5ed57..57ee9229e1 100644 --- a/inc/modules/admin/what-mem_add.php +++ b/inc/modules/admin/what-mem_add.php @@ -191,11 +191,11 @@ if (!isFormSent()) { bigintval(postRequestParameter('sort')), ), __FILE__, __LINE__); } - loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED')); + loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED')); } else { // Demo mode! - loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED')); + loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}'); } -// +// [EOF] ?> diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php index 3194832be9..53a971aa63 100644 --- a/inc/modules/admin/what-memedit.php +++ b/inc/modules/admin/what-memedit.php @@ -212,7 +212,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) } // END - foreach // Load template - loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED')); + loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}'); } else { if ((isGetRequestParameterSet('act')) && (isGetRequestParameterSet('tid')) && (isGetRequestParameterSet('fid'))) { // Init @@ -304,7 +304,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) loadTemplate('admin_mmenu_overview', false, $content); } else { // Menu entries are missing... (???) - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}'); } } diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php index 54c22b1519..d532a27f7c 100644 --- a/inc/modules/admin/what-overview.php +++ b/inc/modules/admin/what-overview.php @@ -48,7 +48,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Is sql_patches not yet installed? if (!isExtensionInstalled('sql_patches')) { // Output warning - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WARNING_SQL_PATCHES_MISSING')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_WARNING_SQL_PATCHES_MISSING--}'); } // END - if // Load include file 'overview-inc' (old standard overview page) diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php index 22c3685833..5458ff6e5f 100644 --- a/inc/modules/admin/what-send_newsletter.php +++ b/inc/modules/admin/what-send_newsletter.php @@ -80,7 +80,7 @@ ORDER BY } // END - while // Output message - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NL_SEND_DONE')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NL_SEND_DONE--}'); } // END - if // Free memory diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php index 651bd116ec..48e91900ef 100644 --- a/inc/modules/admin/what-sub_points.php +++ b/inc/modules/admin/what-sub_points.php @@ -74,7 +74,7 @@ if (getRequestParameter('userid') == 'all') { SQL_FREERESULT($result_main); // Output message - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ALL_POINTS_SUBTRACTED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_POINTS_SUBTRACTED--}'); } else { // Display form add points loadTemplate('admin_sub_points_all'); @@ -98,7 +98,7 @@ if (getRequestParameter('userid') == 'all') { sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $message); // Output message - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_SUBTRACTED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_SUBTRACTED--}'); } else { // Prepare content $content['user'] = '' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . ''; diff --git a/inc/modules/admin/what-surfbar_stats.php b/inc/modules/admin/what-surfbar_stats.php index 271754365d..ced00fe21e 100644 --- a/inc/modules/admin/what-surfbar_stats.php +++ b/inc/modules/admin/what-surfbar_stats.php @@ -89,7 +89,7 @@ ORDER BY loadTemplate('admin_surfbar_url_stats', false, $content); } else { // No statistics so far - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_NO_URL_STATS')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_NO_URL_STATS--}'); } } else { // Generate general statistics @@ -133,7 +133,7 @@ ORDER BY loadTemplate('admin_surfbar_stats', false, $content); } else { // No statistics so far - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_NO_STATS')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_NO_STATS--}'); } } diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php index cab625416e..a870ab77e0 100644 --- a/inc/modules/admin/what-theme_edit.php +++ b/inc/modules/admin/what-theme_edit.php @@ -150,7 +150,7 @@ if (SQL_NUMROWS($result) > 0) { // No themes found??? $OUT .= ' - ' . loadTemplate('admin_settings_saved', true, getMessage('ADMIN_NO_THEMES_FOUND')) . ' + ' . loadTemplate('admin_settings_saved', true, '{--ADMIN_NO_THEMES_FOUND--}') . ' '; } diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php index 3a1c48d912..41493b2f66 100644 --- a/inc/modules/admin/what-theme_import.php +++ b/inc/modules/admin/what-theme_import.php @@ -158,7 +158,7 @@ foreach ($THEMES['theme_unix'] as $key => $unix) { if (empty($OUT)) { // No themes found??? - $OUT .= loadTemplate('admin_theme_import_none', true, loadTemplate('admin_settings_saved', true, getMessage('ADMIN_NO_THEMES_FOUND'))); + $OUT .= loadTemplate('admin_theme_import_none', true, loadTemplate('admin_settings_saved', true, '{--ADMIN_NO_THEMES_FOUND--}')); } // END - if // Load template diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php index 947f16fe9c..83eb8c0cd2 100644 --- a/inc/modules/admin/what-unlock_emails.php +++ b/inc/modules/admin/what-unlock_emails.php @@ -168,7 +168,7 @@ LIMIT 1", loadTemplate('admin_unlock_emails_redir', false, $OUT); } else { // Nothing selected - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_MAILS_NOTHING_CHECKED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_MAILS_NOTHING_CHECKED--}'); } } elseif ((isFormSent('lock')) && (countPostSelection() > 0) && (getConfig('url_blacklist') == 'Y')) { // Lock URLs @@ -190,7 +190,7 @@ LIMIT 1", } // END - foreach // Output message - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_URLS_BLOCKED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_URLS_BLOCKED--}'); } elseif ((!isFormSent('lock')) && (!isFormSent('accept')) && (!isFormSent('reject'))) { // Mail orders are in pool so we can display them $OUT = ''; $SW = 2; @@ -214,14 +214,14 @@ LIMIT 1", loadTemplate('admin_unlock_emails', false, $content); } elseif ((isFormSent('lock')) && (getConfig('url_blacklist') != 'Y')) { // URL blacklist not activated - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_URL_BLACKLIST_DISABLED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_URL_BLACKLIST_DISABLED--}'); } else { // Wrong call! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WRONG_CALL')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_WRONG_CALL--}')); } } else { // No mail orders fond - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}'); } // [EOF] diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php index 94d606139e..e8676e512a 100644 --- a/inc/modules/admin/what-unlock_sponsor.php +++ b/inc/modules/admin/what-unlock_sponsor.php @@ -182,7 +182,7 @@ LIMIT 1", } // END - foreach } else { // Nothing selected - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SPONSOR_NONE_SELECTED_UNLOCK')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SPONSOR_NONE_SELECTED_UNLOCK--}'); } } // END - if @@ -201,16 +201,15 @@ if (SQL_NUMROWS($result) > 0) { $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { // Transfer data to array - // @TODO Rewritings: remote->remote_addr, created->sponsor_created in template $content = array( - 'sw' => $SW, - 'id' => $content['id'], - 'gender' => translateGender($content['gender']), - 'surname' => $content['surname'], - 'family' => $content['family'], - 'email' => generateEmailLink($content['email'], 'sponsor_data'), - 'remote' => $content['remote_addr'], - 'created' => generateDateTime($content['sponsor_created'], 2), + 'sw' => $SW, + 'id' => $content['id'], + 'gender' => $content['gender'], + 'surname' => $content['surname'], + 'family' => $content['family'], + 'email' => generateEmailLink($content['email'], 'sponsor_data'), + 'remote_addr' => $content['remote_addr'], + 'sponsor_created' => generateDateTime($content['sponsor_created'], 2), ); // Load row template and switch colors @@ -222,7 +221,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_unlock_sponsor', false, $OUT); } else { // No pending accounts found - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SPONSOR_NONE_PENDING')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SPONSOR_NONE_PENDING--}'); } // Free memory diff --git a/inc/modules/admin/what-unlock_surfbar_urls.php b/inc/modules/admin/what-unlock_surfbar_urls.php index f902b379cf..83c6ad23ca 100644 --- a/inc/modules/admin/what-unlock_surfbar_urls.php +++ b/inc/modules/admin/what-unlock_surfbar_urls.php @@ -50,19 +50,19 @@ if ((isPostRequestParameterSet('unlock')) && (is_array(postRequestParameter('url // Unlock selected URLs if (SURFBAR_ADMIN_UNLOCK_URL_IDS(postRequestParameter('url_id'))) { // Unlock done! :-) - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_UNLOCK_DONE')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_UNLOCK_DONE--}'); } else { // Unlock failed! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_UNLOCK_FAILED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_UNLOCK_FAILED--}'); } } elseif ((isPostRequestParameterSet(('reject'))) && (is_array(postRequestParameter('url_id'))) && (count(postRequestParameter('url_id')) > 0)) { // Reject selected URLs if (SURFBAR_ADMIN_REJECT_URL_IDS(postRequestParameter('url_id'))) { // Unlock done! :-) - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_UNLOCK_DONE')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_UNLOCK_DONE--}'); } else { // Unlock failed! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_UNLOCK_FAILED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_UNLOCK_FAILED--}'); } } @@ -99,7 +99,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_unlock_surfbar_urls', false, $OUT); } else { // No URLs in surfbar - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_NO_URLS_FOUND')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_NO_URLS_FOUND--}'); } // Free result diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php index 580c57bcbe..0219bab845 100644 --- a/inc/modules/admin/what-updates.php +++ b/inc/modules/admin/what-updates.php @@ -99,7 +99,7 @@ if (empty($ONLINE['version'])) { loadTemplate('admin_update_download', false, $ONLINE); } else { // You have the latest version! - loadTemplate('admin_settings_saved', false, getMessage('NO_UPDATES_AVAILABLE')); + loadTemplate('admin_settings_saved', false, '{--NO_UPDATES_AVAILABLE--}'); } // [EOF] diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php index 069171dd71..0af9eee3a8 100644 --- a/inc/modules/admin/what-usage.php +++ b/inc/modules/admin/what-usage.php @@ -108,7 +108,7 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) { outputHtml($content); } else { // Nothing to load, then we have no directory 'usage' - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_USAGE_DIRECTORY_404')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_USAGE_DIRECTORY_404--}'); } // [EOF] diff --git a/inc/modules/admin/what-user_contct.php b/inc/modules/admin/what-user_contct.php index 74551c3f80..95525b00fb 100644 --- a/inc/modules/admin/what-user_contct.php +++ b/inc/modules/admin/what-user_contct.php @@ -67,7 +67,7 @@ if ((isGetRequestParameterSet('userid')) && (bigintval(getRequestParameter('user sendEmail($content['email'], getMessage('ADMIN_CONTACT_USER_SUBJECT'), $message); // Display message - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_USER_CONTACTED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_USER_CONTACTED--}'); } else { // Load contact form template loadTemplate('admin_contct_user_form', false, $content); diff --git a/inc/modules/admin/what-usr_online.php b/inc/modules/admin/what-usr_online.php index 3a1043a4ee..e0c4136358 100644 --- a/inc/modules/admin/what-usr_online.php +++ b/inc/modules/admin/what-usr_online.php @@ -99,7 +99,7 @@ if (isExtensionActive('online')) { } // END - if } else { // Online statistics deactivated! - loadTemplate('admin_settings_saved', false, getMessage('ONLINE_STATISTICS_DEACTIVATED')); + loadTemplate('admin_settings_saved', false, '{--ONLINE_STATISTICS_DEACTIVATED--}'); } // [EOF] diff --git a/inc/modules/guest/what-doubler.php b/inc/modules/guest/what-doubler.php index 01b6209015..8457a98c8c 100644 --- a/inc/modules/guest/what-doubler.php +++ b/inc/modules/guest/what-doubler.php @@ -50,31 +50,12 @@ if ((!isExtensionActive('doubler')) && (!isAdmin())) { return; } // END - if -// Percent values etc. -$content['charge'] = translateComma(getConfig('doubler_charge') * 100); -$content['ref'] = translateComma(getConfig('doubler_ref') * 100); -$content['total'] = translateComma(getConfig('doubler_points')); -$content['min'] = translateComma(getConfig('doubler_min')); -$content['max'] = translateComma(getConfig('doubler_max')); - -// Transfer referal id -$content['refid'] = determineReferalId(); - // Which mail-send-mode did the admin setup? $content['payout_time'] = getMessage('DOUBLER_PAYOUT_TIME_' . getConfig('doubler_send_mode')); // Generate table with already payed out doubles $content['payout_history'] = generateDoublerTable(0, 'Y', 'N', 'DESC'); -// Generate table with next-to-run payouts -$content['next_table'] = generateDoublerTable(); - -// Generate timemark -$content['timeout_mark'] = createFancyTime(getConfig('doubler_timeout')); - -// Points left to double -$content['left'] = translateComma(DOUBLER_GET_TOTAL_POINTS_LEFT()); - // Load template loadTemplate('guest_doubler', false, $content); diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php index 7bd3c02db3..d38988eb58 100644 --- a/inc/modules/guest/what-register.php +++ b/inc/modules/guest/what-register.php @@ -60,7 +60,7 @@ if ((isFormSent()) && (isRegistrationDataComplete())) { doRegistration(); // Output success registration - loadTemplate('admin_settings_saved', false, getMessage('REGISTRATION_DONE')); + loadTemplate('admin_settings_saved', false, '{--REGISTRATION_DONE--}'); } else { // Do this only if form is sent if (isFormSent()) { diff --git a/inc/modules/guest/what-sponsor_infos.php b/inc/modules/guest/what-sponsor_infos.php index 28019f4e7c..a60c582d2b 100644 --- a/inc/modules/guest/what-sponsor_infos.php +++ b/inc/modules/guest/what-sponsor_infos.php @@ -95,12 +95,12 @@ if (SQL_NUMROWS($result_act) > 0) { } } else { // No pay types setuped so far! - $OUT_PAY = loadTemplate('guest_sponsor_infos_none_row', loadTemplate('admin_settings_saved', true, getMessage('SPONSOR_NO_ACTIONS_ACTIVATED'))); + $OUT_PAY = loadTemplate('guest_sponsor_infos_none_row', loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_ACTIONS_ACTIVATED--}')); } } else { // No actions activated so far! - $OUT_ACT = loadTemplate('guest_sponsor_infos_none_row', loadTemplate('admin_settings_saved', true, getMessage('SPONSOR_NO_ACTIONS_ACTIVATED'))); - $OUT_PAY = loadTemplate('guest_sponsor_infos_none_row', loadTemplate('admin_settings_saved', true, getMessage('SPONSOR_NO_ACTIONS_ACTIVATED'))); + $OUT_ACT = loadTemplate('guest_sponsor_infos_none_row', loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_ACTIONS_ACTIVATED--}')); + $OUT_PAY = loadTemplate('guest_sponsor_infos_none_row', loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_ACTIONS_ACTIVATED--}')); } // Free memory diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php index a9e1c850c6..1952a4ca5f 100644 --- a/inc/modules/guest/what-sponsor_login.php +++ b/inc/modules/guest/what-sponsor_login.php @@ -103,10 +103,10 @@ LIMIT 1", sendAdminNotification(getMessage('ADMIN_NEW_SPONSOR'), 'admin_sponsor_pending', $data); // Sponsor account set to pending - loadTemplate('admin_settings_saved', false, getMessage('SPONSOR_ACCOUNT_IS_PENDING')); + loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACCOUNT_IS_PENDING--}'); } else { // Could not unlock account! - loadTemplate('admin_settings_saved', false, getMessage('SPONSOR_ACCOUNT_PENDING_FAILED')); + loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACCOUNT_PENDING_FAILED--}'); } } elseif ($data['status'] == 'EMAIL') { // Changed email adress need to be confirmed @@ -124,14 +124,14 @@ LIMIT 1", // Check on success if (SQL_AFFECTEDROWS() == 1) { // Sponsor account is unlocked again - loadTemplate('admin_settings_saved', false, getMessage('SPONSOR_ACCOUNT_IS_CONFIRMED_AGAIN')); + loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACCOUNT_IS_CONFIRMED_AGAIN--}'); } else { // Could not unlock account! - loadTemplate('admin_settings_saved', false, getMessage('SPONSOR_ACCOUNT_EMAIL_FAILED')); + loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACCOUNT_EMAIL_FAILED--}'); } } else { /// ??? Other status? - loadTemplate('admin_settings_saved', false, getMessage('SPONSOR_ACCOUNT_STATUS_FAILED')); + loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACCOUNT_STATUS_FAILED--}'); } } else { // No sponsor found @@ -173,10 +173,10 @@ WHERE email='%s' AND (`status`='UNCONFIRMED' OR `status`='EMAIL') LIMIT 1", sendEmail(postRequestParameter('email'), getMessage('SPONSOR_ACTIVATION_LINK_SUBJ'), $message_sponsor); // Output message - loadTemplate('admin_settings_saved', false, getMessage('SPONSOR_ACTIVATION_LINK_SENT')); + loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACTIVATION_LINK_SENT--}'); } else { // No account found or not UNCONFIRMED - loadTemplate('admin_settings_saved', false, getMessage('SPONSOR_ACTIVATION_LINK_404')); + loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACTIVATION_LINK_404--}'); } // Free memory @@ -216,15 +216,20 @@ WHERE `email`='%s' AND `id`='%s' AND `status`='CONFIRMED' LIMIT 1", sendEmail(postRequestParameter('email'), getMessage('SPONSOR_LOST_PASSWORD_SUBJ'), $message_sponsor); // Update password - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_sponsor_data` SET `password`='%s' -WHERE `id`='%s' LIMIT 1", + SQL_QUERY_ESC("UPDATE + `{?_MYSQL_PREFIX?}_sponsor_data` +SET + `password`='%s' +WHERE + `id`=%s +LIMIT 1", array(md5($DATA['password']), bigintval($DATA['id'])), __FILE__, __LINE__); // Output message - loadTemplate('admin_settings_saved', false, getMessage('SPONSOR_LOST_PASSWORD_SENT')); + loadTemplate('admin_settings_saved', false, '{--SPONSOR_LOST_PASSWORD_SENT--}'); } else { // No account found or not UNCONFIRMED - loadTemplate('admin_settings_saved', false, getMessage('SPONSOR_LOST_PASSWORD_404')); + loadTemplate('admin_settings_saved', false, '{--SPONSOR_LOST_PASSWORD_404--}'); } // Free memory @@ -253,21 +258,21 @@ WHERE `id`='%s' AND password='%s' LIMIT 1", redirectToUrl('modules.php?module=sponsor'); } else { // Cookie setup failed! - loadTemplate('admin_settings_saved', false, getMessage('SPONSPOR_COOKIE_SETUP_FAILED')); + loadTemplate('admin_settings_saved', false, '{--SPONSPOR_COOKIE_SETUP_FAILED--}'); // Login formular and other links loadTemplate('guest_sponsor_login'); } } else { // Status is not fine - loadTemplate('admin_settings_saved', false, getMessage('SPONSOR_LOGIN_FAILED_' . strtoupper($status) . '')); + loadTemplate('admin_settings_saved', false, '{--SPONSOR_LOGIN_FAILED_' . strtoupper($status) . '--}'); // Login formular and other links loadTemplate('guest_sponsor_login'); } } else { // Account missing or wrong pass! We shall not find this out for the "cracker folks"... - loadTemplate('admin_settings_saved', false, getMessage('SPONSOR_LOGIN_FAILED_404_WRONG_PASS')); + loadTemplate('admin_settings_saved', false, '{--SPONSOR_LOGIN_FAILED_404_WRONG_PASS--}'); // Login formular and other links loadTemplate('guest_sponsor_login'); diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php index 3556a9447b..bdfea2200d 100644 --- a/inc/modules/guest/what-sponsor_reg.php +++ b/inc/modules/guest/what-sponsor_reg.php @@ -334,7 +334,7 @@ ORDER BY // Errors found? if (count($FORM_ERRORS) > 0) { - $OUT = loadTemplate('admin_settings_saved', true, getMessage('SPONSOR_REGISTER_SOMETHING_MISSING'); + $OUT = loadTemplate('admin_settings_saved', true, '{--SPONSOR_REGISTER_SOMETHING_MISSING--}'); $OUT .= '
    '; foreach ($FORM_ERRORS as $error) { $OUT .= '
  1. ' . $error . '
    2. '; @@ -354,7 +354,7 @@ ORDER BY loadTemplate('guest_sponsor_reg', false, $content); } else { // Nothing added so far - loadTemplate('admin_settings_saved', false, getMessage('SPONSOR_PAYMENT_LIST_IS_EMPTY')); + loadTemplate('admin_settings_saved', false, '{--SPONSOR_PAYMENT_LIST_IS_EMPTY--}'); } // Free memory diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php index a5165082ba..f605c8fc0d 100644 --- a/inc/modules/guest/what-stats.php +++ b/inc/modules/guest/what-stats.php @@ -234,12 +234,12 @@ switch (getConfig('guest_stats')) { loadTemplate('guest_stats_table', false, $content); } else { // No clicks detected - loadTemplate('admin_settings_saved', false, getMessage('GUEST_STATS_NO_CLICKS')); + loadTemplate('admin_settings_saved', false, '{--GUEST_STATS_NO_CLICKS--}'); } break; case 'INACTIVE': // Deactivated stats - loadTemplate('admin_settings_saved', false, getMessage('GUEST_STATS_DEACTIVATED')); + loadTemplate('admin_settings_saved', false, '{--GUEST_STATS_DEACTIVATED--}'); break; } // END - switch diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php index 86263f07e8..cb0453d670 100644 --- a/inc/modules/member/what-categories.php +++ b/inc/modules/member/what-categories.php @@ -108,15 +108,15 @@ if ($cats > 0) { // Categories saved? if ($cnt > 0) { // Output message - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_CATS_SAVED')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_CATS_SAVED--}'); } else { // None save - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_CATS_NOT_SAVED')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_CATS_NOT_SAVED--}'); } } else { if ($LEAST === true) { // Also here we have to secure it... :( - loadTemplate('admin_settings_saved', false, getMessage('CATS_LEAST')); + loadTemplate('admin_settings_saved', false, '{--CATS_LEAST--}'); } // END - if // Put some data into constants for the template @@ -161,11 +161,11 @@ if ($cats > 0) { } } else { // No cateogries are defined yet - loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_CATS')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATS--}'); } // Free result SQL_FREERESULT($result); -// +// [EOF] ?> diff --git a/inc/modules/member/what-doubler.php b/inc/modules/member/what-doubler.php index ba674f5394..520853db57 100644 --- a/inc/modules/member/what-doubler.php +++ b/inc/modules/member/what-doubler.php @@ -52,23 +52,13 @@ if ((!isExtensionActive('doubler')) && (!isAdmin())) { return; } // END - if -// Percent values etc. -// @TODO The '*100' is in the way to get moved into the template -$content['charge'] = translateComma(getConfig('doubler_charge') * 100); -$content['ref'] = translateComma(getConfig('doubler_ref') * 100); - -// Default refid is the userid -$content['userid'] = getMemberId(); +// Init nickname +$content['nickname'] = ''; // Transfer referal id if (isExtensionActive('nickname')) { // Load nickname from DB - $nick = getNickname(getMemberId()); - - if (!empty($nick)) { - // Set nickname - $content['userid'] = $nick; - } // END - if + $content['nickname'] = getNickname(getMemberId()); } // END - if // Which mail-send-mode did the admin setup? @@ -77,18 +67,9 @@ $content['payout_time'] = getMessage('DOUBLER_PAYOUT_TIME_' . getConfig('doubler // Generate table with already payed out doubles $content['payout_history'] = generateDoublerTable(getMemberId(), 'Y', 'N', 'DESC'); -// Generate table with next-to-run payouts -$content['next_table'] = generateDoublerTable(getMemberId()); - // Generate table with refferal payouts $content['payout_ref'] = generateDoublerTable(getMemberId(), 'N', 'Y', 'DESC'); -// Generate timemark -$content['timeout_mark'] = createFancyTime(getConfig('doubler_timeout')); - -// Points left to double -$content['left'] = translateComma(DOUBLER_GET_TOTAL_POINTS_LEFT()); - // Load template loadTemplate('member_doubler', false, $content); diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php index 209ad00787..bfcffff743 100644 --- a/inc/modules/member/what-holiday.php +++ b/inc/modules/member/what-holiday.php @@ -154,7 +154,7 @@ LIMIT 1", createNewTask('{--HOLIDAY_ADMIN_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId()); // Display message - loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_IS_ACTIVATED_NOW')); + loadTemplate('admin_settings_saved', false, '{--HOLIDAY_IS_ACTIVATED_NOW--}'); } } // END - if @@ -213,17 +213,17 @@ LIMIT 1", sendAdminNotification(getMessage('HOLIDAY_ADMIN_DEAC_SUBJ'), 'admin_holiday_deactivated', $content, getMemberId()); // Display message to user - loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_DEACTIVATED_NOW')); + loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_DEACTIVATED_NOW--}'); } else { // Display message to user - loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_CANNOT_DEACTIVATE')); + loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_CANNOT_DEACTIVATE--}'); } // Free result SQL_FREERESULT($result2); } elseif ($content['holiday_active'] == 'Y') { // To fast! - loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED')); + loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_LOCKED--}'); } } else { // User not found @@ -314,7 +314,7 @@ LIMIT 1", array(getMemberId()), __FILE__, __LINE__); } } else { // To fast! - loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED')); + loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_LOCKED--}'); } } // END - if diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php index 2b58327ded..3b9cb6fe3d 100644 --- a/inc/modules/member/what-html_mail.php +++ b/inc/modules/member/what-html_mail.php @@ -57,7 +57,7 @@ if (isFormSent()) { // Save settings SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `html`='%s' WHERE `userid`=%s LIMIT 1", array(postRequestParameter('html'), getMemberId()), __FILE__, __LINE__); - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_SETTINGS_SAVED')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_SETTINGS_SAVED--}'); } else { // Prepare it $content['html_y'] = ''; diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index 28a0f11ad1..ab440d29be 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -203,7 +203,7 @@ LIMIT 1", loadTemplate('admin_settings_saved', false, $content['update_check']); } elseif ((!isEmailValid(postRequestParameter('email'))) && (!isAdmin())) { // Invalid email address! - loadTemplate('admin_settings_saved', false, getMessage('INVALID_EMAIL_ENTERED')); + loadTemplate('admin_settings_saved', false, '{--INVALID_EMAIL_ENTERED--}'); } else { // Generate hash $hash = generateHash(postRequestParameter('pass1'), substr($content['password'], 0, -40)); @@ -305,11 +305,11 @@ LIMIT 1", sendModeMails ('mydata', $modes); } else { // Something went wrong - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_UPDATE_FAILED')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_UPDATE_FAILED--}'); } } else { // Entered wrong pass for updating profile - loadTemplate('admin_settings_saved', false, getMessage('MEBER_UPDATE_PWD_WRONG')); + loadTemplate('admin_settings_saved', false, '{--MEBER_UPDATE_PWD_WRONG--}'); } } break; diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index 83d8724ff2..77b8206c67 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -99,7 +99,7 @@ $total = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTot if (($HOLIDAY == 'Y') && (isExtensionInstalledAndNewer('holiday', '0.1.3'))) { // Holiday is active! - loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_ORDER_NOT_POSSIBLE')); + loadTemplate('admin_settings_saved', false, '{--HOLIDAY_ORDER_NOT_POSSIBLE--}'); } elseif ((isPostRequestParameterSet('frametester')) && ($ALLOWED > 0) && (postRequestParameter('receiver') > 0)) { // Continue with the frametester, we first need to store the data temporary in the pool // @@ -110,12 +110,11 @@ FROM WHERE `sender`=%s AND `url`='%s' AND - `timestamp` > (UNIX_TIMESTAMP() - %s) + `timestamp` > (UNIX_TIMESTAMP() - {?url_tlock?}) LIMIT 1", array( getMemberId(), - postRequestParameter('url'), - getConfig('url_tlock') + postRequestParameter('url') ), __FILE__, __LINE__); $type = 'TEMP'; $id = '0'; @@ -435,7 +434,7 @@ LIMIT 1", $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS1'); } elseif (($ALLOWED == '0') && (getConfig('order_max_full') == 'ORDER')) { // No more mail orders allowed - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_ORDER_ALLOWED_EXHAUSTED')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}'); } elseif (($links < getConfig('unconfirmed')) && ($mmails == 1)) { // Display order form $result_cats = SQL_QUERY("SELECT @@ -699,7 +698,7 @@ LIMIT 1", } } elseif ($mmails == '0') { // Please set more than 0 mails per day - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_HAS_ZERO_MMAILS')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_HAS_ZERO_MMAILS--}'); } else { // Please confirm some mails first loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_LINKS_LEFT'), $links); diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php index a73ae1afca..dadbf5b6ba 100644 --- a/inc/modules/member/what-payout.php +++ b/inc/modules/member/what-payout.php @@ -147,7 +147,7 @@ ORDER BY outputPayoutList($totalPoints); } else { // No payout types setup - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PAYOUT_SETUP_INCOMPLETE')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_SETUP_INCOMPLETE--}'); } } else { // Chedk if he can get paid by selected type @@ -235,7 +235,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')", sendAdminNotification(getMessage('ADMIN_PAYOUY_REQUEST_SUBJ'), $admin_tpl, postRequestArray(), getMemberId()); // Load template and output it - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PAYOUT_REQUEST_SENT')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_REQUEST_SENT--}'); } elseif ($content['allow'] == 'Y') { // Prepare content $content = array( @@ -259,11 +259,11 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')", } } else { // Not enougth points - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PAYOUT_POINTS_NOT_ENOUGTH')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_POINTS_NOT_ENOUGTH--}'); } } else { // id is invalid - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PAYOUT_ID_INVALID')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_ID_INVALID--}'); } // Free result diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php index 38065edd7b..6932b6ecd0 100644 --- a/inc/modules/member/what-points.php +++ b/inc/modules/member/what-points.php @@ -61,9 +61,9 @@ if (isExtensionInstalledAndNewer('bonus', '0.4.4')) $depths += 4; $content['rowspan'] = ($depths*2+15); // Init some vars... -$totalPoints = '0'; -$totalReferals = '0'; -$totalLocked = '0'; +$content['total_points'] = '0'; +$content['total_referals'] = '0'; +$content['total_locked'] = '0'; $OUT = ''; // Load ref levels @@ -89,8 +89,8 @@ while ($data = SQL_FETCHARRAY($result_depths)) { $content = merge_array($content, SQL_FETCHARRAY($result_points)); // Add both points - $totalPoints += $content['points']; - $totalLocked += $content['locked_points']; + $content['total_points'] += $content['points']; + $content['total_locked'] += $content['locked_points']; } // END - if // Free result @@ -109,7 +109,7 @@ while ($data = SQL_FETCHARRAY($result_depths)) { $content = merge_array($content, SQL_FETCHARRAY($result_refs)); // Add them to total refs - $totalReferals += $content['counter']; + $content['total_referals'] += $content['counter']; } // END - if // Free result @@ -126,35 +126,33 @@ SQL_FREERESULT($result_depths); $content['rows'] = $OUT; // Initialize variables -$CONFIRMED = '---'; -$SENT = '---'; -$RECEIVED = '---'; +$content['confirmed'] = '---'; +$content['sent'] = '---'; +$content['receive'] = '---'; // Only user >= v0.1.2: Fetch confirmed mails counter if (isExtensionInstalledAndNewer('user', '0.1.2')) { $add = ''; - $CONFIRMED = getUserData('mails_confirmed'); + $content['confirmed'] = getUserData('mails_confirmed'); if (isExtensionInstalledAndNewer('user', '0.1.4')) { - $SENT = getUserData('emails_sent'); - $RECEIVED = getUserData('emails_received'); + $content['sent'] = getUserData('emails_sent'); + $content['receive'] = getUserData('emails_received'); } // END - if // Please update the user extension if you see 3 dashes - if (empty($SENT)) $SENT = '---'; - if (empty($RECEIVED)) $RECEIVED = '---'; + if (empty($content['sent'])) $content['sent'] = '---'; + if (empty($content['receive'])) $content['receive'] = '---'; } else { // Please update! - $CONFIRMED = '---'; + $content['confirmed'] = '---'; } // If TLOCK is 0 add 3 zeros for floating -if ($totalLocked == '0') $totalLocked = '0.00000'; +if ($content['total_locked'] == '0') $content['total_locked'] = '0.00000'; // Remember several values in constants -$content['sum'] = ($totalPoints - getUserData('used_points')); -$content['tref'] = $totalReferals; -$content['tlock'] = $totalLocked; +$content['total_points'] = ($content['total_points'] - getUserData('used_points')); // Fixes a bug when there is no bonus extension installed if (isExtensionInstalledAndOlder('bonus', '0.4.4')) setConfigEntry('bonus_active', 'X'); @@ -164,19 +162,8 @@ $content['special_rows'] = ''; // Display login bonus and turbo-click bonus if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonus')) && (getConfig('bonus_active') == 'Y')) { - // Fetch some data and init others (to avoid a notice here) - $content['login'] = getUserData('login_bonus'); - $content['turbo'] = getUserData('turbo_bonus'); - - // Get more data if ext-bonus is newer - if (isExtensionInstalledAndNewer('bonus', '0.4.4')) { - $content['ref'] = getUserData('bonus_ref'); - $content['order'] = getUserData('bonus_order'); - $content['stats'] = getUserData('bonus_stats'); - } // END - if - // Total bonus points - $content['ttotal'] = $content['turbo'] + $content['login'] + $content['ref'] + $content['order'] + $content['stats']; + $content['total'] = getUserData('turbo_bonus') + getUserData('login_bonus') + getUserData('bonus_ref') + getUserData('bonus_order') + getUserData('bonus_stats'); // Output rows $content['special_rows'] = loadTemplate('member_points_bonus_rows', true, $content); @@ -188,11 +175,6 @@ if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonu $content['special_rows'] = loadTemplate('member_points_upgrade'); } -// Remeber values for the final template -$content['receive'] = $RECEIVED; -$content['confirmed'] = $CONFIRMED; -$content['sent'] = $SENT; - // Load final template if (isExtensionActive('user')) { // Load template when required extension is there @@ -202,12 +184,12 @@ if (isExtensionActive('user')) { loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('user')); } else { // Message for user - loadTemplate('admin_settings_saved', false, getMessage('PROBLEM_POINTS_OVERVIEW_UNAVAILABLE')); + loadTemplate('admin_settings_saved', false, '{--PROBLEM_POINTS_OVERVIEW_UNAVAILABLE--}'); } if (isExtensionActive('payout')) { // Payput extension is installed and active so we can check if the user has enougth points - outputPayoutList(convertCommaToDot(($totalPoints - getUserData('used_points')))); + outputPayoutList($content['total_points'] - getUserData('used_points')); } // END - if // [EOF] diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php index b8f8557b5c..794689bdb5 100644 --- a/inc/modules/member/what-primera.php +++ b/inc/modules/member/what-primera.php @@ -57,7 +57,7 @@ if ((!isExtensionActive('primera')) && (!isAdmin())) { // Check if the admin has entered the data if ((getConfig('primera_api_name') == '') || (getConfig('primera_api_md5') == '')) { // Something important is missing... - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_API_DATA_MISSING')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_API_DATA_MISSING--}'); return; } // END - if @@ -112,7 +112,7 @@ if (getRequestParameter('mode') == 'pay') { // Is this enougth for a payout? if ($points < getConfig('primera_min_payout')) { // No, then abort here - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_MIN_PAYOUT_PAYOUT')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_MIN_PAYOUT_PAYOUT--}'); return; } @@ -132,19 +132,19 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) { // Is the user id and password set? if (!isPostRequestParameterSet(('primera_nickname'))) { // Nothing entered in Primus nickname - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_EMPTY_USERNAME')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_EMPTY_USERNAME--}'); } elseif (!isPostRequestParameterSet(('primera_password'))) { // Nothing entered in Primera password - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_EMPTY_PASSWORD')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_EMPTY_PASSWORD--}'); } elseif (!isPostRequestParameterSet(('amount'))) { // Nothing entered in amount - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_EMPTY_AMOUNT')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_EMPTY_AMOUNT--}'); } elseif (postRequestParameter('amount') != bigintval(postRequestParameter('amount'))) { // Only numbers in amount! - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_INVALID_AMOUNT')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_INVALID_AMOUNT--}'); } elseif (postRequestParameter('amount') < getConfig('primera_min_payout')) { // Not enougth entered! - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_AMOUNT_SMALLER_MIN')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_AMOUNT_SMALLER_MIN--}'); } elseif (postRequestParameter('amount') > $points) { // Not enougth points left! loadTemplate('admin_settings_saved', false, sprintf(getMessage('MEMBER_PRIMERA_PAYOUT_POINTS_DEPLETED'), bigintval(postRequestParameter('amount')), bigintval($points))); @@ -169,7 +169,7 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) { array(postRequestParameter('primera_nickname'), getMemberId()), __FILE__, __LINE__); // All done! - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_PAYOUT_DONE')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_PAYOUT_DONE--}'); return; } elseif ((GET_PRIMERA_ERROR_CODE() == 'user_failed') || (GET_PRIMERA_ERROR_CODE() == 'own_failed') || (GET_PRIMERA_ERROR_CODE() == 'amount_failed') || (GET_PRIMERA_ERROR_CODE() == 'api_amount_failed')) { // Wrong login data diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php index fcfa29aefd..28d898f32c 100644 --- a/inc/modules/member/what-refback.php +++ b/inc/modules/member/what-refback.php @@ -43,12 +43,10 @@ if (!defined('__SECURITY')) { } elseif (!isMember()) { // User is not logged in redirectToIndexMemberOnlyModule(); -} - -// Is the refback system enabled? -if (getConfig('refback_enabled') != 'Y') { +} elseif (getConfig('refback_enabled') != 'Y') { // Output message - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_REFBACK_DISABLED')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_REFBACK_DISABLED--}'); + // Abort here return false; } // END - if @@ -76,13 +74,13 @@ if ((isFormSent('edit')) && (isPostRequestParameterSet('id'))) { // Check status if (isset($status['ok'])) { // No message found - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_REFBACK_DONE')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_REFBACK_DONE--}'); } elseif (isset($status['message'])) { // Something went wrong with error message loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_REFBACK_ERROR_MESSAGE', $status['message'])); } else { // No message found - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_REFBACK_ERROR_EMPTY_MESSAGE')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_REFBACK_ERROR_EMPTY_MESSAGE--}'); } } else { // Percents out-of-bounds ;-) @@ -154,7 +152,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('member_refback_list', false, $OUT); } else { // No entries - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_REFBACK_NO_ENTRIES')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_REFBACK_NO_ENTRIES--}'); } // Free result diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php index d31f735742..211272e068 100644 --- a/inc/modules/member/what-reflinks.php +++ b/inc/modules/member/what-reflinks.php @@ -112,7 +112,7 @@ if (SQL_NUMROWS($result) > 0) { $content['refbanner_content'] = loadTemplate('member_reflinks_table', true, $OUT); } else { // No refbanner found! - $content['refbanner_content'] = loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_REFBANNER_FOUND')); + $content['refbanner_content'] = loadTemplate('admin_settings_saved', true, '{--MEMBER_NO_REFBANNER_FOUND--}'); } // Free result diff --git a/inc/modules/member/what-reflist.php b/inc/modules/member/what-reflist.php index 5875286770..7797639cb9 100644 --- a/inc/modules/member/what-reflist.php +++ b/inc/modules/member/what-reflist.php @@ -96,7 +96,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('member_ref_list', false, $OUT); } else { // No entries - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_REFBACK_NO_ENTRIES')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_REFBACK_NO_ENTRIES--}'); } // Free result diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php index fb156eb909..75a93fa8b0 100644 --- a/inc/modules/member/what-stats.php +++ b/inc/modules/member/what-stats.php @@ -95,7 +95,7 @@ if (SQL_NUMROWS($result) > 0) { $main_content['pool'] = loadTemplate('member_pool_table', true, $OUT); } else { // No mails in pool! - $main_content['pool'] = loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_MAILS_IN_POOL')); + $main_content['pool'] = loadTemplate('admin_settings_saved', true, '{--MEMBER_NO_MAILS_IN_POOL--}'); } // Free result @@ -139,7 +139,7 @@ if (SQL_NUMROWS($result) > 0) { $main_content['stats'] = loadTemplate('member_stats_table', true, $OUT); } else { // No mail orders fond - $main_content['stats'] = loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_MAILS_IN_STATS')); + $main_content['stats'] = loadTemplate('admin_settings_saved', true, '{--MEMBER_NO_MAILS_IN_STATS--}'); } // Free result diff --git a/inc/modules/member/what-surfbar_book.php b/inc/modules/member/what-surfbar_book.php index 1fb968bbf2..1c57183d09 100644 --- a/inc/modules/member/what-surfbar_book.php +++ b/inc/modules/member/what-surfbar_book.php @@ -56,7 +56,7 @@ if ((!isExtensionActive('surfbar')) && (!isAdmin())) { // Still allowed to book more URLs? if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) { // No more URLs allowed to book! - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_NO_MORE_ALLOWED')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_SURFBAR_NO_MORE_ALLOWED--}'); } elseif ((isFormSent()) && (isPostRequestParameterSet(('limited')))) { // Is limitation "no" and "limit" is > 0? if ((postRequestParameter('limited') != 'Y') && ((isPostRequestParameterSet(('limit'))) && (postRequestParameter('limit') > 0)) || (!isPostRequestParameterSet(('limit')))) { diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php index 562ea10b33..14a3ed991f 100644 --- a/inc/modules/member/what-surfbar_list.php +++ b/inc/modules/member/what-surfbar_list.php @@ -60,13 +60,13 @@ if ((isFormSent()) && (isPostRequestParameterSet(('action'))) && (isPostRequestP // Process the form if (SURFBAR_MEMBER_DO_FORM(postRequestArray(), $urlArray)) { // Action performed but shall we display it? - if (((postRequestParameter('action') != 'edit') && (postRequestParameter('action') != "delete")) || (isPostRequestParameterSet(('execute')))) { + if (((postRequestParameter('action') != 'edit') && (postRequestParameter('action') != 'delete')) || (isPostRequestParameterSet('execute'))) { // Display "action done" message if action is wether 'edit' nor 'delete' or has been executed - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_ACTION_DONE')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_SURFBAR_ACTION_DONE--}'); } // END - if } else { // Something went wrong - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_ACTION_FAILED')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_SURFBAR_ACTION_FAILED--}'); } } elseif (count($urlArray) > 0) { // List all URLs @@ -97,7 +97,7 @@ if ((isFormSent()) && (isPostRequestParameterSet(('action'))) && (isPostRequestP loadTemplate('member_surfbar_list', false, $OUT); } else { // No URLs booked so far - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_NO_URLS_FOUND')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_SURFBAR_NO_URLS_FOUND--}'); } // [EOF] diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php index 4995716159..e298d8789b 100644 --- a/inc/modules/member/what-themes.php +++ b/inc/modules/member/what-themes.php @@ -64,17 +64,17 @@ if (isPostRequestParameterSet('member_theme')) { setTheme($newTheme); // Theme saved! - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_THEME_SAVED')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_THEME_SAVED--}'); } // END - if // Initialize array $THEMES = array( - 'theme_unix' => array(), // Unix name from filesystem - 'theme_name' => array(), // Title - 'theme_author' => array(), // Theme author's name - 'theme_email' => array(), // Author's email address - 'theme_url' => array(), // URL were you can download it from - 'theme_version' => array(), // Version number of theme + 'theme_unix' => array(), // Unix name from filesystem + 'theme_name' => array(), // Title + 'theme_author' => array(), // Theme author's name + 'theme_email' => array(), // Author's email address + 'theme_url' => array(), // URL were you can download it from + 'theme_version' => array(), // Version number of theme ); // Read directory "themes" @@ -133,7 +133,7 @@ if (empty($OUT)) { // No themes found??? $OUT = " - ".loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_THEMES_FOUND'))." + ".loadTemplate('admin_settings_saved', true, '{--MEMBER_NO_THEMES_FOUND--}')." \n"; } // END - if diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index ddc7586b6f..7741e57601 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -172,7 +172,7 @@ switch ($mode) { sendAdminNotification($adminSubject, 'admin_transfer_points', $content); // Transfer is completed - loadTemplate('admin_settings_saved', false, getMessage('TRANSFER_COMPLETED') . "
    {--TRANSFER_CONTINUE_OVERVIEW--}"); + loadTemplate('admin_settings_saved', false, '{--TRANSFER_COMPLETED--}' . '
    {--TRANSFER_CONTINUE_OVERVIEW--}'); } elseif ($valid_code === false) { // Invalid Touring code! loadTemplate('admin_settings_saved', false, '
    {--TRANSFER_INVALID_CODE--}
    '); @@ -240,7 +240,7 @@ switch ($mode) { SQL_FREERESULT($result); } else { // No one else is opt-in - $OUT = loadTemplate('admin_settings_saved', true, getMessage('TRANSFER_NO_ONE_ELSE_OPT_IN')); + $OUT = loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_ONE_ELSE_OPT_IN--}'); $content['to_disabled'] = ' disabled="disabled"'; } @@ -255,7 +255,7 @@ switch ($mode) { $content['captcha_code'] = ' ' . $img; } else { $code = '00000'; - $content['captcha_code'] = loadTemplate('admin_settings_saved', true, getMessage('TRANSFER_NO_CODE')); + $content['captcha_code'] = loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_CODE--}'); } // Init points/reason @@ -415,11 +415,11 @@ KEY (`party_userid`) SQL_FREERESULT($result); } else { // Nothing for in and out - $OUT = " - - ".loadTemplate('admin_settings_saved', true, getMessage('TRANSFER_NO_INOUT_TRANSFERS'))." + $OUT = ' + + ' . loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_INOUT_TRANSFERS--}') . ' -"; +'; } // ... and add them to a constant for the template diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php index 12ecfd5da8..4cc86f57cf 100644 --- a/inc/modules/member/what-unconfirmed.php +++ b/inc/modules/member/what-unconfirmed.php @@ -263,7 +263,7 @@ LIMIT 1", } } else { // No mails left to confirm... :) - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_MAILS_TO_CONFIRM--}'); } // [EOF] diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php index e99858cd74..4729c81f1d 100644 --- a/inc/modules/member/what-wernis.php +++ b/inc/modules/member/what-wernis.php @@ -56,7 +56,7 @@ if ((!isExtensionActive('wernis')) && (!isAdmin())) { // Check if the admin has entered the data if ((getConfig('wernis_api_id') == '') || (getConfig('wernis_api_md5') == '')) { // Something important is missing... - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_API_DATA_MISSING')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_API_DATA_MISSING--}'); return; } // END - if @@ -171,26 +171,26 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) { // Is the user id and password set? if (!isPostRequestParameterSet(('wernis_userid'))) { // Nothing entered in WDS66 user id - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_EMPTY_USERNAME')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_EMPTY_USERNAME--}'); } elseif (!isPostRequestParameterSet(('wds66_password'))) { // Nothing entered in WDS66 password - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_EMPTY_PASSWORD')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_EMPTY_PASSWORD--}'); } elseif (!isPostRequestParameterSet(('amount'))) { // Nothing entered in amount - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_EMPTY_AMOUNT')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_EMPTY_AMOUNT--}'); } elseif (postRequestParameter('wernis_userid') != bigintval(postRequestParameter('wernis_userid'))) { // Only numbers in account id! - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_INVALID_USERNAME')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_INVALID_USERNAME'); } elseif (postRequestParameter('amount') != bigintval(postRequestParameter('amount'))) { // Only numbers in amount! - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_INVALID_AMOUNT')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_INVALID_AMOUNT--}'); } else { // Check input data depending on the mode and execute the requested mode switch (getRequestParameter('mode')) { case 'withdraw': // Widthdraws WDS66 -> This exchange if (postRequestParameter('amount') < getConfig('wernis_min_withdraw')) { // Not enougth entered! - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_WITHDRAW_AMOUNT_SMALLER_MIN')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_WITHDRAW_AMOUNT_SMALLER_MIN--}'); } else { // All is fine here so do the withdraw $success = WERNIS_EXECUTE_WITHDRAW(postRequestParameter('wernis_userid'), md5(postRequestParameter('wds66_password')), postRequestParameter('amount')); @@ -203,7 +203,7 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) { array(bigintval(postRequestParameter('wernis_userid')), getMemberId()), __FILE__, __LINE__); // All done! - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_WITHDRAW_DONE')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_WITHDRAW_DONE--}'); return; } elseif ((GET_WERNIS_ERROR_CODE() == 'user_failed') || (GET_WERNIS_ERROR_CODE() == 'own_failed') || (GET_WERNIS_ERROR_CODE() == 'amount_failed')) { // Wrong login data @@ -218,7 +218,7 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) { case 'payout': // Payout this exchange -> WDS66 if (postRequestParameter('amount') < getConfig('wernis_min_payout')) { // Not enougth entered! - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_PAYOUT_AMOUNT_SMALLER_MIN')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_PAYOUT_AMOUNT_SMALLER_MIN--}'); } elseif (postRequestParameter('amount') > $points) { // Not enougth points left! loadTemplate('admin_settings_saved', false, sprintf(getMessage('MEMBER_WERNIS_PAYOUT_POINTS_DEPLETED'), bigintval(postRequestParameter('amount')), bigintval($points))); @@ -234,7 +234,7 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) { array(bigintval(postRequestParameter('wernis_userid')), getMemberId()), __FILE__, __LINE__); // All done! - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_PAYOUT_DONE')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_PAYOUT_DONE--}'); return; } elseif ((GET_WERNIS_ERROR_CODE() == 'user_failed') || (GET_WERNIS_ERROR_CODE() == 'own_failed') || (GET_WERNIS_ERROR_CODE() == 'amount_failed') || (GET_WERNIS_ERROR_CODE() == 'api_amount_failed')) { // Wrong login data diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php index ea1bb7c60b..62d18a26c1 100644 --- a/inc/modules/sponsor/account.php +++ b/inc/modules/sponsor/account.php @@ -115,7 +115,7 @@ if (SQL_NUMROWS($result) == 1) { $OUT = loadTemplate('admin_settings_saved', true, $message); } else { // No message generated - $OUT = loadTemplate('admin_settings_saved', true, getMessage('SPONSOR_NO_MESSAGE_GENERATED')); + $OUT = loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MESSAGE_GENERATED--}'); } } else { // Init gender diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php index f49a345912..6c06b081c1 100644 --- a/inc/modules/sponsor/settings.php +++ b/inc/modules/sponsor/settings.php @@ -104,7 +104,7 @@ if (SQL_NUMROWS($result) == 1) { $OUT = loadTemplate('admin_settings_saved', true, $message); } else { // No message generated - $OUT = loadTemplate('admin_settings_saved', true, getMessage('SPONSOR_NO_MESSAGE_GENERATED')); + $OUT = loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MESSAGE_GENERATED--}'); } } else { // Make yes/no selection diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 499002bd0d..ebb750ba27 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -1314,7 +1314,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify // And sent it away sendEmail($userid, getMessage('SUBJECT_DIRECT_PAYMENT'), $message); - if (!isGetRequestParameterSet('mid')) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED')); + if (!isGetRequestParameterSet('mid')) loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}'); } // Maybe there's another ref? diff --git a/mailid_top.php b/mailid_top.php index 0ea9125b67..e9afe997dd 100644 --- a/mailid_top.php +++ b/mailid_top.php @@ -228,7 +228,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe // Update random confirmed as well? if (isExtensionInstalledAndNewer('user', '0.3.4')) { // Update second counter - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET rand_confirmed=rand_confirmed + 1 WHERE `userid`=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `rand_confirmed`=`rand_confirmed` + 1 WHERE `userid`=%s LIMIT 1", array($url_userid), __FILE__, __LINE__); } // END - if } // END - if diff --git a/templates/de/emails/admin/admin_sponsor_change_data.tpl b/templates/de/emails/admin/admin_sponsor_change_data.tpl index b60c9a2ea6..e4cdbbaafe 100644 --- a/templates/de/emails/admin/admin_sponsor_change_data.tpl +++ b/templates/de/emails/admin/admin_sponsor_change_data.tpl @@ -8,7 +8,7 @@ Hier sind alle neuen (und in Klammern alten) Daten: {--SPONSOR_ENTER_COMPANY_POSITION--}: $content[new_data][position] ($content[position]) {--SPONSOR_ENTER_TAX_IDENT--}: $content[new_data][tax_ident] ($content[tax_ident]) ------------------------------ -{--GUEST_GENDER--}: $content[new_data][gender] ($content[gender]) +{--GUEST_GENDER--}: {%pipe,translateGender=$content[new_data][gender]%} ({%pipe,translateGender=$content[gender]%}) {--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$userid%} {%sponsor,family=$userid%}) {--SPONSOR_EMAIL_STREET_NR1--}: $content[new_data][street_nr1] ($content[street_nr1]) {--SPONSOR_EMAIL_STREET_NR2--}: $content[new_data][street_nr2] ($content[street_nr2]) diff --git a/templates/de/emails/admin/admin_sponsor_change_email.tpl b/templates/de/emails/admin/admin_sponsor_change_email.tpl index a66f57555e..351b955802 100644 --- a/templates/de/emails/admin/admin_sponsor_change_email.tpl +++ b/templates/de/emails/admin/admin_sponsor_change_email.tpl @@ -8,7 +8,7 @@ Hier sind alle neuen (und in Klammern alten) Daten: {--SPONSOR_ENTER_COMPANY_POSITION--}: $content[new_data][position] ($content[position]) {--SPONSOR_ENTER_TAX_IDENT--}: $content[new_data][tax_ident] ($content[tax_ident]) ------------------------------ -{--GUEST_GENDER--}: $content[new_data][gender] ($content[gender]) +{--GUEST_GENDER--}: {%pipe,translateGender=$content[new_data][gender]%} ({%pipe,translateGender=$content[gender]%}) {--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$userid%} {%sponsor,family=$userid%}) {--SPONSOR_EMAIL_STREET_NR1--}: $content[new_data][street_nr1] ($content[street_nr1]) {--SPONSOR_EMAIL_STREET_NR2--}: $content[new_data][street_nr2] ($content[street_nr2]) diff --git a/templates/de/emails/admin/admin_sponsor_settings.tpl b/templates/de/emails/admin/admin_sponsor_settings.tpl index 156230ae10..29fd3f50f9 100644 --- a/templates/de/emails/admin/admin_sponsor_settings.tpl +++ b/templates/de/emails/admin/admin_sponsor_settings.tpl @@ -4,8 +4,8 @@ einer unserer Sponsoren hat soeben seine Einstellungen geaendert! Hier sind alle neuen (und in Klammern alten) Daten: ------------------------------ -{--SPONSOR_RECEIVE_WARNINGS--}: $content[new_data][receive] ($content[receive]) -{--SPONSOR_WARNING_INTERVAL--}: $content[new_data][interval] ($content[interval]) +{--SPONSOR_RECEIVE_WARNINGS--}: {%pipe,translateYesNo=$content[new_data][receive_warnings]%} ({%pipe,translateYesNo=$content[receive_warnings]%}) +{--SPONSOR_WARNING_INTERVAL--}: {%pipe,translateYesNo=$content[new_data][warning_interval]%} ({%pipe,translateYesNo=$content[warning_interval]%}) ------------------------------ ------------------------------ diff --git a/templates/de/emails/sponsor/sponsor_change_data.tpl b/templates/de/emails/sponsor/sponsor_change_data.tpl index 10711c5aca..9442472c1d 100644 --- a/templates/de/emails/sponsor/sponsor_change_data.tpl +++ b/templates/de/emails/sponsor/sponsor_change_data.tpl @@ -1,25 +1,25 @@ -Hallo $DATA[gender] $DATA[surname] $DATA[family], +Hallo $content[gender] $content[surname] $content[family], Sie haben heute Ihre Daten geaendert. Hier sind alle neuen (und in Klammern alten) Daten: ------------------------------ -{--SPONSOR_ENTER_COMPANY_TITLE--}: $DATA[company] ({%sponsor,company=$userid%}) -{--SPONSOR_ENTER_COMPANY_POSITION--}: $DATA[position] ({%sponsor,position=$userid%}) -{--SPONSOR_ENTER_TAX_IDENT--}: $DATA[tax_ident] ({%sponsor,tax_ident=$userid%}) +{--SPONSOR_ENTER_COMPANY_TITLE--}: $content[company] ({%sponsor,company=$userid%}) +{--SPONSOR_ENTER_COMPANY_POSITION--}: $content[position] ({%sponsor,position=$userid%}) +{--SPONSOR_ENTER_TAX_IDENT--}: $content[tax_ident] ({%sponsor,tax_ident=$userid%}) ------------------------------ -{--GUEST_GENDER--}: $DATA[gender] ({%sponsor,gender,translateGender=$userid%}) -{--SURNAME_FAMILY--}: $DATA[surname] $DATA[family] ({%sponsor,surname=$userid%} {%sponsor,family=$userid%}) -{--SPONSOR_EMAIL_STREET_NR1--}: $DATA[street_nr1] ({%sponsor,street_nr1=$userid%}) -{--SPONSOR_EMAIL_STREET_NR2--}: $DATA[street_nr2] ({%sponsor,street_nr2=$userid%}) -{--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $DATA[country]-$DATA[zip] $DATA[city] ({%sponsor,country,determineCountry=$userid%}-{%sponsor,zip,bigintval=$userid%} {%sponsor,city=$userid%}) +{--GUEST_GENDER--}: $content[gender] ({%sponsor,gender,translateGender=$userid%}) +{--SURNAME_FAMILY--}: $content[surname] $content[family] ({%sponsor,surname=$userid%} {%sponsor,family=$userid%}) +{--SPONSOR_EMAIL_STREET_NR1--}: $content[street_nr1] ({%sponsor,street_nr1=$userid%}) +{--SPONSOR_EMAIL_STREET_NR2--}: $content[street_nr2] ({%sponsor,street_nr2=$userid%}) +{--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $content[country]-$content[zip] $content[city] ({%sponsor,country,determineCountry=$userid%}-{%sponsor,zip,bigintval=$userid%} {%sponsor,city=$userid%}) ------------------------------ -{--SPONSOR_ENTER_PHONE--}: $DATA[phone] ($content[phone]) -{--SPONSOR_ENTER_FAX--}: $DATA[fax] ($content[fax]) -{--SPONSOR_ENTER_CELL--}: $DATA[cell] ($content[cell]) +{--SPONSOR_ENTER_PHONE--}: $content[phone] ($content[phone]) +{--SPONSOR_ENTER_FAX--}: $content[fax] ($content[fax]) +{--SPONSOR_ENTER_CELL--}: $content[cell] ($content[cell]) ------------------------------ -{--SPONSOR_ENTER_EMAIL--}: $DATA[email] ($content[email]) -{--SPONSOR_ENTER_URL--}: $DATA[url] ($content[url]) +{--SPONSOR_ENTER_EMAIL--}: $content[email] ($content[email]) +{--SPONSOR_ENTER_URL--}: $content[url] ($content[url]) ------------------------------ Das Passwort wurde Ihnen aus Sicherheitsgruenden nicht mitgesendet. diff --git a/templates/de/emails/sponsor/sponsor_change_email.tpl b/templates/de/emails/sponsor/sponsor_change_email.tpl index db4414792c..13b93334fe 100644 --- a/templates/de/emails/sponsor/sponsor_change_email.tpl +++ b/templates/de/emails/sponsor/sponsor_change_email.tpl @@ -1,4 +1,4 @@ -Hallo $DATA[gender] $DATA[surname] $DATA[family], +Hallo $content[gender] $content[surname] $content[family], Sie haben heute Ihre Email-Adresse geaendert. Ihr Account wurde somit temporaer gesperrt. Sie können es nun mit dem folgenden Link wieder freigeben: diff --git a/templates/de/emails/sponsor/sponsor_settings.tpl b/templates/de/emails/sponsor/sponsor_settings.tpl index 8bab2cf8d1..a0ec011bd7 100644 --- a/templates/de/emails/sponsor/sponsor_settings.tpl +++ b/templates/de/emails/sponsor/sponsor_settings.tpl @@ -4,8 +4,8 @@ Sie haben heute Ihre Einstellungen geaendert. Hier sind alle neuen (und in Klammern alten) Daten: ------------------------------ -{--GUEST_SPONSOR_RECEIVE_WARNINGS--}: $DATA[receive] ($content[receive]) -{--SPONSOR_WARNING_INTERVAL--}: $DATA[interval] ($content[interval]) +{--GUEST_SPONSOR_RECEIVE_WARNINGS--}: {%pipe,translateYesNo=$content[new_content][receive_warnings]%} ({%pipe,translateYesNo=$content[receive_warnings]%}) +{--SPONSOR_WARNING_INTERVAL--}: {%pipe,translateYesNo=$content[new_content][warning_interval]%} ({%pipe,translateYesNo=$content[warning_interval]%}) ------------------------------ Das Passwort wurde Ihnen aus Sicherheitsgruenden nicht mitgesendet. diff --git a/templates/de/html/admin/admin_cache_stats.tpl b/templates/de/html/admin/admin_cache_stats.tpl index fcdcbd9716..dd87abfb21 100644 --- a/templates/de/html/admin/admin_cache_stats.tpl +++ b/templates/de/html/admin/admin_cache_stats.tpl @@ -9,25 +9,31 @@ {--ADMIN_CACHE_DB_HITS--} - $content[db_hits] + {%pipe,translateComma=$content[db_hits]%} {--ADMIN_CACHE_HITS--} - +$content[cache_hits] + +{%pipe,translateComma=$content[cache_hits]%} {--ADMIN_TOTAL_HITS--} - =$content[total_hits] + ={%pipe,translateComma=$content[total_hits]%} - {--ADMIN_CACHE_PERCENTS--} - - $content[cache_perc]% + +
    + {--ADMIN_CACHE_PERCENTS--} +
    + + +
    + {%pipe,translateComma=$content[cache_perc]%}% +
    diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl index 8e508f4e51..a2df11fce5 100644 --- a/templates/de/html/admin/admin_config_doubler.tpl +++ b/templates/de/html/admin/admin_config_doubler.tpl @@ -11,7 +11,7 @@ {--ADMIN_DOUBLER_CHARGE--}: - (%) + (%) @@ -19,7 +19,7 @@ {--ADMIN_DOUBLER_REFERAL--}: - (%) + (%) @@ -27,7 +27,7 @@ {--ADMIN_DOUBLER_MINIMUM--}: - ({?POINTS?}) + ({?POINTS?}) @@ -35,7 +35,7 @@ {--ADMIN_DOUBLER_MAXIMUM--}: - ({?POINTS?}) + ({?POINTS?}) @@ -43,7 +43,7 @@ {--ADMIN_DOUBLER_LEFT--}: - ({?POINTS?}) + ({?POINTS?}) diff --git a/templates/de/html/admin/admin_edit_sponsor_edit.tpl b/templates/de/html/admin/admin_edit_sponsor_edit.tpl index 6a1eb6dd7a..528fab3fb5 100644 --- a/templates/de/html/admin/admin_edit_sponsor_edit.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_edit.tpl @@ -163,7 +163,7 @@ {--SPONSOR_WARNING_INTERVAL--}:  - $content[interval] + $content[warning_interval] diff --git a/templates/de/html/admin/admin_list_bank_package_row.tpl b/templates/de/html/admin/admin_list_bank_package_row.tpl index b9f1353c83..dbe4b2d8fc 100644 --- a/templates/de/html/admin/admin_list_bank_package_row.tpl +++ b/templates/de/html/admin/admin_list_bank_package_row.tpl @@ -12,15 +12,15 @@ $content[description] - $content[fee] {?POINTS?} + {%pipe,translateComma=$content[account_fee]%} {?POINTS?} - $content[plus]% + {%pipe,translateComma=$content[interest_plus]%}% - $content[minus]% + {%pipe,translateComma=$content[interest_minus]%}% - $content[active] + {%pipe,translateComma=$content[package_active]%} diff --git a/templates/de/html/admin/admin_unlock_sponsor_row.tpl b/templates/de/html/admin/admin_unlock_sponsor_row.tpl index da9d6215bf..f48afec366 100644 --- a/templates/de/html/admin/admin_unlock_sponsor_row.tpl +++ b/templates/de/html/admin/admin_unlock_sponsor_row.tpl @@ -3,12 +3,12 @@ - $content[gender] $content[surname] $content[family] + {%pipe,translateGender=$content[gender]%} $content[surname] $content[family] - $content[remote] + $content[remote_addr] - $content[created] + $content[sponsor_created] diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl index d8012e8bbc..0e0b429111 100644 --- a/templates/de/html/admin/admin_user_details.tpl +++ b/templates/de/html/admin/admin_user_details.tpl @@ -102,7 +102,7 @@ {--TOTAL_POINTS--}:
    - $content[total] + {%pipe,translateComma=$content[total]%} {--TOTAL_REFERALS--}:
    @@ -120,7 +120,7 @@ {--LOCKED_POINTS--}:
    - $content[locked] + {%pipe,translateComma=$content[locked]%} {--LAST_UPDATE--}:
    @@ -142,7 +142,7 @@ {--CLICK_RATE--}:
    - $content[click_rate]% + {%pipe,translateComma=$content[click_rate]%}% {--EMAILS_RECEIVED--}:
    @@ -156,21 +156,22 @@ {--RAND_CONFIRMED--}:
    - $content[rand_confirmed] + {%pipe,translateComma=$content[rand_confirmed]%} - {--_UNUSED--}:
    - --- + {--LOCK_TIMESTAMP--}:
    + $content[lock_timestamp] {--LOCK_REASON--}:
    $content[lock_reason] +
    diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl index 3a2eed4e0c..a5e63c0268 100644 --- a/templates/de/html/doubler/doubler_index.tpl +++ b/templates/de/html/doubler/doubler_index.tpl @@ -51,17 +51,17 @@
    - {%message,DOUBLER_ALREADY_PAYED=$content[total]%}
    - {--DOUBLER_POINTS_LEFT_1--} $content[left] {?POINTS?} {--DOUBLER_POINTS_LEFT_2--}
    - {--DOUBLER_USAGE_COUNTER_1--} {?doubler_counter?} {--DOUBLER_USAGE_COUNTER_2--}
    + {%message,DOUBLER_ALREADY_PAYED={%config,translateComma=doubler_points%}%}
    + {--DOUBLER_POINTS_LEFT_1--} {%pipe,getDoublerTotalPointsLeft,translateComma%} {?POINTS?} {--DOUBLER_POINTS_LEFT_2--}
    + {--DOUBLER_USAGE_COUNTER_1--} {%config,translateComma=doubler_counter%} {--DOUBLER_USAGE_COUNTER_2--}

    - {--DOUBLER_MINIMUM_IS--} $content[min] {?POINTS?} - {--DOUBLER_MAXIMUM_IS--} $content[max] {?POINTS?}
    + {--DOUBLER_MINIMUM_IS--} {%config,translateComma=doubler_min%} {?POINTS?} + {--DOUBLER_MAXIMUM_IS--} {%config,translateComma=doubler_max%} {?POINTS?}
    {--DOUBLER_HAVE_FUN--}

    $content[payout_time]

    - {--DOUBLER_POINTS_1--} $content[charge]% + {--DOUBLER_POINTS_1--} {%config,translateComma=doubler_charge%}% {--DOUBLER_POINTS_2--}

    {--DOUBLER_EXAMPLE_1--} 500 {?POINTS?} »» @@ -69,7 +69,7 @@
    {--DOUBLER_FULL_PAYOUT--}


    - {--DOUBLER_REFERAL_1--} $content[ref]% + {--DOUBLER_REFERAL_1--} {%config,translateComma=doubler_ref%}% {--DOUBLER_REFERAL_2--} {--DOUBLER_REFERAL_3--} {--DOUBLER_REFERAL_4--} {--DOUBLER_REFERAL_5--} 100 {?POINTS?} {--DOUBLER_REFERAL_6--} 100 {?POINTS?} diff --git a/templates/de/html/guest/guest_doubler.tpl b/templates/de/html/guest/guest_doubler.tpl index ffc804db4a..de737c5e17 100644 --- a/templates/de/html/guest/guest_doubler.tpl +++ b/templates/de/html/guest/guest_doubler.tpl @@ -8,18 +8,18 @@
      -
    • {--DOUBLER_MINIMUM_IS--} $content[min] {?POINTS?} {--DOUBLER_MAXIMUM_IS--} $content[max] {?POINTS?}
      • -
    • {%message,DOUBLER_ALREADY_PAYED=$content[total]%}
      • -
    • {--DOUBLER_POINTS_LEFT_1--} $content[left] {?POINTS?} {--DOUBLER_POINTS_LEFT_2--}
      • -
    • {--DOUBLER_USAGE_COUNTER_1--} {?doubler_counter?} {--DOUBLER_USAGE_COUNTER_2--}
      • +
    • {--DOUBLER_MINIMUM_IS--} {%config,translateComma=doubler_min%} {?POINTS?} {--DOUBLER_MAXIMUM_IS--} {%config,translateComma=doubler_max%} {?POINTS?}
      • +
    • {%message,DOUBLER_ALREADY_PAYED={%config,translateComma=doubler_points%}%}
      • +
    • {--DOUBLER_POINTS_LEFT_1--} {%pipe,getDoublerTotalPointsLeft,translateComma%} {?POINTS?} {--DOUBLER_POINTS_LEFT_2--}
      • +
    • {--DOUBLER_USAGE_COUNTER_1--} {%config,translateComma=doubler_counter%} {--DOUBLER_USAGE_COUNTER_2--}
    • $content[payout_time]
    • {--DOUBLER_FULL_PAYOUT--}
      • -
    • {--DOUBLER_POINTS_1--} $content[charge]% {--DOUBLER_POINTS_2--}
      • +
    • {--DOUBLER_POINTS_1--} {%config,translateComma=doubler_charge%}% {--DOUBLER_POINTS_2--}
    • {--DOUBLER_EXAMPLE_1--} 500 {?POINTS?} »» {--DOUBLER_EXAMPLE_2--} 1000 {?POINTS?}{--DOUBLER_EXAMPLE_3--}
      • -
    • {--DOUBLER_REFERAL_1--} $content[ref]% {--DOUBLER_REFERAL_2--} {--DOUBLER_REFERAL_3--} {--DOUBLER_REFERAL_4--} +
    • {--DOUBLER_REFERAL_1--} {%config,translateComma=doubler_ref%}]% {--DOUBLER_REFERAL_2--} {--DOUBLER_REFERAL_3--} {--DOUBLER_REFERAL_4--}
    • {--DOUBLER_REFERAL_5--} 100 {?POINTS?} {--DOUBLER_REFERAL_6--} 100 {?POINTS?} {--DOUBLER_REFERAL_8--} 300 {?POINTS?} {--DOUBLER_REFERAL_8--}
    • {--DOUBLER_REFERAL_LINK--}
      • -
    • {--DOUBLER_TIMEOUT_1--} $content[timeout_mark] {--DOUBLER_TIMEOUT_2--}
      • +
    • {--DOUBLER_TIMEOUT_1--} {%config,createFancyTime=doubler_timeout%} {--DOUBLER_TIMEOUT_2--}
    • {--DOUBLER_HAVE_FUN--}
    • {--DOUBLER_WANNA_TRY--}
    @@ -32,8 +32,8 @@ @@ -48,5 +48,5 @@
    {--DOUBLER_NEXT_PAYOUT--}:

    - $content[next_table] + {%pipe,generateDoublerTable%}
    diff --git a/templates/de/html/member/member_doubler.tpl b/templates/de/html/member/member_doubler.tpl index 6ec5e36517..b026836b56 100644 --- a/templates/de/html/member/member_doubler.tpl +++ b/templates/de/html/member/member_doubler.tpl @@ -4,18 +4,18 @@
    - {?URL?}/doubler.php?refid=$content[userid] + {?URL?}/doubler.php?refid={%pipe,getMemberId%}
    - Tipp: Nutzen Sie diesen zum Werben unseres {?mt_word2?}, um die $content[ref]% Referal-Vergütung zu erhalten! + Tipp: Nutzen Sie diesen zum Werben unseres {?mt_word2?}, um die {%config,translateComma=doubler_ref%}% Referal-Vergütung zu erhalten!
    {--DOUBLER_MEMBER_ALREADY_PAYOUT--}:
    $content[payout_history]
    {--DOUBLER_MEMBER_NEXT_PAYOUT--}:
    - $content[next_table] + {%pipe,getMemberId,generateDoublerTable%}
    {--DOUBLER_MEMBER_REF_PAYOUT--}:
    $content[payout_ref] @@ -29,16 +29,16 @@ diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl index eb4cf30446..4981de33d1 100644 --- a/templates/de/html/member/member_points.tpl +++ b/templates/de/html/member/member_points.tpl @@ -9,18 +9,18 @@ {--POINTS_USED--} {%user,used_points,translateComma%} {?POINTS?} - +   {--POINTS_SUM--} - {%pipe,translateComma=$content[sum]%} {?POINTS?} + {%pipe,translateComma=$content[total_points]%} {?POINTS?} - {%pipe,translateComma=$content[tref]%} + {%pipe,translateComma=$content[total_referals]%} {--POINTS_LOCKED--} - {%pipe,translateComma=$content[tlock]%} {?POINTS?} + {%pipe,translateComma=$content[total_locked]%} {?POINTS?} - $content[special_rows] diff --git a/templates/de/html/member/member_points_bonus_rows.tpl b/templates/de/html/member/member_points_bonus_rows.tpl index 7f13874f08..a50c5c9f12 100644 --- a/templates/de/html/member/member_points_bonus_rows.tpl +++ b/templates/de/html/member/member_points_bonus_rows.tpl @@ -35,6 +35,6 @@ {--BONUS_TOTAL--} - {%pipe,translateComma=$content[ttotal]%} {?POINTS?} + {%pipe,translateComma=$content[total]%} {?POINTS?} - -- 2.30.2