Some more fixes

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

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 3faa726f6c53f38199f5b64926c6b6843514b43f..f7528f9063b59416534f4c29677171d3be4ef04e 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -367,8 +367,7 @@ function RALLYE_EXPIRE_RALLYES($result)
 
        // Just count...
        $TOTAL = 0;
-       foreach($prices['uid'] as $key => $uid)
-       {
+       foreach($prices['uid'] as $key => $uid) {
                // Check status
                //   active = 1: account is still confirmed
                //   active = 0: account is deleted or locked
@@ -382,38 +381,50 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
                $prices['active'][$key] = $active;
 
                // Allow valid and active users with at least one ref to get points
-               if (($uid > 0) && ($prices['ref'][$key] > 0) && ($active == 1) && ($prices['cpoints'][$key] > 0))
-               {
+               if (($uid > 0) && ($prices['ref'][$key] > 0) && ($active == 1) && ($prices['cpoints'][$key] > 0)) {
                        $TOTAL++;
-               }
-       }
+               } // END - if
+       } // END - foreach
 
        if (($TOTAL < $min_prices) || ($TOTAL == 0)) {
                // Do not end this rallye!
                unset($DATA);
                return;
-       }
+       } // END - if
 
        // Expire rallye
        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_rallye_data SET expired='Y' WHERE id=%s LIMIT 1",
-        array(bigintval($id)), __FILE__, __LINE__);
+               array(bigintval($id)), __FILE__, __LINE__);
 
        // Run array through (by uid is the most important 2nd-level-array)
-       foreach($prices['uid'] as $key => $uid)
-       {
+       foreach($prices['uid'] as $key => $uid) {
                // Allow valid and active users with at least one ref to get points
-               if (($uid > 0) && ($prices['ref'][$key] > 0) && ($prices['active'][$key] == 1) && ($prices['cpoints'][$key] > 0))
-               {
+               if (($uid > 0) && ($prices['ref'][$key] > 0) && ($prices['active'][$key] == 1) && ($prices['cpoints'][$key] > 0)) {
                        // Transfer data to array for the mail template
                        $DATA['level']  = $prices['level'][$key];
                        $DATA['points'] = $prices['points'][$key];
                        $DATA['info']   = $prices['info'][$key];
                        $DATA['ref']    = $prices['ref'][$key];
 
+                       // Default is other
+                       $winnerLevel = "other";
+
+                       // Determine winner level
+                       if ($DATA['level'] == 1) {
+                               // The winner!
+                               $winnerLevel = "_gold";
+                       } elseif ($DATA['level'] == 2) {
+                               // The vice winner!
+                               $winnerLevel = "_silver";
+                       } elseif ($DATA['level'] == 3) {
+                               // The bronce winner
+                               $winnerLevel = "_bronce";
+                       }
+
                        if ($DATA['points'] > 0) {
                                // Add points directly to user's account
-                               ADD_POINTS_REFSYSTEM($uid, $DATA['points'], false, "0", false, "direct");
-                       }
+                               ADD_POINTS_REFSYSTEM("rallye_winner" . $winnerLevel, $uid, $DATA['points'], false, "0", false, "direct");
+                       } // END - if
 
                        if ($notify == "Y") {
                                // Prepare infos for the mail template
@@ -426,17 +437,7 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
                                }
 
                                // Add suffix to template name
-                               $template = "member_rallye_expired";
-                               if ($DATA['level'] == 1) {
-                                       // The winner!
-                                       $template .= "_gold";
-                               } elseif ($DATA['level'] == 2) {
-                                       // The vice winner!
-                                       $template .= "_silver";
-                               } elseif ($DATA['level'] == 3) {
-                                       // The bronce winner
-                                       $template .= "_bronce";
-                               }
+                               $template = "member_rallye_expired".$winnerLevel;
 
                                // Load template
                                $msg = LOAD_EMAIL_TEMPLATE($template, $DATA, $uid);
@@ -447,8 +448,8 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
                        $cnt++;
                        $users['uid'][$uid] = $uid;
                        $users['poi'][$uid] = $DATA['infos'];
-               }
-       }
+               } // END - if
+       } // END - foreach
 
        // Select template depending on notfication is switch on / off
        if ($notify == "Y") {
@@ -459,7 +460,6 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
        }
 
        // Send mail to admin
-       die("OK!");
        SEND_ADMIN_NOTIFICATION(RALLYE_ADMIN_EXPIRED.": ".$title, $templ, $cnt, 0);
 
        // Add task
@@ -542,7 +542,7 @@ FROM "._MYSQL_PREFIX."_user_points AS p
 LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
 ON p.userid=d.userid
 WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
- array($_CONFIG['ref_payout'], bigintval($uid)), __FILE__, __LINE__);
+                       array($_CONFIG['ref_payout'], bigintval($uid)), __FILE__, __LINE__);
                list($refpoints) = SQL_FETCHROW($result_ref);
                SQL_FREERESULT($result_ref);
 
@@ -740,6 +740,7 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
 //
 function RALLYE_GET_REFCOUNT($uid, $old=0) {
        global $_CONFIG, $cacheArray;
+
        // Check current refs
        if (GET_EXT_VERSION("cache") >= "0.1.2") {
                // Get refs from cache