More rewrites to make use of (cached) wrapper functions

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

diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index 71b43ae3db8eccad1009d88a560df70e6279e856..5e331bd71e3873c224bf336c71f0eb6a12d973c1 100644 (file)
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -51,11 +51,11 @@ function generateDoublerTable ($userid = '0', $done = 'N', $ref = 'N', $sort = '
                // Load entries only from a single user
                $add = sprintf(" AND `userid`=%s", bigintval($userid));
                $mode = 'member'; $COLS = 4; $DT_MODE = 2;
-               $message = getMessage('DOUBLER_MEMBER_NO_ENTRIES_FOUND');
+               $message = '{--DOUBLER_MEMBER_NO_ENTRIES_FOUND--}';
        } else {
                // Guest mode!
                $mode = 'guest'; $COLS = 3; $DT_MODE = 3;
-               $message = getMessage('DOUBLER_GUEST_NO_ENTRIES_FOUND');
+               $message = '{--DOUBLER_GUEST_NO_ENTRIES_FOUND--}';
        }
 
        if (($done == 'Y') && ($sort == 'ASC')) {
@@ -86,16 +86,20 @@ LIMIT %s",
                        $limit
                ), __FUNCTION__, __LINE__);
 
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // List entries
-               $OUT = ''; $SW = 2;
+               $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Rewrite userid/refid only if admin is in
                        // @TODO Can't this be moved into EL?
                        if (isAdmin()) {
+                               // Set empty userid/refid
+                               $content['userid'] = '---';
+                               $content['refid']  = '---';
+
                                // Set links to admin area
-                               if (isValidUserId($content['userid'])) { $content['userid'] = generateUserProfileLink($content['userid']); } else { $content['userid'] = '---'; }
-                               if (isValidUserId($content['refid']))  { $content['refid']  = generateUserProfileLink($content['refid']);  } else { $content['refid']  = '---'; }
+                               if (isValidUserId($content['userid'])) $content['userid'] = generateUserProfileLink($content['userid']);
+                               if (isValidUserId($content['refid']))  $content['refid']  = generateUserProfileLink($content['refid']);
                        } // END - if
 
                        // Prepare data for the row template
@@ -104,12 +108,10 @@ LIMIT %s",
                                'rid'      => $content['refid'],
                                'points'   => $content['points'],
                                'timemark' => generateDateTime($content['timemark'], $DT_MODE),
-                               'sw'       => $SW,
                        );
 
                        // Load template and switch color
                        $OUT .= loadTemplate($mode . '_doubler_list_rows', true, $content);
-                       $SW = 3 - $SW;
                } // END - while
 
                // Free memory
@@ -144,7 +146,7 @@ function getDoublerTotalPointsLeft() {
                if (!empty($jackpot)) $points += $jackpot;
        } // END - if
 
-       if (getConfig('doubler_userid') > 0) {
+       if (isValidUserId(getConfig('doubler_userid'))) {
                // Get user's points
                $user = countSumTotalData(getConfig('doubler_userid'), 'user_points', 'points');
                $points += $user;