'order_points' and locked are now displayed, some array elements/language ids renamed

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 82f91357023524ddbbfb086cf937fa99728d38ef..fb162595b751d5b7d5f411f074838d8edc06f5d6 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -56,8 +56,8 @@
 ./inc/functions.php:92:                // @TODO Extension 'msg' does not exist
 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
 ./inc/install-functions.php:57:        // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
-./inc/language/de.php:1083:    // @TODO Rewrite these two constants
-./inc/language/de.php:1104:    // @TODO Rewrite these three constants
+./inc/language/de.php:1085:    // @TODO Rewrite these two constants
+./inc/language/de.php:1106:    // @TODO Rewrite these three constants
 ./inc/language/de.php:778:// @TODO Are these constants longer used?
 ./inc/language-functions.php:255:      // @TODO These are all valid languages, again hard-coded
 ./inc/language-functions.php:44:// @TODO Rewrite all language constants to this function.

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 13e69f99b9b328df6721c46bdaf003bff3caf8e4..6a11f697f10bdbd08f0b8cc81bf3be3c357240df 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -119,7 +119,7 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
                } // END - if
 
                // Append debug line
-               appendLineToFile(getCachePath() . 'mysql.log', $F . '(LINE=' . $L . '|NUM=' . SQL_NUMROWS($result) . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . $queryTime . '): ' . str_replace("\r", '', str_replace("\n", ' ', $GLOBALS['last_sql'])));
+               appendLineToFile(getCachePath() . 'mysql.log', basename($F) . '|LINE=' . $L . '|NUM=' . (is_resource($result) ? SQL_NUMROWS($result) : 'false') . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . $queryTime . '): ' . str_replace("\r", '', str_replace("\n", ' ', $GLOBALS['last_sql'])));
        } // END - if
 
        // Count DB hits

diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php
index c2e71c2fe6040c8098d55974c88357d057d82d73..3e7185c8cdf91474e5c69a38444864388c85784a 100644 (file)
--- a/inc/extensions/ext-beg.php
+++ b/inc/extensions/ext-beg.php
@@ -312,7 +312,7 @@ INDEX (`userid`)
                // Remove old entries
                $OLD = getBegTimeout();
                if (getBegUseridTimeout() > $OLD) $OLD = getBegUseridTimeout();
