Refback will be payed now (user cannot setup currently)
[mailer.git] / inc / libs / rallye_functions.php
index d6aaef9..643c53f 100644 (file)
  ************************************************************************/
 
 // Some security stuff...
  ************************************************************************/
 
 // 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);
 }
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 //
 function RALLYE_AUTOSTART_RALLYES($result)
 {
 //
 function RALLYE_AUTOSTART_RALLYES($result)
 {
@@ -63,23 +63,18 @@ function RALLYE_AUTOSTART_RALLYES($result)
        $DATA['title']      = $title;
        $DATA['id']         = $id;  // ID for the rallye details link
 
        $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;
                // 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;
        }
                // 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;
                // 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;
        }
                // Rallye ends when X members are totally in your exchange
                $DATA['min_prices'] = RALLYE_END_PRICES_1." ".$min_prices." ".RALLYE_END_PRICES_2;
        }
@@ -88,19 +83,17 @@ function RALLYE_AUTOSTART_RALLYES($result)
        $prices = RALLYE_ADD_PRICES($id);
 
        // Let's begin with the userids...
        $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);
                $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__);
 
                // 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)
-               {
+               if (SQL_NUMROWS($result_ref) == 0) {
                        // Free memory
                        SQL_FREERESULT($result_ref);
 
                        // Free memory
                        SQL_FREERESULT($result_ref);
 
@@ -118,22 +111,21 @@ WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p
 
                        // Add info line
                        $result_ref = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_rallye_users (rallye_id, userid, refs, curr_points)
 
                        // 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')",
+VALUES ('%s','%s','%s','%s')",
  array(bigintval($id), bigintval($uid), bigintval($cnt), $cpoints), __FILE__, __LINE__);
                        $un = true;
  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?
 
                // 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
                        // 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);
                        SEND_EMAIL($uid, RALLYE_MEMBER_NOTIFY.$title, $msg);
-               }
-       }
+               } // END - if
+       } // END - while
 
        // Choose the right admin template
        $templ = "admin_rallye_no_notify";
 
        // Choose the right admin template
        $templ = "admin_rallye_no_notify";
@@ -194,7 +186,11 @@ 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;
-       $since = (time() - $_CONFIG['ap_in_since']);
+       // 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",
@@ -225,12 +221,12 @@ 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 >= %s
+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__);
                list($refpoints) = SQL_FETCHROW($result_ref);
                SQL_FREERESULT($result_ref);
 
 LIMIT 1", array(bigintval($uid), $_CONFIG['ref_payout'], $since), __FILE__, __LINE__);
                list($refpoints) = SQL_FETCHROW($result_ref);
                SQL_FREERESULT($result_ref);
 
-               if (empty($refpoints)) $refpoints = "0";
+               if (empty($refpoints)) $refpoints = 0;
 
                // And subtract start refs
                $cnt -= $refs;
 
                // And subtract start refs
                $cnt -= $refs;
@@ -284,48 +280,77 @@ LIMIT 1", array(bigintval($uid), $_CONFIG['ref_payout'], $since), __FILE__, __LI
 function RALLYE_AUTOADD_USER($uid)
 {
        global $DATA;
 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
        // 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
                // 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",
                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)
                        // 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')",
+VALUES ('%s','%s','0')",
  array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
  array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
-               }
-                else
-               {
+               } else {
                        // Free memory
                        SQL_FREERESULT($result);
                }
 
                        // 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
                        // 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);
 
 
                        // 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
                        // 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);
                        SEND_EMAIL($uid, RALLYE_MEMBER_NOTIFY.$title, $msg);
-               }
-       }
+               } // END - if
+       } // END - if
 }
 //
 function RALLYE_EXPIRE_RALLYES($result)
 }
 //
 function RALLYE_EXPIRE_RALLYES($result)
@@ -333,7 +358,10 @@ function RALLYE_EXPIRE_RALLYES($result)
        global $DATA, $_CONFIG;
 
        // Latest online time
        global $DATA, $_CONFIG;
 
        // Latest online time
-       $since = (time() - $_CONFIG['ap_in_since']);
+       $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);
 
        // Load rallye data
        list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result);
@@ -359,7 +387,7 @@ 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 >= %s
+WHERE userid=%s AND status='CONFIRMED' AND last_online >= (UNIX_TIMESTAMP() - %s)
 LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
                list($active) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
                list($active) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
@@ -395,48 +423,30 @@ LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
                        $DATA['info']   = $prices['info'][$key];
                        $DATA['ref']    = $prices['ref'][$key];
 
                        $DATA['info']   = $prices['info'][$key];
                        $DATA['ref']    = $prices['ref'][$key];
 
-                       if ($DATA['points'] > 0)
-                       {
+                       if ($DATA['points'] > 0) {
                                // Add points directly to user's account
                                // 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']);
-                               }
+                               ADD_POINTS_REFSYSTEM($uid, $DATA['points'], false, "0", false, "direct");
                        }
 
                        }
 
