Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

- Deprecated variables $nick and $email removed from loadEmailTemplate()
- More rewrites for usage of EL
- getMessage() lesser used (saves a lot calls while execution of include file)
- Some internal TODOs closed
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 237437fde3d7855c364ff2798070af30c3c9d36d..c6424c7d1706b27b9186b31642310a8c7c71e5b0 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -41,22 +41,22 @@
 ./inc/extensions-functions.php:143:    // @TODO Do we still need this? setExtensionUpdateNotes('');
 ./inc/extensions-functions.php:422:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 ./inc/extensions-functions.php:538:            // @TODO Extension is loaded, what next?
 ./inc/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: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/install-functions.php:63:        // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
 ./inc/language/de.php:1143:// @TODO Rewrite these two constants
 ./inc/language/de.php:1158:// @TODO Rewrite these three constants


@@ -119,22 +119,23 @@
 ./inc/modules/admin/what-config_admins.php:146:        // @TODO Rewrite this to filter 'run_sqls'
 ./inc/modules/admin/what-config_mods.php:57:                   // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function
 ./inc/modules/admin/what-config_points.php:113:                        // @TODO Rewrite this to a filter
 ./inc/modules/admin/what-config_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-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-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: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_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


@@ -146,9 +147,9 @@
 ./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_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-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


@@ -158,7 +159,6 @@
 ./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-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/admin/what-usage.php:88: // @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php
 ./inc/modules/admin/what-usr_online.php:51:    // @TODO Add a filter for sponsor
 ./inc/modules/guest/what-beg.php:60:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));


@@ -175,13 +175,12 @@
 ./inc/modules/member/what-beg.php:65:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
 ./inc/modules/member/what-bonus.php:57:        // @TODO Rewrite this to a filter
 ./inc/modules/member/what-categories.php:129:          // @TODO Rewrite this to use $OUT .= ...
 ./inc/modules/member/what-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-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
 ./inc/modules/member/what-reflinks.php:54:// @TODO Move this into a filter
 ./inc/modules/member/what-transfer.php:132:                            // @TODO Rewrite this to a filter
 ./inc/modules/member/what-transfer.php:222:                            // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries

diff --git a/doubler.php b/doubler.php
index 7e3f9a27e7bf235f2e41ab97aee50c530cf2731a..f53908359aed0d12042f3c2785818fd2c7d0e691 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -80,7 +80,7 @@ if (isFormSent()) {
                // Is the data valid?
                if (!isUserDataValid()) {
                        // Output message that the userid is not okay
                // 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
                } // 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
                        $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')",
                                // 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
                                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);
 
                                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(),
                                        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. ^^^
                                                ), __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();
 }
 
        $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
 // 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 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);
 
 // Output neccessary form for this
 loadTemplate('doubler_index', false, $content);
 

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 06a2c16f5696b999b8b4c69ab4e09a838fb3369a..8c52528550e4827bd31686598f57580e6a16d1f7 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -772,7 +772,7 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false
                $OUT = loadTemplate('admin_ext_sql_table', true, $content);
        } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.0.7')) && (getConfig('verbose_sql') == 'Y')) {
                // No addional SQL commands to run
                $OUT = loadTemplate('admin_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
        } // END - if
 
        // Return output

diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php
index 3b43bb01d35fa6e4decba42a01c594f80d703a97..8181c9e06fa060ce051b8f0aa73710ce5f46293c 100644 (file)
--- a/inc/extensions/ext-doubler.php
+++ b/inc/extensions/ext-doubler.php
@@ -43,10 +43,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
 } // END - if
 
 // Version number

-setThisExtensionVersion('0.1.6');
+setThisExtensionVersion('0.1.7');

 
 // Version history array (add more with , '0.1.0' and so on)
 
 // 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)
 
 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)
                // --> 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
                // 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
                // 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
                // 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
                // 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
                // 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 ---
 
                //
                // --- 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;
                                        // 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
                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;
        default: // Unknown extension mode
                logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
                break;

-}
+} // END - switch

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/functions.php b/inc/functions.php
index 3ce992eb42afe71452a779c07c9c123b0c24e503..7dfee36d0ba653e7cd9aeeef957d0f33faafcaf1 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -432,12 +432,6 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
        // Make sure all template names are lowercase!
        $template = strtolower($template);
 
        // 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
        // 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
                );
 
                // 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!
        } 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!");
        } else {
                // Debug log
                logDebugMessage(__FUNCTION__, __LINE__, "cat={$data['cat']},receiver={$data['receiver']},data=".base64_encode(serialize($data))." More selected, than available!");

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index dd8d99dcbfe8d60433c37edf015087c011192dee..2b9a008104a0f62eba50c5211716320e03192b45 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -365,7 +365,7 @@ function adminsDeleteAdminAccount ($postData) {
                loadTemplate('admin_del_admins', false, $OUT);
        } else {
                // Cannot delete last account!
                loadTemplate('admin_del_admins', false, $OUT);
        } else {
                // Cannot delete last account!

-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ADMINS_CANNOT_DELETE_LAST'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_ADMINS_CANNOT_DELETE_LAST--}');

        }
 }
 
        }
 }
 

diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index 13690c1b0391921307f129612045c9bf85d6321d..71b43ae3db8eccad1009d88a560df70e6279e856 100644 (file)
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -127,8 +127,8 @@ LIMIT %s",
        return loadTemplate($mode . '_doubler_list', true, $OUT);
 }
 
        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';
 
        // Initialize variables
        $points = '0';
 


@@ -153,5 +153,6 @@ function DOUBLER_GET_TOTAL_POINTS_LEFT() {
        // Return value
        return $points;
 }
        // Return value
        return $points;
 }

-//
+
+// [EOF]

 ?>
 ?>

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 006be6f123dd9f9dd086cda7d42c548034493d03..4a58e2355b21a832067877688e0f2d1ec649f4e6 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -118,7 +118,7 @@ function registerGenerateCategoryTable ($mode, $return=false) {
                SQL_FREERESULT($result);
        } else {
                // No categories setted up so far...
                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) {
        }
 
        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!
        // 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;
 
                // Stop here
                return;

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 180086fc8c1832db9df087f895bf9978418c30a6..ab624167ce67035524659c24018e6d2008b3c699 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -317,7 +317,7 @@ ORDER BY `sort`",
                                $OUT .= loadTemplate('sponsor_action', true, $content);
                        } else {
                                // No sub menus active
                                $OUT .= loadTemplate('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
                        }
 
                        // Free memory


@@ -325,7 +325,7 @@ ORDER BY `sort`",
                }
        } else {
                // No main menus active
                }
        } 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
        }
 
        // Free memory


@@ -442,31 +442,28 @@ function saveSponsorData ($postData, $content) {
        switch (getWhat()) {
                case 'account': // Change account data
                        if ($EMAIL === true) {
        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 {
                        } 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
                        }
                        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
                        // 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());
                        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
 
                        break;
        } // END - switch
 


@@ -480,12 +477,6 @@ function saveSponsorData ($postData, $content) {
                        // Add all data to content
                        $content['new_data'] = $postData;
 
                        // 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);
 
                        // Send email to admins
                        sendAdminNotification($subj, $templ, $content);
 

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 075f755ea7d73a5f2ea4146180d0a464ec5fb8c7..8d9d74d72fef61c4537ca1a68923a9eb7ab81cc7 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -456,7 +456,7 @@ function doNewUserPassword ($email, $userid) {
                        sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message);
 
                        // Output note to user
                        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);
                } else {
                        // Account is locked or unconfirmed
                        $errorCode = generateErrorCodeFromUserStatus($status);

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index d2cca8e044ac7c38d65a225140fdade5d8944307..a26123480ed695eff3aed8643817a87948e9441f 100644 (file)
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -52,7 +52,7 @@ $jackpotPoints = '0'; $userPoints = '0';
 if (isExtensionActive('jackpot')) $jackpotPoints = getJackpotPoints();
 
 // Get total points of the doubler itself
 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;
 if ($DOUBLER_POINTS == '0') {
        // Exit here to prevent some SQL errors (SQL_QUERY_ESC doen't insert zeros! We need to fix this...)
        return;

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 593dec32bc2a525bb0e1c42b0d6165c9efd47128..05deff7ed5b7ecef3c7aff7161a69803b0db362e 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -160,7 +160,7 @@ if (!isAdminRegistered()) {
                } // END - if
 
                // Output message in seperate template
                } // 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);
 
                // 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_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
                }
        } 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_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
                }
        } else {
                // Output reset password form


@@ -213,7 +213,7 @@ if (!isAdminRegistered()) {
 
        if (isGetRequestParameterSet('register')) {
                // Registration of first admin is done
 
        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
        } // END - if
 
        // Check if the admin has submitted data or not


@@ -395,7 +395,7 @@ if (!isAdminRegistered()) {
 
                case 'pass': // Wrong password
                        setPostRequestParameter('ok', $ret);
 
                case 'pass': // Wrong password
                        setPostRequestParameter('ok', $ret);

-                       loadTemplate('admin_settings_saved', false, getMessage('WRONG_PASS'));
+                       loadTemplate('admin_settings_saved', false, '{--WRONG_PASS--}');

                        destroyAdminSession();
                        break;
 
                        destroyAdminSession();
                        break;
 

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 14d8cbb14434a691c74f0bd5586860554c61bc74..d2fc10212b45644a9228404d5c667f41ff76c273 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -570,7 +570,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
        rebuildCache('config', 'config');
 
        // Settings saved, so display message?
        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;
 
        // 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, 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
                        // 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)));
                        } 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
                        // 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)));
                        } 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
        // 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
        } // END - if
 
        // Return status

diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index 5d31043b18b6b9e079c97bedc325903a37138a22..5c64717b9ed5feaebdc6da2eb5730a78408274c9 100644 (file)
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -81,7 +81,7 @@ if (getRequestParameter('userid') == 'all') {
                SQL_FREERESULT($result_main);
 
                // Output message
                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');
        } 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);
                        $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>';
                } else {
                        // Prepare content
                        $content['user']   = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';

diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php
index 0cb4d2e5aed861f8f4a74c3ca1ca2fe20e73ae7a..4ddb85bf332edf5879d62962984bc8836234bf97 100644 (file)
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -81,14 +81,14 @@ VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')",
                        redirectToUrl('modules.php?module=admin&what=config_rallye_prices&rallye='.$id);
                } else {
                        // Problem detected...
                        redirectToUrl('modules.php?module=admin&what=config_rallye_prices&rallye='.$id);
                } else {
                        // Problem detected...

-                       loadTemplate('admin_settings_saved', false, getMessage('RALLYE_PROBLEM_CREATE'));
+                       loadTemplate('admin_settings_saved', false, '{--RALLYE_PROBLEM_CREATE--}');

                }
        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Overlapping detected
                }
        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Overlapping detected

