X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fsurfbar_functions.php;h=fd6fac6d49718e1e342c7f382b9c81fe9260767c;hb=a6f5926aeaf7917cb4bca3d29ffd0e8e6290fb4e;hp=278ad21d4a7d35a72adffef5da2cf17fc420df99;hpb=498f14a6cae9f79913b07da2778c68b57b7dcdef;p=mailer.git

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 278ad21d4a..fd6fac6d49 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -494,18 +494,18 @@ function SURFBAR_HANDLE_DEPLETED_VIEWS () {
 // Alert users which have URLs booked and are low on points amount
 function SURFBAR_HANDLE_LOW_POINTS () {
 	// Get all userids
-	$UIDs = SURFBAR_DETERMINE_DEPLETED_USERIDS(getConfig('surfbar_warn_low_points'));
+	$userids = SURFBAR_DETERMINE_DEPLETED_USERIDS(getConfig('surfbar_warn_low_points'));
 
 	// "Walk" through all URLs
-	foreach ($UIDs['userid'] as $userid => $dummy) {
+	foreach ($userids['userid'] as $userid => $dummy) {
 		// Is the last notification far enougth away to notify again?
-		if ((time() - $UIDs['notified'][$userid]) >= getConfig('surfbar_low_interval')) {
+		if ((time() - $userids['notified'][$userid]) >= getConfig('surfbar_low_interval')) {
 			// Prepare content
 			$content = array(
 				'userid'      => $userid,
 				'low'      => translateComma(getConfig('surfbar_warn_low_points')),
-				'points'   => translateComma($UIDs['points'][$userid]),
-				'notified' => generateDateTime($UIDs['notified'][$userid]),
+				'points'   => translateComma($userids['points'][$userid]),
+				'notified' => generateDateTime($userids['notified'][$userid]),
 				'interval' => createFancyTime(getConfig('surfbar_low_interval'))
 			);
 
@@ -798,10 +798,10 @@ function SURFBAR_DETERMINE_TEMPLATE_NAME() {
 	$templateName = "surfbar_frameset";
 
 	// Any frame set? ;-)
-	if (isGetRequestElementSet('frame')) {
+	if (isGetRequestParameterSet('frame')) {
 		// Use the frame as a template name part... ;-)
 		$templateName = sprintf("surfbar_frame_%s",
-		getRequestElement('frame')
+		getRequestParameter('frame')
 		);
 	} // END - if
 
@@ -835,7 +835,12 @@ INNER JOIN
 ON
 	u.id=l.url_id
 WHERE
-	l.userid=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(l.last_surfed) AND (((UNIX_TIMESTAMP(l.last_surfed) - u.fixed_reload) < 0 AND u.fixed_reload > 0) OR u.fixed_reload = '0')
+	l.userid=%s AND
+	(UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(l.last_surfed) AND
+	(
+		((UNIX_TIMESTAMP(l.last_surfed) - u.fixed_reload) < 0 AND u.fixed_reload > 0) OR
+		u.fixed_reload = '0'
+	)
 LIMIT 1",
 		array(getMemberId()), __FUNCTION__, __LINE__
 	);
@@ -866,10 +871,10 @@ LIMIT 1",
 // Get total amount of URLs of given status for current user or of ACTIVE URLs by default
 function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = '0') {
 	// Determine depleted user account
-	$UIDs = SURFBAR_DETERMINE_DEPLETED_USERIDS();
+	$userids = SURFBAR_DETERMINE_DEPLETED_USERIDS();
 
 	// If we dont get any user ids back, there are no URLs
-	if (count($UIDs['userid']) == '0') {
+	if (count($userids['userid']) == '0') {
 		// No user ids found, no URLs!
 		return 0;
 	} // END - if
@@ -877,13 +882,13 @@ function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = '0') {
 	// Is the exlude userid set?
 	if ($excludeUserId > 0) {
 		// Then add it
-		$UIDs['userid'][$excludeUserId] = $excludeUserId;
+		$userids['userid'][$excludeUserId] = $excludeUserId;
 	} // END - if
 
 	// Get amount from database
 	$result = SQL_QUERY_ESC("SELECT COUNT(`id`) AS cnt
 FROM `{?_MYSQL_PREFIX?}_surfbar_urls`
-WHERE `userid` NOT IN (".implode(', ', $UIDs['userid']).") AND `status`='%s'",
+WHERE `userid` NOT IN (".implode(', ', $userids['userid']).") AND `status`='%s'",
 		array($status), __FUNCTION__, __LINE__
 	);
 
@@ -1114,7 +1119,7 @@ LIMIT 1",
 // Determine which user hash no more points left
 function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) {
 	// Init array
-	$UIDs = array(
+	$userids = array(
 		'userid'      => array(),
 		'points'   => array(),
 		'notified' => array(),
@@ -1123,9 +1128,9 @@ function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) {
 	// Do we have a current user id?
 	if ((isMember()) && ($limit == '0')) {
 		// Then add this as well
-		$UIDs['userid'][getMemberId()]      = getMemberId();
-		$UIDs['points'][getMemberId()]   = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
-		$UIDs['notified'][getMemberId()] = '0';
+		$userids['userid'][getMemberId()]      = getMemberId();
+		$userids['points'][getMemberId()]   = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
+		$userids['notified'][getMemberId()] = '0';
 
 		// Get all userid except logged in one
 		$result = SQL_QUERY_ESC("SELECT
@@ -1171,9 +1176,9 @@ ORDER BY
 		if ($points <= $limit) {
 			// Ignore this one!
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['userid']} has depleted points amount!", false);
-			$UIDs['userid'][$content['userid']]      = $content['userid'];
-			$UIDs['points'][$content['userid']]   = $points;
-			$UIDs['notified'][$content['userid']] = $content['notified'];
+			$userids['userid'][$content['userid']]      = $content['userid'];
+			$userids['points'][$content['userid']]   = $points;
+			$userids['notified'][$content['userid']] = $content['notified'];
 		} // END - if
 	} // END - while
 
@@ -1181,10 +1186,10 @@ ORDER BY
 	SQL_FREERESULT($result);
 
 	// Debug message
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UIDs::count=".count($UIDs)." (with own userid=".getMemberId().')', false);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UIDs::count=".count($userids)." (with own userid=".getMemberId().')', false);
 
 	// Return result
-	return $UIDs;
+	return $userids;
 }
 
 // Determine how many users are Online in surfbar
@@ -1424,7 +1429,7 @@ ORDER BY
 }
 
 // "Getter" for maximum random number
-function SURFBAR_GET_MAX_RANDOM ($UIDs, $add) {
+function SURFBAR_GET_MAX_RANDOM ($userids, $add) {
 	// Count max availabe entries
 	$result = SQL_QUERY("SELECT sbu.id AS cnt
 FROM `{?_MYSQL_PREFIX?}_surfbar_urls` AS sbu
@@ -1432,7 +1437,7 @@ LEFT JOIN `{?_MYSQL_PREFIX?}_surfbar_salts` AS sbs
 ON sbu.id=sbs.url_id
 LEFT JOIN `{?_MYSQL_PREFIX?}_surfbar_locks` AS l
 ON sbu.id=l.url_id
-WHERE sbu.userid NOT IN (".implode(',', $UIDs).") AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND sbu.`status`='ACTIVE'".$add."
+WHERE sbu.userid NOT IN (".implode(',', $userids).") AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND sbu.`status`='ACTIVE'".$add."
 GROUP BY sbu.id", __FUNCTION__, __LINE__);
 
 	// Log last query
@@ -1540,10 +1545,10 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = '0') {
 		} // END - if
 
 		// Determine depleted user account
-		$UIDs = SURFBAR_DETERMINE_DEPLETED_USERIDS();
+		$userids = SURFBAR_DETERMINE_DEPLETED_USERIDS();
 
 		// Get maximum randomness factor
-		$maxRand = SURFBAR_GET_MAX_RANDOM($UIDs['userid'], $add);
+		$maxRand = SURFBAR_GET_MAX_RANDOM($userids['userid'], $add);
 
 		// If more than one URL can be called generate the random number!
 		if ($maxRand > 1) {
@@ -1559,7 +1564,7 @@ LEFT JOIN `{?_MYSQL_PREFIX?}_surfbar_salts` AS sbs
 ON sbu.id=sbs.url_id
 LEFT JOIN `{?_MYSQL_PREFIX?}_surfbar_locks` AS l
 ON sbu.id=l.url_id
-WHERE sbu.userid NOT IN (".implode(',', $UIDs['userid']).") AND sbu.`status`='ACTIVE' AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))".$add."
+WHERE sbu.userid NOT IN (".implode(',', $userids['userid']).") AND sbu.`status`='ACTIVE' AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))".$add."
 GROUP BY sbu.id
 ORDER BY l.last_surfed ASC, sbu.id ASC
 LIMIT %s,1",