New wrapper function introduced, more EL rewrites:

- New wrapper function getTotalPoints() introduced
- Even more rewrites to make usage of EL
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 095875b9fb62775bab1528256d5130cc2ef4bf10..346184b921335684f1774f8f94a15c042d48c396 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -161,7 +161,7 @@
 ./inc/modules/member/what-categories.php:129:          // @TODO Rewrite this to use $OUT .= ...
 ./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-categories.php:129:          // @TODO Rewrite this to use $OUT .= ...
 ./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:216:                                      // @TODO Rewrite this to a filter
+./inc/modules/member/what-payout.php:207:                                      // @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:126:                     // @TODO UNUSED: $refRow['status']      = translateUserStatus($refRow['status']);
 ./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:126:                     // @TODO UNUSED: $refRow['status']      = translateUserStatus($refRow['status']);


@@ -178,8 +178,8 @@
 ./inc/mysql-manager.php:1164:  // @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:1411:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 ./inc/mysql-manager.php:1509:  // @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:1164:  // @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:1411:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 ./inc/mysql-manager.php:1509:  // @TODO Rewrite this to a filter

-./inc/mysql-manager.php:1889:                  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1933:// @TODO Fix inconsistency between last_module and getWhat()
+./inc/mysql-manager.php:1888:                  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1932:// @TODO Fix inconsistency between last_module and getWhat()

 ./inc/mysql-manager.php:370:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:46:// @TODO Can we cache this?
 ./inc/reset/reset_beg.php:51:// @TODO This should be converted in a daily beg rallye
 ./inc/mysql-manager.php:370:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:46:// @TODO Can we cache this?
 ./inc/reset/reset_beg.php:51:// @TODO This should be converted in a daily beg rallye


@@ -200,8 +200,8 @@
 ./mailid_top.php:132:                                  // @TODO Rewrite this to a filter
 ./mailid_top.php:179:                                                  // @TODO Rewrite this to a filter
 ./mailid_top.php:186:                                                                  // @TODO Rewrite this to a filter
 ./mailid_top.php:132:                                  // @TODO Rewrite this to a filter
 ./mailid_top.php:179:                                                  // @TODO Rewrite this to a filter
 ./mailid_top.php:186:                                                                  // @TODO Rewrite this to a filter

-./mailid_top.php:222:                                                                  // @TODO Rewrite these blocks to filter
-./mailid_top.php:257:                                                                          // @TODO Try to rewrite the following unset()
+./mailid_top.php:221:                                                                  // @TODO Rewrite these blocks to filter
+./mailid_top.php:256:                                                                          // @TODO Try to rewrite the following unset()

 ./mailid_top.php:99:           // @TODO Rewrite this to a filter
 ./show_bonus.php:107:                  // @TODO No more needed? $content['points'] = translateComma($content['points']);
 ./view.php:70:         // @TODO No banner found, output some default banner
 ./mailid_top.php:99:           // @TODO Rewrite this to a filter
 ./show_bonus.php:107:                  // @TODO No more needed? $content['points'] = translateComma($content['points']);
 ./view.php:70:         // @TODO No banner found, output some default banner