-               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_OVERLAP_TIMES'));
+               loadTemplate('admin_settings_saved', false, '{--RALLYE_OVERLAP_TIMES--}');

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-add_surfbar_url.php b/inc/modules/admin/what-add_surfbar_url.php
index 2ee7b2d9517f36e265dd0faff5b3332ed7451c6a..2dede7b9a45f512a229c8bf5cba868e6ec92ab14 100644 (file)
--- a/inc/modules/admin/what-add_surfbar_url.php
+++ b/inc/modules/admin/what-add_surfbar_url.php
@@ -60,10 +60,10 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('url'))) {
        // Then add this URL
        if (SURFBAR_ADMIN_ADD_URL($postData['url'], $postData['limit'], $postData['reload'])) {
                // URL was added
        // 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
        } 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
 
        }
 } // END - if
 

diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index f4155ec8c9ab9aa5fa0101c6b78b0de14b06a864..ae6c292bd2a95c6150f6f0aa158d796b83a0b67f 100644 (file)
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -185,10 +185,10 @@ if (!isFormSent()) {
                        ), __FILE__, __LINE__
                );
        }
                        ), __FILE__, __LINE__
                );
        }

-       loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');

 } else {
        // Is demo login!
 } else {
        // Is demo login!

-       loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
+       loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}');

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index f8b06dfb28bc974565f5042e8286be76a08266c5..d41753b54a28f9dd80acb36d904f4ea646f98267 100644 (file)
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -169,7 +169,7 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
                        }
 
                        // Load template
                        }
 
                        // Load template

-                       loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+                       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');

                        break;
 
                case 'del': // Delete menu
                        break;
 
                case 'del': // Delete menu


@@ -179,7 +179,7 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
                        } // END - foreach
 
                        // Load template
                        } // END - foreach
 
                        // Load template

-                       loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+                       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');

                        break;
 
                default: // Unexpected action
                        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_amenu_edit', false, $content);
        } else {
                // Menu entries are missing... (???)

-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-admins_add.php b/inc/modules/admin/what-admins_add.php
index cc758a14ba2a1b3a62d35d7dd39fd9b2992a8189..c1218df72e7cbf3317c47b0d536cfad4539fd5de 100644 (file)
--- a/inc/modules/admin/what-admins_add.php
+++ b/inc/modules/admin/what-admins_add.php
@@ -58,7 +58,7 @@ if (isFormSent('add')) {
                        $FORM = false;
 
                        // Admin login saved
                        $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());
 
                        // Run filter chain
                        runFilterChain('post_admin_added', postRequestArray());

diff --git a/inc/modules/admin/what-admins_contct.php b/inc/modules/admin/what-admins_contct.php
index 833bf3158b82f864f0e2258731e6cc61ce87b31d..9203b250af3f22caa9ca8410c1d94e2a3b4c86e7 100644 (file)
--- a/inc/modules/admin/what-admins_contct.php
+++ b/inc/modules/admin/what-admins_contct.php
@@ -61,7 +61,7 @@ if ((isFormSent()) && (isGetRequestParameterSet('admin'))) {
        }
 
        // Mail / message dropped
        }
 
        // 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');
 } 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_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]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index ec939a6d1e14a07c4e6211b54e77577526cec2fd..c3ad9a63334104a9c662e98e75322b3b9f97b5ea 100644 (file)
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -102,7 +102,7 @@ if (isFormSent('edit')) {
                loadTemplate('admin_admins_mails_edit', false, $rows);
        } else {
                // Nothing selected
                loadTemplate('admin_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
        }
 } else {
        // Load all assigned mails


@@ -187,7 +187,7 @@ ORDER BY
                loadTemplate('admin_admins_mails_list', false, $OUT);
        } else {
                // No entries found
                loadTemplate('admin_admins_mails_list', false, $OUT);
        } else {
                // No entries found

-               loadTemplate('admin_settings_saved', false, getMessage('ADMINS_MAILS_NO_ENTRIES'));
+               loadTemplate('admin_settings_saved', false, '{--ADMINS_MAILS_NO_ENTRIES--}');

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-cache_stats.php b/inc/modules/admin/what-cache_stats.php
index ba73224b8f866777fda00f5b92f48e631261316e..aafc8a74846f01398577e9fa69e6ca4cbdc6d4ca 100644 (file)
--- a/inc/modules/admin/what-cache_stats.php
+++ b/inc/modules/admin/what-cache_stats.php
@@ -47,20 +47,17 @@ addMenuDescription('admin', __FILE__);
 
 // Activated?
 if (getConfig('STATS_ENABLED') == 'Y') {
 
 // Activated?
 if (getConfig('STATS_ENABLED') == 'Y') {

-       // Calculate total hits
-       $totalHits = (getStatsEntry('db_hits') + getStatsEntry('cache_hits'));
-

        // Prepare data for the template
        // 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
 
        // 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]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-chk_regs.php b/inc/modules/admin/what-chk_regs.php
index a21d404b95e92c5a7d234341b6898f66a0aa6014..55ccb052874baf94c4b42f651a6a148ead43758f 100644 (file)
--- a/inc/modules/admin/what-chk_regs.php
+++ b/inc/modules/admin/what-chk_regs.php
@@ -81,7 +81,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('admin_list_chk_reg', false, $OUT);
 } else {
        // No registrations left - or all has confirmed their email address... :-)
        loadTemplate('admin_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
 }
 
 // Free memory

diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index 99d8f8a3ad6e7bea8f65356c53c02ad1071b3081..f8b9eac5f08c043bcd0bfd12d7fc0a176fe93d23 100644 (file)
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -103,7 +103,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0)) {
        } // END - if
 
        // Entries changed
        } // 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;
 } elseif ((isFormSent('del')) && (countPostSelection() > 0)) {
        // Delete ACLs
        $OUT = ''; $SW = 2;


@@ -155,7 +155,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0)) {
        } // END - if
 
        // Entries deleted
        } // 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')));
 } elseif (isFormSent('add')) {
        // Check if everything is fine...
        $mode = getAdminDefaultAcl(bigintval(postRequestParameter('admin_id')));

diff --git a/inc/modules/admin/what-config_doubler.php b/inc/modules/admin/what-config_doubler.php
index 8f375d51c84a040ea57ad641b579bdcd17a01c10..1b3365b7db05db9fbdabf2dfcecda4675647a9e6 100644 (file)
--- a/inc/modules/admin/what-config_doubler.php
+++ b/inc/modules/admin/what-config_doubler.php
@@ -47,8 +47,8 @@ addMenuDescription('admin', __FILE__);
 
 if (isFormSent()) {
        // Replace commata with decimal dot
 
 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')));
        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 {
        // 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'] = '';
        // Init all Y/N selections
        foreach (array('jackpot','own','sent_all') as $entry) {
                $content[$entry . '_y'] = '';

diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php
index dee6e47d26f7ad2e2efc5993a7f576e325d99972..b4a0a3d23480254f1540a7310acf88217b39aad4 100644 (file)
--- a/inc/modules/admin/what-config_mods.php
+++ b/inc/modules/admin/what-config_mods.php
@@ -84,7 +84,7 @@ if (isFormSent('edit')) {
                loadTemplate('admin_mods_edit', false, $OUT);
        } else {
                // Nothing selected
                loadTemplate('admin_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');
 
                // Remove maybe confusing data
                unsetPostRequestParameter('edit');


@@ -120,7 +120,7 @@ if (isFormSent('edit')) {
        } // END - if
 
        // Entries updated
        } // END - if
 
        // Entries updated

-       loadTemplate('admin_settings_saved', false, getMessage('MODS_CHANGED'));
+       loadTemplate('admin_settings_saved', false, '{--MODS_CHANGED--}');

 }
 
 if (countPostSelection() == 0) {
 }
 
 if (countPostSelection() == 0) {

diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php
index b3ce3c631e1e76fcaeaf1ec335add52c13ac827e..c0b4fc7c94828deb52f36a1811ab1df4575dc426 100644 (file)
--- a/inc/modules/admin/what-config_payouts.php
+++ b/inc/modules/admin/what-config_payouts.php
@@ -243,7 +243,7 @@ if ((SQL_NUMROWS($result_mem) > 0) && ($display)) {
        loadTemplate('admin_settings_saved', false, '<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, '<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
 }
 
 // Free result

diff --git a/inc/modules/admin/what-config_proxy.php b/inc/modules/admin/what-config_proxy.php
index 5566979b1ccee476e3369abe355252cccc5e4721..94882452fb0d60bc39a23ec47415ca5920d20c05 100644 (file)
--- a/inc/modules/admin/what-config_proxy.php
+++ b/inc/modules/admin/what-config_proxy.php
@@ -52,7 +52,7 @@ if (isFormSent()) {
                adminSaveSettingsFromPostData();
        } else {
                // Invalid!
                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
        }
 } else {
        // Load template

diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index ce08c0b4c845d1f1d8bae7a664637b8bb85bde99..617b0349be192ba34ac8e399f385c8f68654ddd3 100644 (file)
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -55,21 +55,24 @@ if (isGetRequestParameterSet('rallye')) {
 
                        if (SQL_HASZERONUMS($result)) {
                                // Ok, new price level entered!
 
                        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__);
                                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!
                        } 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')) {
                        }
                }
        } elseif (isFormSent('remove')) {


@@ -82,9 +85,9 @@ VALUES ('%s','%s','%s','%s')",
                        } // END - foreach
 
                        // Output message
                        } // END - foreach
 
                        // Output message

-                       loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_DELETED'));
+                       loadTemplate('admin_settings_saved', false, '{--RALLYE_ENTRIES_DELETED--}');

                } else {
                } 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
                }
        } elseif (isFormSent('change')) {
                // Change entries


@@ -113,7 +116,7 @@ LIMIT 1",
                }
 
                // Output message
                }
 
                // Output message

