Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:
authorRoland Häder <roland@mxchange.org>
Mon, 28 Jun 2010 07:07:51 +0000 (07:07 +0000)
committerRoland Häder <roland@mxchange.org>
Mon, 28 Jun 2010 07:07:51 +0000 (07:07 +0000)
- 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

127 files changed:
DOCS/TODOs.txt
doubler.php
inc/extensions-functions.php
inc/extensions/ext-doubler.php
inc/functions.php
inc/libs/admins_functions.php
inc/libs/doubler_functions.php
inc/libs/register_functions.php
inc/libs/sponsor_functions.php
inc/libs/user_functions.php
inc/mails/doubler_mails.php
inc/modules/admin.php
inc/modules/admin/admin-inc.php
inc/modules/admin/what-add_points.php
inc/modules/admin/what-add_rallye.php
inc/modules/admin/what-add_surfbar_url.php
inc/modules/admin/what-admin_add.php
inc/modules/admin/what-adminedit.php
inc/modules/admin/what-admins_add.php
inc/modules/admin/what-admins_contct.php
inc/modules/admin/what-admins_mails.php
inc/modules/admin/what-cache_stats.php
inc/modules/admin/what-chk_regs.php
inc/modules/admin/what-config_admins.php
inc/modules/admin/what-config_doubler.php
inc/modules/admin/what-config_mods.php
inc/modules/admin/what-config_payouts.php
inc/modules/admin/what-config_proxy.php
inc/modules/admin/what-config_rallye_prices.php
inc/modules/admin/what-config_session.php
inc/modules/admin/what-config_yoomedia.php
inc/modules/admin/what-del_email.php
inc/modules/admin/what-del_holiday.php
inc/modules/admin/what-del_sponsor.php
inc/modules/admin/what-del_transfer.php
inc/modules/admin/what-del_user.php
inc/modules/admin/what-edit_sponsor.php
inc/modules/admin/what-email_archiv.php
inc/modules/admin/what-email_details.php
inc/modules/admin/what-extensions.php
inc/modules/admin/what-guest_add.php
inc/modules/admin/what-guestedit.php
inc/modules/admin/what-list_autopurge.php
inc/modules/admin/what-list_bank_package.php
inc/modules/admin/what-list_beg.php
inc/modules/admin/what-list_bonus.php
inc/modules/admin/what-list_holiday.php
inc/modules/admin/what-list_links.php
inc/modules/admin/what-list_network_params.php
inc/modules/admin/what-list_networks.php
inc/modules/admin/what-list_notifications.php
inc/modules/admin/what-list_payouts.php
inc/modules/admin/what-list_primera.php
inc/modules/admin/what-list_rallyes.php
inc/modules/admin/what-list_refs.php
inc/modules/admin/what-list_sponsor.php
inc/modules/admin/what-list_sponsor_pay.php
inc/modules/admin/what-list_sponsor_pays.php
inc/modules/admin/what-list_surfbar_actions.php
inc/modules/admin/what-list_surfbar_urls.php
inc/modules/admin/what-list_transfer.php
inc/modules/admin/what-list_unconfirmed.php
inc/modules/admin/what-list_user.php
inc/modules/admin/what-list_wernis.php
inc/modules/admin/what-list_yoomedia_tm.php
inc/modules/admin/what-logs.php
inc/modules/admin/what-mem_add.php
inc/modules/admin/what-memedit.php
inc/modules/admin/what-overview.php
inc/modules/admin/what-send_newsletter.php
inc/modules/admin/what-sub_points.php
inc/modules/admin/what-surfbar_stats.php
inc/modules/admin/what-theme_edit.php
inc/modules/admin/what-theme_import.php
inc/modules/admin/what-unlock_emails.php
inc/modules/admin/what-unlock_sponsor.php
inc/modules/admin/what-unlock_surfbar_urls.php
inc/modules/admin/what-updates.php
inc/modules/admin/what-usage.php
inc/modules/admin/what-user_contct.php
inc/modules/admin/what-usr_online.php
inc/modules/guest/what-doubler.php
inc/modules/guest/what-register.php
inc/modules/guest/what-sponsor_infos.php
inc/modules/guest/what-sponsor_login.php
inc/modules/guest/what-sponsor_reg.php
inc/modules/guest/what-stats.php
inc/modules/member/what-categories.php
inc/modules/member/what-doubler.php
inc/modules/member/what-holiday.php
inc/modules/member/what-html_mail.php
inc/modules/member/what-mydata.php
inc/modules/member/what-order.php
inc/modules/member/what-payout.php
inc/modules/member/what-points.php
inc/modules/member/what-primera.php
inc/modules/member/what-refback.php
inc/modules/member/what-reflinks.php
inc/modules/member/what-reflist.php
inc/modules/member/what-stats.php
inc/modules/member/what-surfbar_book.php
inc/modules/member/what-surfbar_list.php
inc/modules/member/what-themes.php
inc/modules/member/what-transfer.php
inc/modules/member/what-unconfirmed.php
inc/modules/member/what-wernis.php
inc/modules/sponsor/account.php
inc/modules/sponsor/settings.php
inc/mysql-manager.php
mailid_top.php
templates/de/emails/admin/admin_sponsor_change_data.tpl
templates/de/emails/admin/admin_sponsor_change_email.tpl
templates/de/emails/admin/admin_sponsor_settings.tpl
templates/de/emails/sponsor/sponsor_change_data.tpl
templates/de/emails/sponsor/sponsor_change_email.tpl
templates/de/emails/sponsor/sponsor_settings.tpl
templates/de/html/admin/admin_cache_stats.tpl
templates/de/html/admin/admin_config_doubler.tpl
templates/de/html/admin/admin_edit_sponsor_edit.tpl
templates/de/html/admin/admin_list_bank_package_row.tpl
templates/de/html/admin/admin_unlock_sponsor_row.tpl
templates/de/html/admin/admin_user_details.tpl
templates/de/html/doubler/doubler_index.tpl
templates/de/html/guest/guest_doubler.tpl
templates/de/html/member/member_doubler.tpl
templates/de/html/member/member_points.tpl
templates/de/html/member/member_points_bonus_rows.tpl

