Korn/csh support improved, if() block rewritten:

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

diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index e24a3eaac310fc043524464cd90e96d2c82f4c11..48b7668775fa0f89aa77b4fc0f4d3f47331b5164 100644 (file)
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -47,15 +45,15 @@ if (!defined('__SECURITY')) {
 function generateDoublerTable ($userid = '0', $done = 'N', $ref = 'N', $sort = 'ASC') {
        if (empty($cnt)) $cnt = '0';
        $add = ''; $DT_MODE = '0';
-       if ($userid > 0) {
+       if (isValidUserId($userid)) {
                // Load entries only from a single user
                $add = sprintf(" AND `userid`=%s", bigintval($userid));
                $mode = 'member'; $COLS = 4; $DT_MODE = 2;
-               $message = '{--DOUBLER_MEMBER_NO_ENTRIES_FOUND--}';
+               $message = '{--MEMBER_DOUBLER_NO_ENTRIES_FOUND--}';
        } else {
                // Guest mode!
                $mode = 'guest'; $COLS = 3; $DT_MODE = 3;
-               $message = '{--DOUBLER_GUEST_NO_ENTRIES_FOUND--}';
+               $message = '{--GUEST_DOUBLER_NO_ENTRIES_FOUND--}';
        }
 
        if (($done == 'Y') && ($sort == 'ASC')) {
@@ -86,9 +84,9 @@ 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?
@@ -103,17 +101,10 @@ LIMIT %s",
                        } // END - if
 
                        // Prepare data for the row template
-                       $content = array(
-                               'userid'   => $content['userid'],
-                               'rid'      => $content['refid'],
-                               'points'   => $content['points'],
-                               'timemark' => generateDateTime($content['timemark'], $DT_MODE),
-                               'sw'       => $SW,
-                       );
+                       $content['timemark'] = generateDateTime($content['timemark'], $DT_MODE);
 
                        // Load template and switch color
                        $OUT .= loadTemplate($mode . '_doubler_list_rows', true, $content);
-                       $SW = 3 - $SW;
                } // END - while
 
                // Free memory
@@ -121,7 +112,7 @@ LIMIT %s",
        } else {
                // List no entries
                $OUT = '<tr>
-  <td colspan="' . $COLS . '" align="center" class="doubler_big_row bottom">
+  <td colspan="' . $COLS . '" align="center" class="bottom">
     ' . loadTemplate('admin_settings_saved', true, $message) . '
   </td>
 </tr>';
@@ -148,9 +139,9 @@ 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');
+               $user = getTotalPoints(getConfig('doubler_userid'));
                $points += $user;
        } // END - if
 
@@ -158,5 +149,17 @@ function getDoublerTotalPointsLeft() {
        return $points;
 }
 
+// "Getter" for doubler_userid
+function getDoublerUserid () {
+       // Is it cached?
+       if (!isset($GLOBALS['doubler_userid'])) {
+               // Get it
+               $GLOBALS['doubler_userid'] = getConfig('doubler_userid');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS['doubler_userid'];
+}
+
 // [EOF]
 ?>