-               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_CHANGED'));
+               loadTemplate('admin_settings_saved', false, '{--RALLYE_ENTRIES_CHANGED--}');

        }
 
        if (isFormSent('edit')) {
        }
 
        if (isFormSent('edit')) {


@@ -278,7 +281,7 @@ ORDER BY
                loadTemplate('admin_list_rallye_prices', false, $OUT);
        } else {
                // No rallyes setup so far
                loadTemplate('admin_list_rallye_prices', false, $OUT);
        } else {
                // No rallyes setup so far

-               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SETUP'));
+               loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SETUP--}');

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-config_session.php b/inc/modules/admin/what-config_session.php
index 40fefe0bd220115b24281935f04499978a95a3d6..19c11e34f1d5a02b2ace42bc8bd8a5df870805a9 100644 (file)
--- a/inc/modules/admin/what-config_session.php
+++ b/inc/modules/admin/what-config_session.php
@@ -52,7 +52,7 @@ if (isFormSent()) {
                adminSaveSettingsFromPostData();
        } else {
                // Invalid!
                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
        }
 } else {
        // Prepare content

diff --git a/inc/modules/admin/what-config_yoomedia.php b/inc/modules/admin/what-config_yoomedia.php
index c151303b2b90227b45c4261e427352baf9d13785..e3fed6b1620c9912c690c21a8cd32b55981dfefb 100644 (file)
--- a/inc/modules/admin/what-config_yoomedia.php
+++ b/inc/modules/admin/what-config_yoomedia.php
@@ -58,7 +58,7 @@ if (isFormSent()) {
                adminSaveSettingsFromPostData();
        } else {
                // Config not saved
                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
        }
 } else {
        // Erotic selection

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index c5abb43616ee6b1927755b421573a733c979b7fe..c2d870f324d3b262c9903dc236ddaaaa57d070dc 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -99,7 +99,7 @@ LIMIT 1",
                        // Shall we pay the points back to the user?
                        if ($totalPoints == 0) {
                                // No points repayed!
                        // 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?
                        } 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!
                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
        }
 
        // Free result


@@ -161,7 +161,7 @@ LIMIT 1",
                array(bigintval(getRequestParameter('pid'))), __FILE__, __LINE__);
 
        // Output message
                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",
 } 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_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
        }
 
        // Free result


@@ -230,15 +230,15 @@ LIMIT 1",
                loadTemplate('admin_del_email_notify', false, $content);
        } else {
                // Mail already deleted!
                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
        }
 
        // Free result
        SQL_FREERESULT($result);
 } else {
        // No mail orders fond

-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WRONG_CALL'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_WRONG_CALL--}');

 }
 
 }
 

-//
+// [EOF]

 ?>
 ?>

diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php
index 4ce7616761f4029f8374940006e3a374a3416ace..19d0175533b210e126a398192b55714ca7328b6f 100644 (file)
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -94,7 +94,7 @@ LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
        loadTemplate('admin_settings_saved', false, getMaskedMessage('HOLIDAY_ADMIN_MULTI_DEL', $cnt));
 } elseif (isGetRequestParameterSet('userid')) {
        // Set default message
        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
 
        // 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
                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);
 
        // 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, $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]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php
index a4b6ac2946cd9a5eaab7a4148125888179a2ec95..c1c493d81a20d1ca371bebb4880448ea38157e29 100644 (file)
--- a/inc/modules/admin/what-del_sponsor.php
+++ b/inc/modules/admin/what-del_sponsor.php
@@ -96,7 +96,7 @@ if (isGetRequestParameterSet('id')) {
        SQL_FREERESULT($result);
 } else {
        // Not called by what-list_sponsor.php
        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]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-del_transfer.php b/inc/modules/admin/what-del_transfer.php
index b4fc851c70dac809360f927c6bb7ce7ed263f60f..bd575c1f0c5f952d265d162fb9a337802f9d3bcf 100644 (file)
--- a/inc/modules/admin/what-del_transfer.php
+++ b/inc/modules/admin/what-del_transfer.php
@@ -95,7 +95,7 @@ if (SQL_NUMROWS($result) > 0) {
        // Nothing for in and out
        $OUT = '<tr>
   <td colspan="6" align="center" class="bottom">
        // 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>';
 }
   </td>
 </tr>';
 }

diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php
index 17973ef9d844f3b3da4e9a5dadf92e9395e4e704..0bc3544533c7ca1a3fc2bdcc29f6dc1c3625fcca 100644 (file)
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -53,7 +53,7 @@ if ((isFormSent()) || ((isFormSent('del')) && (isPostRequestParameterSet(('reaso
                deleteUserAccount(getRequestParameter('userid'), postRequestParameter('reason'));
 
                // Output message
                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>');
        } else {
                // Account does not exists!
                loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');

diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php
index 1230f036bc28560c04f56d22f77438e93ec76a71..d6f091d76a5f9269de462a25ee60455bafa6727d 100644 (file)
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -76,7 +76,7 @@ LIMIT 1",
 
                //  Warning because low points
                $content['receive_warnings'] = addSelectionBox('yn', $content['receive_warnings'], 'receive_warning');
 
                //  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'));
 
                // 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
        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]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index 6dd6352fc0081741bf47ed0edac74369fa436023..b4df32c7465d77044acb0f44e1a1d891971d2b32 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -119,7 +119,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('admin_email_archiv', false, $content);
 } else {
        // No mail orders fond
        loadTemplate('admin_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
 }
 
 // Free memory

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 9f0435abfbe0c703f5a20ece651656dc01453ea4..14f7e44c506aef9eb95a1b4165e87e6e3f589dc0 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -228,7 +228,7 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
 
 if ($MAIL === false) {
        // No mail orders fond
 
 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]
 } // END - if
 
 // [EOF]

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 1b26990c868821c931e034825ff2e7c92406ec70..24f0716a65328389c254de5d0f2c4f0b660c1071 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -279,6 +279,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
                                if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) $cssSelection = translateYesNo($content['ext_css']);
 
                                // Prepare data for the row template
                                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'],
                                $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_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;
 
                }
                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...
                                                } // 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...
                                        } 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
                                }
                        } 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
                        }
                } 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
                } 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':
                }
                break;
 
        case 'demo':

-               loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
+               loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}');

                break;
 } // END - switch
 
                break;
 } // END - switch
 

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index 4ebead8c23d00a840790437c8991dbaa1da8e94c..423415b7bb8d1d9cb3c3756527066c5bdca5980a 100644 (file)
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -202,10 +202,10 @@ ORDER BY `sort` ASC",
                                postRequestParameter('active'),
                        ), __FILE__, __LINE__);
        }
                                postRequestParameter('active'),
                        ), __FILE__, __LINE__);
        }

-       loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');

 } else {
        // Demo mode!
 } else {
        // Demo mode!

-       loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
+       loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}');

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index 032a86eefabed2c7cf55858df898ccc28c5740a5..6e80602f5a921451a8a66c7895465d4a3669a668 100644 (file)
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -154,7 +154,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive()))
                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
                                        array($menu, postRequestParameter('sel_action', $sel), postRequestParameter('sel_what', $sel), $sel),__FILE__, __LINE__);
                        } // END - foreach
                                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
                        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
                                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
                        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
                                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
                        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_gmenu_edit', false, $content);
        } else {
                // Menu entries are missing... (???)

-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index 50b09a99bebd1d902f1f7f5d54b01cf48f6fd27e..027187be6d2f156c6a2eed07fd4b04fd3ad2fa09 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -102,7 +102,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('admin_list_autopurge', false, $content);
 } else {
        // All members are active or you don't have any registered
        loadTemplate('admin_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]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-list_bank_package.php b/inc/modules/admin/what-list_bank_package.php
index 55c60fa01633bc480f70fbbc6d044f07a242ef45..385b3c2d39b40abddfde41ca4723a85fe596c6f6 100644 (file)
--- a/inc/modules/admin/what-list_bank_package.php
+++ b/inc/modules/admin/what-list_bank_package.php
@@ -79,20 +79,19 @@ if ((isPostRequestParameterSet('id')) && (is_array(postRequestParameter('id')))
 if ($show === false) return;
 
 // Load all banking packages from DB
 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)) {
 
 // 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
                $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_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);
 
 }
 
 // Free the result
 SQL_FREERESULT($result);
 

-//
+// [EOF]

 ?>
 ?>

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 7bf2f906c7b85ec460f966c8382d8df716c3b74d..f7d401e299bea76cd0ee325e1510f7713fa519a6 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -52,7 +52,7 @@ if (getConfig('beg_rallye') == 'Y') {
                $curr = date('m', time()) - 1;
                if (strlen($curr) == 1) $curr = '0' . $curr;
                updateConfiguration('last_month', $curr);
                $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?
        } // 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_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
        }
 } else {
        // Rallye deactivated

-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_RALLYE_DEACTIVATED'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_RALLYE_DEACTIVATED--}');

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 021a2e86384e6ea80c4cca1668b48f2d6dd05541..a2d500a129cfb1d8f052d811b7f85e6b87ba7e94 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -52,7 +52,7 @@ if (getConfig('bonus_active') == 'Y') {
                $curr = date('m', time()) - 1;
                if (strlen($curr) == 1) $curr = '0' . $curr;
                updateConfiguration('last_month', $curr);
                $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')) {
        } // END - if
 
        if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {


@@ -66,16 +66,15 @@ if (getConfig('bonus_active') == 'Y') {
                $USE .= ')';
        } else {
                // Old version ???
                $USE .= ')';
        } else {
                // Old version ???

-               $USE = 'turbo_bonus';
+               $USE = '`turbo_bonus`';

        }
 
        // Autopurge installed?
        }
 
        // Autopurge installed?

-       $lastOnline = "%s"; $ONLINE = '';
+       $lastOnline = '%s'; $ONLINE = '';

        if (isExtensionActive('autopurge')) {
                // Use last online timestamp to keep inactive members away from here
        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
 
        // 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_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
        }
 } 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]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-list_holiday.php b/inc/modules/admin/what-list_holiday.php
