X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fsurfbar_functions.php;h=9256ec8627512ef90b57bdafdd1039d439ef7369;hb=e3706a5dff0298ad8d4f9006e195537a0f47c438;hp=4e7497906f2701fba10c4805a4bf485869b3e6ba;hpb=4e7273a155c9afa62cf0e094f96e206455b8bdde;p=mailer.git

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 4e7497906f..9256ec8627 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -240,7 +240,7 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
 		$performed = call_user_func_array($functionName, $urlData);
 	} else {
 		// Log invalid request
-		DEBUG_LOG(__FUNCTION__.": action={$formData['action']},id={$formData['id']},function={$functionName}");
+		DEBUG_LOG(__FUNCTION__, __LINE__, " action={$formData['action']},id={$formData['id']},function={$functionName}");
 	}
 
 	// Return status
@@ -466,7 +466,7 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
 	if (empty($uid)) $uid = 0;
 
 	// Just run the insert query for now
-	SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_urls (userid,url,status,views_max,views_allowed) VALUES(%s,'%s','%s','%s','%s')",
+	SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_urls (userid,url,status,views_max,views_allowed) VALUES (%s,'%s','%s','%s','%s')",
 		array(
 			$uid,
 			$urlData['url'],
@@ -625,7 +625,7 @@ function SURFBAR_CHECK_RELOAD_FULL() {
 
 	// Cache static reload lock
 	$SURFBAR_CACHE['surf_lock'] = $_CONFIG['surfbar_static_lock'];
-	//DEBUG_LOG(__FUNCTION__.":Fixed surf lock is ".$_CONFIG['surfbar_static_lock']."");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "Fixed surf lock is ".$_CONFIG['surfbar_static_lock']."");
 
 	// Do we have dynamic model?
 	if ($_CONFIG['surfbar_pay_model'] == "DYNAMIC") {
@@ -656,7 +656,7 @@ LIMIT 1",
 	$total = SURFBAR_GET_TOTAL_URLS();
 
 	// Do we have some URLs in lock? Admins can always surf on own URLs!
-	//DEBUG_LOG(__FUNCTION__.":userLocks=".SURFBAR_GET_DATA('user_locks').",total={$total}");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "userLocks=".SURFBAR_GET_DATA('user_locks').",total={$total}");
 	$isFull = ((SURFBAR_GET_DATA('user_locks') == $total) && ($total > 0));
 
 	// Return result
@@ -764,16 +764,16 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt="") {
 		if (empty($salt)) {
 			// Generate random hashed string
 			$SURFBAR_CACHE['salt'] = sha1(GEN_PASS(255));
-			//DEBUG_LOG(__FUNCTION__.":newSalt=".SURFBAR_GET_SALT()."");
+			//DEBUG_LOG(__FUNCTION__, __LINE__, "newSalt=".SURFBAR_GET_SALT()."");
 		} else {
 			// Use this as salt!
 			$SURFBAR_CACHE['salt'] = $salt;
-			//DEBUG_LOG(__FUNCTION__.":oldSalt=".SURFBAR_GET_SALT()."");
+			//DEBUG_LOG(__FUNCTION__, __LINE__, "oldSalt=".SURFBAR_GET_SALT()."");
 		}
 
 		// ... and now the validation code
 		$valCode = GEN_RANDOM_CODE($length, sha1(SURFBAR_GET_SALT().":".$urlId), $GLOBALS['userid']);
-		//DEBUG_LOG(__FUNCTION__.":valCode={$valCode}");
+		//DEBUG_LOG(__FUNCTION__, __LINE__, "valCode={$valCode}");
 	} // END - while
 
 	// Hash it with md5() and salt it with the random string
@@ -783,7 +783,7 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt="") {
 	$valHashedCode = generatePassString($hashedCode);
 
 	// Return hashed value
-	//DEBUG_LOG(__FUNCTION__.":finalValCode={$valHashedCode}");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "finalValCode={$valHashedCode}");
 	return $valHashedCode;
 }
 // Check validation code
@@ -797,8 +797,8 @@ function SURFBAR_CHECK_VALIDATION_CODE ($urlId, $check, $salt) {
 	$code = SURFBAR_GENERATE_VALIDATION_CODE($urlId, $salt);
 
 	// Return result of checking hashes and salts
-	//DEBUG_LOG(__FUNCTION__.":---".$code."|".$check."---");
-	//DEBUG_LOG(__FUNCTION__.":+++".$salt."|".SURFBAR_GET_DATA('last_salt')."+++");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "---".$code."|".$check."---");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "+++".$salt."|".SURFBAR_GET_DATA('last_salt')."+++");
 	return (($code == $check) && ($salt == SURFBAR_GET_DATA('last_salt')));
 }
 // Lockdown the userid/id combination (reload lock)
@@ -806,7 +806,7 @@ function SURFBAR_LOCKDOWN_ID ($urlId) {
 	//* //DEBUG: */ print "LOCK!");
 	///* //DEBUG: */ return;
 	// Just add it to the database
-	SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_locks (userid, url_id) VALUES(%s, %s)",
+	SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_locks (userid, url_id) VALUES (%s, %s)",
 		array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__);
 
 	// Remove the salt from database
@@ -816,13 +816,13 @@ function SURFBAR_LOCKDOWN_ID ($urlId) {
 // Pay points to the user and remove it from the sender
 function SURFBAR_PAY_POINTS ($urlId) {
 	// Remove it from the URL owner
-	//DEBUG_LOG(__FUNCTION__.":uid=".SURFBAR_GET_USERID().",costs=".SURFBAR_GET_COSTS()."");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".SURFBAR_GET_USERID().",costs=".SURFBAR_GET_COSTS()."");
 	if (SURFBAR_GET_USERID() > 0) {
 		SUB_POINTS(SURFBAR_GET_USERID(), SURFBAR_GET_COSTS());
 	} // END - if
 
 	// Book it to the user
-	//DEBUG_LOG(__FUNCTION__.":uid=".$GLOBALS['userid'].",reward=".SURFBAR_GET_REWARD()."");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".$GLOBALS['userid'].",reward=".SURFBAR_GET_REWARD()."");
 	ADD_POINTS_REFSYSTEM($GLOBALS['userid'], SURFBAR_GET_DATA('reward'));
 }
 // Updates the statistics of current URL/userid
@@ -852,7 +852,7 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
 	// 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)",
+		SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_stats (userid,url_id,count) VALUES (%s,%s,1)",
 			array($GLOBALS['userid'], SURFBAR_GET_ID()), __FILE__, __LINE__);
 	} // END - if
 
