X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=7335584f74508405d4306d263de3e3db7fb24a14;hp=36e85f6c076078699c6468cbd70664f3f98cdedd;hb=357b2ca133fc1f89db74097955c366cb4bee6996;hpb=831c60d4cec333ea95e0ce23d9e53fd5d8133ce6
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 36e85f6c07..7335584f74 100644
--- 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
- switch($mode)
- {
+ switch($mode) {
case "email": $mode = "\n"; break;
case "html" : $mode = "
\n"; break;
}
@@ -186,11 +185,6 @@ function RALLYE_ADD_PRICES($rallye,$mode="email")
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",
@@ -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
-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;
- // And subtract start refs
- $cnt -= $refs;
-
+ // Init userid for list
$_uid = "---";
// List only users with at least one ref!
+ //* DEBUG: */ echo "*".$cnt."/".$uid."/".$cpoints."/".$refpoints."*
\n";
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;
- // 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);
@@ -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
-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);
@@ -401,9 +388,9 @@ LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
}
}
- if (($TOTAL < $min_prices) || ($TOTAL == 0))
- {
+ if (($TOTAL < $min_prices) || ($TOTAL == 0)) {
// Do not end this rallye!
+ unset($DATA);
return;
}
@@ -472,6 +459,7 @@ LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
}
// Send mail to admin
+ die("OK!");
SEND_ADMIN_NOTIFICATION(RALLYE_ADMIN_EXPIRED.": ".$title, $templ, $cnt, 0);
// Add task
@@ -663,6 +651,7 @@ function RALLYE_LIST_WINNERS($rallye,$default=0)
function RALLYE_DELETE_EXPIRED_RALLYES()
{
global $DATA, $_CONFIG;
+
// Check for expired rallyes
$EXPIRE = $_CONFIG['one_day'] * 3; // @TODO The hard-coded value...
$result_rallye = SQL_QUERY_ESC("SELECT id, title, start_time, end_time
@@ -749,33 +738,29 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
return $OUT;
}
//
-function RALLYE_GET_REFCOUNT($uid, $old=0)
-{
+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]}
\n";
+ if (($u_id == $uid) && ($cacheArray['ref_system']['level'][$id] == 1)) {
+ //* DEBUG: */ echo "uid matches!
\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."*
";
break;
- }
- elseif ($level > 0)
- {
+ } elseif ($level > 1) {
// Not interesting here...
break;
}
}
+
// Abort also here!
if ($cnt > 0) break;
}
@@ -785,24 +770,21 @@ function RALLYE_GET_REFCOUNT($uid, $old=0)
//* DEBUG: */ echo "";
//* DEBUG: */ die();
- if ($cnt > 0)
- {
+ if ($cnt > 0) {
// Count cache hits
- $_CONFIG['cache_hits']++;
+ if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
// Remove old refs
//* DEBUG: */ echo "+".$cnt."/".$old."+
";
$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))