index 237437f..c6424c7 100644 (file)
 ./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
 ./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'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
-./inc/modules/admin/what-list_cats.php:72:                             // @TODO Rewrite this to countSum.....() function
+./inc/modules/admin/what-list_cats.php:71:                             // @TODO Rewrite this to countSum.....() function
 ./inc/modules/admin/what-list_links.php:57:            // @TODO Try to rewrite this to a filter
 ./inc/modules/admin/what-list_links.php:89:                            // @TODO Find a way to rewrite this. See some lines above for different queries
 ./inc/modules/admin/what-list_links.php:98:                                    // @TODO Rewrite this to includes/filter
 ./inc/modules/admin/what-list_unconfirmed.php:100:             // @TODO Rewrite this to $content = SQL_FETCHARRAY(), look some lines above for two differrent queries
 ./inc/modules/admin/what-list_unconfirmed.php:77:      // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
 ./inc/modules/admin/what-list_unconfirmed.php:88:      // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
-./inc/modules/admin/what-list_user.php:157:            // @TODO Rewrite these to filters
-./inc/modules/admin/what-list_user.php:275:            // @TODO Rewrite this into a filter
-./inc/modules/admin/what-list_user.php:322:                    // @TODO Rewrite this into a filter
+./inc/modules/admin/what-list_user.php:156:            // @TODO Rewrite these to filters
+./inc/modules/admin/what-list_user.php:268:            // @TODO Rewrite this into a filter
+./inc/modules/admin/what-list_user.php:314:                    // @TODO Rewrite this into a filter
 ./inc/modules/admin/what-list_user.php:59:// @TODO Rewrite these if-blocks in a filter
 ./inc/modules/admin/what-logs.php:69:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-logs.php:72:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-payments.php:152:                     // @TODO Rewritings: title->mail_title, pay->payment in template
 ./inc/modules/admin/what-refbanner.php:145:                    // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template
 ./inc/modules/admin/what-unlock_emails.php: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')));
 ./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'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;admin=' . $content['admin_id'] . '%}">' . $content['login'] . '</a>';
-./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
index 7e3f9a2..f539083 100644 (file)
@@ -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);
 
index 06a2c16..8c52528 100644 (file)
@@ -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
index 3b43bb0..8181c9e 100644 (file)
@@ -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]
 ?>
index 3ce992e..7dfee36 100644 (file)
@@ -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!");
index dd8d99d..2b9a008 100644 (file)
@@ -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--}');
        }
 }
 
index 13690c1..71b43ae 100644 (file)
@@ -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]
 ?>
index 006be6f..4a58e23 100644 (file)
@@ -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;
index 180086f..ab62416 100644 (file)
@@ -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);
 
index 075f755..8d9d74d 100644 (file)
@@ -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);
index d2cca8e..a261234 100644 (file)
@@ -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;
index 593dec3..05deff7 100644 (file)
@@ -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;
 
index 14d8cbb..d2fc102 100644 (file)
@@ -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
index 5d31043..5c64717 100644 (file)
@@ -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']   = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
index 0cb4d2e..4ddb85b 100644 (file)
@@ -81,14 +81,14 @@ VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')",
                        redirectToUrl('modules.php?module=admin&amp;what=config_rallye_prices&amp;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--}');
        }
 }
 
index 2ee7b2d..2dede7b 100644 (file)
@@ -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
 
index f4155ec..ae6c292 100644 (file)
@@ -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]
index f8b06df..d41753b 100644 (file)
@@ -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--}');
        }
 }
 
index cc758a1..c1218df 100644 (file)
@@ -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());
index 833bf31..9203b25 100644 (file)
@@ -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]
index ec939a6..c3ad9a6 100644 (file)
@@ -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--}');
        }
 }
 
index ba73224..aafc8a7 100644 (file)
@@ -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]
index a21d404..55ccb05 100644 (file)
@@ -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
index 99d8f8a..f8b9eac 100644 (file)
@@ -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')));
index 8f375d5..1b3365b 100644 (file)
@@ -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'] = '';
index dee6e47..b4a0a3d 100644 (file)
@@ -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) {
index b3ce3c6..c0b4fc7 100644 (file)
@@ -243,7 +243,7 @@ if ((SQL_NUMROWS($result_mem) > 0) && ($display)) {
        loadTemplate('admin_settings_saved', false, '<a href="{%url=modules.php?module=admin&amp;what=list_payouts%}">{--ADMIN_PAYOUT_LIST_REQUESTS--}</a>');
 } 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
index 5566979..9488245 100644 (file)
@@ -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
index ce08c0b..617b034 100644 (file)
@@ -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--}');
        }
 }
 