index 9845488bc92f2d809b57a9d6b0807c6e8775521e..d23b431eb17f23fd06ae34973a31f6d0db8e34c4 100644 (file)
--- a/inc/modules/admin/what-list_holiday.php
+++ b/inc/modules/admin/what-list_holiday.php
@@ -88,7 +88,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('admin_list_holiday', false, $OUT);
 } else {
        // No holiday requests found
        loadTemplate('admin_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]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index c74ec6ca251d8fe92d689a43a6b8779057064f39..b0c69441bbb6a0a5d546b0fb0677a4557db46977 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -80,7 +80,7 @@ if (isGetRequestParameterSet('userid')) {
                                sendEmail(getUserData('email'), getMessage('ADMIN_DEL_LINK_SUBJ'), $message);
 
                                // Display message
                                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;
                        } else {
                                // Init variables
                                $OUT = ''; $SW = 2;

diff --git a/inc/modules/admin/what-list_network_params.php b/inc/modules/admin/what-list_network_params.php
index 461604c52b84b3cd5ce421dd305fa57d1818db77..a09cae196ea70d96ee498d3021c963647f6e6fb5 100644 (file)
--- a/inc/modules/admin/what-list_network_params.php
+++ b/inc/modules/admin/what-list_network_params.php
@@ -78,7 +78,7 @@ if (isGetRequestParameterSet('network')) {
                $ADD = sprintf(" AND p.`network_type_id`=%s", bigintval(postRequestParameter('network_type_id')));
 
                // Display message
                $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
        } // END - if
 
        // Load all advert types for given network

diff --git a/inc/modules/admin/what-list_networks.php b/inc/modules/admin/what-list_networks.php
index fd99cc6563fadbb5aa9b37e2d217d8d98b31d330..2d931e8944e44165d9255dc32163d70bc1c41ed9 100644 (file)
--- a/inc/modules/admin/what-list_networks.php
+++ b/inc/modules/admin/what-list_networks.php
@@ -90,7 +90,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('admin_list_networks', false, $OUT);
 } else {
        // Display a message that there are sponsor networks supported, yet
        loadTemplate('admin_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
 }
 
 // Free result

diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php
index f10a81ac98150f40be9dc229d31f379f7e821212..5509489086669858febdddb342415fe0d786fff7 100644 (file)
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -111,7 +111,7 @@ if ((isExtensionActive('bonus')) && (SQL_NUMROWS($result_max) > 0) && (!empty($S
        }
 } elseif ((SQL_NUMROWS($result_max) === 0) && (is_resource($result_max))) {
        // No notifications found
        }
 } 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]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index bef227701f8ebd4e92dcacb3e21c81817d499f3b..4f4d42c43dcd57fbcceeccaca77b2133fbedfb88 100644 (file)
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -62,7 +62,7 @@ if (isGetRequestParameterSet(('pid'))) {
                if (empty($task)) $task = '0';
        } elseif ((empty($userid)) || ($userid == '0')) {
                // Cannot obtain member id!
                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');
        } 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
                                                // 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
                                                } 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
                                                }
 
                                                // Finally send mail


@@ -189,7 +189,7 @@ LIMIT 1",
                                $message = loadEmailTemplate('member_payout_rejected', postRequestParameter('text'), $userid);
 
                                // Output message
                                $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);
 
                                // Finally send mail
                                sendEmail(getUserData('email'), getMessage('MEMBER_PAYOUT_REJECTED_SUBJECT'), $message);


@@ -206,11 +206,11 @@ LIMIT 1",
                        }
                } else {
                        // Cannot load user data
                        }
                } 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
                }
        } 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') {
        }
 } 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_list_payouts', false, $OUT);
        } else {
                // No payout requests are sent so far

-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_NO_REQUESTS_FOUND'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_NO_REQUESTS_FOUND--}');

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-list_primera.php b/inc/modules/admin/what-list_primera.php
index cb9969bc2dee77ab78b7eee076b61442dc7e3e5f..f7e11891e7f6f283ddd7ad2f03e8fc7cbfd75e78 100644 (file)
--- a/inc/modules/admin/what-list_primera.php
+++ b/inc/modules/admin/what-list_primera.php
@@ -77,7 +77,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('admin_list_primera_main', false, $OUT);
 } else {
        // Nothing to display!
        loadTemplate('admin_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
 }
 
 // Free the result

diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 7f6f64a1475a3a4fb647946f1155b9f3f24bb486..205d3c2139a6aaad6a355e25f2d37723be094e78 100644 (file)
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -230,7 +230,7 @@ LIMIT 1",
                loadTemplate('admin_edit_rallyes', false, $OUT);
        } else {
                // Nothing selected to edit
                loadTemplate('admin_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
        }
 } 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_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
        }
 } else {
        // Start listing rallyes


@@ -400,7 +400,7 @@ ORDER BY
                loadTemplate('admin_list_rallyes', false, $content);
        } else {
                // No rallyes setup so far
                loadTemplate('admin_list_rallyes', false, $content);
        } else {
                // No rallyes setup so far

-               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SETUP'));
+               loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SETUP--}');

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-list_refs.php b/inc/modules/admin/what-list_refs.php
index a763a391b472f96ad04819ec825754d0b76f38aa..227f507f8390b55445baba0e8b69b47c67b5b582 100644 (file)
--- a/inc/modules/admin/what-list_refs.php
+++ b/inc/modules/admin/what-list_refs.php
@@ -191,10 +191,10 @@ ORDER BY
                        }
                } elseif (isExtensionActive('refback')) {
                        // No levels found, very bad!
                        }
                } 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
                } 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
                }
 
                // Free result

diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php
index 717664472904b6529c764ca9c722b57b0f3f7b49..9a82dde5dba0672583e7b039e88428512c6011d3 100644 (file)
--- a/inc/modules/admin/what-list_sponsor.php
+++ b/inc/modules/admin/what-list_sponsor.php
@@ -154,7 +154,7 @@ ORDER BY
                loadTemplate('admin_list_sponsor', false, $OUT);
        } else {
                // No sponsors registered so far
                loadTemplate('admin_list_sponsor', false, $OUT);
        } else {
                // No sponsors registered so far

-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SPONSOR_NONE_REGISTERED'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_SPONSOR_NONE_REGISTERED--}');

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php
index eb33c3789fe549ea43347862383558a6c8ca7d7a..f0874d6a173c3e11a92c737d3b30dbbb8b95f712 100644 (file)
--- a/inc/modules/admin/what-list_sponsor_pay.php
+++ b/inc/modules/admin/what-list_sponsor_pay.php
@@ -221,7 +221,7 @@ ORDER BY
                $content['list_out'] = loadTemplate('admin_list_sponsor_pay', true, $OUT);
        } else {
                // Noting setup so far!
                $content['list_out'] = loadTemplate('admin_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
        }
 
        // Free memory

diff --git a/inc/modules/admin/what-list_sponsor_pays.php b/inc/modules/admin/what-list_sponsor_pays.php
index 7a9d71333c3ea63afb082a36d23e54c44fa5ccc8..c9d3dc3c10783d15bb6c3cb3f4aee4ed6fda1078 100644 (file)
--- a/inc/modules/admin/what-list_sponsor_pays.php
+++ b/inc/modules/admin/what-list_sponsor_pays.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();

-}
+} // END - if

 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);


@@ -59,8 +59,8 @@ if (isGetRequestParameterSet('id')) {
        }
 } else {
        // Not called by what-list_sponsor.php
        }
 } else {
        // Not called by what-list_sponsor.php

-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_CALL_NOT_DIRECTLY'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_CALL_NOT_DIRECTLY--}');

 }
 
 }
 

-//
+// [EOF]

 ?>
 ?>

diff --git a/inc/modules/admin/what-list_surfbar_actions.php b/inc/modules/admin/what-list_surfbar_actions.php
index 04f45266b6eecf3305163690ecb2d85ecccbaa13..60c3948e53ed1a9122db61babc2a6595a7b39ab8 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_actions.php
+++ b/inc/modules/admin/what-list_surfbar_actions.php
@@ -88,7 +88,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('admin_list_surfbar_actions', false, $OUT);
 } else {
        // No entries found, very bad!
        loadTemplate('admin_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
 }
 
 // Free result

diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php
index 248d360c8103b02bd6ab4059df9c1b1a4e9f4114..8c7e9493fdc655abfde97b0d8424c0c8d4a225fb 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -51,7 +51,7 @@ $show = true;
 // Check for 'url_id' element
 if ((countRequestPost() > 0) && ((!isPostRequestParameterSet('url_id')) || (!is_array(postRequestParameter('url_id'))) || (count(postRequestParameter('url_id')) == 0))) {
        // Not found so output message
 // 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;
 
        // 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_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
 }
 
 // Free result

diff --git a/inc/modules/admin/what-list_transfer.php b/inc/modules/admin/what-list_transfer.php
index 799d9ab25f838daa8db5d2298f355f89252e3dca..7413805395499d1bec7392956f729ccd29e5b9fb 100644 (file)
--- a/inc/modules/admin/what-list_transfer.php
+++ b/inc/modules/admin/what-list_transfer.php
@@ -74,7 +74,7 @@ if (SQL_NUMROWS($result) > 0) {
        // Nothing for in and out
        $OUT = '<tr>
   <td colspan="6" align="center" class="bottom">
        // 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>';
 }
   </td>
 </tr>';
 }

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 679b5bc7e132e4968bdfce0a70384c9229630a82..920c3cd20db87a0a882ee0ce60d43ee3017b4255 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -86,7 +86,7 @@ LIMIT 1";
        $listed = true; $DATA = $ID; $LINK = 'bonusid';
 } else {
        // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
        $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?
 }
 
 // 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.
                        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
                }
 
                // 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, 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
                }
 
                // Free memory


@@ -205,7 +205,7 @@ LIMIT %s",
                SQL_FREERESULT($result2);
        } elseif (isGetRequestParameterSet('bid')) {
                // Data in bonus table not found
                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
        }
 
        // Free result

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index ba6f073cd1fb68b508226ef02f9bcb5c4b1116a1..5c8220c82393724919674abd414c5c35aa03569d 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -72,7 +72,7 @@ if (isExtensionInstalledAndNewer('user', '0.3.4')) {
        // Add lock reason?
        if (isExtensionInstalledAndNewer('user', '0.3.5')) {
                // Add them...
        // 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
 
        } // 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['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?
                $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');
                }
 
                        $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) {
                // 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?
                } // 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);
        // 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!
        } // 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_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
        }
 
        // Free memory

diff --git a/inc/modules/admin/what-list_wernis.php b/inc/modules/admin/what-list_wernis.php
index 9ef5489abbc2546fc64bc76616e13b7eefb1babb..9d921bda87a2c93058d240315cbd09e776c4054c 100644 (file)
--- a/inc/modules/admin/what-list_wernis.php
+++ b/inc/modules/admin/what-list_wernis.php
@@ -77,7 +77,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('admin_list_wernis_main', false, $OUT);
 } else {
        // Nothing to display!
        loadTemplate('admin_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
 }
 
 // Free the result

diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php
index 925b7b083759edf5ff54f0c439dc2dedf379d9a0..617f41263ee7e9f6994c4e1020e76ea9daf643b5 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -71,7 +71,7 @@ if (isFormSent()) {
 // Enougth queries left?
 if (getConfig('yoomedia_requests_remain') == '0') {
        // Output message
 // 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;
 
        // 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
 // 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
        return false;
 } elseif (count($result[0]) < 7) {
        // Error received so prepare error code

diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php
index 0b9c0f65c8635506362455a114381a460c783eb7..829bc839bad52f457e7c92aa847fe296b65bd41a 100644 (file)
--- a/inc/modules/admin/what-logs.php
+++ b/inc/modules/admin/what-logs.php
@@ -109,7 +109,7 @@ if (isGetRequestParameterSet('access')) {
                outputHtml('</ol>');
        } else {
                // logs directory does not exist
                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--}');

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index 14bde5ed57ce038da88f1b96dccbd967fd1978eb..57ee9229e168f2f5c46f9d0d07b4821ed96ffb4c 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -191,11 +191,11 @@ if (!isFormSent()) {
                                bigintval(postRequestParameter('sort')),
                        ), __FILE__, __LINE__);
        }
                                bigintval(postRequestParameter('sort')),
                        ), __FILE__, __LINE__);
        }

