Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

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

diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index 8255f64fdc30fa0190c527419287bf82e7435e93..71b43ae3db8eccad1009d88a560df70e6279e856 100644 (file)
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 02/17/2005 *
- * ===============                              Last change: 02/17/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 02/17/2005 *
+ * ===================                          Last change: 02/17/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : doubler_functions.php                            *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -69,32 +70,39 @@ function generateDoublerTable ($userid = '0', $done = 'N', $ref = 'N', $sort = '
        }
 
        // List entries
-       $result = SQL_QUERY("SELECT
+       $result = SQL_QUERY_ESC("SELECT
        `userid`, `refid`, `points`, `timemark`
 FROM
        `{?_MYSQL_PREFIX?}_doubler`
 WHERE
-       `completed`='".$done."' AND `is_ref`='".$ref."'".$add."
+       `completed`='%s' AND `is_ref`='%s'" . $add . "
 ORDER BY
-       `timemark` ".$sort."
-LIMIT ".$limit, __FUNCTION__, __LINE__);
+       `timemark` %s
+LIMIT %s",
+               array(
+                       $done,
+                       $ref,
+                       $sort,
+                       $limit
+               ), __FUNCTION__, __LINE__);
 
        if (SQL_NUMROWS($result) > 0) {
                // List entries
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result)) {
                        // Rewrite userid/refid only if admin is in
+                       // @TODO Can't this be moved into EL?
                        if (isAdmin()) {
                                // Set links to admin area
-                               if ($content['userid'] > 0) { $content['userid'] = generateUserProfileLink($content['userid']); } else { $content['userid'] = '---'; }
-                               if ($content['refid'] > 0)  { $content['refid']  = generateUserProfileLink($content['refid']);  } else { $content['refid']  = '---'; }
+                               if (isValidUserId($content['userid'])) { $content['userid'] = generateUserProfileLink($content['userid']); } else { $content['userid'] = '---'; }
+                               if (isValidUserId($content['refid']))  { $content['refid']  = generateUserProfileLink($content['refid']);  } else { $content['refid']  = '---'; }
                        } // END - if
 
                        // Prepare data for the row template
                        $content = array(
                                'userid'   => $content['userid'],
                                'rid'      => $content['refid'],
-                               'points'   => translateComma($content['points']),
+                               'points'   => $content['points'],
                                'timemark' => generateDateTime($content['timemark'], $DT_MODE),
                                'sw'       => $SW,
                        );
@@ -102,25 +110,25 @@ LIMIT ".$limit, __FUNCTION__, __LINE__);
                        // Load template and switch color
                        $OUT .= loadTemplate($mode . '_doubler_list_rows', true, $content);
                        $SW = 3 - $SW;
-               }
+               } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
        } else {
                // List no entries
-               $OUT = "<tr>
-  <td colspan=\"".$COLS."\" align=\"center\" class=\"doubler_big_row bottom2\">
-    ".loadTemplate('admin_settings_saved', true, $message)."
+               $OUT = '<tr>
+  <td colspan="' . $COLS . '" align="center" class="doubler_big_row bottom">
+    ' . loadTemplate('admin_settings_saved', true, $message) . '
   </td>
-</tr>\n";
+</tr>';
        }
 
        // Return template
        return loadTemplate($mode . '_doubler_list', true, $OUT);
 }
 
-//
-function DOUBLER_GET_TOTAL_POINTS_LEFT() {
+// Get total points left in doubler pot
+function getDoublerTotalPointsLeft() {
        // Initialize variables
        $points = '0';
 
@@ -145,5 +153,6 @@ function DOUBLER_GET_TOTAL_POINTS_LEFT() {
        // Return value
        return $points;
 }
-//
+
+// [EOF]
 ?>