index 40fefe0..19c11e3 100644 (file)
@@ -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
index c151303..e3fed6b 100644 (file)
@@ -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
index c5abb43..c2d870f 100644 (file)
@@ -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]
 ?>
index 4ce7616..19d0175 100644 (file)
@@ -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]
index a4b6ac2..c1c493d 100644 (file)
@@ -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]
index b4fc851..bd575c1 100644 (file)
@@ -95,7 +95,7 @@ if (SQL_NUMROWS($result) > 0) {
        // Nothing for in and out
        $OUT = '<tr>
   <td colspan="6" align="center" class="bottom">
-    ' . loadTemplate('admin_settings_saved', true, getMessage('TRANSFER_NO_INOUT_TRANSFERS')) . '
+    ' . loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_INOUT_TRANSFERS--}') . '
   </td>
 </tr>';
 }
index 17973ef..0bc3544 100644 (file)
@@ -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, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
index 1230f03..d6f091d 100644 (file)
@@ -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]
index 6dd6352..b4df32c 100644 (file)
@@ -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
index 9f0435a..14f7e44 100644 (file)
@@ -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]
index 1b26990..24f0716 100644 (file)
@@ -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
 
index 4ebead8..423415b 100644 (file)
@@ -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]
index 032a86e..6e80602 100644 (file)
@@ -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--}');
        }
 }
 
index 50b09a9..027187b 100644 (file)
@@ -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]
index 55c60fa..385b3c2 100644 (file)
@@ -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]
 ?>
index 7bf2f90..f7d401e 100644 (file)
@@ -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]
index 021a2e8..a2d500a 100644 (file)
@@ -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]
index 9845488..d23b431 100644 (file)
@@ -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]
index c74ec6c..b0c6944 100644 (file)
@@ -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;
index 461604c..a09cae1 100644 (file)
@@ -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
index fd99cc6..2d931e8 100644 (file)
@@ -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
index f10a81a..5509489 100644 (file)
@@ -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]
index bef2277..4f4d42c 100644 (file)
@@ -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--}');
        }
 }
 
index cb9969b..f7e1189 100644 (file)
@@ -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
index 7f6f64a..205d3c2 100644 (file)
@@ -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--}');
        }
 }
 
index a763a39..227f507 100644 (file)
@@ -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
index 7176644..9a82dde 100644 (file)
@@ -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--}');
        }
 }
 
index eb33c37..f0874d6 100644 (file)
@@ -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
index 7a9d713..c9d3dc3 100644 (file)
@@ -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]
 ?>
index 04f4526..60c3948 100644 (file)
@@ -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
index 248d360..8c7e949 100644 (file)
@@ -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
index 799d9ab..7413805 100644 (file)
@@ -74,7 +74,7 @@ if (SQL_NUMROWS($result) > 0) {
        // Nothing for in and out
        $OUT = '<tr>
   <td colspan="6" align="center" class="bottom">
-    ' . loadTemplate('admin_settings_saved', true, getMessage('TRANSFER_NO_INOUT_TRANSFERS')) . '
+    ' . loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_INOUT_TRANSFERS--}') . '
   </td>
 </tr>';
 }
index 679b5bc..920c3cd 100644 (file)
@@ -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
index ba6f073..5c8220c 100644 (file)
@@ -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
index 9ef5489..9d921bd 100644 (file)
@@ -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
index 925b7b0..617f412 100644 (file)
@@ -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
index 0b9c0f6..829bc83 100644 (file)
@@ -109,7 +109,7 @@ if (isGetRequestParameterSet('access')) {
                outputHtml('</ol>');
        } 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--}');
        }
 }
 
index 14bde5e..57ee922 100644 (file)
@@ -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]
 ?>
index 3194832..53a971a 100644 (file)
@@ -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--}');
        }
 }
 
index 54c22b1..d532a27 100644 (file)
@@ -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)
index 22c3685..5458ff6 100644 (file)
@@ -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
index 651bd11..48e9190 100644 (file)
@@ -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']   = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>';
index 2717543..ced00fe 100644 (file)
@@ -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--}');
        }
 }
 
index cab6254..a870ab7 100644 (file)
@@ -150,7 +150,7 @@ if (SQL_NUMROWS($result) > 0) {
        // No themes found???
        $OUT .= '<tr>
   <td colspan="7" class="bottom" height="60">
-    ' . loadTemplate('admin_settings_saved', true, getMessage('ADMIN_NO_THEMES_FOUND')) . '
+    ' . loadTemplate('admin_settings_saved', true, '{--ADMIN_NO_THEMES_FOUND--}') . '
   </td>
 </tr>';
 }
index 3a1c48d..41493b2 100644 (file)
@@ -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
index 947f16f..83eb8c0 100644 (file)
@@ -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]
index 94d6061..e8676e5 100644 (file)
@@ -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
index f902b37..83c6ad2 100644 (file)
@@ -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
index 580c57b..0219bab 100644 (file)
@@ -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]
index 069171d..0af9eee 100644 (file)
@@ -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]
index 74551c3..95525b0 100644 (file)
@@ -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);
index 3a1043a..e0c4136 100644 (file)
@@ -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]
index 01b6209..8457a98 100644 (file)
@@ -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);
 