@@ -875,24 +875,24 @@ function SURFBAR_UPDATE_SALT_STATS () {
 		array(SURFBAR_GET_SALT(), SURFBAR_GET_ID(), $GLOBALS['userid']), __FILE__, __LINE__);
 
 	// Debug message
-	//DEBUG_LOG(__FUNCTION__.":salt=".SURFBAR_GET_SALT().",id=".SURFBAR_GET_ID().",uid=".$GLOBALS['userid']."");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "salt=".SURFBAR_GET_SALT().",id=".SURFBAR_GET_ID().",uid=".$GLOBALS['userid']."");
 
 	// 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')",
+		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()), __FILE__, __LINE__);
 	} // END - if
 
 	// Debug message
-	//DEBUG_LOG(__FUNCTION__.":affectedRows=".SQL_AFFECTEDROWS()."");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "affectedRows=".SQL_AFFECTEDROWS()."");
 
 	// Return if the update was okay
 	return (SQL_AFFECTEDROWS() == 1);
 }
 // Check if the reload lock is active for given id
 function SURFBAR_CHECK_RELOAD_LOCK ($urlId) {
-	//DEBUG_LOG(__FUNCTION__.":id={$urlId}");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "id={$urlId}");
 	// Ask the database
 	$result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt
 FROM "._MYSQL_PREFIX."_surfbar_locks
@@ -909,7 +909,7 @@ LIMIT 1",
 	SQL_FREERESULT($result);
 
 	// Return check
-	//DEBUG_LOG(__FUNCTION__.":cnt={$cnt},".SURFBAR_GET_DATA('surf_lock')."");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "cnt={$cnt},".SURFBAR_GET_DATA('surf_lock')."");
 	return ($cnt == 1);
 }
 // Determine which user hash no more points left
