X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=f18f68df6eefa90d93c7450db85cc5ff8b641164;hb=798cdd57a6c0e5879e3ad5d9a76900ed27e1d9e0;hp=10089fc5596d56a3cbddf7a2073806d9ef3a47b8;hpb=49f1879ae5ed8d46035bbb1ddf84c4207bfaacb0;p=mailer.git

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 10089fc559..f18f68df6e 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -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,8 +83,7 @@ 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
@@ -99,8 +93,7 @@ function RALLYE_AUTOSTART_RALLYES($result)
 		// 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);
 
@@ -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)
-VALUES ('%s', '%s', '%s', '%s')",
+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,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",
@@ -229,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."*<br />\n";
 		if (($cnt > 0) && ($refpoints > $cpoints)) { $_uid = $uid; } else { $cnt = ""; }
 
 		// Save values to array
@@ -288,32 +273,44 @@ 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')",
+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");
@@ -321,27 +318,38 @@ VALUES ('%s', '%s', '0')",
 			$DATA['title'] = $title;
 			$DATA['id']    = $id;  // ID for the rallye details link
 			$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 = 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);
@@ -366,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);
 
@@ -402,48 +410,30 @@ LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
 			$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
-				$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
-				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)
-				{
+				if ($DATA['level'] == 1) {
 					// The winner!
 					$template .= "_gold";
-				}
-				 elseif ($DATA['level'] == 2)
-				{
+				} elseif ($DATA['level'] == 2) {
 					// The vice winner!
 					$template .= "_silver";
-				}
-				 elseif ($DATA['level'] == 3)
-				{
+				} elseif ($DATA['level'] == 3) {
 					// The bronce winner
 					$template .= "_bronce";
 				}
@@ -451,7 +441,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);
-			}
+			} // END - if
 
 			// Count userid
 			$cnt++;
@@ -461,12 +451,9 @@ LIMIT 1", array(bigintval($uid), $since), __FILE__, __LINE__);
 	}
 
 	// 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);
 	}
@@ -476,7 +463,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)
-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...
@@ -664,7 +651,7 @@ function RALLYE_DELETE_EXPIRED_RALLYES()
 {
 	global $DATA, $_CONFIG;
 	// Check for expired rallyes
-	$EXPIRE = ONE_DAY * 3; // @TODO The hard-coded value...
+	$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'",
@@ -695,7 +682,7 @@ WHERE end_time <= (UNIX_TIMESTAMP() - %s) AND expired='Y'",
 
 		// 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__);
 	}
 
@@ -707,7 +694,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))
 	{
@@ -749,33 +736,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]}<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;
 			}
@@ -785,24 +768,21 @@ 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 (isset($_CONFIG['cache_hits'])) { $_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))