Missing variable fixed, array initialization moved

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

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index a9cb0f5426d6a9c9e613ef3748c3407b18563289..56230b9022fba02148d2d21f6bcd3c7a1981015b 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -108,7 +108,7 @@ LIMIT 1",
 
                        // Add userid and his ref count to table
                        $result_ref = SQL_QUERY_ESC("SELECT 
-       SUM(p.points) AS points
+       SUM(p.points) AS `points`
 FROM
        `{?_MYSQL_PREFIX?}_user_points` AS p
 LEFT JOIN
@@ -444,9 +444,6 @@ function markReferalRallyesAsExpired ($result) {
        // Free result
        SQL_FREERESULT($result);
 
-       // Load users array (!) with assigned prices
-       $prices = getArrayFromReferalRallyeUsers($id);
-
        // Init array
        $DATA = array();
        $count = '0';
@@ -456,13 +453,16 @@ function markReferalRallyesAsExpired ($result) {
        $DATA['end']    = generateDateTime($end  , 1);
        $DATA['now_t']  = generateDateTime(time(), 1);
 
+       // Load users array (!) with assigned prices
+       $prices = getArrayFromReferalRallyeUsers($id);
+
        // Just count...
        $total = '0';
        foreach ($prices['userid'] as $key => $userid) {
                // Check status
                //   active = 1: account is still confirmed
                //   active = 0: account is deleted or locked
-               $active = countSumTotalData($DATA['userid'][$idx], 'user_data', 'userid', 'userid', true, " AND `status`='CONFIRMED'");
+               $active = countSumTotalData($userid, 'user_data', 'userid', 'userid', true, " AND `status`='CONFIRMED'");
 
                $prices['active'][$key] = $active;
 
@@ -645,7 +645,7 @@ function getArrayFromReferalRallyeUsers ($rallye) {
 
                // Points of ref's
                $result_ref = SQL_QUERY_ESC("SELECT
-       SUM(p.points) AS points
+       SUM(p.points) AS `points`
 FROM
        `{?_MYSQL_PREFIX?}_user_points` AS p
 LEFT JOIN
@@ -828,7 +828,7 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') {
 
                // Accept only template names between 1 and 255 chars length
                if ((strlen($read) < 256) && (!empty($read))) {
-                       // Valid entry found!
+                       // Valid entry found
                        $ral[$read] = $read;
                } else {
                        // Log invalid
@@ -952,11 +952,5 @@ function determineReferalRallyeMinimumPrices ($min_prices) {
        return $return;
 }
 
-// Filter for extra-autpurge
-function FILTER_RALLYE_EXTRA_AUTOPURGE () {
-       // Check expired rallyes (hard-coded 3 days limit for displaying expired rallyes!)
-       purgeExpiredReferalRallyes();
-}
-
 // [EOF]
 ?>