X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=37c25d174f818987b3e1fd42f07e8142945fe27d;hb=cd85b0c3073573f83610b0b8b5f0b1aa90a855fa;hp=1b4798f07b0d6096496c3b63b188ca95c4b86167;hpb=e1c80a52f2efae73e1b554702d4ca00e94789aca;p=mailer.git
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 1b4798f07b..37c25d174f 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,20 +350,8 @@ function RALLYE_EXPIRE_RALLYES($result)
{
global $DATA, $_CONFIG;
- // Latest online time
- $since = 0; $min_users = 0; $min_prices = 0;
- if (EXT_IS_ACTIVE("autopurge")) {
- $since = $_CONFIG['ap_inactive_since'];
- } // END - if
-
// Load rallye data
- 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
+ list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
// Load users array (!) with assigned prices
@@ -393,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);
@@ -755,60 +736,43 @@ 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") && (isset($cacheArray['ref_system'])))
- {
+ 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))
- {
- // Level does exist so abort here
- $cnt = $cacheArray['ref_system']['counter'][$id];
- //* DEBUG: */ echo "*".$uid."/".$cnt."*
";
- break;
- }
- elseif ($level > 0)
- {
- // Not interesting here...
- break;
- }
- }
- // Abort also here!
- if ($cnt > 0) break;
- }
- }
+ 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 && GET_EXT_VERSION("refback") != "") || ($cacheArray['ref_system']['level'][$id] == 0 && GET_EXT_VERSION("refback") == ""))) {
+ //* DEBUG: */ echo "uid matches!
\n";
+ // Entry found!
+ $cnt = $cacheArray['ref_system']['counter'][$id];
+ break;
+ } // END - if
+ } // END - foreach
+
//* DEBUG: */ echo "
"; //* DEBUG: */ print_r($cacheArray['ref_system']); //* DEBUG: */ echo ""; //* DEBUG: */ die(); - if ($cnt > 0) - { + if ($cnt > 0) { // Count cache hits $_CONFIG['cache_hits']++; // Remove old refs //* DEBUG: */ echo "+".$cnt."/".$old."+