-       loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED'));

 } else {
        // Demo mode!
 } else {
        // Demo mode!

-       loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
+       loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}');

 }
 
 }
 

-//
+// [EOF]

 ?>
 ?>

diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index 3194832be964010a38f295f873cbbe7bb8aadee6..53a971aa63bb7040d349ffe3a0e7acb18497e06a 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -212,7 +212,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive()))
        } // END - foreach
 
        // Load template
        } // 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
 } 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_mmenu_overview', false, $content);
        } else {
                // Menu entries are missing... (???)

-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php
index 54c22b15194a2eda302c09801037202446dfa544..d532a27f7cc635556af63c6113fa43704c0afa16 100644 (file)
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -48,7 +48,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Is sql_patches not yet installed?
 if (!isExtensionInstalled('sql_patches')) {
        // Output warning
 // 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)
 } // END - if
 
  // Load include file 'overview-inc' (old standard overview page)

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index 22c3685833d5cbc586f4cb32bb3c0ea47b57ca10..5458ff6e5ff4bf6c072297717785513602f61e68 100644 (file)
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -80,7 +80,7 @@ ORDER BY
                } // END - while
 
                // Output message
                } // 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
        } // END - if
 
        // Free memory

diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index 651bd116ec4f60c04e4e1440858b383c4193df89..48e91900ef2843087db24e19dbb8415f28dcdf6f 100644 (file)
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -74,7 +74,7 @@ if (getRequestParameter('userid') == 'all') {
                SQL_FREERESULT($result_main);
 
                // Output message
                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');
        } 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
                        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>';
                } else {
                        // Prepare content
                        $content['user']   = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>';

diff --git a/inc/modules/admin/what-surfbar_stats.php b/inc/modules/admin/what-surfbar_stats.php
index 271754365d0b49f6238e94b3eb889103e41ffa54..ced00fe21e8d0fb442043f77205d601be7cc07ca 100644 (file)
--- a/inc/modules/admin/what-surfbar_stats.php
+++ b/inc/modules/admin/what-surfbar_stats.php
@@ -89,7 +89,7 @@ ORDER BY
                loadTemplate('admin_surfbar_url_stats', false, $content);
        } else {
                // No statistics so far
                loadTemplate('admin_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
        }
 } else {
        // Generate general statistics


@@ -133,7 +133,7 @@ ORDER BY
                loadTemplate('admin_surfbar_stats', false, $content);
        } else {
                // No statistics so far
                loadTemplate('admin_surfbar_stats', false, $content);
        } else {
                // No statistics so far

-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_NO_STATS'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_NO_STATS--}');

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index cab625416edcd70d0dd3d75191eb7c3c90fc5f2b..a870ab77e0b58c4f51ce4416b54c81b96269c6b1 100644 (file)
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -150,7 +150,7 @@ if (SQL_NUMROWS($result) > 0) {
        // No themes found???
        $OUT .= '<tr>
   <td colspan="7" class="bottom" height="60">
        // 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>';
 }
   </td>
 </tr>';
 }

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index 3a1c48d9123d7344775ed8dc619d269f0f97f719..41493b2f66a219a813af45979395d28ac923aeec 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -158,7 +158,7 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
 
 if (empty($OUT)) {
        // No themes found???
 
 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
 } // END - if
 
 // Load template

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index 947f16fe9c14340a6fb9fed9dbabc153ceaa6d02..83eb8c0cd2c07aa7fc584d933a3f2e6df2b8974c 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -168,7 +168,7 @@ LIMIT 1",
                        loadTemplate('admin_unlock_emails_redir', false, $OUT);
                } else {
                        // Nothing selected
                        loadTemplate('admin_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
                }
        } elseif ((isFormSent('lock')) && (countPostSelection() > 0) && (getConfig('url_blacklist') == 'Y')) {
                // Lock URLs


@@ -190,7 +190,7 @@ LIMIT 1",
                } // END - foreach
 
                // Output message
                } // 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;
        } 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_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!
        } 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
        }
 } 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]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php
index 94d606139e80a35407fa59e4934dc2a57eea7b03..e8676e512ac9274e2e097c1e0105d5afc06f7ad8 100644 (file)
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -182,7 +182,7 @@ LIMIT 1",
                } // END - foreach
        } else {
                // Nothing selected
                } // 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
 
        }
 } // END - if
 


@@ -201,16 +201,15 @@ if (SQL_NUMROWS($result) > 0) {
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
                // Transfer data to array
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
                // Transfer data to array

-               // @TODO Rewritings: remote->remote_addr, created->sponsor_created in template

                $content = array(
                $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
                );
 
                // 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_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
 }
 
 // Free memory

diff --git a/inc/modules/admin/what-unlock_surfbar_urls.php b/inc/modules/admin/what-unlock_surfbar_urls.php
index f902b379cff0da853149c2c8c2b82d8acc2245b6..83c6ad23ca34995c1515214dbcc4dd6745710398 100644 (file)
--- a/inc/modules/admin/what-unlock_surfbar_urls.php
+++ b/inc/modules/admin/what-unlock_surfbar_urls.php
@@ -50,19 +50,19 @@ if ((isPostRequestParameterSet('unlock')) && (is_array(postRequestParameter('url
        // Unlock selected URLs
        if (SURFBAR_ADMIN_UNLOCK_URL_IDS(postRequestParameter('url_id'))) {
                // Unlock done! :-)
        // 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!
        } 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! :-)
        }
 } 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!
        } 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_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
 }
 
 // Free result

diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php
index 580c57bcbeee821feb9e483abf17bfda90e229d3..0219bab845f1aba6e987d3ef289ec016890bf8fe 100644 (file)
--- a/inc/modules/admin/what-updates.php
+++ b/inc/modules/admin/what-updates.php
@@ -99,7 +99,7 @@ if (empty($ONLINE['version'])) {
        loadTemplate('admin_update_download', false, $ONLINE);
 } else {
        // You have the latest version!
        loadTemplate('admin_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]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php
index 069171dd7126c82688c3cd0661d757ef9cdd13ab..0af9eee3a811c12615a6bc8868c51cbc600e35ad 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -108,7 +108,7 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
        outputHtml($content);
 } else {
        // Nothing to load, then we have no directory 'usage'
        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]
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-user_contct.php b/inc/modules/admin/what-user_contct.php
index 74551c3f80702e2ce9547056dd27a4793205961c..95525b00fb29d6770bc5ed4b9e1722a10982760b 100644 (file)
--- a/inc/modules/admin/what-user_contct.php
+++ b/inc/modules/admin/what-user_contct.php
@@ -67,7 +67,7 @@ if ((isGetRequestParameterSet('userid')) && (bigintval(getRequestParameter('user
                        sendEmail($content['email'], getMessage('ADMIN_CONTACT_USER_SUBJECT'), $message);
 
                        // Display message
                        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);
                } else {
                        // Load contact form template
                        loadTemplate('admin_contct_user_form', false, $content);

diff --git a/inc/modules/admin/what-usr_online.php b/inc/modules/admin/what-usr_online.php
index 3a1043a4eef29ddeabf056f17cd0654b5f9aba8a..e0c413635834646d52720f57c3cfe3b803ef600e 100644 (file)
--- a/inc/modules/admin/what-usr_online.php
+++ b/inc/modules/admin/what-usr_online.php
@@ -99,7 +99,7 @@ if (isExtensionActive('online')) {
        } // END - if
 } else {
        // Online statistics deactivated!
        } // END - if
 } else {
        // Online statistics deactivated!

-       loadTemplate('admin_settings_saved', false, getMessage('ONLINE_STATISTICS_DEACTIVATED'));
+       loadTemplate('admin_settings_saved', false, '{--ONLINE_STATISTICS_DEACTIVATED--}');

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/inc/modules/guest/what-doubler.php b/inc/modules/guest/what-doubler.php
index 01b6209015992840020203805253e8553cf1bd26..8457a98c8cefdf5926569f6fdb3c32ba15753c63 100644 (file)
--- a/inc/modules/guest/what-doubler.php
+++ b/inc/modules/guest/what-doubler.php
@@ -50,31 +50,12 @@ if ((!isExtensionActive('doubler')) && (!isAdmin())) {
        return;
 } // END - if
 
        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');
 
 // 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);
 
 // Load template
 loadTemplate('guest_doubler', false, $content);
 

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 7bd3c02db3a930f96f9779cc44cce2502e373ce2..d38988eb589c61ac352094d2278b1a507ffabf2f 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -60,7 +60,7 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
        doRegistration();
 
        // Output success registration
        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()) {
 } else {
        // Do this only if form is sent
        if (isFormSent()) {

diff --git a/inc/modules/guest/what-sponsor_infos.php b/inc/modules/guest/what-sponsor_infos.php
index 28019f4e7c03115a4ce4597b7058c319d4570144..a60c582d2bd018d6819f582f7583e94fb8c12428 100644 (file)
--- a/inc/modules/guest/what-sponsor_infos.php
+++ b/inc/modules/guest/what-sponsor_infos.php
@@ -95,12 +95,12 @@ if (SQL_NUMROWS($result_act) > 0) {
                }
        } else {
                // No pay types setuped so far!
                }
        } 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!
        }
 } 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
 }
 
 // Free memory

diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index a9e1c850c633c80e99846938f44a29c1290c430a..1952a4ca5f7aa2dd5bf9e84785b315284290d1c5 100644 (file)
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.php
@@ -103,10 +103,10 @@ LIMIT 1",
                                sendAdminNotification(getMessage('ADMIN_NEW_SPONSOR'), 'admin_sponsor_pending', $data);
 
                                // Sponsor account set to pending
                                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!
                        } 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
                        }
                } 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
                        // 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!
                        } 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?
                        }
                } 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
                }
        } 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
                        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
                } 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
                }
 
                // 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
                        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
                                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
                } 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
                }
 
                // Free memory


