]> git.mxchange.org Git - mailer.git/commitdiff
Template improved, old lost code removed, some fixes
authorRoland Häder <roland@mxchange.org>
Fri, 18 Dec 2009 21:20:03 +0000 (21:20 +0000)
committerRoland Häder <roland@mxchange.org>
Fri, 18 Dec 2009 21:20:03 +0000 (21:20 +0000)
inc/libs/user_functions.php
inc/modules/member/what-points.php
templates/de/html/member/member_points.tpl

index 199ca7ee2158b4e935605b0366f408b06e094812..a3772fa4f5e5597897f8ef7aa54f5a51c38cb863 100644 (file)
@@ -267,12 +267,6 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
        $errorCode = '0';
        $ext = '';
 
-       // Add last_login if available
-       $lastOnline = '';
-       if (getExtensionVersion('sql_patches') >= '0.2.8') {
-               $lastOnline = ', `last_login`';
-       } // END - if
-
        // Init array
        $content = array(
                'password'    => '',
@@ -295,7 +289,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                fetchUserData($userid);
        }
 
-       // Load entry
+       // Get user data array and set userid (e.g. important if we login with nickname)
        $content = getUserDataArray();
        if (!empty($content['userid'])) $userid = bigintval($content['userid']);
 
@@ -353,7 +347,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                                        // Is a success URL set?
                                        if (empty($successUrl)) {
                                                // Procedure to checking for login data
-                                               if (($GLOBALS['bonus_payed']) && (isExtensionActive('bonus'))) {
+                                               if (($GLOBALS['bonus_payed'] === true) && (isExtensionActive('bonus'))) {
                                                        // Bonus added (just displaying!)
                                                        $URL = 'modules.php?module=chk_login&amp;mode=bonus';
                                                } else {
index f5bb460ff1444c8ff45793d58af0370de06e7230..67aa5913f994f0ef8d088b865bc01727ca9faf9b 100644 (file)
@@ -157,7 +157,7 @@ if (isExtensionInstalledAndNewer('user', '0.1.2')) {
 if ($totalLocked == '0') $totalLocked = '0.00000';
 
 // Remember several values in constants
-$content['sum']   = translateComma($totalPoints - getUserData('used_points'));
+$content['sum']   = translateComma($totalPoints - getUserData('used_points'), false);
 $content['tref']  = translateComma($totalReferals);
 $content['tlock'] = translateComma($totalLocked);
 
@@ -184,7 +184,7 @@ if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonu
        } // END - if
 
        // Total bonus points
-       $content['ttotal'] = translateComma($content['turbo'] + $content['login'] + $content['ref'] + $content['order'] + $content['stats']);
+       $content['ttotal'] = translateComma($content['turbo'] + $content['login'] + $content['ref'] + $content['order'] + $content['stats'], false);
 
        // Translate more data
        $content['turbo'] = translateComma($content['turbo']);
index 5ade89c35386774596b725e8c5f66694d47935ef..f9c255b8f5860d2b3c1c9034d0000098177fc386 100644 (file)
@@ -14,7 +14,7 @@
        <tr>
                <td class="member_data bottom"><strong>{--POINTS_SUM--}</strong></td>
                <td class="member_data bottom">
-                       &nbsp;<strong>$content[sum] {?POINTS?}</strong>
+                       <strong>$content[sum] {?POINTS?}</strong>
                </td>
                <td class="member_data bottom" align="center"><strong>$content[tref]</strong></td>
        </tr>