Fix in CREATE_EXTENSION_DEACTIVATION_TASK() and coding-style updated
[mailer.git] / inc / libs / rallye_functions.php
index ad8d6c5f15139b4ee33102c70a208d6ace4d4dcf..9e096a317e5d761be0a2ac3de513272a537c1592 100644 (file)
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 //
 function RALLYE_AUTOSTART_RALLYES($result)
 {
@@ -49,11 +49,11 @@ function RALLYE_AUTOSTART_RALLYES($result)
        SQL_FREERESULT($result);
 
        // Set notified to Y
-       $result_notified = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_rallye_data SET notified='Y' WHERE id=%s LIMIT 1",
-        array(bigintval($id)), __FILE__, __LINE__);
+       SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_rallye_data SET notified='Y' WHERE id=%s LIMIT 1",
+               array(bigintval($id)), __FILE__, __LINE__);
 
        // Do a snapshot off all user refs
-       $result_user = SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
+       $result_user = SQL_QUERY("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
 
        // Transfer all neccessary data to the global $DATA array
        $DATA['uid_cnt']    = SQL_NUMROWS($result_user);
@@ -63,23 +63,18 @@ function RALLYE_AUTOSTART_RALLYES($result)
        $DATA['title']      = $title;
        $DATA['id']         = $id;  // ID for the rallye details link
 
-       if ($min_users == 0)
-       {
+       if ($min_users == 0) {
                // Rallye ends without user limitation
                $DATA['min_users'] = RALLYE_END_NO_USER_LIMITATION;
-       }
-        else
-       {
+       } else {
                // Rallye ends when X members are totally in your exchange
                $DATA['min_users'] = RALLYE_END_USERS_1." ".$min_users." ".RALLYE_END_USERS_2;
        }
-       if ($min_prices == 0)
-       {
+
+       if ($min_prices == 0) {
                // Rallye ends without user limitation
                $DATA['min_prices'] = RALLYE_END_NO_PRICE_LIMITATION;
-       }
-        else
-       {
+       } else {
                // Rallye ends when X members are totally in your exchange
                $DATA['min_prices'] = RALLYE_END_PRICES_1." ".$min_prices." ".RALLYE_END_PRICES_2;
        }
@@ -88,52 +83,49 @@ function RALLYE_AUTOSTART_RALLYES($result)
        $prices = RALLYE_ADD_PRICES($id);
 
        // Let's begin with the userids...
-       while (list($uid) = SQL_FETCHROW($result_user))
-       {
+       while (list($uid) = SQL_FETCHROW($result_user)) {
                $un = false;
 
                // Get refs by userid
                $cnt = RALLYE_GET_REFCOUNT($uid);
-               if (empty($cnt)) $cnt = "0"; // Added prevent some unknown troubles... :-?
+               if (empty($cnt)) $cnt = 0; // Added prevent some unknown troubles... :-?
 
                // Check if line is already included...
                $result_ref = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_rallye_users WHERE rallye_id=%s AND userid=%s LIMIT 1",
-                array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
-               if (SQL_NUMROWS($result_ref) == 0)
-               {
+                       array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
+               if (SQL_NUMROWS($result_ref) == 0) {
                        // Free memory
                        SQL_FREERESULT($result_ref);
 
                        // Add userid and his ref count to table
                        $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(p.points)
 FROM "._MYSQL_PREFIX."_user_points AS p
-LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
+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(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);
                        list($cpoints) = SQL_FETCHROW($result_ref);
                        SQL_FREERESULT($result_ref);
 
                        if (empty($cpoints)) $cpoints = "0.00000";
 
                        // Add info line
-                       $result_ref = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_rallye_users (rallye_id, userid, refs, curr_points)
-VALUES ('%s', '%s', '%s', '%s')",
- array(bigintval($id), bigintval($uid), bigintval($cnt), $cpoints), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_rallye_users (rallye_id, userid, refs, curr_points)
+VALUES ('%s','%s','%s','%s')",
                              array(bigintval($id), bigintval($uid), bigintval($cnt), $cpoints), __FILE__, __LINE__);
                        $un = true;
-               }
+               } // END - if
 
                // Ignored but for the template required refs (made before start of rallye)
                $DATA['refs']  = $cnt;
 
                // Shall I notify this member?
-               if (($notify == "Y") && ($un))
-               {
+               if (($notify == "Y") && ($un)) {
                        // Load email template and send it to the user
-                       $msg = LOAD_EMAIL_TEMPLATE("member_rallye_notify", $prices, $uid);
+                       $msg = LOAD_EMAIL_TEMPLATE("member_rallye_notify", array('prices' => $prices), $uid);
                        SEND_EMAIL($uid, RALLYE_MEMBER_NOTIFY.$title, $msg);
-               }
-       }
+               } // END - if
+       } // END - while
 
        // Choose the right admin template
        $templ = "admin_rallye_no_notify";
@@ -149,8 +141,7 @@ VALUES ('%s', '%s', '%s', '%s')",
 function RALLYE_ADD_PRICES($rallye,$mode="email")
 {
        // Output mode
-       switch($mode)
-       {
+       switch($mode) {
                case "email": $mode = "\n";     break;
                case "html" : $mode = "<br />\n"; break;
        }
@@ -194,7 +185,6 @@ function RALLYE_ADD_PRICES($rallye,$mode="email")
 function RALLYE_ADD_TOPUSERS($rallye,$default=0)
 {
        global $_CONFIG;
-       $since = (time() - $_CONFIG['ap_in_since']);
 
        // 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",
@@ -223,20 +213,19 @@ WHERE u.rallye_id=%s AND r.counter > 0 ORDER BY u.refs DESC",
 
                // Points of ref's
                $result_ref = SQL_QUERY_ESC("SELECT DISTINCT p.points FROM "._MYSQL_PREFIX."_user_points AS p
-LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
+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 >= %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), getConfig('ref_payout')), __FILE__, __LINE__);
                list($refpoints) = SQL_FETCHROW($result_ref);
                SQL_FREERESULT($result_ref);
 
-               if (empty($refpoints)) $refpoints = "0";
-
-               // And subtract start refs
-               $cnt -= $refs;
+               if (empty($refpoints)) $refpoints = 0;
 
+               // Init userid for list
                $_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
@@ -284,57 +273,83 @@ LIMIT 1", array(bigintval($uid), $_CONFIG['ref_payout'], $since), __FILE__, __LI
 function RALLYE_AUTOADD_USER($uid)
 {
        global $DATA;
+       $ADD = "";
+
+       // Updated extension?
+       if (GET_EXT_VERSION("rallye") >= "0.2.0") {
+               $ADD .= ", min_users, min_prices";
+       } // END - if
+
        // Check for an auto-add rallye
-       $result = SQL_QUERY("SELECT id, title, start_time, end_time, send_notify FROM "._MYSQL_PREFIX."_rallye_data WHERE is_active='Y' AND notified='Y' AND auto_add_new_user='Y' AND expired='N' LIMIT 1", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) == 1)
-       {
+       $result = SQL_QUERY("SELECT id, title, start_time, end_time, send_notify".$ADD." FROM "._MYSQL_PREFIX."_rallye_data WHERE is_active='Y' AND notified='Y' AND auto_add_new_user='Y' AND expired='N' LIMIT 1", __FILE__, __LINE__);
+       if (SQL_NUMROWS($result) == 1) {
+               // Init variables
+               $min_users = 0; $min_prices = 0;
                // Load data
-               list($id, $title, $start, $end, $notify) = SQL_FETCHROW($result);
+               if (GET_EXT_VERSION("rallye") >= "0.2.0") {
+                       list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result);
+               } else {
+                       list($id, $title, $start, $end, $notify) = SQL_FETCHROW($result);
+               }
+
+               // Free result
                SQL_FREERESULT($result);
 
                // Check if line is already included...
                $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_rallye_users WHERE rallye_id=%s AND userid=%s LIMIT 1",
-                array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
-               if (SQL_NUMROWS($result) == 0)
-               {
+                       array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
+
+               // Is this user added?
+               if (SQL_NUMROWS($result) == 0) {
                        // Add userid and his ref count to table
-                       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_rallye_users (rallye_id, userid, refs)
-VALUES ('%s', '%s', '0')",
+                       SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_rallye_users (rallye_id, userid, refs)
+VALUES ('%s','%s','0')",
  array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
-               }
-                else
-               {
+               } else {
                        // Free memory
                        SQL_FREERESULT($result);
                }
 
-               if ($notify == "Y")
-               {
+               if ($notify == "Y") {
                        // Transfer all neccessary data to the global $DATA array
                        $DATA['start'] = MAKE_DATETIME($start, "2");
                        $DATA['end']   = MAKE_DATETIME($end  , "2");
                        $DATA['now_t'] = MAKE_DATETIME(time(), "2");
                        $DATA['title'] = $title;
                        $DATA['id']    = $id;  // ID for the rallye details link
-                       $DATA['ref']   = "0";
+                       $DATA['ref']   = 0;
+                       $DATA['refs']  = GET_TOTAL_DATA($uid, "user_data", "userid", "refid", true);
 
                        // Load prices
                        $prices = RALLYE_ADD_PRICES($id);
 
+                       if ($min_users == 0) {
+                               // Rallye ends without user limitation
+                               $DATA['min_users'] = RALLYE_END_NO_USER_LIMITATION;
+                       } else {
+                               // Rallye ends when X members are totally in your exchange
+                               $DATA['min_users'] = RALLYE_END_USERS_1." ".$min_users." ".RALLYE_END_USERS_2;
+                       }
+
+                       if ($min_prices == 0) {
+                               // Rallye ends without user limitation
+                               $DATA['min_prices'] = RALLYE_END_NO_PRICE_LIMITATION;
+                       } else {
+                               // Rallye ends when X members are totally in your exchange
+                               $DATA['min_prices'] = RALLYE_END_PRICES_1." ".$min_prices." ".RALLYE_END_PRICES_2;
+                       }
+
                        // Send notification to member
-                       $msg = LOAD_EMAIL_TEMPLATE("member_rallye_notify", $prices, $uid);
+                       $msg = LOAD_EMAIL_TEMPLATE("member_rallye_notify", array('prices' => $prices), $uid);
                        SEND_EMAIL($uid, RALLYE_MEMBER_NOTIFY.$title, $msg);
-               }
-       }
+               } // END - if
+       } // END - if
 }
 //
 function RALLYE_EXPIRE_RALLYES($result)
 {
        global $DATA, $_CONFIG;
 
-       // Latest online time
-       $since = (time() - $_CONFIG['ap_in_since']);
-
        // Load rallye data
        list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
@@ -352,114 +367,94 @@ 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
                $result = SQL_QUERY_ESC("SELECT COUNT(userid) AS active
 FROM "._MYSQL_PREFIX."_user_data
-WHERE userid=%s AND status='CONFIRMED' AND last_online >= %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);
 
                $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))
-       {
+       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__);
+       SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_rallye_data SET expired='Y' WHERE id=%s LIMIT 1",
+               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];
 