@@ -952,12 +952,12 @@ ORDER BY u.userid ASC", __FILE__, __LINE__);
 	while (list($uid, $notified) = SQL_FETCHROW($result)) {
 		// Get total points
 		$points = GET_TOTAL_DATA($uid, "user_points", "points") - GET_TOTAL_DATA($uid, "user_data", "used_points");
-		//DEBUG_LOG(__FUNCTION__.":uid={$uid},points={$points}");
+		//DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$uid},points={$points}");
 
 		// Shall we add this to ignore?
 		if ($points <= $limit) {
 			// Ignore this one!
-			//DEBUG_LOG(__FUNCTION__.":uid={$uid} has depleted points amount!");
+			//DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$uid} has depleted points amount!");
 			$UIDs['uid'][$uid] = $uid;
 			$UIDs['points'][$uid] = $points;
 			$UIDs['notified'][$uid] = $notified;
@@ -968,7 +968,7 @@ ORDER BY u.userid ASC", __FILE__, __LINE__);
 	SQL_FREERESULT($result);
 
 	// Debug message
-	//DEBUG_LOG(__FUNCTION__.":UIDs::count=".count($UIDs)." (with own userid=".$GLOBALS['userid'].")");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "UIDs::count=".count($UIDs)." (with own userid=".$GLOBALS['userid'].")");
 
 	// Return result
 	return $UIDs;
@@ -1154,17 +1154,17 @@ ORDER BY
 	// Load all entries
 	while (list($lid, $url, $last) = SQL_FETCHROW($result)) {
 		// Debug message
-		//DEBUG_LOG(__FUNCTION__.":next - lid={$lid},url={$url},rest=".(time() - $last)."/".SURFBAR_GET_DATA('surf_lock')."");
+		//DEBUG_LOG(__FUNCTION__, __LINE__, "next - lid={$lid},url={$url},rest=".(time() - $last)."/".SURFBAR_GET_DATA('surf_lock')."");
 
 		// Skip entries that are too old
 		if (($last > (time() - SURFBAR_GET_DATA('surf_lock'))) && (!in_array($url, $ignored))) {
 			// Debug message
-			//DEBUG_LOG(__FUNCTION__.":okay - lid={$lid},url={$url},last={$last}");
+			//DEBUG_LOG(__FUNCTION__, __LINE__, "okay - lid={$lid},url={$url},last={$last}");
 
 			// Add only if missing or bigger
 			if ((!isset($IDs[$url])) || ($IDs[$url] > $last)) {
 				// Debug message
-				//DEBUG_LOG(__FUNCTION__.":ADD - lid={$lid},url={$url},last={$last}");
+				//DEBUG_LOG(__FUNCTION__, __LINE__, "ADD - lid={$lid},url={$url},last={$last}");
 
 				// Add this ID
 				$IDs[$url] = $last;
@@ -1172,7 +1172,7 @@ ORDER BY
 			} // END - if
 		} else {
 			// Debug message
-			//DEBUG_LOG(__FUNCTION__.":ignore - lid={$lid},url={$url},last={$last}");
+			//DEBUG_LOG(__FUNCTION__, __LINE__, "ignore - lid={$lid},url={$url},last={$last}");
 
 			// Ignore these old entries!
 			$ignored[] = $url;
@@ -1201,7 +1201,7 @@ WHERE sbu.userid NOT IN (".implode(",", $UIDs).") AND (sbu.views_allowed=0 OR (s
 GROUP BY sbu.id", __FILE__, __LINE__);
 
 	// Log last query
-	//DEBUG_LOG(__FUNCTION__.":lastQuery=".$_CONFIG['db_last_query']."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS()."");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "lastQuery=".$_CONFIG['db_last_query']."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS()."");
 
 	// Fetch max rand
 	$maxRand = SQL_NUMROWS($result);
@@ -1317,7 +1317,7 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = 0) {
 		} // END - if
 
 		// And query the database
-		//DEBUG_LOG(__FUNCTION__.":randNum={$randNum},maxRand={$maxRand},surfLock=".SURFBAR_GET_DATA('surf_lock')."");
+		//DEBUG_LOG(__FUNCTION__, __LINE__, "randNum={$randNum},maxRand={$maxRand},surfLock=".SURFBAR_GET_DATA('surf_lock')."");
 		$result = SQL_QUERY_ESC("SELECT sbu.id, sbu.userid, sbu.url, sbs.last_salt, sbu.views_total, sbu.views_max, sbu.views_allowed, UNIX_TIMESTAMP(l.last_surfed) AS last_surfed
 FROM "._MYSQL_PREFIX."_surfbar_urls AS sbu
 LEFT JOIN "._MYSQL_PREFIX."_surfbar_salts AS sbs
@@ -1345,12 +1345,12 @@ LIMIT 1",
 	}
 
 	// Is there an id number?
-	//DEBUG_LOG(__FUNCTION__.":lastQuery=".$_CONFIG['db_last_query']."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS()."");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "lastQuery=".$_CONFIG['db_last_query']."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS()."");
 	if (SQL_NUMROWS($result) == 1) {
 		// Load/cache data
-		//DEBUG_LOG(__FUNCTION__.":count(".count($SURFBAR_CACHE).") - BEFORE");
+		//DEBUG_LOG(__FUNCTION__, __LINE__, "count(".count($SURFBAR_CACHE).") - BEFORE");
 		$SURFBAR_CACHE = merge_array($SURFBAR_CACHE, SQL_FETCHARRAY($result));
-		//DEBUG_LOG(__FUNCTION__.":count(".count($SURFBAR_CACHE).") - AFTER");
+		//DEBUG_LOG(__FUNCTION__, __LINE__, "count(".count($SURFBAR_CACHE).") - AFTER");
 
 		// Determine waiting time
 		$SURFBAR_CACHE['time'] = SURFBAR_DETERMINE_WAIT_TIME();
@@ -1358,28 +1358,28 @@ LIMIT 1",
 		// Is the last salt there?
 		if (is_null($SURFBAR_CACHE['last_salt'])) {
 			// Then repair it wit the static!
-			//DEBUG_LOG(__FUNCTION__.":last_salt - FIXED!");
+			//DEBUG_LOG(__FUNCTION__, __LINE__, "last_salt - FIXED!");
 			$SURFBAR_CACHE['last_salt'] = "";
 		} // END - if
 
 		// Fix missing last_surfed
 		if ((!isset($SURFBAR_CACHE['last_surfed'])) || (is_null($SURFBAR_CACHE['last_surfed']))) {
 			// Fix it here
-			//DEBUG_LOG(__FUNCTION__.":last_surfed - FIXED!");
+			//DEBUG_LOG(__FUNCTION__, __LINE__, "last_surfed - FIXED!");
 			$SURFBAR_CACHE['last_surfed'] = 0;
 		} // END - if
 
 		// Get base/fixed reward and costs
 		$SURFBAR_CACHE['reward'] = SURFBAR_DETERMINE_REWARD();
 		$SURFBAR_CACHE['costs']  = SURFBAR_DETERMINE_COSTS();
-		//DEBUG_LOG(__FUNCTION__.":BASE/STATIC - reward=".SURFBAR_GET_REWARD()."|costs=".SURFBAR_GET_COSTS()."");
+		//DEBUG_LOG(__FUNCTION__, __LINE__, "BASE/STATIC - reward=".SURFBAR_GET_REWARD()."|costs=".SURFBAR_GET_COSTS()."");
 
 		// Only in dynamic model add the dynamic bonus!
 		if ($_CONFIG['surfbar_pay_model'] == "DYNAMIC") {
 			// Calculate dynamic reward/costs and add it
 			$SURFBAR_CACHE['reward'] += SURFBAR_CALCULATE_DYNAMIC_ADD();
 			$SURFBAR_CACHE['costs']  += SURFBAR_CALCULATE_DYNAMIC_ADD();
-			//DEBUG_LOG(__FUNCTION__.":DYNAMIC+ - reward=".SURFBAR_GET_REWARD()."|costs=".SURFBAR_GET_COSTS()."");
+			//DEBUG_LOG(__FUNCTION__, __LINE__, "DYNAMIC+ - reward=".SURFBAR_GET_REWARD()."|costs=".SURFBAR_GET_COSTS()."");
 		} // END - if
 
 		// Now get the id
@@ -1390,7 +1390,7 @@ LIMIT 1",
 	SQL_FREERESULT($result);
 
 	// Return result
-	//DEBUG_LOG(__FUNCTION__.":nextId={$nextId}");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "nextId={$nextId}");
 	return $nextId;
 }
 // -----------------------------------------------------------------------------
@@ -1400,7 +1400,7 @@ LIMIT 1",
 // Private getter for data elements
 function SURFBAR_GET_DATA ($element) {
 	global $SURFBAR_CACHE;
-	//DEBUG_LOG(__FUNCTION__.":element={$element}");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "element={$element}");
 
 	// Default is null
 	$data = null;
@@ -1417,7 +1417,7 @@ function SURFBAR_GET_DATA ($element) {
 	}
 
 	// Return result
-	//DEBUG_LOG(__FUNCTION__.":element[$element]={$data}");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "element[$element]={$data}");
 	return $data;
 }
 // Getter for reward from cache