index 7bd3c02..d38988e 100644 (file)
@@ -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()) {
index 28019f4..a60c582 100644 (file)
@@ -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
index a9e1c85..1952a4c 100644 (file)
@@ -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');
index 3556a94..bdfea22 100644 (file)
@@ -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 .= '<ol>';
                                foreach ($FORM_ERRORS as $error) {
                                        $OUT .= '<li>' . $error . '</li>';
@@ -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
index a516508..f605c8f 100644 (file)
@@ -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
 
index 86263f0..cb0453d 100644 (file)
@@ -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]
 ?>
index ba674f5..520853d 100644 (file)
@@ -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);
 
index 209ad00..bfcffff 100644 (file)
@@ -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
 
index 2b58327..3b9cb6f 100644 (file)
@@ -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'] = '';
index 28a0f11..ab440d2 100644 (file)
@@ -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;
index 83d8724..77b8206 100644 (file)
@@ -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&amp;what=order&amp;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);
index a73ae1a..dadbf5b 100644 (file)
@@ -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
index 38065ed..6932b6e 100644 (file)
@@ -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]
index b8f8557..794689b 100644 (file)
@@ -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
index fcfa29a..28d898f 100644 (file)
@@ -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
index d31f735..211272e 100644 (file)
@@ -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
index 5875286..7797639 100644 (file)
@@ -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
index fb156eb..75a93fa 100644 (file)
@@ -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
index 1fb968b..1c57183 100644 (file)
@@ -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')))) {
index 562ea10..14a3ed9 100644 (file)
@@ -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]
index 4995716..e298d87 100644 (file)
@@ -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 = "<tr>
   <td colspan=\"5\" class=\"bottom\" height=\"80\">
-    ".loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_THEMES_FOUND'))."
+    ".loadTemplate('admin_settings_saved', true, '{--MEMBER_NO_THEMES_FOUND--}')."
   </td>
 </tr>\n";
 } // END - if
index ddc7586..7741e57 100644 (file)
@@ -172,7 +172,7 @@ switch ($mode) {
                                sendAdminNotification($adminSubject, 'admin_transfer_points', $content);
 
                                // Transfer is completed
-                               loadTemplate('admin_settings_saved', false, getMessage('TRANSFER_COMPLETED') . "<br /><a href=\"{%url=modules.php?module=login&amp;what=transfer%}\">{--TRANSFER_CONTINUE_OVERVIEW--}</a>");
+                               loadTemplate('admin_settings_saved', false, '{--TRANSFER_COMPLETED--}' . '<br /><a href="{%url=modules.php?module=login&amp;what=transfer%}">{--TRANSFER_CONTINUE_OVERVIEW--}</a>');
                        } elseif ($valid_code === false) {
                                // Invalid Touring code!
                                loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_CODE--}</div>');
@@ -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'] = '<input type="hidden" name="code_chk" value="' . $rand . '" /><input type="text" name="code" class="member_normal" size="5" maxlength="7"' . $content['to_disabled'] . ' />&nbsp;' . $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 = "<tr>
-  <td colspan=\"5\" align=\"center\" class=\"bottom\">
-    ".loadTemplate('admin_settings_saved', true, getMessage('TRANSFER_NO_INOUT_TRANSFERS'))."
+                       $OUT = '<tr>
+  <td colspan="5" align="center" class="bottom">
+    ' . loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_INOUT_TRANSFERS--}') . '
   </td>
-</tr>";
+</tr>';
                }
 
                // ... and add them to a constant for the template
index 12ecfd5..4cc86f5 100644 (file)
@@ -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]
index e99858c..4729c81 100644 (file)
@@ -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
index ea1bb7c..62d18a2 100644 (file)
@@ -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
index f49a345..6c06b08 100644 (file)
@@ -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
index 499002b..ebb750b 100644 (file)
@@ -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?
index 0ea9125..e9afe99 100644 (file)
@@ -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
index b60c9a2..e4cdbba 100644 (file)
@@ -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])
index a66f575..351b955 100644 (file)
@@ -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])
index 156230a..29fd3f5 100644 (file)
@@ -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]%})
 ------------------------------
 
 ------------------------------
index 10711c5..9442472 100644 (file)
@@ -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.
index db44147..13b9333 100644 (file)
@@ -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&ouml;nnen es nun mit dem folgenden Link wieder freigeben:
 
index 8bab2cf..a0ec011 100644 (file)
@@ -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.
index fcdcbd9..dd87abf 100644 (file)
@@ -9,25 +9,31 @@
        <tr>
                <td width="320" class="bottom right" align="right">{--ADMIN_CACHE_DB_HITS--}</td>
                <td width="100" class="bottom" style="padding-right: 2px" align="right">
-                       $content[db_hits]
+                       {%pipe,translateComma=$content[db_hits]%}
                </td>
        </tr>
        <tr>
                <td width="320" class="bottom right" align="right">{--ADMIN_CACHE_HITS--}</td>
                <td width="100" class="bottom" style="padding-right: 2px" align="right">
-                       +$content[cache_hits]
+                       +{%pipe,translateComma=$content[cache_hits]%}
                </td>
        </tr>
        <tr>
                <td width="320" class="bottom right" align="right">{--ADMIN_TOTAL_HITS--}</td>
                <td width="100" class="bottom" style="padding-right: 2px" align="right">
