Fixes for rallye extension, refs are now no longer removed from rallye if ref was...

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

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 643c53f29fc691232ee75868161593de0cfa73f7..cf06f007354efc5738e03a64088a0907d39cde21 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -141,8 +141,7 @@ VALUES ('%s','%s','%s','%s')",
 function RALLYE_ADD_PRICES($rallye,$mode="email")
 {
        // Output mode
 function RALLYE_ADD_PRICES($rallye,$mode="email")
 {
        // Output mode

-       switch($mode)
-       {
+       switch($mode) {

                case "email": $mode = "\n";     break;
                case "html" : $mode = "<br />\n"; break;
        }
                case "email": $mode = "\n";     break;
                case "html" : $mode = "<br />\n"; break;
        }


@@ -186,11 +185,6 @@ function RALLYE_ADD_PRICES($rallye,$mode="email")
 function RALLYE_ADD_TOPUSERS($rallye,$default=0)
 {
        global $_CONFIG;
 function RALLYE_ADD_TOPUSERS($rallye,$default=0)
 {
        global $_CONFIG;

-       // Init variable
-       $since = 0;
-       if (EXT_IS_ACTIVE("autopurge")) {
-               $since = $_CONFIG['ap_inactive_since'];
-       } // END - if

 
        // First check how many prices are set
        $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_rallye_prices WHERE rallye_id=%s ORDER BY price_level",
 
        // First check how many prices are set
        $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_rallye_prices WHERE rallye_id=%s ORDER BY price_level",


@@ -221,18 +215,17 @@ WHERE u.rallye_id=%s AND r.counter > 0 ORDER BY u.refs DESC",
                $result_ref = SQL_QUERY_ESC("SELECT DISTINCT p.points FROM "._MYSQL_PREFIX."_user_points AS p
 LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
 ON p.userid=d.userid
                $result_ref = SQL_QUERY_ESC("SELECT DISTINCT p.points FROM "._MYSQL_PREFIX."_user_points AS p
 LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
 ON p.userid=d.userid

-WHERE d.userid=%s AND d.status='CONFIRMED' AND p.ref_depth=1 AND d.max_mails > 0 AND d.mails_confirmed >= %s AND d.last_online >= (UNIX_TIMESTAMP() - %s)
-LIMIT 1", array(bigintval($uid), $_CONFIG['ref_payout'], $since), __FILE__, __LINE__);
+WHERE d.userid=%s AND d.status='CONFIRMED' AND p.ref_depth=1 AND d.max_mails > 0 AND d.mails_confirmed >= %s
+LIMIT 1", array(bigintval($uid), $_CONFIG['ref_payout']), __FILE__, __LINE__);

                list($refpoints) = SQL_FETCHROW($result_ref);
                SQL_FREERESULT($result_ref);
 
                if (empty($refpoints)) $refpoints = 0;
 
                list($refpoints) = SQL_FETCHROW($result_ref);
                SQL_FREERESULT($result_ref);
 
                if (empty($refpoints)) $refpoints = 0;
 

-               // And subtract start refs
-               $cnt -= $refs;
-
+               // Init userid for list

                $_uid = "---";
                // List only users with at least one ref!
                $_uid = "---";
                // List only users with at least one ref!

+               //* DEBUG: */ echo "*".$cnt."/".$uid."/".$cpoints."/".$refpoints."*<br />\n";

                if (($cnt > 0) && ($refpoints > $cpoints)) { $_uid = $uid; } else { $cnt = ""; }
 
                // Save values to array
                if (($cnt > 0) && ($refpoints > $cpoints)) { $_uid = $uid; } else { $cnt = ""; }
 
                // Save values to array


@@ -357,12 +350,6 @@ function RALLYE_EXPIRE_RALLYES($result)
 {
        global $DATA, $_CONFIG;
 
 {
        global $DATA, $_CONFIG;
 

-       // Latest online time
-       $since = 0;
-       if (EXT_IS_ACTIVE("autopurge")) {
-               $since = $_CONFIG['ap_inactive_since'];
-       } // END - if
-

        // Load rallye data
        list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
        // Load rallye data
        list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);


@@ -387,8 +374,8 @@ function RALLYE_EXPIRE_RALLYES($result)
                //   active = 0: account is deleted or locked
                $result = SQL_QUERY_ESC("SELECT COUNT(userid) AS active
 FROM "._MYSQL_PREFIX."_user_data
                //   active = 0: account is deleted or locked
                $result = SQL_QUERY_ESC("SELECT COUNT(userid) AS active
 FROM "._MYSQL_PREFIX."_user_data

-WHERE userid=%s AND status='CONFIRMED' AND last_online >= (UNIX_TIMESTAMP() - %s)
-LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
+WHERE userid=%s AND status='CONFIRMED'
+LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);

                list($active) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
                list($active) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 


@@ -749,33 +736,29 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
        return $OUT;
 }
 //
        return $OUT;
 }
 //

-function RALLYE_GET_REFCOUNT($uid, $old=0)
-{
+function RALLYE_GET_REFCOUNT($uid, $old=0) {

        global $_CONFIG, $cacheArray;
        // Check current refs
        global $_CONFIG, $cacheArray;
        // Check current refs

-       if (GET_EXT_VERSION("cache") >= "0.1.2")
-       {
+       if (GET_EXT_VERSION("cache") >= "0.1.2") {

                // Get refs from cache
                $cnt = 0;
                // Get refs from cache
                $cnt = 0;

-               foreach ($cacheArray['ref_system']['userid'] as $id => $u_id)
-               {
-                       if (($u_id == $uid) && ($cacheArray['ref_system']['level'][$id] == 0))
-                       {
-                               foreach ($cacheArray['ref_depths']['level'] as $level)
-                               {
-                                       if (($level == $cacheArray['ref_system']['level'][$id]) && ($level == 0))
-                                       {
+               foreach ($cacheArray['ref_system']['userid'] as $id => $u_id) {
+                       // Do we have a ref for this user?
+                       //* DEBUG: */ echo "id={$id},u_id={$u_id},uid={$uid},old={$old},level={$cacheArray['ref_system']['level'][$id]}<br />\n";
+                       if (($u_id == $uid) && ($cacheArray['ref_system']['level'][$id] == 1)) {
+                               //* DEBUG: */ echo "uid matches!<br />\n";
+                               foreach ($cacheArray['ref_depths']['level'] as $level) {
+                                       if (($level == $cacheArray['ref_system']['level'][$id]) && ($level == 1)) {

                                                // Level does exist so abort here
                                                $cnt = $cacheArray['ref_system']['counter'][$id];
                                                //* DEBUG: */ echo "*".$uid."/".$cnt."*<br />";
                                                break;
                                                // Level does exist so abort here
                                                $cnt = $cacheArray['ref_system']['counter'][$id];
                                                //* DEBUG: */ echo "*".$uid."/".$cnt."*<br />";
                                                break;

-                                       }
-                                        elseif ($level > 0)
-                                       {
+                                       } elseif ($level > 1) {

                                                // Not interesting here...
                                                break;
                                        }
                                }
                                                // Not interesting here...
                                                break;
                                        }
                                }

+

                                // Abort also here!
                                if ($cnt > 0) break;
                        }
                                // Abort also here!
                                if ($cnt > 0) break;
                        }


@@ -785,8 +768,7 @@ function RALLYE_GET_REFCOUNT($uid, $old=0)
                //* DEBUG: */ echo "</PRE>";
                //* DEBUG: */ die();
 
                //* DEBUG: */ echo "</PRE>";
                //* DEBUG: */ die();
 

-               if ($cnt > 0)
-               {
+               if ($cnt > 0) {

                        // Count cache hits
                        $_CONFIG['cache_hits']++;
 
                        // Count cache hits
                        $_CONFIG['cache_hits']++;
 


@@ -794,9 +776,7 @@ function RALLYE_GET_REFCOUNT($uid, $old=0)
                        //* DEBUG: */ echo "+".$cnt."/".$old."+<br />";
                        $cnt -= $old;
                }
                        //* DEBUG: */ echo "+".$cnt."/".$old."+<br />";
                        $cnt -= $old;
                }

-       }
-        else
-       {
+       } else {

                // Load current refs from database
                $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(s.counter) AS cnt
 FROM "._MYSQL_PREFIX."_refsystem AS s
                // Load current refs from database
                $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(s.counter) AS cnt
 FROM "._MYSQL_PREFIX."_refsystem AS s