X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fsurfbar_functions.php;h=6babc26648a71476ff46913158b757cd07042a6d;hp=c122b79cf538b9658b6c6d8371ee59cb3266b85f;hb=ee0625c4882bb462985c504abf65a3ef0e7bf1eb;hpb=4001187f22197f55e5a1f211fc8defcc180f7c32

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index c122b79cf5..6babc26648 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Funktionen fuer die Surfbar                      *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -153,10 +158,10 @@ function SURFBAR_MEMBER_ADD_URL ($url, $limit) {
 	} elseif (!VALIDATE_URL($url)) {
 		// URL invalid
 		return false;
-	} elseif (SURFBAR_LOOKUP_BY_URL($url, $GLOBALS['userid'])) {
+	} elseif (SURFBAR_LOOKUP_BY_URL($url, getUserId())) {
 		// URL already found in surfbar!
 		return false;
-	} elseif (!SURFBAR_IF_USER_BOOK_MORE_URLS($GLOBALS['userid'])) {
+	} elseif (!SURFBAR_IF_USER_BOOK_MORE_URLS(getUserId())) {
 		// No more allowed!
 		return false;
 	} elseif ("".($limit + 0)."" != "".$limit."") {
@@ -165,7 +170,7 @@ function SURFBAR_MEMBER_ADD_URL ($url, $limit) {
 	}
 
 	// Register the new URL
-	return SURFBAR_REGISTER_URL($url, $GLOBALS['userid'], "PENDING", "reg", array('limit' => $limit));
+	return SURFBAR_REGISTER_URL($url, getUserId(), "PENDING", "reg", array('limit' => $limit));
 }
 // Create list of actions depending on status for the user
 function SURFBAR_MEMBER_ACTIONS ($urlId, $status) {
@@ -514,10 +519,8 @@ function SURFBAR_LOOKUP_BY_URL ($url, $uid) {
 
 // Load URL data by given search term and column
 function SURFBAR_GET_URL_DATA ($searchTerm, $column="id", $order="id", $sort="ASC", $group="id", $add="") {
-	global $lastUrlData;
-
 	// By default nothing is found
-	$lastUrlData = array();
+	$GLOBALS['last_url_data'] = array();
 
 	// Is the column an id number?
 	if (($column == "id") || ($column == "userid")) {
@@ -546,10 +549,10 @@ ORDER BY %s %s
 			// Shall we group these results?
 			if ($group == "id") {
 				// Add the row by id as index
-				$lastUrlData[$dataRow['id']] = $dataRow;
+				$GLOBALS['last_url_data'][$dataRow['id']] = $dataRow;
 			} else {
 				// Group entries
-				$lastUrlData[$dataRow[$group]][$dataRow['id']] = $dataRow;
+				$GLOBALS['last_url_data'][$dataRow[$group]][$dataRow['id']] = $dataRow;
 			}
 		} // END - while
 	} // END - if
@@ -558,7 +561,7 @@ ORDER BY %s %s
 	SQL_FREERESULT($result);
 
 	// Return the result
-	return $lastUrlData;
+	return $GLOBALS['last_url_data'];
 }
 
 // Registers an URL with the surfbar. You should have called SURFBAR_LOOKUP_BY_URL() first!
@@ -804,7 +807,7 @@ INNER JOIN `{!_MYSQL_PREFIX!}_surfbar_urls` AS u
 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)
 LIMIT 1",
-		array($GLOBALS['userid']), __FUNCTION__, __LINE__
+		array(getUserId()), __FUNCTION__, __LINE__
 	);
 
 	// Fetch row
