From f51be78aa682f22b29fcfcfcd4331d6b3b47a552 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 18 Dec 2009 21:20:03 +0000 Subject: [PATCH] Template improved, old lost code removed, some fixes --- inc/libs/user_functions.php | 10 ++-------- inc/modules/member/what-points.php | 4 ++-- templates/de/html/member/member_points.tpl | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 199ca7ee21..a3772fa4f5 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -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&mode=bonus'; } else { diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php index f5bb460ff1..67aa5913f9 100644 --- a/inc/modules/member/what-points.php +++ b/inc/modules/member/what-points.php @@ -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']); diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl index 5ade89c353..f9c255b8f5 100644 --- a/templates/de/html/member/member_points.tpl +++ b/templates/de/html/member/member_points.tpl @@ -14,7 +14,7 @@ {--POINTS_SUM--} -  $content[sum] {?POINTS?} + $content[sum] {?POINTS?} $content[tref] -- 2.39.5