@@ -253,21 +258,21 @@ WHERE `id`='%s' AND password='%s' LIMIT 1",
                                redirectToUrl('modules.php?module=sponsor');
                        } else {
                                // Cookie setup failed!
                                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
 
                                // 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"...
 
                        // 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');
 
                // Login formular and other links
                loadTemplate('guest_sponsor_login');

diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index 3556a9447bde6597a7f3b843e62be350d406675c..bdfea2200d2b7cd40cae11a013664db991ab45ea 100644 (file)
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -334,7 +334,7 @@ ORDER BY
 
                        // Errors found?
                        if (count($FORM_ERRORS) > 0) {
 
                        // 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>';
                                $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('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
        }
 
        // Free memory

diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index a5165082ba5b18a4dda7a4c5fc724c1500e276e7..f605c8fc0d51c78a2a0763be6978f9a16a711ef0 100644 (file)
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -234,12 +234,12 @@ switch (getConfig('guest_stats')) {
                        loadTemplate('guest_stats_table', false, $content);
                } else {
                        // No clicks detected
                        loadTemplate('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
                }
                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
 
                break;
 } // END - switch
 

diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php
index 86263f07e8c26a7856f574434f11be56c51f8fdd..cb0453d670aefc3c5b6f5078d5d48d1ed00a5682 100644 (file)
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -108,15 +108,15 @@ if ($cats > 0) {
                // Categories saved?
                if ($cnt > 0) {
                        // Output message
                // 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
                } 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... :(
                }
        } 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
                } // END - if
 
                // Put some data into constants for the template


@@ -161,11 +161,11 @@ if ($cats > 0) {
        }
 } else {
        // No cateogries are defined yet
        }
 } 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);
 
 }
 
 // Free result
 SQL_FREERESULT($result);
 

-//
+// [EOF]

 ?>
 ?>

diff --git a/inc/modules/member/what-doubler.php b/inc/modules/member/what-doubler.php
index ba674f53947d3ec3874bce19183922e45b451bab..520853db579b9ada40b23e056f7a106221ecd21a 100644 (file)
--- a/inc/modules/member/what-doubler.php
+++ b/inc/modules/member/what-doubler.php
@@ -52,23 +52,13 @@ if ((!isExtensionActive('doubler')) && (!isAdmin())) {
        return;
 } // END - if
 
        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
 
 // 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?
 } // 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 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 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);
 
 // Load template
 loadTemplate('member_doubler', false, $content);
 

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 209ad00787beb478c9d39f52260ac0e82ec1ea6f..bfcffff743d30f0ef1765d3bee6c933e18b68651 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -154,7 +154,7 @@ LIMIT 1",
                createNewTask('{--HOLIDAY_ADMIN_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId());
 
                // Display message
                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
 
        }
 } // END - if
 


@@ -213,17 +213,17 @@ LIMIT 1",
                                sendAdminNotification(getMessage('HOLIDAY_ADMIN_DEAC_SUBJ'), 'admin_holiday_deactivated', $content, getMemberId());
 
                                // Display message to user
                                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
                        } 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!
                        }
 
                        // 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
                }
        } else {
                // User not found


@@ -314,7 +314,7 @@ LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
                }
        } else {
                // To fast!
                }
        } else {
                // To fast!

-               loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED'));
+               loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_LOCKED--}');

        }
 } // END - if
 
        }
 } // END - if
 

diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php
index 2b58327deda023f9bbef42a7dfe0b7e184d06f3e..3b9cb6fe3d00ea9d9247c9b4eed7169e3e85281b 100644 (file)
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -57,7 +57,7 @@ if (isFormSent()) {
        // Save settings
        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `html`='%s' WHERE `userid`=%s LIMIT 1",
                array(postRequestParameter('html'), getMemberId()), __FILE__, __LINE__);
        // 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'] = '';
 } else {
        // Prepare it
        $content['html_y'] = '';

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 28a0f11ad17e9ce30c0bb68ab711534a091b217a..ab440d29bea8b2650edcd539e4143912132daba3 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -203,7 +203,7 @@ LIMIT 1",
                        loadTemplate('admin_settings_saved', false, $content['update_check']);
                } elseif ((!isEmailValid(postRequestParameter('email'))) && (!isAdmin())) {
                        // Invalid email address!
                        loadTemplate('admin_settings_saved', false, $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));
                } 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
                                        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
                                }
                        } 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;
                        }
                }
                break;

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 83d8724ff24622ea82a394cd25bacb0cac6e89e6..77b8206c67f4883ad06e8137130a8147f5afc9bc 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -99,7 +99,7 @@ $total = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTot
 
 if (($HOLIDAY == 'Y') && (isExtensionInstalledAndNewer('holiday', '0.1.3'))) {
        // Holiday is active!
 
 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
        //
 } 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
 WHERE
        `sender`=%s AND
        `url`='%s' AND

-       `timestamp` > (UNIX_TIMESTAMP() - %s)
+       `timestamp` > (UNIX_TIMESTAMP() - {?url_tlock?})

 LIMIT 1",
                array(
                        getMemberId(),
 LIMIT 1",
                array(
                        getMemberId(),

-                       postRequestParameter('url'),
-                       getConfig('url_tlock')
+                       postRequestParameter('url')

                ), __FILE__, __LINE__);
 
        $type = 'TEMP'; $id = '0';
                ), __FILE__, __LINE__);
 
        $type = 'TEMP'; $id = '0';


@@ -435,7 +434,7 @@ LIMIT 1",
        $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS1');
 } elseif (($ALLOWED == '0') && (getConfig('order_max_full') == 'ORDER')) {
        // No more mail orders allowed
        $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS1');
 } elseif (($ALLOWED == '0') && (getConfig('order_max_full') == 'ORDER')) {
        // No more mail orders allowed

-       loadTemplate('admin_settings_saved', false, getMessage('MEMBER_ORDER_ALLOWED_EXHAUSTED'));
+       loadTemplate('admin_settings_saved', false, '{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}');

 } elseif (($links < getConfig('unconfirmed')) && ($mmails == 1)) {
        // Display order form
        $result_cats = SQL_QUERY("SELECT
 } 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
        }
 } 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);
 } else {
        // Please confirm some mails first
        loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_LINKS_LEFT'), $links);

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index a73ae1afca13e3e620fa46a4b3dd81df638f2838..dadbf5b6bac0df4a1d6b94285e98ee8f95cca539 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -147,7 +147,7 @@ ORDER BY
                outputPayoutList($totalPoints);
        } else {
                // No payout types setup
                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
        }
 } 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
                                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(
                        } 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
                        }
                } 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
                }
        } 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
        }
 
        // Free result

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index 38065edd7bf3815c9847cfdaca24c3b4a8e0c9ef..6932b6ecd04b07e76792e65f0df88f305c9bf0c3 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -61,9 +61,9 @@ if (isExtensionInstalledAndNewer('bonus', '0.4.4')) $depths += 4;
 $content['rowspan'] = ($depths*2+15);
 
 // Init some vars...
 $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
 $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
                $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
        } // 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
                $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
        } // END - if
 
        // Free result


@@ -126,35 +126,33 @@ SQL_FREERESULT($result_depths);
 $content['rows'] = $OUT;
 
 // Initialize variables
 $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 = '';
 
 // 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')) {
 
        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
        } // 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!
 } else {
        // Please update!

-       $CONFIRMED = '---';
+       $content['confirmed'] = '---';

 }
 
 // If TLOCK is 0 add 3 zeros for floating
 }
 
 // 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
 
 // 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');
 
 // 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')) {
 
 // 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
        // 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);
 
        // 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');
 }
 
        $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
 // 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, 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
 }
 
 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]
 } // END - if
 
 // [EOF]

diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php
index b8f8557b5c74942216b84da8af8f38f98243d147..794689bdb5fedaf9401e2a2d41219c1052eb2512 100644 (file)
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -57,7 +57,7 @@ if ((!isExtensionActive('primera')) && (!isAdmin())) {
 // Check if the admin has entered the data
 if ((getConfig('primera_api_name') == '') || (getConfig('primera_api_md5') == '')) {
        // Something important is missing...
 // 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
 
        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
        // 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;
        }
 
                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
                        // 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
                        } 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
                        } 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!
                        } 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!
                        } 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)));
                        } 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!
                                                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
                                        return;
                                } elseif ((GET_PRIMERA_ERROR_CODE() == 'user_failed') || (GET_PRIMERA_ERROR_CODE() == 'own_failed') || (GET_PRIMERA_ERROR_CODE() == 'amount_failed') || (GET_PRIMERA_ERROR_CODE() == 'api_amount_failed')) {
                                        // Wrong login data

diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php
index fcfa29aefd879c8a10ff89d3a3c4ae0f825fdce9..28d898f32cde8d0df03387b6813edddd097ab58b 100644 (file)
--- a/inc/modules/member/what-refback.php
+++ b/inc/modules/member/what-refback.php
@@ -43,12 +43,10 @@ if (!defined('__SECURITY')) {
 } elseif (!isMember()) {
        // User is not logged in
        redirectToIndexMemberOnlyModule();
 } 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
        // 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
        // Abort here
        return false;
 } // END - if


@@ -76,13 +74,13 @@ if ((isFormSent('edit')) && (isPostRequestParameterSet('id'))) {
                        // Check status
                        if (isset($status['ok'])) {
                                // No message found
                        // 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
                        } 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 ;-)
                        }
                } else {
                        // Percents out-of-bounds ;-)


@@ -154,7 +152,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('member_refback_list', false, $OUT);
 } else {
        // No entries
        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
 }
 
 // Free result

diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php
index d31f73574293148426ca90e0b2d61443b7c47e79..211272e06810791f72bebb3fe0369f0f8aa7bac4 100644 (file)
--- a/inc/modules/member/what-reflinks.php
+++ b/inc/modules/member/what-reflinks.php
@@ -112,7 +112,7 @@ if (SQL_NUMROWS($result) > 0) {
        $content['refbanner_content'] = loadTemplate('member_reflinks_table', true, $OUT);
 } else {
        // No refbanner found!
        $content['refbanner_content'] = loadTemplate('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
 }
 
 // Free result

diff --git a/inc/modules/member/what-reflist.php b/inc/modules/member/what-reflist.php
index 5875286770c6e979354bfcd249d95bc897b7e7db..7797639cb9929f484759303cbe725d36f15d146d 100644 (file)
--- a/inc/modules/member/what-reflist.php
+++ b/inc/modules/member/what-reflist.php
@@ -96,7 +96,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('member_ref_list', false, $OUT);
 } else {
        // No entries
        loadTemplate('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
 }
 
 // Free result

diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php
index fb156eb909278fbd171e81e284e3d3996005d4e3..75a93fa8b0bf549fae7ebb5d734ab2ceef51651d 100644 (file)
--- a/inc/modules/member/what-stats.php
+++ b/inc/modules/member/what-stats.php
@@ -95,7 +95,7 @@ if (SQL_NUMROWS($result) > 0) {
        $main_content['pool'] = loadTemplate('member_pool_table', true, $OUT);
 } else {
        // No mails in pool!
        $main_content['pool'] = loadTemplate('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
 }
 
 // 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('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
 }
 
 // Free result

diff --git a/inc/modules/member/what-surfbar_book.php b/inc/modules/member/what-surfbar_book.php
index 1fb968bbf247f5c252f698ddafbba24d2dbfe4a6..1c57183d09e3e7e4d97dad47cae6e8267a78548b 100644 (file)
--- a/inc/modules/member/what-surfbar_book.php
+++ b/inc/modules/member/what-surfbar_book.php
@@ -56,7 +56,7 @@ if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
 // Still allowed to book more URLs?
 if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
        // No more URLs allowed to book!
 // 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')))) {
 } elseif ((isFormSent()) && (isPostRequestParameterSet(('limited')))) {
        // Is limitation "no" and "limit" is > 0?
        if ((postRequestParameter('limited') != 'Y') && ((isPostRequestParameterSet(('limit'))) && (postRequestParameter('limit') > 0)) || (!isPostRequestParameterSet(('limit')))) {

diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php
index 562ea10b330609f176777c8c01e23670aa9bf5e6..14a3ed991f31db834ece4760afb87af93c09de5a 100644 (file)
--- a/inc/modules/member/what-surfbar_list.php
+++ b/inc/modules/member/what-surfbar_list.php
@@ -60,13 +60,13 @@ if ((isFormSent()) && (isPostRequestParameterSet(('action'))) && (isPostRequestP
        // Process the form
        if (SURFBAR_MEMBER_DO_FORM(postRequestArray(), $urlArray)) {
                // Action performed but shall we display it?
        // 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
                        // 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
                } // 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
        }
 } 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('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]
 }
 
 // [EOF]

diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php
index 4995716159eaaaba921c858f5e9fd7a407cc658b..e298d8789bed5b23ffd56bdc253b7c5252c39bb0 100644 (file)
--- a/inc/modules/member/what-themes.php
+++ b/inc/modules/member/what-themes.php
@@ -64,17 +64,17 @@ if (isPostRequestParameterSet('member_theme')) {
        setTheme($newTheme);
 
        // Theme saved!
        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(
 } // 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"
 );
 
 // Read directory "themes"


@@ -133,7 +133,7 @@ if (empty($OUT)) {
        // No themes found???
        $OUT = "<tr>
   <td colspan=\"5\" class=\"bottom\" height=\"80\">
        // 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
   </td>
 </tr>\n";
 } // END - if

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index ddc7586b6f4001a2144985461ef6fd5f4e7c6b29..7741e57601f0314a6b024623fd655f3f5c16015c 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -172,7 +172,7 @@ switch ($mode) {
                                sendAdminNotification($adminSubject, 'admin_transfer_points', $content);
 
                                // Transfer is completed
                                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>');
                        } 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
                                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"';
                        }
 
                                $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'] = '<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
                        }
 
                        // Init points/reason


@@ -415,11 +415,11 @@ KEY (`party_userid`)
                        SQL_FREERESULT($result);
                } else {
                        // Nothing for in and out
                        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>
   </td>

-</tr>";
+</tr>';

                }
 
                // ... and add them to a constant for the template
                }
 
                // ... and add them to a constant for the template

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 12ecfd5da861333b2b2eda5a701fd4ddd9f8c860..4cc86f57cf4a6df4bcbf74ec3a6219a54ce7bc67 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -263,7 +263,7 @@ LIMIT 1",
        }
 } else {
        // No mails left to confirm... :)
        }
 } 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]
 }
 
 // [EOF]

diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php
index e99858cd74a0970a5158ea5b3ce33147975b420b..4729c81f1de3cd656f1efcb93709c5032ab9a716 100644 (file)
--- a/inc/modules/member/what-wernis.php
+++ b/inc/modules/member/what-wernis.php
@@ -56,7 +56,7 @@ if ((!isExtensionActive('wernis')) && (!isAdmin())) {
 // Check if the admin has entered the data
 if ((getConfig('wernis_api_id') == '') || (getConfig('wernis_api_md5') == '')) {
        // Something important is missing...
 // 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
 
        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
        // 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
        } 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
        } 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!
        } 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!
        } 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!
        } 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'));
                                } 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!
                                                        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
                                                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!
                        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)));
                                } 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!
                                                        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
                                                return;
                                        } elseif ((GET_WERNIS_ERROR_CODE() == 'user_failed') || (GET_WERNIS_ERROR_CODE() == 'own_failed') || (GET_WERNIS_ERROR_CODE() == 'amount_failed') || (GET_WERNIS_ERROR_CODE() == 'api_amount_failed')) {
                                                // Wrong login data

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index ea1bb7c60b0e743b8289710f1c25316d7dad31ab..62d18a26c106b6ab526902dc327fecfd4fdf1373 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -115,7 +115,7 @@ if (SQL_NUMROWS($result) == 1) {
                                $OUT = loadTemplate('admin_settings_saved', true, $message);
                        } else {
                                // No message generated
                                $OUT = loadTemplate('admin_settings_saved', true, $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
                        }
                } else {
                        // Init gender

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index f49a345912321f9c8795c58b7f23422c7f7befe8..6c06b081c1c93b003a482e7d6d927fa5e2d3f4d8 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -104,7 +104,7 @@ if (SQL_NUMROWS($result) == 1) {
                                $OUT = loadTemplate('admin_settings_saved', true, $message);
                        } else {
                                // No message generated
                                $OUT = loadTemplate('admin_settings_saved', true, $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
                        }
                } else {
                        // Make yes/no selection

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 499002bd0d7219d8e8d58e3af6113093efd60d53..ebb750ba2754d42b4215eed8f8deb146dac08ec0 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1314,7 +1314,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 
                                // And sent it away
                                sendEmail($userid, getMessage('SUBJECT_DIRECT_PAYMENT'), $message);
 
                                // 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?
                        }
 
                        // Maybe there's another ref?

diff --git a/mailid_top.php b/mailid_top.php
index 0ea9125b67774b82684dd26ab5be120758f5996a..e9afe997ddc1b326fb1f7472949e5d798a2af586 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -228,7 +228,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                                                                                // Update random confirmed as well?
                                                                                if (isExtensionInstalledAndNewer('user', '0.3.4')) {
                                                                                        // Update second counter
                                                                                // 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
                                                                                                array($url_userid), __FILE__, __LINE__);
                                                                                } // END - if
                                                                        } // END - if