-                       =$content[total_hits]
+                       ={%pipe,translateComma=$content[total_hits]%}
                </td>
        </tr>
        <tr>
-               <td width="320" class="admin_footer right" align="right"><strong>{--ADMIN_CACHE_PERCENTS--}</strong></td>
-               <td width="100" class="admin_footer" style="padding-right: 2px" align="center">
-                       <strong>$content[cache_perc]%</strong>
+               <td width="320" class="admin_footer right">
+                       <div align="right" style="padding-right: 2px">
+                               <strong>{--ADMIN_CACHE_PERCENTS--}</strong>
+                       </div>
+               </td>
+               <td width="100" class="admin_footer">
+                       <div align="right" style="padding-right: 2px">
+                               <strong>{%pipe,translateComma=$content[cache_perc]%}%</strong>
+                       </div>
                </td>
        </tr>
 </table>
index 8e508f4..a2df11f 100644 (file)
@@ -11,7 +11,7 @@
                        {--ADMIN_DOUBLER_CHARGE--}:
                </td>
                <td width="195" style="padding-left: 5px">
-                       <input type="text" name="doubler_charge" class="admin_normal" size="5" maxlength="10" value="$content[charge]" /> (%)
+                       <input type="text" name="doubler_charge" class="admin_normal" size="5" maxlength="10" value="{%config,translateComma=doubler_charge%}" /> (%)
                </td>
        </tr>
        <tr>
@@ -19,7 +19,7 @@
                        {--ADMIN_DOUBLER_REFERAL--}:
                </td>
                <td width="195" style="padding-left: 5px">
-                       <input type="text" name="doubler_ref" class="admin_normal" size="5" maxlength="10" value="$content[referal]" /> (%)
+                       <input type="text" name="doubler_ref" class="admin_normal" size="5" maxlength="10" value="{%config,translateComma=doubler_ref%}" /> (%)
                </td>
        </tr>
        <tr>
@@ -27,7 +27,7 @@
                        {--ADMIN_DOUBLER_MINIMUM--}:
                </td>
                <td width="195" style="padding-left: 5px">
-                       <input type="text" name="doubler_min" class="admin_normal" size="9" maxlength="20" value="$content[minimum]" /> ({?POINTS?})
+                       <input type="text" name="doubler_min" class="admin_normal" size="9" maxlength="20" value="{%config,translateComma=doubler_min%}" /> ({?POINTS?})
                </td>
        </tr>
        <tr>
@@ -35,7 +35,7 @@
                        {--ADMIN_DOUBLER_MAXIMUM--}:
                </td>
                <td width="195" style="padding-left: 5px">
-                       <input type="text" name="doubler_max" class="admin_normal" size="9" maxlength="20" value="$content[maximum]" /> ({?POINTS?})
+                       <input type="text" name="doubler_max" class="admin_normal" size="9" maxlength="20" value="{%config,translateComma=doubler_max%}" /> ({?POINTS?})
                </td>
        </tr>
        <tr>
@@ -43,7 +43,7 @@
                        {--ADMIN_DOUBLER_LEFT--}:
                </td>
                <td width="195" style="padding-left: 5px">
-                       <input type="text" name="doubler_left" class="admin_normal" size="9" maxlength="20" value="$content[left]"> ({?POINTS?})
+                       <input type="text" name="doubler_left" class="admin_normal" size="9" maxlength="20" value="{%config,translateComma=doubler_left%}"> ({?POINTS?})
                </td>
        </tr>
        <tr>
index 6a1eb6d..528fab3 100644 (file)
     {--SPONSOR_WARNING_INTERVAL--}:&nbsp;
   </td>
   <td class="bottom">
-    $content[interval]
+    $content[warning_interval]
   </td>
 </tr>
 <tr>
index b9f1353..dbe4b2d 100644 (file)
                $content[description]
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[fee] {?POINTS?}
+               {%pipe,translateComma=$content[account_fee]%} {?POINTS?}
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[plus]%
+               {%pipe,translateComma=$content[interest_plus]%}%
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[minus]%
+               {%pipe,translateComma=$content[interest_minus]%}%
        </td>
        <td align="center" class="switch_sw$content[sw] bottom">
-               $content[active]
+               {%pipe,translateComma=$content[package_active]%}
        </td>
 </tr>
index da9d621..f48afec 100644 (file)
@@ -3,12 +3,12 @@
                <input type="checkbox" title="{--ID_SELECT--} $content[id]" name="id[$content[id]]" class="admin_normal" value="1" />
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               <a href="$content[email]">$content[gender] $content[surname] $content[family]</a>
+               <a href="$content[email]">{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]</a>
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[remote]
+               $content[remote_addr]
        </td>
        <td align="center" class="switch_sw$content[sw] bottom">
-               $content[created]
+               $content[sponsor_created]
        </td>
 </tr>
index d8012e8..0e0b429 100644 (file)
                </td>
                <td align="center" class="top right">
                        {--TOTAL_POINTS--}:<br />
-                       <strong>$content[total]</strong>
+                       <strong>{%pipe,translateComma=$content[total]%}</strong>
                </td>
                <td align="center" class="top right">
                        {--TOTAL_REFERALS--}:<br />
                </td>
                <td align="center" class="top right">
                        {--LOCKED_POINTS--}:<br />