diff --git a/doubler.php b/doubler.php
index 8685143cf2f2f935ab93a199e9f15c76424c3fe9..aaf4c8053b2edaca8e30c0a638020c69e7b42e22 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -95,7 +95,7 @@ if (isFormSent()) {
                        $GLOBALS['doubler_userid'] = getUserData('userid');
 
                        // Calulcate points
                        $GLOBALS['doubler_userid'] = getUserData('userid');
 
                        // Calulcate points

-                       $points = countSumTotalData(getUserData('userid'), 'user_points', 'points') - countSumTotalData(getUserData('userid'), 'user_data', 'used_points');
+                       $points = getTotalPoints(getUserData('userid'));

 
                        // So let's continue with probing his points amount
                        if (($points - getConfig('doubler_left') - postRequestParameter('points') * getConfig('doubler_charge') / 100) >= 0) {
 
                        // So let's continue with probing his points amount
                        if (($points - getConfig('doubler_left') - postRequestParameter('points') * getConfig('doubler_charge') / 100) >= 0) {

diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php
index 4b466f3564df982c67d88219b99d449e3aea5570..1de221578ffa94397a55f47743db46025075b59c 100644 (file)
--- a/inc/extensions/ext-wernis.php
+++ b/inc/extensions/ext-wernis.php
@@ -136,7 +136,7 @@ PRIMARY KEY (id)
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("WDS66-Username muss nun eintragen werden (API-Anpassung).");
                                break;
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("WDS66-Username muss nun eintragen werden (API-Anpassung).");
                                break;

-               }
+               } // END - switch

                break;
 
        case 'modify': // When the extension got modified
                break;
 
        case 'modify': // When the extension got modified


@@ -153,7 +153,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 427c31205ccf3f23ec849c6015c5176bf53afd28..c171e6217fb7d810a2e926a427a8d6c699c42c1b 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -89,7 +89,7 @@ function addFatalMessage ($F, $L, $message, $extra = '') {
 
 // Getter for total fatal message count
 function getTotalFatalErrors () {
 
 // Getter for total fatal message count
 function getTotalFatalErrors () {

-       // Init coun
+       // Init count

        $count = '0';
 
        // Do we have at least the first entry?
        $count = '0';
 
        // Do we have at least the first entry?

diff --git a/inc/language/beg_de.php b/inc/language/beg_de.php
index 6cf9a06e830bcce65c33a795b55a0cb44bd8246e..8f7b2cf85499309551522b5c7cf731e117cf9d9d 100644 (file)
--- a/inc/language/beg_de.php
+++ b/inc/language/beg_de.php
@@ -61,19 +61,19 @@ addMessages(array(
        'BEG_SORRY_ANOTHER_WAS_HERE_2' => " hat von Ihnen auch keine ",
        'BEG_SORRY_ANOTHER_WAS_HERE_3' => " {?POINTS?} erhalten.",
        'BEG_THANKS_FOR_CLICK_AGAIN' => "Danke dennoch für den erneuten Klick.",
        'BEG_SORRY_ANOTHER_WAS_HERE_2' => " hat von Ihnen auch keine ",
        'BEG_SORRY_ANOTHER_WAS_HERE_3' => " {?POINTS?} erhalten.",
        'BEG_THANKS_FOR_CLICK_AGAIN' => "Danke dennoch für den erneuten Klick.",

-       'BEG_MEMBER_YOUR_LINK' => "Hier ist Ihr persönlicher Bettel-Link",
-       'BEG_MEMBER_CLICKS_TOTAL' => "Anzahl Gesamtklicks auf Ihren Bettel-Link",
-       'BEG_MEMBER_EARN_1' => "Sie erhalten von",
-       'BEG_MEMBER_EARN_2' => "bis",
-       'BEG_MEMBER_EARN_3' => "für jeden Klick auf Ihren Bettellink.",
-       'BEG_MEMBER_TIMEOUT' => "Die Zeitsperre ist derzeit eingestellt auf <span class=\"data\">{%config,createFancyTime=beg_timeout%}</span>. Innerhalb dieser Zeit erhalten Sie keine erneute Verg&uuml;tung.",
-       'BEG_MEMBER_HAVE_FUN' => "Viel Spass beim {?POINTS?}-Betteln.",
-       'BEG_GUEST_TRAILER' => "{?POINTS?} erbetteln bei...",
-       'BEG_GUEST_EARN_1' => "Betteln macht sich bezahlt! F&uuml;r jeden Klick erhalten Sie von",
-       'BEG_GUEST_EARN_2' => "bis",
-       'BEG_GUEST_EARN_3' => "auf Ihr Mitgliedskonto direkt gutgeschrieben. Zuddem verdienen Sie an den erbettelteten {?POINTS?} Ihrer Refferal mit.",
-       'BEG_GUEST_TIMEOUT' => "Sie k&ouml;nnen derzeit alle <span class=\"data\">%s</span> {?POINTS?} betteln.",
-       'BEG_GUEST_HAVE_FUN' => "Heute noch anmelden und Spass haben.",
+       'MEMBER_BEG_YOUR_LINK' => "Hier ist Ihr pers&ouml;nlicher Bettel-Link",
+       'MEMBER_BEG_CLICKS_TOTAL' => "Anzahl Gesamtklicks auf Ihren Bettel-Link",
+       'MEMBER_BEG_EARN_1' => "Sie erhalten von",
+       'MEMBER_BEG_EARN_2' => "bis",
+       'MEMBER_BEG_EARN_3' => "f&uuml;r jeden Klick auf Ihren Bettellink.",
+       'MEMBER_BEG_TIMEOUT' => "Die Zeitsperre ist derzeit eingestellt auf <span class=\"data\">{%config,createFancyTime=beg_timeout%}</span>. Innerhalb dieser Zeit erhalten Sie keine erneute Verg&uuml;tung.",
+       'MEMBER_BEG_HAVE_FUN' => "Viel Spass beim {?POINTS?}-Betteln.",
+       'GUEST_BEG_TRAILER' => "{?POINTS?} erbetteln bei...",
+       'GUEST_BEG_EARN_1' => "Betteln macht sich bezahlt! F&uuml;r jeden Klick erhalten Sie von",
+       'GUEST_BEG_EARN_2' => "bis",
+       'GUEST_BEG_EARN_3' => "auf Ihr Mitgliedskonto direkt gutgeschrieben. Zuddem verdienen Sie an den erbettelteten {?POINTS?} Ihrer Refferal mit.",
+       'GUEST_BEG_TIMEOUT' => "Sie k&ouml;nnen derzeit alle <span class=\"data\">{%config,createFancyTime=beg_timeout%}</span> {?POINTS?} betteln.",
+       'GUEST_BEG_HAVE_FUN' => "Heute noch anmelden und Spass haben.",

        'ADMIN_BEG_POINTS_MAX' => "Maximale erbettelbare {?POINTS?} bei Klick auf Bettellink",
        'ADMIN_BEG_USERID' => "Mitglied-Account zum Abbuchen der erbettelten {?POINTS?}",
        'ADMIN_SELECT_BEG_MODE' => "Verg&uuml;tungsmodus der erbettelten {?POINTS?}",
        'ADMIN_BEG_POINTS_MAX' => "Maximale erbettelbare {?POINTS?} bei Klick auf Bettellink",
        'ADMIN_BEG_USERID' => "Mitglied-Account zum Abbuchen der erbettelten {?POINTS?}",
        'ADMIN_SELECT_BEG_MODE' => "Verg&uuml;tungsmodus der erbettelten {?POINTS?}",


@@ -101,7 +101,7 @@ addMessages(array(
        'BEG_RANK' => "Bettel-Rank",
        'BEG_TOTAL' => "Gesamt erbettelt",
        'BEG_POINTS' => "Erbettelt",
        'BEG_RANK' => "Bettel-Rank",
        'BEG_TOTAL' => "Gesamt erbettelt",
        'BEG_POINTS' => "Erbettelt",

-       'BEG_MEMBER_TOTAL' => "Erbettelte {?POINTS?} aller Mitglieder",
+       'MEMBER_BEG_TOTAL' => "Erbettelte {?POINTS?} aller Mitglieder",

        'ADMIN_BEG_TIMEOUT' => "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die sp&auml;testens am <span class=\"data\">%s</span> noch aktiv waren. Alle anderen Mitglieder erhalten die Verg&uuml;tung nicht.",
        'ADMIN_EDIT_BEG_RALLYE_SETTINGS' => "Einstellungen an der Bettel-Rallye",
        'ADMIN_BEG_RALLYE_ACTIVE' => "Ist die Bettel-Rallye aktiv? (Mails k&ouml;nnen optional versendet werden!)",
        'ADMIN_BEG_TIMEOUT' => "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die sp&auml;testens am <span class=\"data\">%s</span> noch aktiv waren. Alle anderen Mitglieder erhalten die Verg&uuml;tung nicht.",
        'ADMIN_EDIT_BEG_RALLYE_SETTINGS' => "Einstellungen an der Bettel-Rallye",
        'ADMIN_BEG_RALLYE_ACTIVE' => "Ist die Bettel-Rallye aktiv? (Mails k&ouml;nnen optional versendet werden!)",


@@ -118,7 +118,7 @@ addMessages(array(
        'BEG_RALLYE_CONDITION_2' => "Es kann jeder dran teilnehmen, der Mitglied bei diesem {?mt_word?} (<strong>{?MAIN_TITLE?}</strong>) und freigegeben ist.",
        'BEG_RALLYE_CONDITION_3' => "Zur Erstellung des Rallye-Ergebnisses werden alle erbettelten {?POINTS?} ber&uuml;cksichtig.",
        'BEG_RALLYE_CONDITION_4' => "Der Rechtsweg ist ausgeschlossen.",
        'BEG_RALLYE_CONDITION_2' => "Es kann jeder dran teilnehmen, der Mitglied bei diesem {?mt_word?} (<strong>{?MAIN_TITLE?}</strong>) und freigegeben ist.",
        'BEG_RALLYE_CONDITION_3' => "Zur Erstellung des Rallye-Ergebnisses werden alle erbettelten {?POINTS?} ber&uuml;cksichtig.",
        'BEG_RALLYE_CONDITION_4' => "Der Rechtsweg ist ausgeschlossen.",

-       'BEG_MEMBER_HERE_IS_THE_LIST' => "Hier finden Sie die aktuelle Liste mit den m&ouml;glichen Gewinnern.",
+       'MEMBER_BEG_HERE_IS_THE_LIST' => "Hier finden Sie die aktuelle Liste mit den m&ouml;glichen Gewinnern.",

        'BEG_LINK_HERE' => "Betteln Sie am Besten gleich los! Hier ist der Link dazu.",
        'ADMIN_BEG_RANKS' => "Anzahl Gewinner der Bettel-Rallye",
        'BEG_MONTHLY_RALLYE' => "GEWONNEN: Monatliche Bettel-Rallye",
        'BEG_LINK_HERE' => "Betteln Sie am Besten gleich los! Hier ist der Link dazu.",
        'ADMIN_BEG_RANKS' => "Anzahl Gewinner der Bettel-Rallye",
        'BEG_MONTHLY_RALLYE' => "GEWONNEN: Monatliche Bettel-Rallye",

diff --git a/inc/language/doubler_de.php b/inc/language/doubler_de.php
index fdfed8e503da349e8275ab5ef8c8b0524bfac854..5028dbe970f25e09ca6368b9cdd2bf4f59a86ebb 100644 (file)
--- a/inc/language/doubler_de.php
+++ b/inc/language/doubler_de.php
@@ -85,8 +85,7 @@ addMessages(array(
        'DOUBLER_NOTE_FOR_PASSWORD' => "Das Passwort wird nicht gespeichert.",
        'DOUBLER_ENTER_POINTS' => "{?POINTS?} zum Verdoppeln",
        'DOUBLER_NOW' => "Verdoppeln.",
        'DOUBLER_NOTE_FOR_PASSWORD' => "Das Passwort wird nicht gespeichert.",
        'DOUBLER_ENTER_POINTS' => "{?POINTS?} zum Verdoppeln",
        'DOUBLER_NOW' => "Verdoppeln.",

-       'DOUBLER_ALREADY_PAYED' => "Es wurden bereits <strong>%s {?POINTS?}</strong> ausgezahlt.",
-       'MEMBER_DOUBLER_ALREADY_PAYED' => "Es wurden bereits <strong>{%config,translateComma=doubler_points%} {?POINTS?}</strong> ausgezahlt.",
+       'DOUBLER_ALREADY_PAYED' => "Es wurden bereits <strong>{%config,translateComma=doubler_points%} {?POINTS?}</strong> ausgezahlt.",

        'DOUBLER_MINIMUM_IS' => "Mindestens",
        'DOUBLER_MAXIMUM_IS' => "verdoppeln, maximal",
        'DOUBLER_HAVE_FUN' => "Viel Spa&szlig;.",
        'DOUBLER_MINIMUM_IS' => "Mindestens",
        'DOUBLER_MAXIMUM_IS' => "verdoppeln, maximal",
        'DOUBLER_HAVE_FUN' => "Viel Spa&szlig;.",

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index c6768029f0219a4162909c4c336b4cbefb002ffc..25a7974dde0fc8f4fb6b8007c8b8fff5e5325da5 100644 (file)
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -235,7 +235,7 @@ function handleBonusPoints ($mode) {
        }
 
        // Check his amount first
        }
 
        // Check his amount first

-       $total = countSumTotalData(getBonusUserId(), 'user_points', 'points') - countSumTotalData(getBonusUserId(), 'user_data', 'used_points');
+       $total = getTotalPoints(getBonusUserId());

 
        // Subtract points from...
        switch (getConfig('bonus_mode')) {
 
        // Subtract points from...
        switch (getConfig('bonus_mode')) {

diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index b9a603e4e2cbc8a7ef00831a5b18a276e490d039..cc143c2e6ccd4b52567739a0c2569dadbd36e4f5 100644 (file)
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -143,7 +143,7 @@ function getDoublerTotalPointsLeft() {
 
        if (isValidUserId(getConfig('doubler_userid'))) {
                // Get user's points
 
        if (isValidUserId(getConfig('doubler_userid'))) {
                // Get user's points

-               $user = countSumTotalData(getConfig('doubler_userid'), 'user_points', 'points');
+               $user = getTotalPoints(getConfig('doubler_userid'));

                $points += $user;
        } // END - if
 
                $points += $user;
        } // END - if
 

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index e588ce6508afb2034241d4972bf84a92848c84b5..490d6725ca189121c81237cdfa8bde99152aeb1b 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -1147,9 +1147,9 @@ function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) {
        // Do we have a current user id?
        if ((isMember()) && ($limit == '0')) {
                // Then add this as well
        // Do we have a current user id?
        if ((isMember()) && ($limit == '0')) {
                // Then add this as well

-               $userids['url_userid'][getMemberId()]      = getMemberId();
-               $userids['points'][getMemberId()]   = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
-               $userids['notified'][getMemberId()] = '0';
+               $userids['url_userid'][getMemberId()] = getMemberId();
+               $userids['points'][getMemberId()]     = getTotalPoints(getMemberId());
+               $userids['notified'][getMemberId()]   = '0';

 
                // Get all userid except logged in one
                $result = SQL_QUERY_ESC("SELECT
 
                // Get all userid except logged in one
                $result = SQL_QUERY_ESC("SELECT


@@ -1188,16 +1188,16 @@ ORDER BY
        // Load all userid
        while ($content = SQL_FETCHARRAY($result)) {
                // Get total points
        // Load all userid
        while ($content = SQL_FETCHARRAY($result)) {
                // Get total points

-               $points = countSumTotalData($content['url_userid'], 'user_points', 'points') - countSumTotalData($content['url_userid'], 'user_data', 'used_points');
+               $points = getTotalPoints($content['url_userid']);

                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['url_userid']},points={$points}", false);
 
                // Shall we add this to ignore?
                if ($points <= $limit) {
                        // Ignore this one!
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['url_userid']} has depleted points amount!", false);
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['url_userid']},points={$points}", false);
 
                // Shall we add this to ignore?
                if ($points <= $limit) {
                        // Ignore this one!
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['url_userid']} has depleted points amount!", false);

-                       $userids['url_userid'][$content['url_userid']]      = $content['url_userid'];
-                       $userids['points'][$content['url_userid']]   = $points;
-                       $userids['notified'][$content['url_userid']] = $content['notified'];
+                       $userids['url_userid'][$content['url_userid']] = $content['url_userid'];
+                       $userids['points'][$content['url_userid']]     = $points;
+                       $userids['notified'][$content['url_userid']]   = $content['notified'];

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

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 21c3f2f1478c3e8896d0e69a60f8c690e9d05972..ffc792f40f0e7ff315c2951ebb73152ecdbb5af9 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();

-}
+} // END - if

 
 // Sets a status message and code
 function WERNIS_STATUS_MESSAGE ($message, $status) {
 
 // Sets a status message and code
 function WERNIS_STATUS_MESSAGE ($message, $status) {


@@ -389,22 +389,5 @@ function WERNIS_ADD_WITHDRAW_FEE ($points) {
        return $points;
 }
 
        return $points;
 }
 

-// Add all fees to the array
-function WERNIS_ADD_FEES_TO_ARRAY (&$array) {
-       // Is the array an array? ;-)
-       if (!is_array($array)) {
-               // Log error and return
-               logDebugMessage(__FUNCTION__, __LINE__, 'Type ' . gettype($array) . ' != array.');
-               return;
-       } // END - if
-
-       // Add both factors
-       $array['withdraw_factor']      = translateComma(getConfig('wernis_withdraw_factor'));
-
-       // Add all fees
-       $array['withdraw_fee_percent'] = translateComma(getConfig('wernis_withdraw_fee_percent'));
-       $array['withdraw_fee_fix']     = translateComma(getConfig('wernis_withdraw_fee_fix'));
-}
-

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

diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php
index 88bf548263f0a90078c59a999523425310f5b7a7..c6a793cd2e123c7a3e08e579d138c466c363b7ba 100644 (file)
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -96,7 +96,7 @@ LIMIT 1",
                                                        array($points, bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
 
                                                // Remember points /reason for the template
                                                        array($points, bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
 
                                                // Remember points /reason for the template

-                                               $content['points'] = translateComma($points);
+                                               $content['points'] = $points;

                                                $content['reason'] = secureString(postRequestParameter('reason'));
 
                                                // Send email
                                                $content['reason'] = secureString(postRequestParameter('reason'));
 
                                                // Send email


@@ -119,7 +119,7 @@ LIMIT 1",
                                                        array($points, bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
 
                                                // Remember points /reason for the template
                                                        array($points, bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
 
                                                // Remember points /reason for the template

-                                               $content['points'] = translateComma($points);
+                                               $content['points'] = $points;

                                                $content['reason'] = secureString(postRequestParameter('reason'));
 
                                                // Send email
                                                $content['reason'] = secureString(postRequestParameter('reason'));
 
                                                // Send email

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 6e78f65d9ed415c7212aca5c781a81967c9f2432..d9fe102e9de8dc255241e5cf11e1d9ae5f6a24fc 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -279,7 +279,7 @@ LIMIT 1",
                        if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']);
 
                        // Calculate total points
                        if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']);
 
                        // Calculate total points

-                       $content['points'] = countSumTotalData($content['userid'], 'user_points', 'points')  - countSumTotalData($content['userid'], 'user_data', 'used_points');
+                       $content['points'] = getTotalPoints($content['userid']);

 
                        // Clickrate
                        $content['rate'] = '0';
 
                        // Clickrate
                        $content['rate'] = '0';

diff --git a/inc/modules/guest/what-active.php b/inc/modules/guest/what-active.php
index 7e017196db325b43b2f6db6be0ef7b31cb47c340..9b14876013dbb10cd0fd85cb62136e2385b2b572 100644 (file)
--- a/inc/modules/guest/what-active.php
+++ b/inc/modules/guest/what-active.php
@@ -79,7 +79,7 @@ if (!SQL_HASZERONUMS($result)) {
                $content = array(
                        'userid'      => $userid,
                        'nickname'    => $nick2,
                $content = array(
                        'userid'      => $userid,
                        'nickname'    => $nick2,

-                       'points'      => (countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'user_data', 'used_points')),
+                       'points'      => getTotalPoints($userid),

                        'last_online' => generateDateTime($last, 2),
                );
 
                        'last_online' => generateDateTime($last, 2),
                );
 

diff --git a/inc/modules/guest/what-beg.php b/inc/modules/guest/what-beg.php
index 0ea722691d92bcacf729f784d547f090b18018c7..07a7d8b6cf257198c35a5182d48e2e64cccb81f8 100644 (file)
--- a/inc/modules/guest/what-beg.php
+++ b/inc/modules/guest/what-beg.php
@@ -53,7 +53,7 @@ if ((!isExtensionActive('beg')) && (!isAdmin())) {
 // @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
 
 // Load final template
 // @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
 
 // Load final template

-loadTemplate('guest_beg', false, $content);
+loadTemplate('guest_beg');

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

diff --git a/inc/modules/guest/what-doubler.php b/inc/modules/guest/what-doubler.php
index a4809fb0aff6460eeb066eb77e75d2cc190079a2..1d8a4ac6610b5f66d02b7e721f37276eca4a6b2f 100644 (file)
--- a/inc/modules/guest/what-doubler.php
+++ b/inc/modules/guest/what-doubler.php
@@ -51,7 +51,7 @@ if ((!isExtensionActive('doubler')) && (!isAdmin())) {
 } // END - if
 
 // Which mail-send-mode did the admin setup?
 } // END - if
 
 // Which mail-send-mode did the admin setup?

-$content['payout_time'] = '{--DOUBLER_PAYOUT_TIME_' . getConfig('doubler_send_mode') . '--}';
+$content['payout_time'] = '{--DOUBLER_PAYOUT_TIME_{?doubler_send_mode?}--}';

 
 // 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');

diff --git a/inc/modules/guest/what-top10.php b/inc/modules/guest/what-top10.php
index 82d1adab6e5bec0475c4a5407107aa39f9ae7ab2..20865bdfedd99f8410fed3acc8cf5c8f139c9df6 100644 (file)
--- a/inc/modules/guest/what-top10.php
+++ b/inc/modules/guest/what-top10.php
@@ -79,7 +79,7 @@ while ($content = SQL_FETCHARRAY($result)) {
                'userid'       => $content['userid'],
                'nickname'     => $content['nickname'],
                'total_logins' => $content['total_logins'],
                'userid'       => $content['userid'],
                'nickname'     => $content['nickname'],
                'total_logins' => $content['total_logins'],

-               'points'       => (countSumTotalData($content['userid'], 'user_points', 'points')),
+               'points'       => getTotalPoints($content['userid']),

                'last_online'  => generateDateTime($content['last_online'], 3),
        );
 
                'last_online'  => generateDateTime($content['last_online'], 3),
        );
 


@@ -208,7 +208,7 @@ while ($content = SQL_FETCHARRAY($result)) {
                'userid'      => $content['userid'],
                'refs'        => $content['refs'],
                'nickname'    => $content['nickname'],
                'userid'      => $content['userid'],
                'refs'        => $content['refs'],
                'nickname'    => $content['nickname'],

-               'points'      => (countSumTotalData($content['userid'], 'user_points', 'points')),
+               'points'      => getTotalPoints($content['userid']),

                'last_online' => generateDateTime($content['last_online'], 3)
        );
 
                'last_online' => generateDateTime($content['last_online'], 3)
        );
 

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 281248a7950803e3705b67810bb60bb3807db954..3104a783642a18b73febf322e371ff3cc8a0e22c 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -95,7 +95,7 @@ $ALLOWED = $MAXI - $ORDERS;
 if (getConfig('order_max_full') == 'MAX') $ALLOWED = $MAXI;
 
 // Now check his points amount
 if (getConfig('order_max_full') == 'MAX') $ALLOWED = $MAXI;
 
 // Now check his points amount

-$total = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');;
+$total = getTotalPoints(getMemberId());

 
 if (($HOLIDAY == 'Y') && (isExtensionInstalledAndNewer('holiday', '0.1.3'))) {
        // Holiday is active!
 
 if (($HOLIDAY == 'Y') && (isExtensionInstalledAndNewer('holiday', '0.1.3'))) {
        // Holiday is active!

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index edb05b80424fb096c29798ba73caf3bcfb007072..4c317522e761554d656d83e945d9abe78dd31448 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -54,17 +54,8 @@ if ((!isExtensionActive('payout')) && (!isAdmin())) {
        return;
 } // END - if
 
        return;
 } // END - if
 

-// Get total points
-$totalPoints = countSumTotalData(getMemberId(), 'user_points', 'points');
-
-// Get used points
-$usedPoints = countSumTotalData(getMemberId(), 'user_data', 'used_points');
-

 // Translate point into comma
 // Translate point into comma

-$totalPoints = ($totalPoints - $usedPoints);
-
-// Sanity check...
-if (empty($totalPoints)) $totalPoints = '0.00000';
+$totalPoints = getTotalPoints(getMemberId());

 
 if (!isGetRequestParameterSet('payout')) {
        // Load payout types
 
 if (!isGetRequestParameterSet('payout')) {
        // Load payout types

diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php
index f38dfd5b9b099e22308544203a6882ffa39a25db..243a2bb3370704e77bcefb5452865b67ca591f46 100644 (file)
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -99,7 +99,7 @@ if (!isGetRequestParameterSet('mode')) {
 
 if (getRequestParameter('mode') == 'pay') {
        // Get total points and check if the user can request a payout
 
 if (getRequestParameter('mode') == 'pay') {
        // Get total points and check if the user can request a payout

-       $points = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
+       $points = getTotalPoints(getMemberId());

 
        // No dots here...
        $points = explode('.', $points);
 
        // No dots here...
        $points = explode('.', $points);


@@ -113,7 +113,7 @@ if (getRequestParameter('mode') == 'pay') {
                // No, then abort here
                loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_MIN_PAYOUT_PAYOUT--}');
                return;
                // No, then abort here
                loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_MIN_PAYOUT_PAYOUT--}');
                return;

-       }
+       } // END - if

 
        // Add points to content array
        $content['points'] = $points;
 
        // Add points to content array
        $content['points'] = $points;

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index aad5bf37e2264d0ce4b92c8c92b96924e19162ce..ae163b75109f16d70a2e04fed8fc49d94c74ddf4 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -62,7 +62,7 @@ if ((getUserData('opt_in') != 'Y') && ($mode == 'new')) $mode = '';
 switch ($mode) {
        case 'new': // Start new transfer
                // Get total points and subtract the balance amount from it = maximum transferable points
 switch ($mode) {
        case 'new': // Start new transfer
                // Get total points and subtract the balance amount from it = maximum transferable points

-               $total = countSumTotalData(getMemberId(), 'user_points', 'points')  - countSumTotalData(getMemberId(), 'user_data', 'used_points');
+               $total = getTotalPoints(getMemberId());

 
                // Remember maximum value for template
                $content['max_transferable'] = round($total - getConfig('transfer_balance') - 0.5);
 
                // Remember maximum value for template
                $content['max_transferable'] = round($total - getConfig('transfer_balance') - 0.5);

diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php
index 3e3189811f4adae4d2c53dd4daecca2f6f39ce69..8cf42616a4a6c35ebc5bb1c3a6c77107ce2be463 100644 (file)
--- a/inc/modules/member/what-wernis.php
+++ b/inc/modules/member/what-wernis.php
@@ -116,11 +116,8 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo
                setGetRequestParameter('mode', 'choose');
        }
 } elseif ((getRequestParameter('mode') == 'payout') && (getConfig('wernis_payout_active') == 'Y')) {
                setGetRequestParameter('mode', 'choose');
        }
 } elseif ((getRequestParameter('mode') == 'payout') && (getConfig('wernis_payout_active') == 'Y')) {

-       // Get total points and check if the user can request a payout
-       $points = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
-
-       // Remove the registration fee
-       $points = $points - getPointsRegister();
+       // Get user's total points and remove the registration fee
+       $points = getTotalPoints(getMemberId()) - getPointsRegister();

 
        // Is there a percentage or fixed fee?
        $points = WERNIS_TAKE_FEE($points, 'payout');
 
        // Is there a percentage or fixed fee?
        $points = WERNIS_TAKE_FEE($points, 'payout');


@@ -141,21 +138,15 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo
        $points = bigintval($points[0]);
 
        // Add points to content array
        $points = bigintval($points[0]);
 
        // Add points to content array

-       $content['points']     = translateComma($points);
+       $content['points']     = $points;

 
        // Get WDS66 username
        $content['wernis_userid'] = getUserData('wernis_userid');
 } elseif ((getRequestParameter('mode') == 'withdraw') && (getConfig('wernis_withdraw_active') == 'Y')) {
 
        // Get WDS66 username
        $content['wernis_userid'] = getUserData('wernis_userid');
 } elseif ((getRequestParameter('mode') == 'withdraw') && (getConfig('wernis_withdraw_active') == 'Y')) {

-       // Get total points for just displaying them
-       $points = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
-

        // Prepare data for the template
        // Prepare data for the template

-       $content['points']        = translateComma($points);
+       $content['points']        = getTotalPoints(getMemberId());

        $content['wernis_userid'] = '';
 
        $content['wernis_userid'] = '';
 

-       // Add fees to array
-       WERNIS_ADD_FEES_TO_ARRAY($content);
-

        // Fetch id
        $content['wernis_userid'] = getUserData('wernis_userid');
 } else {
        // Fetch id
        $content['wernis_userid'] = getUserData('wernis_userid');
 } else {


@@ -167,13 +158,13 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo
 // Is the formular sent?
 if ((isFormSent()) && (isGetRequestParameterSet('mode'))) {
        // Is the user id and password set?
 // Is the formular sent?
 if ((isFormSent()) && (isGetRequestParameterSet('mode'))) {
        // Is the user id and password set?

-       if (!isPostRequestParameterSet(('wernis_userid'))) {
+       if (!isPostRequestParameterSet('wernis_userid')) {

                // Nothing entered in WDS66 user id
                loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_EMPTY_USERNAME--}');
                // Nothing entered in WDS66 user id
                loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_EMPTY_USERNAME--}');

-       } elseif (!isPostRequestParameterSet(('wds66_password'))) {
+       } elseif (!isPostRequestParameterSet('wds66_password')) {

                // Nothing entered in WDS66 password
                loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_EMPTY_PASSWORD--}');
                // Nothing entered in WDS66 password
                loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_EMPTY_PASSWORD--}');

-       } elseif (!isPostRequestParameterSet(('amount'))) {
+       } elseif (!isPostRequestParameterSet('amount')) {

                // Nothing entered in amount
                loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_EMPTY_AMOUNT--}');
        } elseif (postRequestParameter('wernis_userid') != bigintval(postRequestParameter('wernis_userid'))) {
                // Nothing entered in amount
                loadTemplate('admin_settings_saved', false, '{--MEMBER_WERNIS_EMPTY_AMOUNT--}');
        } elseif (postRequestParameter('wernis_userid') != bigintval(postRequestParameter('wernis_userid'))) {


@@ -248,7 +239,7 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) {
                                logDebugMessage(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", getRequestParameter('mode')));
                                loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_WERNIS_MODE_INVALID', getRequestParameter('mode')));
                                return;
                                logDebugMessage(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", getRequestParameter('mode')));
                                loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_WERNIS_MODE_INVALID', getRequestParameter('mode')));
                                return;

-               }
+               } // END - switch

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

diff --git a/inc/modules/sponsor/welcome.php b/inc/modules/sponsor/welcome.php
index 4a0dcccbf34252420ca00f1a9a0264dc3b9bc4d4..3748ee35cf26266abc5135b2e0a07bec6f3e6f2b 100644 (file)
--- a/inc/modules/sponsor/welcome.php
+++ b/inc/modules/sponsor/welcome.php
@@ -50,19 +50,25 @@ if (!defined('__SECURITY')) {
 }
 
 // Load some data
 }
 
 // Load some data

-$result = SQL_QUERY_ESC("SELECT `gender`, `surname`, `family`, (`points_amount` - `points_used`) AS points
-FROM `{?_MYSQL_PREFIX?}_sponsor_data`
-WHERE `id`='%s' AND `password`='%s' LIMIT 1",
-       array(bigintval(getSession('sponsorid')), getSession('sponsorpass')), __FILE__, __LINE__);
+$result = SQL_QUERY_ESC("SELECT
+       `gender`, `surname`, `family`, (`points_amount` - `points_used`) AS points
+FROM
+       `{?_MYSQL_PREFIX?}_sponsor_data`
+WHERE
+       `id`=%s AND
+       `password`='%s'
+LIMIT 1",
+       array(
+               bigintval(getSession('sponsorid')),
+               getSession('sponsorpass')
+       ), __FILE__, __LINE__);
+
+// Fetch data

 $content = SQL_FETCHARRAY($result);
 
 // Free memory
 SQL_FREERESULT($result);
 
 $content = SQL_FETCHARRAY($result);
 
 // Free memory
 SQL_FREERESULT($result);
 

-// Prepare data for the template
-$content['gender'] = translateGender($content['gender']);
-$content['points'] = translateComma($content['points']);
-

 // Load main template
 $OUT = loadTemplate('sponsor_welcome', true, $content);
 
 // Load main template
 $OUT = loadTemplate('sponsor_welcome', true, $content);
 

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 910f6a551360e8c2d021bb3062e53d10177a66c6..cc8988e1f91742c7a6f294f1d3b558bff94f1169 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1514,7 +1514,6 @@ LIMIT 1",
 
        // Add reason and translate points
        $data['text']   = $reason;
 
        // Add reason and translate points
        $data['text']   = $reason;

-       $data['points'] = translateComma($data['points']);

 
        // Now a mail to the user and that's all...
        $message = loadEmailTemplate('del-user', $data, $userid);
 
        // Now a mail to the user and that's all...
        $message = loadEmailTemplate('del-user', $data, $userid);


@@ -1830,7 +1829,7 @@ ORDER BY
                // Fetch all entries
                while ($row = SQL_FETCHARRAY($result)) {
                        // Get total points of this user
                // Fetch all entries
                while ($row = SQL_FETCHARRAY($result)) {
                        // Get total points of this user

-                       $row['points'] = countSumTotalData($row['refid'], 'user_points', 'points') - countSumTotalData($row['refid'], 'user_data', 'used_points');
+                       $row['points'] = getTotalPoints($row['refid']);

 
                        // Get unconfirmed mails
                        $row['unconfirmed']  = countSumTotalData($row['refid'], 'user_links', 'id', 'userid', true);
 
                        // Get unconfirmed mails
                        $row['unconfirmed']  = countSumTotalData($row['refid'], 'user_links', 'id', 'userid', true);

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index bc89dfc63f560e1c950c87ad75646ade19ef57ad..56620b901933277a19059475f389d7a1043d05f5 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -1826,5 +1826,17 @@ function isVerboseSqlEnabled () {
        return $GLOBALS['is_verbose_sql_enabled'];
 }
 
        return $GLOBALS['is_verbose_sql_enabled'];
 }
 

+// "Getter" for total user points
+function getTotalPoints ($userid) {
+       // Do we have cache?
+       if (!isset($GLOBALS['total_points'][$userid])) {
+               // Determine it
+               $GLOBALS['total_points'][$userid] = countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'user_data', 'used_points');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS['total_points'][$userid];
+}
+

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

diff --git a/mailid_top.php b/mailid_top.php
index 6d88d094bc08544fb870e7d070ec94103ad194c0..36a5c007856fbe55ff9fffaa52399a9f51bd51f9 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -215,7 +215,6 @@ if ((isValidUserId($url_userid)) && (($url_mid > 0) || ($url_bid > 0)) && (!ifFa
                                                                        } // END - switch
 
                                                                        // Export data into constants for the template
                                                                        } // END - switch
 
                                                                        // Export data into constants for the template

-                                                                       $content['points'] = translateComma($payment);

                                                                        $content['banner'] = loadTemplate('mailid_banner', true);
 
                                                                        // Only when user extension = v0.1.2: Update mails-confirmed counter
                                                                        $content['banner'] = loadTemplate('mailid_banner', true);
 
                                                                        // Only when user extension = v0.1.2: Update mails-confirmed counter


@@ -278,10 +277,7 @@ if ((isValidUserId($url_userid)) && (($url_mid > 0) || ($url_bid > 0)) && (!ifFa
                                                                                } // END - if
 
                                                                                // Load total points
                                                                                } // END - if
 
                                                                                // Load total points

-                                                                               $content['total'] = translateComma(
-                                                                                       countSumTotalData($url_userid, 'user_points', 'points') -
-                                                                                       countSumTotalData($url_userid, 'user_data', 'used_points')
-                                                                               );
+                                                                               $content['total'] = getTotalPoints($url_userid);

 
                                                                                // Load template
                                                                                loadTemplate($template, false, $content);
 
                                                                                // Load template
                                                                                loadTemplate($template, false, $content);

diff --git a/surfbar.php b/surfbar.php
index 63facf329f15a92886fa1e1fabc9bd9c8fb0a6d7..4bfb8caaaf44ed98aa718246ce9f4234a7a9ecbc 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -122,12 +122,9 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
                // This makes the footer appear again
                unsetGetRequestParameter('frame');
        } elseif ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'stats')) {
                // This makes the footer appear again
                unsetGetRequestParameter('frame');
        } elseif ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'stats')) {

-               // Get total points amount
-               $points = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
-

                // Prepare content
                $content = array(
                // Prepare content
                $content = array(

-                       'points' => $points,
+                       'points' => getTotalPoints(getMemberId()),

                        'reload' => (getConfig('surfbar_stats_reload') * 1000)
                );
 
                        'reload' => (getConfig('surfbar_stats_reload') * 1000)
                );
 

diff --git a/templates/de/emails/back-admin.tpl b/templates/de/emails/back-admin.tpl
index 365bf1e292add7aeadc02b2fbecf9c13b3bbe4a4..e8d185dda70236d1a785290b50ca26e61ac277af 100644 (file)
--- a/templates/de/emails/back-admin.tpl
+++ b/templates/de/emails/back-admin.tpl
@@ -1,6 +1,6 @@
 Hallo Administrator,
 
 Hallo Administrator,
 

-soeben wurden in Ihrem {?mt_word?} $content[points] {?POINTS?} aus nicht versendeten Mails in den Jackpot getan!
+soeben wurden in Ihrem {?mt_word?} {%pipe,translateComma=$content[points]%} {?POINTS?} aus nicht versendeten Mails in den Jackpot getan!

 
 Mit freundlichen Grüßen,
   Ihr {?MAIN_TITLE?} Script
 
 Mit freundlichen Grüßen,
   Ihr {?MAIN_TITLE?} Script

diff --git a/templates/de/emails/sponsor/sponsor_add_points.tpl b/templates/de/emails/sponsor/sponsor_add_points.tpl
index 9821c77581525aa0c167b0791d5cbb2cd7905136..945f2d245f76758873c0fd9c7577a5c89c2acef8 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_add_points.tpl
+++ b/templates/de/emails/sponsor/sponsor_add_points.tpl
@@ -1,6 +1,6 @@
 Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 

-Einer unserer Administratoren hat Ihnen soeben $content[points] {?POINTS?} Ihrem Sponsoren-Account mit der id $content[id] gutgeschrieben!
+Einer unserer Administratoren hat Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} Ihrem Sponsoren-Account mit der id $content[id] gutgeschrieben!

 
 Grund dazu war folgender:
 ------------------------------
 
 Grund dazu war folgender:
 ------------------------------

diff --git a/templates/de/emails/sponsor/sponsor_sub_points.tpl b/templates/de/emails/sponsor/sponsor_sub_points.tpl
index 9f526fd7f66466e71dcb1ceb8dac27f3c0c802be..28f1e6e5f5545b4889224a67403ba6ab323a1b11 100644 (file)
--- a/templates/de/emails/sponsor/sponsor_sub_points.tpl
+++ b/templates/de/emails/sponsor/sponsor_sub_points.tpl
@@ -1,6 +1,6 @@
 Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 
 Hallo {%sponsor,gender,translateGender=$userid%} {%sponsor,surname=$userid%} {%sponsor,family=$userid%},
 

-Einer unserer Administratoren hat Ihnen soeben $content[points] {?POINTS?} von Ihrem Sponsoren-Account mit der id $content[id] abgezogen!
+Einer unserer Administratoren hat Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} von Ihrem Sponsoren-Account mit der id $content[id] abgezogen!

 
 Grund dazu war folgender:
 ------------------------------
 
 Grund dazu war folgender:
 ------------------------------

diff --git a/templates/de/emails/sub-points.tpl b/templates/de/emails/sub-points.tpl
index 8db1d81f29382dbabf8b53010d24fe40b47c1c84..91ac7f449ab02d771d9cf6e04951381cea5e9f24 100644 (file)
--- a/templates/de/emails/sub-points.tpl
+++ b/templates/de/emails/sub-points.tpl
@@ -1,6 +1,6 @@
 Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 
 Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
 

-Einer unserer Administratoren hat Ihnen soeben $content[points] {?POINTS?} abgezogen!
+Einer unserer Administratoren hat Ihnen soeben {%pipe,translateComma=$content[points]%} {?POINTS?} abgezogen!

 
 Grund dazu war folgender:
 ----------------
 
 Grund dazu war folgender:
 ----------------

diff --git a/templates/de/html/admin/admin_list_beg.tpl b/templates/de/html/admin/admin_list_beg.tpl
index 5f58825e39afff4f7dddee6e8f0fbb74a6e305be..d49b69d4eb7285beb8725b68acfd6fb2517def6b 100644 (file)
--- a/templates/de/html/admin/admin_list_beg.tpl
+++ b/templates/de/html/admin/admin_list_beg.tpl
@@ -21,7 +21,7 @@
        $content[rows]
        <tr>
                <td colspan="3" class="header_column bottom right" align="right">
        $content[rows]
        <tr>
                <td colspan="3" class="header_column bottom right" align="right">

-                       <u>{--BEG_MEMBER_TOTAL--}:</u>
+                       <u>{--MEMBER_BEG_TOTAL--}:</u>

                </td>
                <td class="header_column bottom right">
                        <u>$content[total] {?POINTS?}</u>
                </td>
                <td class="header_column bottom right">
                        <u>$content[total] {?POINTS?}</u>

diff --git a/templates/de/html/guest/guest_beg.tpl b/templates/de/html/guest/guest_beg.tpl
index 3e1d5697ddedfb73157de4d8c1daf3e084128664..937bbc89b97e59fc9a2eddfcca95851dd972d756 100644 (file)
--- a/templates/de/html/guest/guest_beg.tpl
+++ b/templates/de/html/guest/guest_beg.tpl
@@ -1,19 +1,19 @@
 <div align="center" class="beg_table dashed">
        <div class="beg_msg">
 <div align="center" class="beg_table dashed">
        <div class="beg_msg">

-               <div class="big">{--BEG_GUEST_TRAILER--}</div>
+               <div class="big">{--GUEST_BEG_TRAILER--}</div>

                <div>{?MAIN_TITLE?}</div>
        </div>
        <div class="beg_msg">
                <div class="para">
                <div>{?MAIN_TITLE?}</div>
        </div>
        <div class="beg_msg">
                <div class="para">

-                       {--BEG_GUEST_EARN_1--} <strong>{%config,translateComma=beg_points%} {?POINTS?}</strong>
-                       {--BEG_GUEST_EARN_2--} <strong>{%config,translateComma=beg_points_max%} {?POINTS?}</strong>
-                       {--BEG_GUEST_EARN_3--}
+                       {--GUEST_BEG_EARN_1--} <strong>{%config,translateComma=beg_points%} {?POINTS?}</strong>
+                       {--GUEST_BEG_EARN_2--} <strong>{%config,translateComma=beg_points_max%} {?POINTS?}</strong>
+                       {--GUEST_BEG_EARN_3--}

                </div>
                <div class="para">
                </div>
                <div class="para">

-                       {%message,BEG_GUEST_TIMEOUT={%config,createFancyTime=beg_timeout%}%}
+                       {--GUEST_BEG_TIMEOUT--}

                </div>
                <div class="para" align="right">
                </div>
                <div class="para" align="right">

-                       {--BEG_GUEST_HAVE_FUN--}
+                       {--GUEST_BEG_HAVE_FUN--}

                </div>
        </div>
        <div align="center" class="beg_msg">
                </div>
        </div>
        <div align="center" class="beg_msg">

diff --git a/templates/de/html/guest/guest_doubler.tpl b/templates/de/html/guest/guest_doubler.tpl
index 4c4e70f77b3ed53d0d6fa022349e447b77ac5a85..e0dfdfcc228405ba6424085769a933c14273f708 100644 (file)
--- a/templates/de/html/guest/guest_doubler.tpl
+++ b/templates/de/html/guest/guest_doubler.tpl
@@ -9,7 +9,7 @@
                <td class="doubler_main bottom" style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
                        <ul>
                        <li>{--DOUBLER_MINIMUM_IS--} <strong>{%config,translateComma=doubler_min%} {?POINTS?}</strong> {--DOUBLER_MAXIMUM_IS--} <strong>{%config,translateComma=doubler_max%} {?POINTS?}</strong></li>
                <td class="doubler_main bottom" style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
                        <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,DOUBLER_ALREADY_PAYED={%config,translateComma=doubler_points%}%}</li>
+                       <li>{--DOUBLER_ALREADY_PAYED--}</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>{--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>

diff --git a/templates/de/html/mailid/mailid_points_done.tpl b/templates/de/html/mailid/mailid_points_done.tpl
index 24d69b2006b54f911f502eddbb3d7c86ea173864..98bb7c3bfe2438810120fa56f36f1be334bfe2f2 100644 (file)
--- a/templates/de/html/mailid/mailid_points_done.tpl
+++ b/templates/de/html/mailid/mailid_points_done.tpl
@@ -1,15 +1,19 @@
+<div align="center">

 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">

-                       {%message,THANX_POINTS_ADDED=$content[points]%}<br />
-                       {%message,MAILID_TOTAL_POINTS=$content[total]%}
+                       {%message,THANX_POINTS_ADDED={%pipe,translateComma=$content[points]%}%}<br />
+                       {%message,MAILID_TOTAL_POINTS={%pipe,translateComma=$content[total]%}%}

                </td>
                <td align="center">
                        <table border="0" cellspacing="0" cellpadding="0" class="member_banner dashed">
                        <tr>
                </td>
                <td align="center">
                        <table border="0" cellspacing="0" cellpadding="0" class="member_banner dashed">
                        <tr>

-                               <td align="center">$content[banner]</td>
+                               <td align="center">
+                                       $content[banner]
+                               </td>

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

+</div>

diff --git a/templates/de/html/mailid/mailid_points_done2.tpl b/templates/de/html/mailid/mailid_points_done2.tpl
index 3842ea434dacae6b54919274db9abcdf3d6a04ca..05ce6f42a25caca37d0b7052ad3d1820792f9ea8 100644 (file)
--- a/templates/de/html/mailid/mailid_points_done2.tpl
+++ b/templates/de/html/mailid/mailid_points_done2.tpl
@@ -1,9 +1,10 @@
+<div align="center">

 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">
                        <div class="tiny">
 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">
                        <div class="tiny">

-                       {%message,THANX_POINTS_ADDED=$content[points]%}<br />
-                       {%message,MAILID_TOTAL_POINTS=$content[total]%}<br />
+                       {%message,THANX_POINTS_ADDED={%pipe,translateComma=$content[points]%}%}<br />
+                       {%message,MAILID_TOTAL_POINTS={%pipe,translateComma=$content[total]%}%}<br />

                        <br />
                        <a href="{%url=show_bonus.php?userid=$content[userid]&amp;t=$content[type]&amp;d=$content[data]%}" target="_blank">{--BONUS_SHOW_TURBO_BONUS--}
                        </div>
                        <br />
                        <a href="{%url=show_bonus.php?userid=$content[userid]&amp;t=$content[type]&amp;d=$content[data]%}" target="_blank">{--BONUS_SHOW_TURBO_BONUS--}
                        </div>


@@ -11,9 +12,12 @@
                <td align="center">
                <table border="0" cellspacing="0" cellpadding="0" class="member_banner dashed">
                        <tr>
                <td align="center">
                <table border="0" cellspacing="0" cellpadding="0" class="member_banner dashed">
                        <tr>

-                               <td align="center">$content[banner]</td>
+                               <td align="center">
+                                       $content[banner]
+                               </td>

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

+</div>

diff --git a/templates/de/html/mailid/mailid_points_failed.tpl b/templates/de/html/mailid/mailid_points_failed.tpl
index b63a910d1a9f97894b43170c2d5993a6ddc137eb..73d9461abc1f07c66faa48d52502a685fc98f9e4 100644 (file)
--- a/templates/de/html/mailid/mailid_points_failed.tpl
+++ b/templates/de/html/mailid/mailid_points_failed.tpl
@@ -1,7 +1,8 @@
+<div align="center">

 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">

-                       {%message,POINTS_NOT_ADDED=$content[points]%}
+                       {%message,POINTS_NOT_ADDED={%pipe,translateComma=$content[points]%}%}

                </td>
                <td align="center">
                        <div class="member_banner dashed">
                </td>
                <td align="center">
                        <div class="member_banner dashed">


@@ -10,3 +11,4 @@
                </td>
        </tr>
 </table>
                </td>
        </tr>
 </table>

+</div>

diff --git a/templates/de/html/mailid/mailid_points_locked.tpl b/templates/de/html/mailid/mailid_points_locked.tpl
index b36719abb0915ba14ab411c9e918708a7ed9ea6c..856f69dc408d96eed842b8555d2f7a06ea289854 100644 (file)
--- a/templates/de/html/mailid/mailid_points_locked.tpl
+++ b/templates/de/html/mailid/mailid_points_locked.tpl
@@ -1,7 +1,8 @@
+<div align="center">

 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">

-                       {%message,THANX_POINTS_LOCKED=$content[points]%}
+                       {%message,THANX_POINTS_LOCKED={%pipe,translateComma=$content[points]%}%}

                </td>
                <td align="center">
                        <div class="member_banner dashed">
                </td>
                <td align="center">
                        <div class="member_banner dashed">


@@ -10,3 +11,4 @@
                </td>
        </tr>
 </table>
                </td>
        </tr>
 </table>

+</div>

diff --git a/templates/de/html/mailid/mailid_points_locked2.tpl b/templates/de/html/mailid/mailid_points_locked2.tpl
index 684705d7e29615409609bffd85753dcb39468602..ecddad00b58907ef5b57bd25a276e4e978173800 100644 (file)
--- a/templates/de/html/mailid/mailid_points_locked2.tpl
+++ b/templates/de/html/mailid/mailid_points_locked2.tpl
@@ -1,8 +1,9 @@
+<div align="center">

 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">
                        <div class="tiny">
 <table border="0" cellspacing="0" cellpadding="0" class="member_mailidtop">
        <tr>
                <td width="220" align="center">
                        <div class="tiny">

-                               {%message,THANX_POINTS_LOCKED=$content[points]%}<br />
+                               {%message,THANX_POINTS_LOCKED={%pipe,translateComma=$content[points]%}%}<br />

                                <br />
                                <a href="{%url=show_bonus.php?userid=$content[userid]&amp;t=$content[type]&amp;d=$content[data]%}" target="_blank">{--BONUS_SHOW_TURBO_BONUS--}
                        </div>
                                <br />
                                <a href="{%url=show_bonus.php?userid=$content[userid]&amp;t=$content[type]&amp;d=$content[data]%}" target="_blank">{--BONUS_SHOW_TURBO_BONUS--}
                        </div>


@@ -14,3 +15,4 @@
                </td>
        </tr>
 </table>
                </td>
        </tr>
 </table>

+</div>

diff --git a/templates/de/html/member/member_beg.tpl b/templates/de/html/member/member_beg.tpl
index 3132773ee64a4020312e9069b7b19aae783dca3d..46baf279c6f8ed89c5846ea6c4c8d605f3fa982e 100644 (file)
--- a/templates/de/html/member/member_beg.tpl
+++ b/templates/de/html/member/member_beg.tpl
@@ -1,27 +1,27 @@
 <div align="center" class="beg_table dashed">
        <div class="beg_msg">
                <div>
 <div align="center" class="beg_table dashed">
        <div class="beg_msg">
                <div>

-                       {--BEG_MEMBER_YOUR_LINK--}:
+                       {--MEMBER_BEG_YOUR_LINK--}:

                </div>
                <div>
                        <strong><a href="{?URL?}/beg.php?userid=$content[userid]">{?URL?}/beg.php?userid=$content[userid]</a></strong>
                </div>
        </div>
        <div class="beg_msg">
                </div>
                <div>
                        <strong><a href="{?URL?}/beg.php?userid=$content[userid]">{?URL?}/beg.php?userid=$content[userid]</a></strong>
                </div>
        </div>
        <div class="beg_msg">

-               {--BEG_MEMBER_CLICKS_TOTAL--}:
+               {--MEMBER_BEG_CLICKS_TOTAL--}:

                <strong>{%user,beg_clicks,translateComma%}</strong>
        </div>
        <div align="left" class="beg_msg">
                <div class="para">
                <strong>{%user,beg_clicks,translateComma%}</strong>
        </div>
        <div align="left" class="beg_msg">
                <div class="para">

-                       {--BEG_MEMBER_EARN_1--} <strong>{%config,translateComma=beg_points%} {?POINTS?}</strong>
-                       {--BEG_MEMBER_EARN_2--} <strong>{%config,translateComma=beg_points_max%} {?POINTS?}</strong>
-                       {--BEG_MEMBER_EARN_3--}
+                       {--MEMBER_BEG_EARN_1--} <strong>{%config,translateComma=beg_points%} {?POINTS?}</strong>
+                       {--MEMBER_BEG_EARN_2--} <strong>{%config,translateComma=beg_points_max%} {?POINTS?}</strong>
+                       {--MEMBER_BEG_EARN_3--}

                </div>
                <div class="para">
                </div>
                <div class="para">

-                       {%message,BEG_MEMBER_TIMEOUT%}
+                       {%message,MEMBER_BEG_TIMEOUT%}

                </div>
                <div class="para" align="right">
                </div>
                <div class="para" align="right">

-                       {--BEG_MEMBER_HAVE_FUN--}
+                       {--MEMBER_BEG_HAVE_FUN--}

                </div>
        </div>
 </div>
                </div>
        </div>
 </div>

diff --git a/templates/de/html/member/member_doubler.tpl b/templates/de/html/member/member_doubler.tpl
index b026836b5608d46f0c6da0146acc2e9dab2f7e89..2dd2d3fca578a5c71457412c37b479fd7a06136d 100644 (file)
--- a/templates/de/html/member/member_doubler.tpl
+++ b/templates/de/html/member/member_doubler.tpl
@@ -28,7 +28,7 @@
        <div class="doubler_main bottom" style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
                <ul>
                        <li>{--DOUBLER_MINIMUM_IS--} <strong>{%config,translateComma=doubler_min%} {?POINTS?}</strong> {--DOUBLER_MAXIMUM_IS--} <strong>{%config,translateComma=doubler_max%} {?POINTS?}</strong></li>
        <div class="doubler_main bottom" style="padding-left: 0px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px">
                <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>Es wurden bereits <strong>{%config,translateComma=doubler_points%} {?POINTS?}</strong> ausgezahlt.</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>{--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>

diff --git a/templates/de/html/member/member_list_beg.tpl b/templates/de/html/member/member_list_beg.tpl
index 4040388c6c316b0752cf0e8f672cc0946a9553c4..f9797bd2e8961b50baf4ab4907d1616371048241 100644 (file)
--- a/templates/de/html/member/member_list_beg.tpl
+++ b/templates/de/html/member/member_list_beg.tpl
@@ -1,4 +1,4 @@
-<div align="center"><strong>{--BEG_MEMBER_HERE_IS_THE_LIST--}</strong><br />
+<div align="center"><strong>{--MEMBER_BEG_HERE_IS_THE_LIST--}</strong><br />

 <br />
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed">
        <tr>
 <br />
 <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed">
        <tr>

diff --git a/templates/de/html/member/member_wernis_mode_payout.tpl b/templates/de/html/member/member_wernis_mode_payout.tpl
index a38334c14cf5da9cd98a2d8fe98c0fe7bc1fbdbf..32904d6ed35f033d767ee3997a5be97d892f4e23 100644 (file)
--- a/templates/de/html/member/member_wernis_mode_payout.tpl
+++ b/templates/de/html/member/member_wernis_mode_payout.tpl
@@ -8,7 +8,7 @@
        </tr>
        <tr>
                <td height="25" align="right">{--MEMBER_WERNIS_PAYOUT_POINTS--}</td>
        </tr>
        <tr>
                <td height="25" align="right">{--MEMBER_WERNIS_PAYOUT_POINTS--}</td>

-               <td><strong>$content[points]</strong> Wernis</td>
+               <td><strong>{%pipe,translateComma=$content[points]%}</strong> Wernis</td>

        </tr>
        <tr>
                <td height="25" align="right">{--MEMBER_WERNIS_PAYOUT_MIN_POINTS--}</td>
        </tr>
        <tr>
                <td height="25" align="right">{--MEMBER_WERNIS_PAYOUT_MIN_POINTS--}</td>

diff --git a/templates/de/html/member/member_wernis_mode_withdraw.tpl b/templates/de/html/member/member_wernis_mode_withdraw.tpl
index f0a9a79f37f347bd571be347abe44671274107c3..009a66fa3134e343a2b17df6d69a4913c9ab70d5 100644 (file)
--- a/templates/de/html/member/member_wernis_mode_withdraw.tpl
+++ b/templates/de/html/member/member_wernis_mode_withdraw.tpl
@@ -8,7 +8,7 @@
        </tr>
        <tr>
                <td class="bottom" height="25" align="right">{--MEMBER_WERNIS_WITHDRAW_POINTS_ACCOUNT--}</td>
        </tr>
        <tr>
                <td class="bottom" height="25" align="right">{--MEMBER_WERNIS_WITHDRAW_POINTS_ACCOUNT--}</td>

-               <td class="bottom"><strong>$content[points]</strong> Wernis</td>
+               <td class="bottom"><strong>{%pipe,translateComma=$content[points]%}</strong> Wernis</td>

        </tr>
        <tr>
                <td class="bottom" height="25" align="right">{--MEMBER_WERNIS_WITHDRAW_MIN_POINTS--}</td>
        </tr>
        <tr>
                <td class="bottom" height="25" align="right">{--MEMBER_WERNIS_WITHDRAW_MIN_POINTS--}</td>

diff --git a/templates/de/html/sponsor/sponsor_welcome.tpl b/templates/de/html/sponsor/sponsor_welcome.tpl
index b988bb9aaa2f89698fc7b9d99b710790e1007ed3..90cdd38a8e1922ae146577c5c10ab5c5add3772b 100644 (file)
--- a/templates/de/html/sponsor/sponsor_welcome.tpl
+++ b/templates/de/html/sponsor/sponsor_welcome.tpl
@@ -7,5 +7,5 @@ Schön, dass wir Sie wieder in unserem Sponsorenbereich begrüssen d&uum
 </div>
 
 <div class="para">
 </div>
 
 <div class="para">

-Sie haben noch <strong>$content[points] {?POINTS?}</strong> f&uuml;r weitere Sponsorenaktionen &uuml;brig.
+Sie haben noch <strong>{%pipe,translateComma=$content[points]%} {?POINTS?}</strong> f&uuml;r weitere Sponsorenaktionen &uuml;brig.

 </div>
 </div>