diff --git a/templates/de/emails/admin/admin_sponsor_change_data.tpl b/templates/de/emails/admin/admin_sponsor_change_data.tpl
index b60c9a2ea66b66e7c5f48fc0e07fafea4b0ec5b5..e4cdbbaafe43fc1bcab8130d773bc759c7bd06f9 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_change_data.tpl
+++ b/templates/de/emails/admin/admin_sponsor_change_data.tpl
@@ -8,7 +8,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $content[new_data][position] ($content[position])
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[new_data][tax_ident] ($content[tax_ident])
 ------------------------------
 {--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])
 {--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$userid%} {%sponsor,family=$userid%})
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[new_data][street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[new_data][street_nr2] ($content[street_nr2])

diff --git a/templates/de/emails/admin/admin_sponsor_change_email.tpl b/templates/de/emails/admin/admin_sponsor_change_email.tpl
index a66f57555e5f29891890c30bd015e0c5b1c7d757..351b9558021159a2cab7981be98f92cdda675ae3 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_change_email.tpl
+++ b/templates/de/emails/admin/admin_sponsor_change_email.tpl
@@ -8,7 +8,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $content[new_data][position] ($content[position])
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[new_data][tax_ident] ($content[tax_ident])
 ------------------------------
 {--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])
 {--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$userid%} {%sponsor,family=$userid%})
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[new_data][street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[new_data][street_nr2] ($content[street_nr2])

diff --git a/templates/de/emails/admin/admin_sponsor_settings.tpl b/templates/de/emails/admin/admin_sponsor_settings.tpl
index 156230ae10e0d9db34b4ab0ad48b56a5dece2274..29fd3f50f9aa7d83433beacb660e3763b80eeadb 100644 (file)
--- a/templates/de/emails/admin/admin_sponsor_settings.tpl
+++ b/templates/de/emails/admin/admin_sponsor_settings.tpl
@@ -4,8 +4,8 @@ einer unserer Sponsoren hat soeben seine Einstellungen geaendert!
 
 Hier sind alle neuen (und in Klammern alten) Daten:
 ------------------------------
 
 Hier sind alle neuen (und in Klammern alten) Daten:
 ------------------------------

-{--SPONSOR_RECEIVE_WARNINGS--}: $content[new_data][receive] ($content[receive])
-{--SPONSOR_WARNING_INTERVAL--}: $content[new_data][interval] ($content[interval])
+{--SPONSOR_RECEIVE_WARNINGS--}: {%pipe,translateYesNo=$content[new_data][receive_warnings]%} ({%pipe,translateYesNo=$content[receive_warnings]%})
+{--SPONSOR_WARNING_INTERVAL--}: {%pipe,translateYesNo=$content[new_data][warning_interval]%} ({%pipe,translateYesNo=$content[warning_interval]%})

 ------------------------------
 
 ------------------------------
 ------------------------------
 
 ------------------------------

diff --git a/templates/de/emails/sponsor/sponsor_change_data.tpl b/templates/de/emails/sponsor/sponsor_change_data.tpl
index 10711c5aca3ea0fa33cfe1c3cde8bfd602022103..9442472c1d78afd9bcefe19c5512eef5cbb266ee 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_change_data.tpl
+++ b/templates/de/emails/sponsor/sponsor_change_data.tpl
@@ -1,25 +1,25 @@
-Hallo $DATA[gender] $DATA[surname] $DATA[family],
+Hallo $content[gender] $content[surname] $content[family],

 
 Sie haben heute Ihre Daten geaendert.
 
 Hier sind alle neuen (und in Klammern alten) Daten:
 ------------------------------
 
 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.
 ------------------------------
 
 Das Passwort wurde Ihnen aus Sicherheitsgruenden nicht mitgesendet.

diff --git a/templates/de/emails/sponsor/sponsor_change_email.tpl b/templates/de/emails/sponsor/sponsor_change_email.tpl
index db4414792c12acbe608f61d0e9c5b844e5ddb7db..13b93334fe9a96fa325b8c0c6cb66473efe27583 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_change_email.tpl
+++ b/templates/de/emails/sponsor/sponsor_change_email.tpl
@@ -1,4 +1,4 @@
-Hallo $DATA[gender] $DATA[surname] $DATA[family],
+Hallo $content[gender] $content[surname] $content[family],

 
 Sie haben heute Ihre Email-Adresse geaendert. Ihr Account wurde somit temporaer gesperrt. Sie können es nun mit dem folgenden Link wieder freigeben:
 
 
 Sie haben heute Ihre Email-Adresse geaendert. Ihr Account wurde somit temporaer gesperrt. Sie können es nun mit dem folgenden Link wieder freigeben:
 

diff --git a/templates/de/emails/sponsor/sponsor_settings.tpl b/templates/de/emails/sponsor/sponsor_settings.tpl
index 8bab2cf8d1a21277e66a2e0a64b6228782c00a60..a0ec011bd7c4be18d81b7287d592225da4b276cc 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_settings.tpl
+++ b/templates/de/emails/sponsor/sponsor_settings.tpl
@@ -4,8 +4,8 @@ Sie haben heute Ihre Einstellungen geaendert.
 
 Hier sind alle neuen (und in Klammern alten) Daten:
 ------------------------------
 
 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.
 ------------------------------
 
 Das Passwort wurde Ihnen aus Sicherheitsgruenden nicht mitgesendet.

diff --git a/templates/de/html/admin/admin_cache_stats.tpl b/templates/de/html/admin/admin_cache_stats.tpl
index fcdcbd97163c9191a65c44424c60053d61da97f9..dd87abfb211d65c6c955676b570bc4c719cecc09 100644 (file)
--- a/templates/de/html/admin/admin_cache_stats.tpl
+++ b/templates/de/html/admin/admin_cache_stats.tpl
@@ -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">
        <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">
                </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">
                </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>
        </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>
                </td>
        </tr>
 </table>

diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl
index 8e508f4e51106b6299a7510e6ff3fe0638a7087e..a2df11fce594aa5ca382861835872c62d6bf0078 100644 (file)
--- a/templates/de/html/admin/admin_config_doubler.tpl
+++ b/templates/de/html/admin/admin_config_doubler.tpl
@@ -11,7 +11,7 @@
                        {--ADMIN_DOUBLER_CHARGE--}:
                </td>
                <td width="195" style="padding-left: 5px">
                        {--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>
                </td>
        </tr>
        <tr>


@@ -19,7 +19,7 @@
                        {--ADMIN_DOUBLER_REFERAL--}:
                </td>
                <td width="195" style="padding-left: 5px">
                        {--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>
                </td>
        </tr>
        <tr>


@@ -27,7 +27,7 @@
                        {--ADMIN_DOUBLER_MINIMUM--}:
                </td>
                <td width="195" style="padding-left: 5px">
                        {--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>
                </td>
        </tr>
        <tr>


@@ -35,7 +35,7 @@
                        {--ADMIN_DOUBLER_MAXIMUM--}:
                </td>
                <td width="195" style="padding-left: 5px">
                        {--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>
                </td>
        </tr>
        <tr>


@@ -43,7 +43,7 @@
                        {--ADMIN_DOUBLER_LEFT--}:
                </td>
                <td width="195" style="padding-left: 5px">
                        {--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>
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_edit_sponsor_edit.tpl b/templates/de/html/admin/admin_edit_sponsor_edit.tpl
index 6a1eb6dd7ad2e8863524f974d5714b43ac8cfbe3..528fab3fb5e7bfd6d5061e9affad6602fe8efb7d 100644 (file)
--- a/templates/de/html/admin/admin_edit_sponsor_edit.tpl
+++ b/templates/de/html/admin/admin_edit_sponsor_edit.tpl
@@ -163,7 +163,7 @@
     {--SPONSOR_WARNING_INTERVAL--}: 
   </td>
   <td class="bottom">
     {--SPONSOR_WARNING_INTERVAL--}:&nbsp;
   </td>
   <td class="bottom">

-    $content[interval]
+    $content[warning_interval]

   </td>
 </tr>
 <tr>
   </td>
 </tr>
 <tr>

diff --git a/templates/de/html/admin/admin_list_bank_package_row.tpl b/templates/de/html/admin/admin_list_bank_package_row.tpl
index b9f1353c83c949bf08cce20b9d95451df581491a..dbe4b2d8fc58da59ccf848f2cbe064f6faf99a95 100644 (file)
--- a/templates/de/html/admin/admin_list_bank_package_row.tpl
+++ b/templates/de/html/admin/admin_list_bank_package_row.tpl
@@ -12,15 +12,15 @@
                $content[description]
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
                $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">
        </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">
        </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">
        </td>
        <td align="center" class="switch_sw$content[sw] bottom">

-               $content[active]
+               {%pipe,translateComma=$content[package_active]%}

        </td>
 </tr>
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_unlock_sponsor_row.tpl b/templates/de/html/admin/admin_unlock_sponsor_row.tpl
index da9d6215bff60e7aa2bfb20f7731d1f8ac572f22..f48afec366cd6631bcd1f895d254bcab2858d12c 100644 (file)
--- a/templates/de/html/admin/admin_unlock_sponsor_row.tpl
+++ b/templates/de/html/admin/admin_unlock_sponsor_row.tpl
@@ -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">
                <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">
        </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">
        </td>
        <td align="center" class="switch_sw$content[sw] bottom">

-               $content[created]
+               $content[sponsor_created]

        </td>
 </tr>
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl
index d8012e8bbce62c8737c56455327535b27f39aac1..0e0b42911102819d03cf0c922440367314f2291e 100644 (file)
--- a/templates/de/html/admin/admin_user_details.tpl
+++ b/templates/de/html/admin/admin_user_details.tpl
@@ -102,7 +102,7 @@
                </td>
                <td align="center" class="top right">
                        {--TOTAL_POINTS--}:<br />
                </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">
                        {--TOTAL_REFERALS--}:<br />


@@ -120,7 +120,7 @@
                </td>
                <td align="center" class="top right">
                        {--LOCKED_POINTS--}:<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">
                        {--LAST_UPDATE--}:<br />


@@ -142,7 +142,7 @@
                </td>
                <td align="center" class="top right">
                        {--CLICK_RATE--}:<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">
                        {--EMAILS_RECEIVED--}:<br />


@@ -156,21 +156,22 @@
                </td>
                <td align="center" class="top right">
                        {--RAND_CONFIRMED--}:<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">
                </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>
                </td>
                <td align="center" class="top">
                        {--LOCK_REASON--}:<br />
                        <strong>$content[lock_reason]</strong>
                </td>
        </tr>

+       <!--

        <tr>
                <td align="center" class="top right">
        <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 />
                </td>
                <td align="center" class="top right">
                        {--_UNUSED--}:<br />


@@ -185,6 +186,7 @@
                        <strong>---</strong>
                </td>
        </tr>
                        <strong>---</strong>
                </td>
        </tr>

+       //-->

        <tr>
                <td align="center" class="admin_footer top" colspan="4">
                        <div>
        <tr>
                <td align="center" class="admin_footer top" colspan="4">
                        <div>

diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl
index 3a2eed4e0c8363bbb79f0796be726017b32533a1..a5e63c026819cd83df1549f375b77d81ad8925bb 100644 (file)
--- a/templates/de/html/doubler/doubler_index.tpl
+++ b/templates/de/html/doubler/doubler_index.tpl
@@ -51,17 +51,17 @@
                </table>
                </form>
                <br />
                </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 />
                <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_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;
                {--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 />
                <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>
                {--DOUBLER_REFERAL_2--} {--DOUBLER_REFERAL_3--}
                {--DOUBLER_REFERAL_4--} {--DOUBLER_REFERAL_5--} <strong>100
                {?POINTS?}</strong> {--DOUBLER_REFERAL_6--} <strong>100 {?POINTS?}</strong>

diff --git a/templates/de/html/guest/guest_doubler.tpl b/templates/de/html/guest/guest_doubler.tpl
index ffc804db4a9f2502c05855d08a68ccdf6121b1fe..de737c5e17ffecdbeb27d14cea37909395e5af10 100644 (file)
--- a/templates/de/html/guest/guest_doubler.tpl
+++ b/templates/de/html/guest/guest_doubler.tpl
@@ -8,18 +8,18 @@
        <tr>
                <td class="doubler_main bottom" style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
                        <ul>
        <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>$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_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_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>
                        <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>
        <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>
                        </ul>
                </td>
        </tr>


@@ -48,5 +48,5 @@
 <div class="big">
        {--DOUBLER_NEXT_PAYOUT--}:</div>
        <br />
 <div class="big">
        {--DOUBLER_NEXT_PAYOUT--}:</div>
        <br />

-       $content[next_table]
+       {%pipe,generateDoublerTable%}

 </div>
 </div>

diff --git a/templates/de/html/member/member_doubler.tpl b/templates/de/html/member/member_doubler.tpl
index 6ec5e36517582f103a7dc48bcbc1b592b6f06b25..b026836b5608d46f0c6da0146acc2e9dab2f7e89 100644 (file)
--- a/templates/de/html/member/member_doubler.tpl
+++ b/templates/de/html/member/member_doubler.tpl
@@ -4,18 +4,18 @@
        </div>
 
        <div>
        </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>
        </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>
        </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]
 
        <div class="big">{--DOUBLER_MEMBER_REF_PAYOUT--}:</div>
        $content[payout_ref]


@@ -29,16 +29,16 @@
                <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>
                <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>$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_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_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>
                        <li>{--DOUBLER_HAVE_FUN--}</li>
                </ul>
        </div>

diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl
index eb4cf30446358d45e8ae659e748cc67b2d7c8fe4..4981de33d1cde375b1366d00bb2a43f8121313c9 100644 (file)
--- a/templates/de/html/member/member_points.tpl
+++ b/templates/de/html/member/member_points.tpl
@@ -9,18 +9,18 @@
        <tr>
                <td class="member_data bottom">{--POINTS_USED--}</td>
                <td class="member_data bottom">{%user,used_points,translateComma%} {?POINTS?}</td>
        <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">
        </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>

-               <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>
        </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]
                <td class="member_data">-</td>
        </tr>
        $content[special_rows]

diff --git a/templates/de/html/member/member_points_bonus_rows.tpl b/templates/de/html/member/member_points_bonus_rows.tpl
index 7f13874f0870ceac50e49882d4077a90a0579112..a50c5c9f12203c5926b001d2987977788c0829af 100644 (file)
--- a/templates/de/html/member/member_points_bonus_rows.tpl
+++ b/templates/de/html/member/member_points_bonus_rows.tpl
@@ -35,6 +35,6 @@
 </tr>
 <tr>
        <td class="member_data"><strong>{--BONUS_TOTAL--}</strong></td>
 </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>
        <td class="member_data">-</td>
 </tr>