-                       if ($DATA['points'] > 0)
-                       {
-                               // Add points directly to user's account
-                               $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_points SET points=points+%s WHERE userid=%s AND ref_depth=0 LIMIT 1",
-                                array($DATA['points'], bigintval($uid)), __FILE__, __LINE__);
-
-                               // Update mediadata as well
-                               if (GET_EXT_VERSION("mediadata") >= "0.0.4")
-                               {
-                                       // Update database
-                                       MEDIA_UPDATE_ENTRY(array("total_points"), "add", $DATA['points']);
-                               }
+                       // 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 ($notify == "Y")
-                       {
+                       if ($DATA['points'] > 0) {
+                               // Add points directly to user's account
+                               ADD_POINTS_REFSYSTEM("rallye_winner" . $winnerLevel, $uid, $DATA['points'], false, "0", false, "direct");
+                       } // END - if
+
+                       if ($notify == "Y") {
                                // Prepare infos for the mail template
-                               if (!empty($DATA['info']))
-                               {
+                               if (!empty($DATA['info'])) {
                                        // Take direct infos
                                        $DATA['infos'] = $DATA['info'];
-                               }
-                                else
-                               {
+                               } else {
                                        // Take points
                                        $DATA['infos'] = $DATA['points']." ".POINTS;
                                }
 
                                // 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);
                                SEND_EMAIL($uid, RALLYE_MEMBER_EXPIRED.": ".$DATA['level']." "._RALLYE_PRICE, $msg);
-                       }
+                       } // END - if
 
                        // Count userid
                        $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")
-       {
+       if ($notify == "Y") {
                $templ = "admin_rallye_expired";
-       }
-        elseif (is_array($users['uid']))
-       {
+       } elseif (is_array($users['uid'])) {
                $templ = "admin_rallye_expired_no";
                $cnt = RALLYE_LOAD_USER_DATA($users);
        }
@@ -468,8 +463,8 @@ LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
        SEND_ADMIN_NOTIFICATION(RALLYE_ADMIN_EXPIRED.": ".$title, $templ, $cnt, 0);
 
        // Add task
-       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (status, task_type, subject, text, task_created)
-VALUES ('NEW', 'RALLYE_EXPIRED', '".RALLYE_ADMIN_EXPIRED.": %s', '".RALLYE_ADMIN_EXPIRED_TEXT."', UNIX_TIMESTAMP())",
+       SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (status, task_type, subject, text, task_created)
+VALUES ('NEW','RALLYE_EXPIRED','".RALLYE_ADMIN_EXPIRED.": %s','".RALLYE_ADMIN_EXPIRED_TEXT."',UNIX_TIMESTAMP())",
  array($title), __FILE__, __LINE__);
 
        // All work done here...
@@ -481,12 +476,12 @@ function RALLYE_LOAD_USER_DATA($uids_array)
        $uid_string = implode(",", $uids_array['uid']);
 
        // Load users
-       $result = SQL_QUERY_ESC("SELECT userid, sex, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid IN(%s) AND status='CONFIRMED' ORDER BY userid LIMIT %s",
+       $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid IN(%s) AND status='CONFIRMED' ORDER BY userid LIMIT %s",
         array($uid_string, count($uids_array)), __FILE__, __LINE__);
        $ret = "";
-       while (list($u, $sex, $surname, $family, $email) = SQL_FETCHROW($result))
+       while (list($u, $gender, $surname, $family, $email) = SQL_FETCHROW($result))
        {
-               $ret .= TRANSLATE_SEX($sex)." ".$surname." ".$family." (".$email.") - ".$uids_array['poi'][$u]."\n";
+               $ret .= TRANSLATE_GENDER($gender)." ".$surname." ".$family." (".$email.") - ".$uids_array['poi'][$u]."\n";
        }
 
        // Return result
@@ -524,7 +519,7 @@ function RALLYE_LOAD_USERS_ARRAY($rallye)
        global $_CONFIG;
 
        // Fix zero points to 0.00000
-       if ($_CONFIG['ref_payout'] == "0") $_CONFIG['ref_payout'] = "0.00000";
+       if (getConfig('ref_payout') == "0") $_CONFIG['ref_payout'] = "0.00000";
 
        // Init multi array
        $users = array(
@@ -533,7 +528,7 @@ function RALLYE_LOAD_USERS_ARRAY($rallye)
                'cpoints' => array(),
        );
 
-       // Load users                    uid    old   points earned
+       // Load users                          uid    old  points earned
        $result_user = SQL_QUERY_ESC("SELECT userid, refs, curr_points FROM "._MYSQL_PREFIX."_rallye_users WHERE rallye_id=%s ORDER BY userid",
         array(bigintval($rallye)), __FILE__, __LINE__);
        while(list($uid, $refs, $cpoints) = SQL_FETCHROW($result_user))
@@ -544,14 +539,14 @@ function RALLYE_LOAD_USERS_ARRAY($rallye)
                // Points of ref's
                $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(p.points)
 FROM "._MYSQL_PREFIX."_user_points AS p
-LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
+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(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);
                list($refpoints) = SQL_FETCHROW($result_ref);
                SQL_FREERESULT($result_ref);
 
-               if (empty($refpoints)) $refpoints = "0";
+               if (empty($refpoints)) $refpoints = 0;
 
                // Store calculated new refs to array
                $users['uid'][]     = $uid;
@@ -569,7 +564,7 @@ WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p
        $prices = RALLYE_LOAD_PRICES_ARRAY($rallye);
 
        // Merge users into prices
-       foreach ($prices['level'] as $k=>$lvl)
+       foreach ($prices['level'] as $k => $lvl)
        {
                $prices['uid'][$k]  = $users['uid'][$k];
                if (empty($prices['uid'][$k])) $prices['uid'][$k]  = "---";
@@ -601,7 +596,7 @@ function RALLYE_LIST_WINNERS($rallye,$default=0)
                // Check status
                //   active = 1: account is still confirmed
                //   active = 0: account is deleted or locked
-               $result_active = SQL_QUERY_ESC("SELECT COUNT(userid) FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+               $result_active = SQL_QUERY_ESC("SELECT COUNT(userid) FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
                 array(bigintval($DATA['uid'][$idx])), __FILE__, __LINE__);
                list($active) = SQL_FETCHROW($result_active);
                SQL_FREERESULT($result_active);
@@ -656,10 +651,13 @@ function RALLYE_LIST_WINNERS($rallye,$default=0)
 function RALLYE_DELETE_EXPIRED_RALLYES()
 {
        global $DATA, $_CONFIG;
+
        // Check for expired rallyes
-       $EXPIRE = time() - ONE_DAY * 3; // The hard-coded value...
-       $result_rallye = SQL_QUERY_ESC("SELECT id, title, start_time, end_time FROM "._MYSQL_PREFIX."_rallye_data WHERE end_time <= %s AND expired='Y'",
-        array($EXPIRE), __FILE__, __LINE__);
+       $EXPIRE = getConfig('one_day') * 3; // @TODO The hard-coded value...
+       $result_rallye = SQL_QUERY_ESC("SELECT id, title, start_time, end_time
+FROM "._MYSQL_PREFIX."_rallye_data
+WHERE end_time <= (UNIX_TIMESTAMP() - %s) AND expired='Y'",
+               array($EXPIRE), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result_rallye) > 0)
        {
@@ -676,18 +674,18 @@ function RALLYE_DELETE_EXPIRED_RALLYES()
                        SEND_ADMIN_NOTIFICATION(RALLYE_ADMIN_PURGED.": ".$title, "admin_rallye_purged", "", 0);
 
                        // Purge whole rallye
-                       $result_purge = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_data WHERE id=%s LIMIT 1",
-                        array(bigintval($id)), __FILE__, __LINE__);
-                       $result_purge = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_prices WHERE rallye_id=%s LIMIT 1",
-                        array(bigintval($id)), __FILE__, __LINE__);
-                       $result_purge = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_users WHERE rallye_id=%s LIMIT 1",
-                        array(bigintval($id)), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_data WHERE id=%s LIMIT 1",
+                               array(bigintval($id)), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_prices WHERE rallye_id=%s LIMIT 1",
+                               array(bigintval($id)), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_users WHERE rallye_id=%s LIMIT 1",
+                               array(bigintval($id)), __FILE__, __LINE__);
                }
 
                // Add task
