Fixes for parsing success results

[mailer.git] / inc / libs / bonus_functions.php

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 5b7358917ef5bec4e9a2ba12e4b24bdc0c207ee6..4c99ef6a3e51e920c5d6cd653d6701252fd6f78f 100644 (file)
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -132,7 +132,7 @@ function addBonusRanks ($data, $type, $userid) {
                // Transfer data to template
                $GLOBALS['ranking_content']['yr_level']  = $GLOBALS['ranking_content']['level'];
                $GLOBALS['ranking_content']['yr_points'] = translateComma($GLOBALS['ranking_content']['points']);
-               $GLOBALS['ranking_content']['yr_tmark']  = generateDateTime($GLOBALS['ranking_content']['timemark'], '1');
+               $GLOBALS['ranking_content']['yr_tmark']  = generateDateTime($GLOBALS['ranking_content']['timemark'], 1);
 
                // Load template
                $GLOBALS['ranking_content']['own'] = loadTemplate('show_bonus_yr', true, $GLOBALS['ranking_content']);
@@ -170,6 +170,15 @@ LIMIT 1",
                                // Load data
                                $rows = merge_array($rows, SQL_FETCHARRAY($result_users));
 
+                               // Is ext-nickname active?
+                               if (isExtensionActive('nickname')) {
+                                       // Then get the nickname
+                                       $nick = getNickname($rows['userid']);
+
+                                       // Is it not empty? Then use it
+                                       if (!empty($nick)) $rows['userid'] = $nick;
+                               } // END - if
+
                                // Translate comma
                                $rows['points'] = translateComma($rows['points']);
                        } // END - if
@@ -216,7 +225,7 @@ function handleBonusPoints ($mode) {
        if (getConfig('bonus_active') != 'Y') return;
 
        // Switch to jackpot-mode when no UID is supplied but userid-mode is selected
-       if ((getConfig('bonus_mode') == 'UID') && (getConfig('bonus_userid') == '0') && (isExtensionActive('jackpot'))) {
+       if ((getConfig('bonus_mode') == 'UID') && (getConfig('bonus_userid') == 0) && (isExtensionActive('jackpot'))) {
                // Update database & config
                updateConfiguration('bonus_mode', 'JACKPOT');
        } // END - if