@@ -866,34 +869,34 @@ function SURFBAR_GET_TOTAL_USER_URLS ($uid=0, $status="",$exclude="") {
 	// Is the user 0 and user is logged in?
 	if (($uid == 0) && (IS_MEMBER())) {
 		// Then use this userid
-		$uid = $GLOBALS['userid'];
+		$uid = getUserId();
 	} elseif ($uid == 0) {
 		// Error!
 		return (getConfig('surfbar_max_order') + 1);
 	}
 
 	// Default is all URLs
-	$ADD = "";
+	$add = "";
 
 	// Is the status set?
 	if (is_array($status)) {
 		// Only URLs with these status
-		$ADD = sprintf(" AND status IN('%s')", implode("','", $status));
+		$add = sprintf(" AND status IN('%s')", implode("','", $status));
 	} elseif (!empty($status)) {
 		// Only URLs with this status
-		$ADD = sprintf(" AND `status`='%s'", $status);
+		$add = sprintf(" AND `status`='%s'", $status);
 	} elseif (is_array($exclude)) {
 		// Exclude URLs with these status
-		$ADD = sprintf(" AND status NOT IN('%s')", implode("','", $exclude));
+		$add = sprintf(" AND status NOT IN('%s')", implode("','", $exclude));
 	} elseif (!empty($exclude)) {
 		// Exclude URLs with this status
-		$ADD = sprintf(" AND status != '%s'", $exclude);
+		$add = sprintf(" AND status != '%s'", $exclude);
 	}
 
 	// Get amount from database
 	$result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt
 FROM `{!_MYSQL_PREFIX!}_surfbar_urls`
-WHERE userid=%s".$ADD."
+WHERE userid=%s".$add."
 LIMIT %s",
 		array($uid, getConfig('surfbar_max_order')), __FUNCTION__, __LINE__
 	);
@@ -933,7 +936,7 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt="") {
 		}
 
 		// ... and now the validation code
-		$valCode = generateRandomCodde($length, sha1(SURFBAR_GET_SALT().":".$urlId), $GLOBALS['userid']);
+		$valCode = generateRandomCodde($length, sha1(SURFBAR_GET_SALT().":".$urlId), getUserId());
 		//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "valCode={$valCode}", false);
 	} // END - while
 
@@ -966,11 +969,11 @@ function SURFBAR_LOCKDOWN_ID ($urlId) {
 	///* DEBUG: */ return;
 	// Just add it to the database
 	SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_locks` (userid, url_id) VALUES (%s, %s)",
-		array($GLOBALS['userid'], bigintval($urlId)), __FUNCTION__, __LINE__);
+		array(getUserId(), bigintval($urlId)), __FUNCTION__, __LINE__);
 
 	// Remove the salt from database
 	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_surfbar_salts` WHERE url_id=%s AND userid=%s LIMIT 1",
-		array(bigintval($urlId), $GLOBALS['userid']), __FUNCTION__, __LINE__);
+		array(bigintval($urlId), getUserId()), __FUNCTION__, __LINE__);
 }
 // Pay points to the user and remove it from the sender if userid is given else it is a "sponsored surf"
 function SURFBAR_PAY_POINTS () {
@@ -981,13 +984,13 @@ function SURFBAR_PAY_POINTS () {
 	} // END - if
 
 	// Book it to the user
-	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".$GLOBALS['userid'].",reward=".SURFBAR_GET_REWARD()."", false);
-	ADD_POINTS_REFSYSTEM(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), $GLOBALS['userid'], SURFBAR_GET_DATA('reward'));
+	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".getUserId().",reward=".SURFBAR_GET_REWARD()."", false);
+	ADD_POINTS_REFSYSTEM(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), getUserId(), SURFBAR_GET_DATA('reward'));
 }
 // Updates the statistics of current URL/userid
 function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
 	// Init add
-	$ADD = "";
+	$add = "";
 
 	// Get allowed views
 	$allowed = SURFBAR_GET_VIEWS_ALLOWED();
@@ -995,22 +998,22 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
 	// Do we have a limit?
 	if ($allowed > 0) {
 		// Then count views_max down!
-		$ADD .= ",views_max=views_max-1";
+		$add .= ",views_max=views_max-1";
 	} // END - if
 
 	// Update URL stats