-                       <strong>$content[locked]</strong>
+                       <strong>{%pipe,translateComma=$content[locked]%}</strong>
                </td>
                <td align="center" class="top right">
                        {--LAST_UPDATE--}:<br />
                </td>
                <td align="center" class="top right">
                        {--CLICK_RATE--}:<br />
-                       <strong>$content[click_rate]%</strong>
+                       <strong>{%pipe,translateComma=$content[click_rate]%}%</strong>
                </td>
                <td align="center" class="top">
                        {--EMAILS_RECEIVED--}:<br />
                </td>
                <td align="center" class="top right">
                        {--RAND_CONFIRMED--}:<br />
-                       <strong>$content[rand_confirmed]</strong>
+                       <strong>{%pipe,translateComma=$content[rand_confirmed]%}</strong>
                </td>
                <td align="center" class="top right">
-                       {--_UNUSED--}:<br />
-                       <strong>---</strong>
+                       {--LOCK_TIMESTAMP--}:<br />
+                       <strong>$content[lock_timestamp]</strong>
                </td>
                <td align="center" class="top">
                        {--LOCK_REASON--}:<br />
                        <strong>$content[lock_reason]</strong>
                </td>
        </tr>
+       <!--
        <tr>
                <td align="center" class="top right">
-                       {--LOCK_TIMESTAMP--}:<br />
-                       <strong>$content[lock_timestamp]</strong>
+                       {--_UNUSED--}:<br />
+                       <strong>---</strong>
                </td>
                <td align="center" class="top right">
                        {--_UNUSED--}:<br />
                        <strong>---</strong>
                </td>
        </tr>
+       //-->
        <tr>
                <td align="center" class="admin_footer top" colspan="4">
                        <div>
index 3a2eed4..a5e63c0 100644 (file)
                </table>
                </form>
                <br />
-               {%message,DOUBLER_ALREADY_PAYED=$content[total]%}<br />
-               {--DOUBLER_POINTS_LEFT_1--} <strong>$content[left] {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}<br />
-               {--DOUBLER_USAGE_COUNTER_1--} <strong>{?doubler_counter?}</strong> {--DOUBLER_USAGE_COUNTER_2--}<br />
+               {%message,DOUBLER_ALREADY_PAYED={%config,translateComma=doubler_points%}%}<br />
+               {--DOUBLER_POINTS_LEFT_1--} <strong>{%pipe,getDoublerTotalPointsLeft,translateComma%} {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}<br />
+               {--DOUBLER_USAGE_COUNTER_1--} <strong>{%config,translateComma=doubler_counter%}</strong> {--DOUBLER_USAGE_COUNTER_2--}<br />
                <br />
-               {--DOUBLER_MINIMUM_IS--} <strong>$content[min] {?POINTS?}</strong>
-               {--DOUBLER_MAXIMUM_IS--} <strong>$content[max] {?POINTS?}</strong><br />
+               {--DOUBLER_MINIMUM_IS--} <strong>{%config,translateComma=doubler_min%} {?POINTS?}</strong>
+               {--DOUBLER_MAXIMUM_IS--} <strong>{%config,translateComma=doubler_max%} {?POINTS?}</strong><br />
                {--DOUBLER_HAVE_FUN--}<br />
                <br />
                $content[payout_time]<br />
                <br />
-               {--DOUBLER_POINTS_1--} <strong>$content[charge]%</strong>
+               {--DOUBLER_POINTS_1--} <strong>{%config,translateComma=doubler_charge%}%</strong>
                {--DOUBLER_POINTS_2--}<br />
                <br />
                {--DOUBLER_EXAMPLE_1--} <strong>500 {?POINTS?}</strong> &raquo;&raquo;
@@ -69,7 +69,7 @@
                <br />
                <div class="big">{--DOUBLER_FULL_PAYOUT--}</div><br />
                <br />
-               {--DOUBLER_REFERAL_1--} <strong>$content[ref]%</strong>
+               {--DOUBLER_REFERAL_1--} <strong>{%config,translateComma=doubler_ref%}%</strong>
                {--DOUBLER_REFERAL_2--} {--DOUBLER_REFERAL_3--}
                {--DOUBLER_REFERAL_4--} {--DOUBLER_REFERAL_5--} <strong>100
                {?POINTS?}</strong> {--DOUBLER_REFERAL_6--} <strong>100 {?POINTS?}</strong>
index ffc804d..de737c5 100644 (file)
@@ -8,18 +8,18 @@
        <tr>
                <td class="doubler_main bottom" style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
                        <ul>
-                       <li>{--DOUBLER_MINIMUM_IS--} <strong>$content[min] {?POINTS?}</strong> {--DOUBLER_MAXIMUM_IS--} <strong>$content[max] {?POINTS?}</strong></li>
-                       <li>{%message,DOUBLER_ALREADY_PAYED=$content[total]%}</li>
-                       <li>{--DOUBLER_POINTS_LEFT_1--} <strong>$content[left] {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}</li>
-                       <li>{--DOUBLER_USAGE_COUNTER_1--} <strong>{?doubler_counter?}</strong> {--DOUBLER_USAGE_COUNTER_2--}</li>
+                       <li>{--DOUBLER_MINIMUM_IS--} <strong>{%config,translateComma=doubler_min%} {?POINTS?}</strong> {--DOUBLER_MAXIMUM_IS--} <strong>{%config,translateComma=doubler_max%} {?POINTS?}</strong></li>
+                       <li>{%message,DOUBLER_ALREADY_PAYED={%config,translateComma=doubler_points%}%}</li>
+                       <li>{--DOUBLER_POINTS_LEFT_1--} <strong>{%pipe,getDoublerTotalPointsLeft,translateComma%} {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}</li>
+                       <li>{--DOUBLER_USAGE_COUNTER_1--} <strong>{%config,translateComma=doubler_counter%}</strong> {--DOUBLER_USAGE_COUNTER_2--}</li>
                        <li>$content[payout_time]</li>
                        <li><strong>{--DOUBLER_FULL_PAYOUT--}</strong></li>