-                       if ($notify == "Y")
-                       {
+                       if ($notify == "Y") {
                                // Prepare infos for the mail template
                                // Prepare infos for the mail template
-                               if (!empty($DATA['info']))
-                               {
+                               if (!empty($DATA['info'])) {
                                        // Take direct infos
                                        $DATA['infos'] = $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";
                                        // Take points
                                        $DATA['infos'] = $DATA['points']." ".POINTS;
                                }
 
                                // Add suffix to template name
                                $template = "member_rallye_expired";
-                               if ($DATA['level'] == 1)
-                               {
+                               if ($DATA['level'] == 1) {
                                        // The winner!
                                        $template .= "_gold";
                                        // The winner!
                                        $template .= "_gold";
-                               }
-                                elseif ($DATA['level'] == 2)
-                               {
+                               } elseif ($DATA['level'] == 2) {
                                        // The vice winner!
                                        $template .= "_silver";
                                        // The vice winner!
                                        $template .= "_silver";
-                               }
-                                elseif ($DATA['level'] == 3)
-                               {
+                               } elseif ($DATA['level'] == 3) {
                                        // The bronce winner
                                        $template .= "_bronce";
                                }
                                        // The bronce winner
                                        $template .= "_bronce";
                                }
@@ -444,7 +454,7 @@ LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
                                // Load template
                                $msg = LOAD_EMAIL_TEMPLATE($template, $DATA, $uid);
                                SEND_EMAIL($uid, RALLYE_MEMBER_EXPIRED.": ".$DATA['level']." "._RALLYE_PRICE, $msg);
                                // 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++;
 
                        // Count userid
                        $cnt++;
@@ -454,12 +464,9 @@ LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
        }
 
        // Select template depending on notfication is switch on / off
        }
 
        // Select template depending on notfication is switch on / off
-       if ($notify == "Y")
-       {
+       if ($notify == "Y") {
                $templ = "admin_rallye_expired";
                $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);
        }
                $templ = "admin_rallye_expired_no";
                $cnt = RALLYE_LOAD_USER_DATA($users);
        }
@@ -469,7 +476,7 @@ LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
 
        // Add task
        $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (status, task_type, subject, text, task_created)
 
        // 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())",
+VALUES ('NEW','RALLYE_EXPIRED','".RALLYE_ADMIN_EXPIRED.": %s','".RALLYE_ADMIN_EXPIRED_TEXT."',UNIX_TIMESTAMP())",
  array($title), __FILE__, __LINE__);
 
        // All work done here...
  array($title), __FILE__, __LINE__);
 
        // All work done here...
@@ -481,12 +488,12 @@ function RALLYE_LOAD_USER_DATA($uids_array)
        $uid_string = implode(",", $uids_array['uid']);
 
        // Load users
        $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 = "";
         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
        }
 
        // Return result
@@ -551,7 +558,7 @@ WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p
                list($refpoints) = SQL_FETCHROW($result_ref);
                SQL_FREERESULT($result_ref);
 
                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;
 
                // Store calculated new refs to array
                $users['uid'][]     = $uid;
@@ -657,9 +664,11 @@ function RALLYE_DELETE_EXPIRED_RALLYES()
 {
        global $DATA, $_CONFIG;
        // Check for 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 = $_CONFIG['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)
        {
 
        if (SQL_NUMROWS($result_rallye) > 0)
        {
@@ -686,7 +695,7 @@ function RALLYE_DELETE_EXPIRED_RALLYES()
 
                // Add task
                $result_task = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (status, task_type, subject, text, task_created)
 
                // 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())",
+VALUES ('NEW','RALLYE_PURGED','".RALLYE_ADMIN_PURGED.": %s','".RALLYE_ADMIN_PURGED_TEXT."',UNIX_TIMESTAMP())",
  array($title), __FILE__, __LINE__);
        }
 
  array($title), __FILE__, __LINE__);
        }
 
@@ -698,7 +707,7 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
 {
        // Check templates directory
        $OUT = ""; $ral = array();
 {
        // 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))
        {
        $dir = opendir($BASE);
        while ($read = readdir($dir))
        {
@@ -742,7 +751,7 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
 //
 function RALLYE_GET_REFCOUNT($uid, $old=0)
 {
 //
 function RALLYE_GET_REFCOUNT($uid, $old=0)
 {
-       global $_CONFIG;
+       global $_CONFIG, $cacheArray;
        // Check current refs
        if (GET_EXT_VERSION("cache") >= "0.1.2")
        {
        // Check current refs
        if (GET_EXT_VERSION("cache") >= "0.1.2")
        {
@@ -793,12 +802,12 @@ function RALLYE_GET_REFCOUNT($uid, $old=0)
 FROM "._MYSQL_PREFIX."_refsystem AS s
 LEFT JOIN "._MYSQL_PREFIX."_refdepths AS d
 ON s.level=d.level
 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))
                {
                list($cnt) = SQL_FETCHROW($result_ref);
                SQL_FREERESULT($result_ref);
                if (empty($cnt))
                {
-                       $cnt = "0";
+                       $cnt = 0;
                }
                 else
                {
                }
                 else
                {