-	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET views_total=views_total+1".$ADD." WHERE id=%s LIMIT 1",
+	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET views_total=views_total+1".$add." WHERE id=%s LIMIT 1",
 		array(SURFBAR_GET_ID()), __FUNCTION__, __LINE__);
 
 	// Update the stats entry
 	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_stats` SET count=count+1 WHERE userid=%s AND url_id=%s LIMIT 1",
-		array($GLOBALS['userid'], SURFBAR_GET_ID()), __FUNCTION__, __LINE__);
+		array(getUserId(), SURFBAR_GET_ID()), __FUNCTION__, __LINE__);
 
 	// Was that update okay?
 	if (SQL_AFFECTEDROWS() < 1) {
 		// No, then insert entry
 		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_stats` (userid,url_id,count) VALUES (%s,%s,1)",
-			array($GLOBALS['userid'], SURFBAR_GET_ID()), __FUNCTION__, __LINE__);
+			array(getUserId(), SURFBAR_GET_ID()), __FUNCTION__, __LINE__);
 	} // END - if
 
 	// Update total/daily/weekly/monthly counter
@@ -1029,16 +1032,16 @@ function SURFBAR_UPDATE_SALT_STATS () {
 
 	// Simply store the salt from cache away in database...
 	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_salts` SET last_salt='%s' WHERE url_id=%s AND userid=%s LIMIT 1",
-		array(SURFBAR_GET_SALT(), SURFBAR_GET_ID(), $GLOBALS['userid']), __FUNCTION__, __LINE__);
+		array(SURFBAR_GET_SALT(), SURFBAR_GET_ID(), getUserId()), __FUNCTION__, __LINE__);
 
 	// Debug message
-	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "salt=".SURFBAR_GET_SALT().",id=".SURFBAR_GET_ID().",uid=".$GLOBALS['userid']."", false);
+	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "salt=".SURFBAR_GET_SALT().",id=".SURFBAR_GET_ID().",uid=".getUserId()."", false);
 
 	// Was that okay?
 	if (SQL_AFFECTEDROWS() < 1) {
 		// Insert missing entry!
 		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_salts` (url_id,userid,last_salt) VALUES (%s, %s, '%s')",
-			array(SURFBAR_GET_ID(), $GLOBALS['userid'], SURFBAR_GET_SALT()), __FUNCTION__, __LINE__);
+			array(SURFBAR_GET_ID(), getUserId(), SURFBAR_GET_SALT()), __FUNCTION__, __LINE__);
 	} // END - if
 
 	// Debug message
@@ -1056,7 +1059,7 @@ FROM `{!_MYSQL_PREFIX!}_surfbar_locks`
 WHERE userid=%s AND url_id=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(last_surfed)
 ORDER BY last_surfed ASC
 LIMIT 1",
-		array($GLOBALS['userid'], bigintval($urlId)), __FUNCTION__, __LINE__
+		array(getUserId(), bigintval($urlId)), __FUNCTION__, __LINE__
 	);
 
 	// Fetch counter
@@ -1081,9 +1084,9 @@ function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) {
 	// Do we have a current user id?
 	if ((IS_MEMBER()) && ($limit == 0)) {
 		// Then add this as well
-		$UIDs['uid'][$GLOBALS['userid']]      = $GLOBALS['userid'];
-		$UIDs['points'][$GLOBALS['userid']]   = GET_TOTAL_DATA($GLOBALS['userid'], "user_points", "points") - GET_TOTAL_DATA($GLOBALS['userid'], "user_data", "used_points");
-		$UIDs['notified'][$GLOBALS['userid']] = 0;
+		$UIDs['uid'][getUserId()]      = getUserId();
+		$UIDs['points'][getUserId()]   = GET_TOTAL_DATA(getUserId(), "user_points", "points") - GET_TOTAL_DATA(getUserId(), "user_data", "used_points");
+		$UIDs['notified'][getUserId()] = 0;
 
 		// Get all userid except logged in one
 		$result = SQL_QUERY_ESC("SELECT u.userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified
@@ -1093,7 +1096,7 @@ ON u.userid=d.userid
 WHERE u.userid NOT IN (%s,0) AND u.`status`='ACTIVE'
 GROUP BY u.userid
 ORDER BY u.userid ASC",
-			array($GLOBALS['userid']), __FUNCTION__, __LINE__);
+			array(getUserId()), __FUNCTION__, __LINE__);
 	} else {
 		// Get all userid
 		$result = SQL_QUERY("SELECT u.userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified
@@ -1125,7 +1128,7 @@ ORDER BY u.userid ASC", __FUNCTION__, __LINE__);
 	SQL_FREERESULT($result);
 
 	// Debug message
-	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "UIDs::count=".count($UIDs)." (with own userid=".$GLOBALS['userid'].")", false);
+	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "UIDs::count=".count($UIDs)." (with own userid=".getUserId().")", false);
 
 	// Return result
 	return $UIDs;