-                       <li>{--DOUBLER_POINTS_1--} <strong>$content[charge]%</strong> {--DOUBLER_POINTS_2--}</li>
+                       <li>{--DOUBLER_POINTS_1--} <strong>{%config,translateComma=doubler_charge%}%</strong> {--DOUBLER_POINTS_2--}</li>
                        <li>{--DOUBLER_EXAMPLE_1--} <strong>500 {?POINTS?}</strong> &raquo;&raquo; {--DOUBLER_EXAMPLE_2--} <strong>1000 {?POINTS?}</strong>{--DOUBLER_EXAMPLE_3--}</li>
-                       <li>{--DOUBLER_REFERAL_1--} <strong>$content[ref]%</strong> {--DOUBLER_REFERAL_2--} {--DOUBLER_REFERAL_3--} {--DOUBLER_REFERAL_4--}
+                       <li>{--DOUBLER_REFERAL_1--} <strong>{%config,translateComma=doubler_ref%}]%</strong> {--DOUBLER_REFERAL_2--} {--DOUBLER_REFERAL_3--} {--DOUBLER_REFERAL_4--}
                        <li>{--DOUBLER_REFERAL_5--} <strong>100 {?POINTS?}</strong> {--DOUBLER_REFERAL_6--} <strong>100 {?POINTS?}</strong> {--DOUBLER_REFERAL_8--} <strong>300 {?POINTS?}</strong> {--DOUBLER_REFERAL_8--}</li>
                        <li>{--DOUBLER_REFERAL_LINK--}</li>
-                       <li>{--DOUBLER_TIMEOUT_1--} <strong>$content[timeout_mark]</strong> {--DOUBLER_TIMEOUT_2--}</li>
+                       <li>{--DOUBLER_TIMEOUT_1--} <strong>{%config,createFancyTime=doubler_timeout%}</strong> {--DOUBLER_TIMEOUT_2--}</li>
                        <li>{--DOUBLER_HAVE_FUN--}</li>
                        <li><strong><a href="{?URL?}/doubler.php">{--DOUBLER_WANNA_TRY--}</a></strong></li>
                        </ul>
@@ -32,8 +32,8 @@
        <tr>
                <td class="doubler_main" style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
                        <ul>
-                       <li>{--DOUBLER_NOT_YET_REGISTERED--} <a href="{?URL?}/ref.php?refid=$content[refid]">{--DOUBLER_REGISTER_NOW--}</a></li>
-                       <li>{--DOUBLER_YOUR_ADVERTISING_HERE--} <a href="{%url=modules.php?module=index&amp;what=impressum&amp;refid=$content[refid]%}">{--DOUBLER_CONTACT_US--}</a></li>
+                       <li>{--DOUBLER_NOT_YET_REGISTERED--} <a href="{?URL?}/ref.php?refid={%pipe,determineReferalId%}">{--DOUBLER_REGISTER_NOW--}</a></li>
+                       <li>{--DOUBLER_YOUR_ADVERTISING_HERE--} <a href="{%url=modules.php?module=index&amp;what=impressum&amp;refid={%pipe,determineReferalId%}%}">{--DOUBLER_CONTACT_US--}</a></li>
                        </ul>
                </td>
        </tr>
@@ -48,5 +48,5 @@
 <div class="big">
        {--DOUBLER_NEXT_PAYOUT--}:</div>
        <br />
-       $content[next_table]
+       {%pipe,generateDoublerTable%}
 </div>
index 6ec5e36..b026836 100644 (file)
@@ -4,18 +4,18 @@
        </div>
 
        <div>
-               <strong><a target="_blank" title="Benutzen Sie diesen Link zum Verdoppeln!" href="{?URL?}/doubler.php?refid=$content[userid]%}">{?URL?}/doubler.php?refid=$content[userid]</a></strong>
+               <strong><a target="_blank" title="Benutzen Sie diesen Link zum Verdoppeln!" href="{?URL?}/doubler.php?refid={%pipe,getMemberId%}%}">{?URL?}/doubler.php?refid={%pipe,getMemberId%}</a></strong>
        </div>
 
        <div>
-               <strong>Tipp:</strong> Nutzen Sie diesen zum Werben unseres {?mt_word2?}, um die <strong>$content[ref]%</strong> Referal-Verg&uuml;tung zu erhalten!
+               <strong>Tipp:</strong> Nutzen Sie diesen zum Werben unseres {?mt_word2?}, um die <strong>{%config,translateComma=doubler_ref%}%</strong> Referal-Verg&uuml;tung zu erhalten!
        </div>
 
        <div class="big">{--DOUBLER_MEMBER_ALREADY_PAYOUT--}:</div>
        $content[payout_history]
 
        <div class="big">{--DOUBLER_MEMBER_NEXT_PAYOUT--}:</div>