-               SQL_QUERY('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_beg_ips` WHERE `timeout` < (UNIX_TIMESTAMP() - ' . ($OLD + 60*60) . ')', __FILE__, __LINE__);
+               SQL_QUERY('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_beg_ips` WHERE (UNIX_TIMESTAMP() - `timeout`) >= ' . ($OLD + 60*60) . '', __FILE__, __LINE__);
 
                // Check for beg rallye is active and send mails out
                if ((isBegRallyeEnabled()) && (isBegNewMemberNotifyEnabled())) {

diff --git a/inc/language-functions.php b/inc/language-functions.php
index 29e07cf33a87d0b9433429757ec984ac00531e99..77f6f2e9e543d328ff1d60b39bfad4e83c7fedbd 100644 (file)
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -270,7 +270,9 @@ function ifLanguageFilesCompares ($source, $target, $targetLanguage) {
        // Init differences
        $GLOBALS['lang_diff'][$target] = array();
        $GLOBALS['lang_diff_count'][$target] = 0;
-       if (!isset($GLOBALS['lang_diff_count']['total'])) $GLOBALS['lang_diff_count']['total'] = 0;
+       if (!isset($GLOBALS['lang_diff_count']['total'])) {
+               $GLOBALS['lang_diff_count']['total'] = 0;
+       } // END - if
 
        // *Does* match by default
        $matches = true;

diff --git a/inc/language/de.php b/inc/language/de.php
index 022f64f30c59b2b25d3e9b51fd417e23400433d0..520d11e5be59a96b5234a0ab6fbe1dfed6cf5553 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -570,7 +570,7 @@ addMessages(array(
        'ADMIN_CHANGE_PAYMENT' => "Mailvergütungen ändern",
        'ADMIN_REMOVE_PAYMENT' => "Mailvergütungen löschen",
        'REFERALS' => "Referals",
-       'MEMBER_TOTAL_POINTS' => "Gesamtsumme",
+       'MEMBER_PART_POINTS' => "Teilsummen",
        'KBYTES' => "KBytes",
        'DEFAULT_SUBJECT_LINE' => "Klick-Mail von {?MAIN_TITLE?}",
        'MEBER_UPDATE_PWD_WRONG' => "Sie haben das falsche Passwort eingegeben! Bitte nochmal versuchen.",
@@ -1074,6 +1074,8 @@ addMessages(array(
        'DEBUG_REPORT_BUG_SUBJECT' => "[BUG!] Es wurde ein Bug im Script erkannt:",
        'ADMIN_EXTENSION_ALWAYS_ACTIVE' => "Die Erweiterung <span class=\"data\">%s</span> kann nicht deaktiviert werden, da sie immer aktiv bleiben muss.",
        'MEMBER_REFERAL_LINKS_FOOTER' => "Ihr Referal-Link eingebaut in Ihrer Homepage bringt Ihnen passiv mehr Referals. (Aber Ihren Referal-Link bewerben schadet auch nicht... ;-) )",
+       'POINTS_ORDER' => "Werbeguthaben",
+       'MEMBER_TOTAL_POINTS' => "Gesamtguthaben",
 
        'MEMBER_MAIL_BONUS_CONFIRMED_ON' => "Sie haben diese Bonusmail <span class=\"data\">%s</span> best&auml;tigt.",
        'MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN' => "Es konnte nicht festgestellt werden, wann Sie die Bonus-Mail <span class=\"data\">%s</span> best&auml;tigt hatten.",

diff --git a/inc/libs/payout_functions.php b/inc/libs/payout_functions.php
index bf2c8a6988dd9eb70ccdc0e1a3ed61532f8a18bc..21d89144302c5af4638a7c5e4565e34389c99a23 100644 (file)
--- a/inc/libs/payout_functions.php
+++ b/inc/libs/payout_functions.php
@@ -88,6 +88,19 @@ function translatePayoutStatus ($status) {
        $message = '{--PAYOUT_STATUS_' . strtoupper($status) . '--}';
 
        // Return it
+       return $message;
+}
+
+// "Getter" for payoutable user points
+function getPayoutPoints ($userid) {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__][$userid])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__][$userid] = countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'user_data', 'used_points');
+       } // END - if
+
+       // Return it
+       return $GLOBALS[__FUNCTION__][$userid];
 }
 
 // [EOF]

diff --git a/inc/modules/admin/what-del_transfer.php b/inc/modules/admin/what-del_transfer.php
index 756aa130f2f207013cb866b1a0a832d1f07aa53f..567b318c215162c5b81e4e440a06eaad8fdcea79 100644 (file)
--- a/inc/modules/admin/what-del_transfer.php
+++ b/inc/modules/admin/what-del_transfer.php
@@ -100,7 +100,7 @@ if (!SQL_HASZERONUMS($result)) {
 $content['rows'] = $OUT;
 
 // Remeber total amount
-$content['total'] = $total;
+$content['total_points'] = $total;
 
 // Set title
 $content['title'] = '{--TRANSFER_LIST_ALL--}';

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 654f7eccca0a90e6a3598fdfeb5bb7f17af8bf4b..cad194c34a911739a9afcfd684b80ab720fb268c 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -107,7 +107,7 @@ ORDER BY
                } // END - while
 
                $content['rows']  = $OUT;
-               $content['total'] = $total;
+               $content['total_points'] = $total;
 
                // Check if we need to display form or not with manuel withdraw
                if (getLastMonth() == getMonth()) {

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 0c8129d11d2f89124b69b5f526b192b2695a0ff6..da8b9ba4f87bbaf233cf97a75762c2d60ae3eb1c 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -118,7 +118,7 @@ ORDER BY
                } // END - while
 
                $content['rows']  = $OUT;
-               $content['total'] = $total;
+               $content['total_points'] = $total;
 
                // Check if we need to display form or not with manuel withdraw
                if (getLastMonth() == getMonth()) {

diff --git a/inc/modules/admin/what-list_transfer.php b/inc/modules/admin/what-list_transfer.php
index a3773aa3ebc684ebdc47627dccc1b1da256e1ada..8da60d30ce57e0cf1d054a48a7a8968613a4510b 100644 (file)
--- a/inc/modules/admin/what-list_transfer.php
+++ b/inc/modules/admin/what-list_transfer.php
@@ -80,7 +80,7 @@ if (!SQL_HASZERONUMS($result)) {
 $content['rows'] = $OUT;
 
 // Remeber total amount
-$content['total'] = $total;
+$content['total_points'] = $total;
 
 // Set title
 $content['title'] = '{--TRANSFER_LIST_ALL--}';

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 40f53bb89879c0c3f80bf128add605e809e683cf..4d0fda767b809368cbc9a0456ecc1970df605a19 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -139,7 +139,7 @@ LIMIT 1",
                $content['joined']            = generateDateTime($content['joined'], 0);
                $content['last_update']       = generateDateTime($content['last_update'], 0);
                $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], 0);
-               $content['total']             = countSumTotalData($userid, 'user_points', 'points');
+               $content['total_points']      = countSumTotalData($userid, 'user_points', 'points');
                $content['locked']            = countSumTotalData($userid, 'user_points', 'locked_points');
                $content['lock_timestamp']    = generateDateTime($content['lock_timestamp'], 2);
                $content['nickname']          = '{--EXT_NICKNAME_404--}';

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index f1d4a2444c179500f701339fd4ed2360b677c02e..bd934037f5ddeea3956795a0dc659b55e23e84a1 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -527,7 +527,7 @@ LIMIT 1",
                                SQL_FREERESULT($result);
 
                                // Output user's points
-                               $content['total'] = $total;
+                               $content['total_points'] = $total;
 
                                // Check how many mail orders he has placed today and how many he's allowed to send
                                switch (getConfig('order_max_full')) {

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index aa9e6e516c4175c6f649607792caf42a412bed7d..280912e15a8eb94c0396d4c85650c929f8b3d1be 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -53,7 +53,7 @@ if ((!isExtensionActive('payout')) && (!isAdmin())) {
 } // END - if
 
 // Translate point into comma
-$totalPoints = getTotalPoints(getMemberId());
+$payoutPoints = getPayoutPoints(getMemberId());
 
 if (!isGetRequestParameterSet('payout')) {
        // Load payout types
@@ -65,7 +65,7 @@ WHERE
        %s >= `min_points`
 ORDER BY
        `type` ASC",
-               array($totalPoints), __FILE__, __LINE__);
+               array($payoutPoints), __FILE__, __LINE__);
        if (!SQL_HASZERONUMS($result)) {
                // Free memory
                SQL_FREERESULT($result);
@@ -116,7 +116,7 @@ ORDER BY
                SQL_FREERESULT($result_payouts);
 
                // Output payout list
-               outputPayoutList($totalPoints);
+               outputPayoutList($payoutPoints);
        } else {
                // No payout types setup
                displayMessage('{--MEMBER_PAYOUT_SETUP_INCOMPLETE--}');
@@ -131,7 +131,7 @@ ORDER BY
                $content = SQL_FETCHARRAY($result);
 
                // Calculate maximum value
-               $max     = round($totalPoints * $content['rate'] - 0.5);
+               $max     = round($payoutPoints * $content['rate'] - 0.5);
                $PAY_MAX = '0';
 
                // Calulcate points from submitted amount
@@ -142,7 +142,7 @@ ORDER BY
                }
 
                // Has enougth points to payout?
-               if ($totalPoints >= $content['min_points']) {
+               if ($payoutPoints >= $content['min_points']) {
                        // Ok, he can get be paid
                        if ((isFormSent()) && ($points <= $PAY_MAX) && ($points >= $content['min_points'])) {
                                // Remember points in array

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index 15bc77867ae86ab1802b8ac6de3cbcc73874f041..fb050d655264151b139430836a6f13fe563bc4f7 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -60,10 +60,19 @@ if (isExtensionInstalledAndNewer('bonus', '0.4.4')) $numDepths += 4;
 // Remember row count in constant
 $content['rowspan'] = ($numDepths * 2 + 15);
 
-// Init some vars...
-$content['total_points'] = '0';
-$content['total_referals'] = '0';
-$content['total_locked'] = '0';
+// Initialize array elements
+$content['part_points']        = '0.00000';
+$content['part_referals']      = '0';
+$content['part_locked']        = '0.00000';
+$content['part_order']         = '0.00000';
+$content['part_locked_order']  = '0.00000';
+$content['counter']             = '0';
+$content['points']              = '0.00000';
+$content['order_points']        = '0.00000';
+$content['locked_points']       = '0.00000';
+$content['locked_order_points'] = '0.00000';
+
+// And output variable
 $OUT = '';
 
 // Load ref levels
@@ -71,26 +80,23 @@ while ($data = SQL_FETCHARRAY($result_depths)) {
        // Merge it together
        $content = merge_array($content, $data);
 
-       // Initialize array elements
-       $content['counter']       = '0';
-       $content['points']        = '0.00000';
-       $content['locked_points'] = '0.00000';
-
        // Load referal points
        $result_points = SQL_QUERY_ESC("SELECT
        p.`points`,
+       p.`order_points`,
        p.`locked_points`,
+       p.`locked_order_points`,
        r.`counter`
 FROM
        `{?_MYSQL_PREFIX?}_user_points` AS p
-INNER JOIN
+LEFT JOIN
        `{?_MYSQL_PREFIX?}_refsystem` AS r
 ON
        p.`userid`=r.`userid` AND
        p.`ref_depth`=r.`level`
 WHERE
        p.`userid`=%s AND
-       p.`ref_depth`='%s'
+       p.`ref_depth`=%s
 LIMIT 1",
                array(
                        getMemberId(),
@@ -103,9 +109,11 @@ LIMIT 1",
                $content = merge_array($content, SQL_FETCHARRAY($result_points));
 
                // Add all entries
-               $content['total_points']   += $content['points'];
-               $content['total_locked']   += $content['locked_points'];
-               $content['total_referals'] += $content['counter'];
+               $content['part_points']       += $content['points'];
+               $content['part_order']        += $content['order_points'];
+               $content['part_locked']       += $content['locked_points'];
+               $content['part_locked_order'] += $content['locked_order_points'];
+               $content['part_referals']     += $content['counter'];
        } // END - if
 
        // Free result
@@ -122,7 +130,7 @@ SQL_FREERESULT($result_depths);
 $content['rows'] = $OUT;
 
 // Remember several values in constants
-$content['total_points']  = ($content['total_points'] - getUserData('used_points'));
+$content['total_points'] = $content['part_points'] - getUserData('used_points') + $content['part_order'];
 
 // Fixes a bug when there is no bonus extension installed
 if (isExtensionInstalledAndOlder('bonus', '0.4.4')) {
@@ -135,7 +143,7 @@ $content['special_rows'] = '';
 // Display login bonus and turbo-click bonus
 if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonus')) && (isBonusRallyeActive())) {
        // Total bonus points
-       $content['total'] = getUserData('turbo_bonus') + getUserData('login_bonus') + getUserData('bonus_ref') + getUserData('bonus_order') + getUserData('bonus_stats');
+       $content['bonus_total_points'] = 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);
@@ -161,7 +169,7 @@ if (isExtensionActive('user')) {
 
 if (isExtensionActive('payout')) {
        // Payput extension is installed and active so we can check if the user has enougth points
-       outputPayoutList($content['total_points'] - getUserData('used_points'));
+       outputPayoutList($content['part_points'] - getUserData('used_points'));
 } // END - if
 
 // [EOF]

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 4255b1f6d8a28e429944d981b2917c1d7a918b9d..b535b08da2b5d221aa5556052c2877c02baa576a 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -340,7 +340,7 @@ switch ($mode) {
                $content['rows'] = $OUT;
 
                // Remeber total amount
-               $content['total'] = $totalPoints;
+               $content['total_points'] = $totalPoints;
 
                // Load final template
                loadTemplate('member_transfer_list', false, $content);
@@ -427,7 +427,7 @@ KEY (`party_userid`)
                $content['rows'] =  $OUT;
 
                // Remeber total amount
-               $content['total'] = $total;
+               $content['total_points'] = $total;
 
                // Set title
                $content['title'] = '{--TRANSFER_LIST_ALL--}';

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 1520f1191589d24b8c4d5c1f94ee645459b0c6af..f311eb72dc01c131c46224ab06fe649594fc4ad1 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -2336,7 +2336,7 @@ function getTotalPoints ($userid) {
        // Do we have cache?
        if (!isset($GLOBALS[__FUNCTION__][$userid])) {
                // Determine it
-               $GLOBALS[__FUNCTION__][$userid] = countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'user_data', 'used_points');
+               $GLOBALS[__FUNCTION__][$userid] = countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'order_points', 'points') - countSumTotalData($userid, 'user_data', 'used_points');
        } // END - if
 
        // Return cache

diff --git a/mailid_top.php b/mailid_top.php
index e033a56f04ae689a41fa81309515fa20739f91d5..2f04e4caeb8f6b28a1aeff0cfd810be59f03ec73 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -288,7 +288,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                                } // END - if
 
                                                                                // Load total points
-                                                                               $content['total']  = getTotalPoints($userId);
+                                                                               $content['total_points']  = getTotalPoints($userId);
 
                                                                                // Add payment points
                                                                                $content['points'] = $payment;

diff --git a/templates/de/html/admin/admin_list_beg.tpl b/templates/de/html/admin/admin_list_beg.tpl
index 75a98eb811d41fca442483b87b382c944059aedc..3c1bdb25d7a7477d3c58f3b07f85bf9bffd72d8a 100644 (file)
--- a/templates/de/html/admin/admin_list_beg.tpl
+++ b/templates/de/html/admin/admin_list_beg.tpl
@@ -28,7 +28,7 @@ $content[rows]
                <u>{--MEMBER_BEG_TOTAL--}:</u>
        </td>
        <td class="header_column bottom right">
-               <u>{%pipe,translateComma=$content[total]%} {?POINTS?}</u>
+               <u>{%pipe,translateComma=$content[total_points]%} {?POINTS?}</u>
        </td>
        <td class="header_column bottom">
                &nbsp;

diff --git a/templates/de/html/admin/admin_list_bonus.tpl b/templates/de/html/admin/admin_list_bonus.tpl
index 781575b221589a896b69b7ec7b7a5901dac771d6..e10febf2e3f1524d2ed02d3aed937e2f00d7c51b 100644 (file)
--- a/templates/de/html/admin/admin_list_bonus.tpl
+++ b/templates/de/html/admin/admin_list_bonus.tpl
@@ -28,7 +28,7 @@ $content[rows]
                <u>{--ADMIN_TOTAL_MEMBER_BONUS--}:</u>&nbsp;
        </td>
        <td class="header_column bottom right">
-               <u>{%pipe,translateComma=$content[total]%} {?POINTS?}</u>
+               <u>{%pipe,translateComma=$content[total_points]%} {?POINTS?}</u>
        </td>
        <td class="header_column bottom">&nbsp;</td>
 </tr>

diff --git a/templates/de/html/admin/admin_list_transfer.tpl b/templates/de/html/admin/admin_list_transfer.tpl
index 66fe8136ca774d37b42e4aef83588899aa8b3303..372aee856d7a9b32d491252feced0881976f0d1f 100644 (file)
--- a/templates/de/html/admin/admin_list_transfer.tpl
+++ b/templates/de/html/admin/admin_list_transfer.tpl
@@ -32,7 +32,7 @@
                        <strong>{--ADMIN_TRANSFER_POINTS_TOTAL--}</strong>
                </td>
                <td align="center" class="header_column bottom">
-                       {%pipe,translateComma=$content[total]%}
+                       {%pipe,translateComma=$content[total_points]%}
                </td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl
index dc85ff32d0f00f4cc13c542e424f7e69f94e7df8..d2a5d01f83e8a6bb9e20bb5bf00ed2a9159badae 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 />
-                       <strong>{%pipe,translateComma=$content[total]%}</strong>
+                       <strong>{%pipe,translateComma=$content[total_points]%}</strong>
                </td>
                <td align="center" class="top right">
                        {--TOTAL_REFERALS--}:<br />

diff --git a/templates/de/html/mailid/mailid_points_done.tpl b/templates/de/html/mailid/mailid_points_done.tpl
index e3529c352b6feaab3ba3d6dce4c45217eef35ac8..54ac17efbb7e79bdf5baac07d2d5fda62d5d1be5 100644 (file)
--- a/templates/de/html/mailid/mailid_points_done.tpl
+++ b/templates/de/html/mailid/mailid_points_done.tpl
@@ -3,7 +3,7 @@
        <tr>
                <td width="220" align="center">
                        {%message,MEMBER_THANX_POINTS_ADDED=$content[points]%}<br />
-                       {%message,MEMBER_MAILID_TOTAL_POINTS=$content[total]%}
+                       {%message,MEMBER_MAILID_TOTAL_POINTS=$content[total_points]%}
                </td>
                <td align="center">
                        <div class="banner dashed">

diff --git a/templates/de/html/mailid/mailid_points_done2.tpl b/templates/de/html/mailid/mailid_points_done2.tpl
index 5aa6b39b9aa50188bf5d622743c9cb406ae9ff7d..03203e00f3210d3331d898e2971750c2b63eaa57 100644 (file)
--- a/templates/de/html/mailid/mailid_points_done2.tpl
+++ b/templates/de/html/mailid/mailid_points_done2.tpl
@@ -4,7 +4,7 @@
                <td width="220" align="center">
                        <div class="tiny">
                        {%message,MEMBER_THANX_POINTS_ADDED=$content[points]%}<br />
-                       {%message,MEMBER_MAILID_TOTAL_POINTS=$content[total]%}<br />
+                       {%message,MEMBER_MAILID_TOTAL_POINTS=$content[total_points]%}<br />
                        <br />
                        <a href="{%url=show_bonus.php?userid=$content[userid]&amp;t=$content[type]&amp;d=$content[data]%}" target="_blank">{--MEMBER_SHOW_TURBO_BONUS_LINK--}
                        </div>

diff --git a/templates/de/html/member/member_order_points.tpl b/templates/de/html/member/member_order_points.tpl
index 7d1fc9f9b8f83eb318921f6352d3b2b60f222b7c..d8fb6e503456e71998fc5aef01e271d3a28f4023 100644 (file)
--- a/templates/de/html/member/member_order_points.tpl
+++ b/templates/de/html/member/member_order_points.tpl
@@ -3,7 +3,7 @@
 <div class="table dashed">
        <div align="center">
                {--MEMBER_POINTS_LEFT--}:
-               <strong>{%pipe,translateComma=$content[total]%} {?POINTS?}</strong>
+               <strong>{%pipe,translateComma=$content[total_points]%} {?POINTS?}</strong>
        </div>
 
        <div align="center">

diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl
index bf671bc934f675ddbe1640291bc8f3109e908152..42737b4902b5e310935ee4b6eb540a4eb7cb679e 100644 (file)
--- a/templates/de/html/member/member_points.tpl
+++ b/templates/de/html/member/member_points.tpl
@@ -3,12 +3,26 @@
        <tr>
                <td align="center" class="header_column bottom"><strong>{--REFERAL_LEVEL--}</strong></td>
                <td align="center" class="header_column bottom"><strong>{?POINTS?}</strong></td>
+               <td align="center" class="header_column bottom"><strong>{--POINTS_ORDER--}</strong></td>
                <td align="center" class="header_column bottom"><strong>{--REFERALS--}</strong></td>
        </tr>
        $content[rows]
+       <tr>
+               <td class="member_data bottom top">
+                       <strong>{--MEMBER_PART_POINTS--}</strong>
+               </td>
+               <td class="member_data bottom top">
+                       <strong>{%pipe,translateComma=$content[part_points]%} {?POINTS?}</strong>
+               </td>
+               <td class="member_data bottom top">
+                       <strong>{%pipe,translateComma=$content[part_order]%} {?POINTS?}</strong>
+               </td>
+               <td class="member_data bottom top" align="center">-</td>
+       </tr>
        <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" align="center">-</td>
        </tr>
        <tr>
@@ -18,39 +32,45 @@
                <td class="member_data bottom">
                        <strong>{%pipe,translateComma=$content[total_points]%} {?POINTS?}</strong>
                </td>
+               <td class="member_data bottom">-</td>
                <td class="member_data bottom" align="center">
-                       <strong>{%pipe,translateComma=$content[total_referals]%}</strong>
+                       <strong>{%pipe,translateComma=$content[part_referals]%}</strong>
                </td>
        </tr>
        <tr>
                <td class="member_data">{--POINTS_LOCKED--}</td>
-               <td class="member_data">{%pipe,translateComma=$content[total_locked]%} {?POINTS?}</td>
+               <td class="member_data">{%pipe,translateComma=$content[part_locked]%} {?POINTS?}</td>
+               <td class="member_data">{%pipe,translateComma=$content[part_locked_order]%} {?POINTS?}</td>
                <td class="member_data" align="center">-</td>
        </tr>
        $content[special_rows]
        <tr>
-               <td colspan="3" class="header_column bottom top">
+               <td colspan="4" class="header_column bottom top">
                        <div align="center"><strong>{--MEMBER_CLICK_STATISTICS--}</strong></div>
                </td>
        </tr>
        <tr>
                <td class="member_data">{--MEMBER_RECEIVED_MAILS--}:</td>
-               <td class="member_data">{%user,emails_received,translateComma%}</td>
+               <td class="member_data" align="center">{%user,emails_received,translateComma%}</td>
+               <td class="member_data">-</td>
                <td class="member_data" align="center">-</td>
        </tr>
        <tr>
                <td class="member_data">{--MEMBER_UNCONFIRMED_LOCKED--}:</td>
-               <td class="member_data">{%user,ref_payout,translateComma%}</td>
+               <td class="member_data" align="center">{%user,ref_payout,translateComma%}</td>
+               <td class="member_data">-</td>
                <td class="member_data" align="center">-</td>
        </tr>
        <tr>
                <td class="member_data">{--MEMBER_CONFIRMED_MAILS--}:</td>
-               <td class="member_data">{%user,mails_confirmed,translateComma%}</td>
+               <td class="member_data" align="center">{%user,mails_confirmed,translateComma%}</td>
+               <td class="member_data">-</td>
                <td class="member_data" align="center">-</td>
        </tr>
        <tr>
                <td class="member_data">{--MEMBER_SENT_MAILS--}:</td>
-               <td class="member_data">{%user,emails_sent,translateComma%}</td>
+               <td class="member_data" align="center">{%user,emails_sent,translateComma%}</td>
+               <td class="member_data">-</td>
                <td class="member_data" align="center">-</td>
        </tr>
 </table>

diff --git a/templates/de/html/member/member_points_bonus_disabled.tpl b/templates/de/html/member/member_points_bonus_disabled.tpl
index d23aa2f5ceba66ea8e4570e297b130f33206e092..37f09d501f1233ebe845c77e5029ee38cccd2fe4 100644 (file)
--- a/templates/de/html/member/member_points_bonus_disabled.tpl
+++ b/templates/de/html/member/member_points_bonus_disabled.tpl
@@ -1,5 +1,5 @@
 <tr>
-       <td colspan="3" align="center" class="header_column">
+       <td colspan="4" align="center" class="header_column">
                <strong>{--MEMBER_BONUS_RALLYE_DISABLED--}</strong>
        </td>
 </tr>

diff --git a/templates/de/html/member/member_points_bonus_rows.tpl b/templates/de/html/member/member_points_bonus_rows.tpl
index 3ffd03dda2385945ee86ea94767a336ceaf9977d..12035e8699858e46f4c08a5ac54e993b17a6d520 100644 (file)
--- a/templates/de/html/member/member_points_bonus_rows.tpl
+++ b/templates/de/html/member/member_points_bonus_rows.tpl
@@ -1,40 +1,46 @@
 <tr>
-       <td colspan="5" align="center" class="header_column bottom top">
+       <td colspan="4" align="center" class="header_column bottom top">
                <strong>{--MEMBER_BONUS_POINTS_TITLE--}</strong>
        </td>
 </tr>
 <tr>
-       <td colspan="5" class="member_data bottom">
+       <td colspan="4" class="member_data bottom">
                <div align="center" class="notice">{--MEMBER_BONUS_LOGIN_TURBO_NOTE--}</div>
        </td>
 </tr>
 <tr>
        <td class="member_data">{--MEMBER_BONUS_LOGIN_TOTAL--}</td>
        <td class="member_data">{%user,login_bonus,translateComma%} {?POINTS?}</td>
+       <td class="member_data">-</td>
        <td class="member_data" align="center">-</td>
 </tr>
 <tr>
        <td class="member_data">{--MEMBER_BONUS_TURBO_TOTAL--}</td>
        <td class="member_data">{%user,turbo_bonus,translateComma%} {?POINTS?}</td>
+       <td class="member_data">-</td>
        <td class="member_data" align="center">-</td>
 </tr>
 <tr>
        <td class="member_data">{--MEMBER_BONUS_REFERAL_TOTAL--}</td>
        <td class="member_data">{%user,bonus_ref,translateComma%} {?POINTS?}</td>
+       <td class="member_data">-</td>
        <td class="member_data" align="center">-</td>
 </tr>
 <tr>
        <td class="member_data">{--MEMBER_BONUS_ORDER_TOTAL--}</td>
        <td class="member_data">{%user,bonus_order,translateComma%} {?POINTS?}</td>
+       <td class="member_data">-</td>
        <td class="member_data" align="center">-</td>
 </tr>
 <tr>
        <td class="member_data bottom">{--MEMBER_BONUS_STATS_TOTAL--}</td>
        <td class="member_data bottom">{%user,bonus_stats,translateComma%} {?POINTS?}</td>
+       <td class="member_data bottom">-</td>
        <td class="member_data bottom" align="center">-</td>
 </tr>
 <tr>
        <td class="member_data"><strong>{--MEMBER_BONUS_TOTAL--}</strong></td>
-       <td class="member_data"><strong>{%pipe,translateComma=$content[total]%} {?POINTS?}</strong></td>
+       <td class="member_data"><strong>{%pipe,translateComma=$content[bonus_total_points]%} {?POINTS?}</strong></td>
+       <td class="member_data">-</td>
        <td class="member_data" align="center">-</td>
 </tr>

diff --git a/templates/de/html/member/member_points_row.tpl b/templates/de/html/member/member_points_row.tpl
index d81e59fa04eddf4200404e50a1da8deaa8ce6ed7..80c23bcc66a9a6e511dfd6d242cb874d7de6033b 100644 (file)
--- a/templates/de/html/member/member_points_row.tpl
+++ b/templates/de/html/member/member_points_row.tpl
@@ -1,5 +1,6 @@
 <tr>
        <td class="member_data">$content[level]. {--REFERAL_LEVEL--} ({%pipe,translateComma=$content[percents]%}&#37;)</td>
        <td class="member_data">{%pipe,translateComma=$content[points]%} {?POINTS?}</td>
+       <td class="member_data">{%pipe,translateComma=$content[order_points]%} {?POINTS?}</td>
        <td class="member_data" align="center">{%pipe,translateComma=$content[counter]%}</td>
 </tr>

diff --git a/templates/de/html/member/member_points_upgrade.tpl b/templates/de/html/member/member_points_upgrade.tpl
index 9601adf3eb6829d5f854a9aaf82d94627ce02a78..8180432d9fc28f3c69090e7c3d2135b25ff0a8bd 100644 (file)
--- a/templates/de/html/member/member_points_upgrade.tpl
+++ b/templates/de/html/member/member_points_upgrade.tpl
@@ -1,5 +1,5 @@
 <tr>
-       <td colspan="3" align="center" class="member_data">
+       <td colspan="4" align="center" class="member_data">
                <strong class="notice">{--BONUS_EXTENSION_UPGRADE--}</strong>
        </td>
 </tr>

diff --git a/templates/de/html/member/member_transfer_list.tpl b/templates/de/html/member/member_transfer_list.tpl
index 61f542b5cab7805fd76441fe50fe02d6132ccbe6..d2b637157800a238c28c1c6642ddc3e629538eb2 100644 (file)
--- a/templates/de/html/member/member_transfer_list.tpl
+++ b/templates/de/html/member/member_transfer_list.tpl
@@ -28,7 +28,7 @@
                        $content[balance] ({?POINTS?}): 
                </td>
                <td width="80" align="center" class="table_footer">
-                       <strong>{%pipe,translateComma=$content[total]%}</strong>
+                       <strong>{%pipe,translateComma=$content[total_points]%}</strong>
                </td>
        </tr>
 </table>