-               $result_task = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (status, task_type, subject, text, task_created)
-VALUES ('NEW', 'RALLYE_PURGED', '".RALLYE_ADMIN_PURGED.": %s', '".RALLYE_ADMIN_PURGED_TEXT."', UNIX_TIMESTAMP())",
- array($title), __FILE__, __LINE__);
+               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (status, task_type, subject, text, task_created)
+VALUES ('NEW','RALLYE_PURGED','".RALLYE_ADMIN_PURGED.": %s','".RALLYE_ADMIN_PURGED_TEXT."',UNIX_TIMESTAMP())",
                      array($title), __FILE__, __LINE__);
        }
 
        // Free memory
@@ -698,7 +696,7 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
 {
        // Check templates directory
        $OUT = ""; $ral = array();
-       $BASE = sprintf("%stemplates/%s/html", PATH, GET_LANGUAGE());
+       $BASE = sprintf("%stemplates/%s/html/rallye/", PATH, GET_LANGUAGE());
        $dir = opendir($BASE);
        while ($read = readdir($dir))
        {
@@ -740,33 +738,30 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
        return $OUT;
 }
 //
-function RALLYE_GET_REFCOUNT($uid, $old=0)
-{
-       global $_CONFIG;
+function RALLYE_GET_REFCOUNT($uid, $old=0) {
+       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;
-               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;
-                                       }
-                                        elseif ($level > 0)
-                                       {
+                                       } elseif ($level > 1) {
                                                // Not interesting here...
                                                break;
                                        }
                                }
+
                                // Abort also here!
                                if ($cnt > 0) break;
                        }