-       $content[next_table]
+       {%pipe,getMemberId,generateDoublerTable%}
 
        <div class="big">{--DOUBLER_MEMBER_REF_PAYOUT--}:</div>
        $content[payout_ref]
                <ul>
                        <li>{--DOUBLER_MINIMUM_IS--} <strong>{%config,translateComma=doubler_min%} {?POINTS?}</strong> {--DOUBLER_MAXIMUM_IS--} <strong>{%config,translateComma=doubler_max%} {?POINTS?}</strong></li>
                        <li>{%message,MEMBER_DOUBLER_ALREADY_PAYED%}</li>
-                       <li>{--DOUBLER_POINTS_LEFT_1--} <strong>$content[left] {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}</li>
-                       <li>{--DOUBLER_USAGE_COUNTER_1--} <strong>{?doubler_counter?}</strong> {--DOUBLER_USAGE_COUNTER_2--}</li>
+                       <li>{--DOUBLER_POINTS_LEFT_1--} <strong>{%pipe,getDoublerTotalPointsLeft,translateComma%} {?POINTS?}</strong> {--DOUBLER_POINTS_LEFT_2--}</li>
+                       <li>{--DOUBLER_USAGE_COUNTER_1--} <strong>{%config,translateComma=doubler_counter%}</strong> {--DOUBLER_USAGE_COUNTER_2--}</li>
                        <li>$content[payout_time]</li>
                        <li><strong>{--DOUBLER_FULL_PAYOUT--}</strong></li>
-                       <li>{--DOUBLER_POINTS_1--} <strong>$content[charge]%</strong> {--DOUBLER_POINTS_2--}</li>
+                       <li>{--DOUBLER_POINTS_1--} <strong>{%config,translateComma=doubler_charge%}%</strong> {--DOUBLER_POINTS_2--}</li>
                        <li>{--DOUBLER_EXAMPLE_1--} <strong>500 {?POINTS?}</strong> &raquo;&raquo; {--DOUBLER_EXAMPLE_2--} <strong>1000 {?POINTS?}</strong>{--DOUBLER_EXAMPLE_3--}</li>
-                       <li>{--DOUBLER_REFERAL_1--} <strong>$content[ref]%</strong> {--DOUBLER_REFERAL_2--} {--DOUBLER_REFERAL_3--} {--DOUBLER_REFERAL_4--}</li>
+                       <li>{--DOUBLER_REFERAL_1--} <strong>{%config,translateComma=doubler_ref%}%</strong> {--DOUBLER_REFERAL_2--} {--DOUBLER_REFERAL_3--} {--DOUBLER_REFERAL_4--}</li>
                        <li>{--DOUBLER_REFERAL_5--} <strong>100 {?POINTS?}</strong> {--DOUBLER_REFERAL_6--} <strong>100 {?POINTS?}</strong> {--DOUBLER_REFERAL_8--} <strong>300 {?POINTS?}</strong> {--DOUBLER_REFERAL_8--}</li>
                        <li>{--DOUBLER_REFERAL_LINK--}</li>
-                       <li>{--DOUBLER_TIMEOUT_1--} <strong>$content[timeout_mark]</strong> {--DOUBLER_TIMEOUT_2--}</li>
+                       <li>{--DOUBLER_TIMEOUT_1--} <strong>{%config,createFancyTime=doubler_timeout%}</strong> {--DOUBLER_TIMEOUT_2--}</li>
                        <li>{--DOUBLER_HAVE_FUN--}</li>
                </ul>
        </div>
index eb4cf30..4981de3 100644 (file)
@@ -9,18 +9,18 @@
        <tr>
                <td class="member_data bottom">{--POINTS_USED--}</td>
                <td class="member_data bottom">{%user,used_points,translateComma%} {?POINTS?}</td>
-               <td class="member_data bottom"></td>
+               <td class="member_data bottom">&nbsp;</td>
        </tr>
        <tr>
                <td class="member_data bottom"><strong>{--POINTS_SUM--}</strong></td>
                <td class="member_data bottom">
-                       <strong>{%pipe,translateComma=$content[sum]%} {?POINTS?}</strong>
+                       <strong>{%pipe,translateComma=$content[total_points]%} {?POINTS?}</strong>
                </td>
-               <td class="member_data bottom" align="center"><strong>{%pipe,translateComma=$content[tref]%}</strong></td>
+               <td class="member_data bottom" align="center"><strong>{%pipe,translateComma=$content[total_referals]%}</strong></td>
        </tr>
        <tr>
                <td class="member_data">{--POINTS_LOCKED--}</td>
-               <td class="member_data">{%pipe,translateComma=$content[tlock]%} {?POINTS?}</td>
+               <td class="member_data">{%pipe,translateComma=$content[total_locked]%} {?POINTS?}</td>
                <td class="member_data">-</td>
        </tr>
        $content[special_rows]
index 7f13874..a50c5c9 100644 (file)
@@ -35,6 +35,6 @@
 </tr>
 <tr>
        <td class="member_data"><strong>{--BONUS_TOTAL--}</strong></td>
-       <td class="member_data"><strong>{%pipe,translateComma=$content[ttotal]%} {?POINTS?}</strong></td>
+       <td class="member_data"><strong>{%pipe,translateComma=$content[total]%} {?POINTS?}</strong></td>
        <td class="member_data">-</td>
 </tr>