@@ -1202,10 +1205,12 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array())
 	// ---------- Comment out for debugging/developing member actions! ---------
 
 	// Was that fine?
+	// ---------- Comment out for debugging/developing member actions! ---------
 	//if (SQL_AFFECTEDROWS() != 1) {
 	//	// No, something went wrong
 	//	return false;
 	//} // END - if
+	// ---------- Comment out for debugging/developing member actions! ---------
 
 	// Prepare content for notification routines
 	$data[$urlId]['uid']         = $data[$urlId]['userid'];
@@ -1315,7 +1320,7 @@ FROM
 WHERE
 	userid=%s
 ORDER BY
-	id ASC", array($GLOBALS['userid']),
+	id ASC", array(getUserId()),
 		__FUNCTION__, __LINE__);
 
 	// Load all entries
@@ -1355,7 +1360,7 @@ ORDER BY
 	return $USE;
 }
 // "Getter" for maximum random number
-function SURFBAR_GET_MAX_RANDOM ($UIDs, $ADD) {
+function SURFBAR_GET_MAX_RANDOM ($UIDs, $add) {
 	// Count max availabe entries
 	$result = SQL_QUERY("SELECT sbu.id AS cnt
 FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS sbu
@@ -1363,7 +1368,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(",", $UIDs).") 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
@@ -1388,7 +1393,7 @@ function SURFBAR_GET_USER_URLS () {
 FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS u
 WHERE u.userid=%s AND u.status != 'DELETED'
 ORDER BY u.id ASC",
-		array($GLOBALS['userid']), __FUNCTION__, __LINE__);
+		array(getUserId()), __FUNCTION__, __LINE__);
 
 	// Are there entries?
 	if (SQL_NUMROWS($result) > 0) {
@@ -1454,24 +1459,24 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = 0) {
 		$USE = SURFBAR_GET_LOCK_IDS();
 
 		// Shall we add some URL ids to ignore?
-		$ADD = "";
+		$add = "";
 		if (count($USE) > 0) {
 			// Ignore some!
-			$ADD = " AND sbu.id NOT IN (";
+			$add = " AND sbu.id NOT IN (";
 			foreach ($USE as $url_id => $lid) {
 				// Add URL id
-				$ADD .= $url_id.",";
+				$add .= $url_id.",";
 			} // END - foreach
 
 			// Add closing bracket
-			$ADD = substr($ADD, 0, -1) . ")";
+			$add = substr($add, 0, -1) . ")";
 		} // END - if
 
 		// Determine depleted user account
 		$UIDs = SURFBAR_DETERMINE_DEPLETED_USERIDS();
 
 		// Get maximum randomness factor
-		$maxRand = SURFBAR_GET_MAX_RANDOM($UIDs['uid'], $ADD);
+		$maxRand = SURFBAR_GET_MAX_RANDOM($UIDs['uid'], $add);
 
 		// If more than one URL can be called generate the random number!
 		if ($maxRand > 1) {
@@ -1487,7 +1492,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['uid']).") 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(",", $UIDs['uid']).") 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",
@@ -1503,7 +1508,7 @@ LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_locks` AS l
 ON sbu.id=l.url_id
 WHERE sbu.userid != %s AND sbu.`status`='ACTIVE' AND sbu.id=%s AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))
 LIMIT 1",
-			array($GLOBALS['userid'], bigintval($urlId)), __FUNCTION__, __LINE__
+			array(getUserId(), bigintval($urlId)), __FUNCTION__, __LINE__
 		);
 	}