@@ -776,29 +771,26 @@ function RALLYE_GET_REFCOUNT($uid, $old=0)
                //* DEBUG: */ echo "</PRE>";
                //* DEBUG: */ die();
 
-               if ($cnt > 0)
-               {
+               if ($cnt > 0) {
                        // Count cache hits
-                       $_CONFIG['cache_hits']++;
+                       if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 
                        // Remove old refs
                        //* 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
 LEFT JOIN "._MYSQL_PREFIX."_refdepths AS d
 ON s.level=d.level
-WHERE s.userid=%s AND s.level=0", array(bigintval($uid)), __FILE__, __LINE__);
+WHERE s.userid=%s AND s.level=1", array(bigintval($uid)), __FILE__, __LINE__);
                list($cnt) = SQL_FETCHROW($result_ref);
                SQL_FREERESULT($result_ref);
                if (empty($cnt))
                {
-                       $cnt = "0";
+                       $cnt = 0;
                }
                 else
                {
@@ -810,5 +802,12 @@ WHERE s.userid=%s AND s.level=0", array(bigintval($uid)), __FILE__, __LINE__);
        //* DEBUG: */ echo "*".$uid."/".$old."/".$cnt."*<br />";
        return $cnt;
 }
+
+// Filter for extra-autpurge
+function FILTER_RALLYE_EXTRA_AUTOPURGE () {
+       // Check expired rallyes (hard-coded 3 days limit for displaying expired rallyes!)
+       RALLYE_DELETE_EXPIRED_RALLYES();
+}
+
 //
 ?>