X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=796356caca854116dba09c067d42782580e5ed4c;hp=f6e65e5b1aee83baff18ddbe9de4492dc025cb4e;hb=811c2a74188a97591fb05ed1dd3d1929b8bc23aa;hpb=4240b5d40ef77c13d4e76dc75da545114f69f08f

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index f6e65e5b1a..796356caca 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";
@@ -303,7 +295,7 @@ function RALLYE_AUTOADD_USER($uid)
 		{
 			// 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
@@ -326,7 +318,7 @@ VALUES ('%s', '%s', '0')",
 			$prices = RALLYE_ADD_PRICES($id);
 
 			// 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);
 		}
 	}
@@ -402,48 +394,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 +425,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 +435,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 +447,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 +635,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 +666,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 +678,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))
 	{
@@ -751,7 +722,7 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
 //
 function RALLYE_GET_REFCOUNT($uid, $old=0)
 {
-	global $_CONFIG;
+	global $_CONFIG, $cacheArray;
 	// Check current refs
 	if (GET_EXT_VERSION("cache") >= "0.1.2")
 	{