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

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 4e7497906f..26610a438e 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -225,8 +225,17 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
 		return false;
 	}
 
+	// Secure action
+	$action = SQL_ESCAPE(htmlentities(strip_tags($formData['action']), ENT_QUOTES));
+
+	// Has it changed?
+	if ($action != $formData['action']) {
+		// Invalid data in action found
+		return false;
+	} // END - if
+
 	// Create the function name for selected action
-	$functionName = sprintf("SURFBAR_MEMBER_%s_ACTION", strtoupper(SQL_ESCAPE($formData['action'])));
+	$functionName = sprintf("SURFBAR_MEMBER_%s_ACTION", strtoupper($action));
 
 	// Is the function there?
 	if (function_exists($functionName)) {
@@ -234,13 +243,14 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
 		$URLs[$formData['id']]['new_status'] = $SURFBAR_CACHE['new_status'];
 
 		// Extract URL data for call-back
-		$urlData = array($URLs[$formData['id']]);
+		$urlData = array(array_merge($URLs[$formData['id']], array($action => $formData)));
 
 		// Action found so execute it
 		$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}");
+		ADD_FATAL(sprintf("Invalid member action! action=%s,id=%s,function=%s", $formData['action'], $formData['id'], $functionName));
 	}
 
 	// Return status
@@ -259,6 +269,7 @@ function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) {
 
 	// Fetch the new status if found
 	if ($isValid) {
+		// Load new status
 		list($SURFBAR_CACHE['new_status']) = SQL_FETCHROW($result);
 	} // END - if
 
@@ -273,7 +284,7 @@ function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) {
 //                               Member actions
 // -----------------------------------------------------------------------------
 //
-// Retreat an URL
+// Retreat a booked URL
 function SURFBAR_MEMBER_RETREAT_ACTION ($urlData) {
 	// Create the data array for next function call
 	$data = array(
@@ -293,6 +304,142 @@ function SURFBAR_MEMBER_BOOKNOW_ACTION ($urlData) {
 	// Simply change the status here
 	return SURFBAR_CHANGE_STATUS ($urlData['id'], $urlData['status'], $urlData['new_status'], $data);
 }
+// Show edit form or do the changes
+function SURFBAR_MEMBER_EDIT_ACTION ($urlData) {
+	// Is the "execute" flag there?
+	if (isset($urlData['edit']['execute'])) {
+		// Execute the changes
+		return SURFBAR_MEMBER_EXECUTE_ACTION("edit", $urlData);
+	} // END - if
+
+	// Display form
+	return SURFBAR_MEMBER_DISPLAY_ACTION_FORM("edit", $urlData);
+}
+// Show delete form or do the changes
+function SURFBAR_MEMBER_DELETE_ACTION ($urlData) {
+	// Is the "execute" flag there?
+	if (isset($urlData['delete']['execute'])) {
+		// Execute the changes
+		return SURFBAR_MEMBER_EXECUTE_ACTION("delete", $urlData);
+	} // END - if
+
+	// Display form
+	return SURFBAR_MEMBER_DISPLAY_ACTION_FORM("delete", $urlData);
+}
+// Pause active banner
+function SURFBAR_MEMBER_PAUSE_ACTION ($urlData) {
+	return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData));
+}
+// Unpause stopped banner
+function SURFBAR_MEMBER_UNPAUSE_ACTION ($urlData) {
+	// Fix missing entry for template
+	$urlData['edit'] = $urlData['unpause'];
+	$urlData['edit']['url'] = $urlData['url'];
+	$urlData['edit']['limit'] = $urlData['views_max'];
+
+	// Return status change
+	return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData));
+}
+// Display selected "action form"
+function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) {
+	// Translate some data
+	$urlData['registered']    = MAKE_DATETIME($urlData['registered'], "2");
+	$urlData['views_total']   = TRANSLATE_COMMA($urlData['views_total']);
+	$urlData['views_max']     = TRANSLATE_COMMA($urlData['views_max']);
+	$urlData['views_allowed'] = TRANSLATE_COMMA($urlData['views_allowed']);
+	$urlData['last_locked']   = MAKE_DATETIME($urlData['last_locked'], "2");
+
+	// Is the lock reason empty?
+	if (empty($urlData['lock_reason'])) {
+		// Fix it to three dashes
+		$urlData['lock_reason'] = "---";
+	} // END - if
+
+	// Include fields only for action 'edit'
+	if ($action == "edit") {
+		// Default is not limited
+		$urlData['limited_yes'] = "";
+		$urlData['limited_no']  = " checked=\"checked\"";
+		$urlData['limited']     = "false";
+
+		// Is this URL limited?
+		if ($urlData['views_max'] > 0) {
+			// Then rewrite form data
+			$urlData['limited_yes'] = " checked=\"checked\"";
+			$urlData['limited_no']  = "";
+			$urlData['limited']     = "true";
+		} // END - if
+	} // END - if
+
+	// Load the form and display it
+	LOAD_TEMPLATE(sprintf("member_surfbar_%s_action_form", $action), false, $urlData);
+
+	// All fine by default ... ;-)
+	return true;
+}
+// Execute choosen action
+function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) {
+	// By default nothing is executed
+	$executed = false;
+
+	// Is limitation "no" and "limit" is > 0?
+	if ((isset($urlData[$action]['limited'])) && ($urlData[$action]['limited'] == "N") && ((isset($urlData[$action]['limit'])) && ($urlData[$action]['limit'] > 0)) || (!isset($urlData[$action]['limit']))) {
+		// Set it to unlimited
+		$urlData[$action]['limit'] = 0;
+	} // END - if
+
+	// Construct function name
+	$functionName = sprintf("SURFBAR_MEMBER_EXECUTE_%s_ACTION", strtoupper($action));
+
+	// Is 'userid' set and not 'uid' ?
+	if ((!isset($urlData['uid'])) && (isset($urlData['userid']))) {
+		// Auto-fix this
+		$urlData['uid'] = $urlData['userid'];
+	} // END - if
+
+	// Is that function there?
+	if (function_exists($functionName)) {
+		// Execute the function
+		if (call_user_func_array($functionName, array($urlData)) == true) {
+			// Update status as well
+			$executed = SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData));
+		} // END - if
+	} else {
+		// Not found!
+		ADD_FATAL(sprintf(MEMBER_SURFBAR_EXECUTE_ACTION_404, $functionName));
+	}
+
+	// Return status
+	return $executed;
+}
+// "Execute edit" function: Update changed data
+function SURFBAR_MEMBER_EXECUTE_EDIT_ACTION ($urlData) {
+	// Default is nothing done
+	$status = false;
+
+	// Translate URLs for testing
+	$url1 = COMPILE_CODE($urlData['url']);
+	$url2 = COMPILE_CODE($urlData['edit']['url']);
+
+	// Has the URL or limit changed?
+	if (true) {
+	//if (($urlData['views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) {
+		// Run the query
+		SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_surfbar_urls SET url='%s', views_allowed=%s, views_max=%s WHERE id=%s AND status='%s' LIMIT 1",
+			array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['status']), __FILE__, __LINE__);
+
+		// All fine
+		$status = true;
+	}
+
+	// Return status
+	return $status;
+}
+// "Execute delete" function: Does nothing...
+function SURFBAR_MEMBER_EXECUTE_DELETE_ACTION ($urlData) {
+	// Nothing special to do (see above function for such "special actions" to perform)
+	return true;
+}
 //
 // -----------------------------------------------------------------------------
 //                           Self-maintenance functions
@@ -388,7 +535,7 @@ function SURFBAR_GET_URL_DATA ($searchTerm, $column="id", $order="id", $sort="AS
 	} // END - if
 
 	// Look up the record
-	$result = SQL_QUERY_ESC("SELECT id, userid, url, views_total, status, registered, last_locked, lock_reason, views_max, views_allowed
+	$result = SQL_QUERY_ESC("SELECT id, userid, url, views_total, views_max, views_allowed, status, registered, last_locked, lock_reason, views_max, views_allowed
 FROM "._MYSQL_PREFIX."_surfbar_urls
 WHERE %s='%s'".$add."
 ORDER BY %s %s
@@ -442,7 +589,6 @@ function SURFBAR_REGISTER_URL ($url, $uid, $status="PENDING", $addMode="reg", $l
 	} // END - if
 
 	// Translate status and limit
-	$content['status'] = SURFBAR_TRANSLATE_STATUS($content['status']);
 	$content['limit'] = SURFBAR_TRANSLATE_LIMIT($content['limit']);
 
 	// If in reg-mode we notify admin
@@ -466,7 +612,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'],
@@ -487,10 +633,25 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) {
 	// Set default subject if following eval() wents wrong
 	$subject = ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT;
 
-	// Prepare subject
-	$subject = constant(sprintf("ADMIN_SURFBAR_NOTIFY_%s_SUBJECT",
+	// Create constant name
+	$constantName = sprintf("ADMIN_SURFBAR_NOTIFY_%s_SUBJECT",
 		strtoupper($messageType)
-	));
+	);
+
+	// Prepare subject
+	if (defined($constantName)) {
+		$subject = constant($constantName);
+	} else {
+		ADD_FATAL(ADMIN_SURFBAR_NOTIFY_SUBJECT_404, $constantName);
+	}
+
+	// Translate some data if present
+	if (isset($content['status']))        $content['status']        = SURFBAR_TRANSLATE_STATUS($content['status']);
+	if (isset($content['registered']))    $content['registered']    = MAKE_DATETIME($content['registered'], "2");
+	if (isset($content['last_locked']))   $content['last_locked']   = MAKE_DATETIME($content['last_locked'], "2");
+	if (isset($content['views_total']))   $content['views_total']   = TRANSLATE_COMMA($content['views_total']);
+	if (isset($content['views_allowed'])) $content['views_allowed'] = TRANSLATE_COMMA($content['views_allowed']);
+	if (isset($content['views_max']))     $content['views_max']     = TRANSLATE_COMMA($content['views_max']);
 
 	// Send the notification out
 	return SEND_ADMIN_NOTIFICATION($subject, $templateName, $content, $content['uid']);
@@ -508,10 +669,17 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
 	// Set default subject if following eval() wents wrong
 	$subject = MEMBER_SURFBAR_NOTIFY_DEFAULT_SUBJECT;
 
-	// Prepare subject
-	$subject = constant(sprintf("MEMBER_SURFBAR_NOTIFY_%s_SUBJECT",
+	// Create constant name
+	$constantName = sprintf("MEMBER_SURFBAR_NOTIFY_%s_SUBJECT",
 		strtoupper($messageType)
-	));
+	);
+
+	// Prepare subject
+	if (defined($constantName)) {
+		$subject = constant($constantName);
+	} else {
+		ADD_FATAL(MEMBER_SURFBAR_NOTIFY_SUBJECT_404, $constantName);
+	}
 
 	// Load template
 	$mailText = LOAD_EMAIL_TEMPLATE($templateName, $content, $content['uid']);
@@ -541,10 +709,10 @@ function SURFBAR_TRANSLATE_STATUS ($status) {
 	// Set default translated status
 	$statusTranslated = "!".$constantName."!";
 
-	// Generate eval() command
+	// Is the constant there?
 	if (defined($constantName)) {
-		$eval = "\$statusTranslated = ".$constantName.";";
-		eval($eval);
+		// Then get it's value
+		$statusTranslated = constant($constantName);
 	} // END - if
 
 	// Return result
@@ -625,7 +793,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']."", false);
 
 	// Do we have dynamic model?
 	if ($_CONFIG['surfbar_pay_model'] == "DYNAMIC") {
@@ -656,7 +824,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}", false);
 	$isFull = ((SURFBAR_GET_DATA('user_locks') == $total) && ($total > 0));
 
 	// Return result
@@ -764,16 +932,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()."", false);
 		} else {
 			// Use this as salt!
 			$SURFBAR_CACHE['salt'] = $salt;
-			//DEBUG_LOG(__FUNCTION__.":oldSalt=".SURFBAR_GET_SALT()."");
+			//DEBUG_LOG(__FUNCTION__, __LINE__, "oldSalt=".SURFBAR_GET_SALT()."", false);
 		}
 
 		// ... 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}", false);
 	} // END - while
 
 	// Hash it with md5() and salt it with the random string
@@ -783,7 +951,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}", false);
 	return $valHashedCode;
 }
 // Check validation code
@@ -797,16 +965,16 @@ 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."---", false);
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "+++".$salt."|".SURFBAR_GET_DATA('last_salt')."+++", false);
 	return (($code == $check) && ($salt == SURFBAR_GET_DATA('last_salt')));
 }
 // Lockdown the userid/id combination (reload lock)
 function SURFBAR_LOCKDOWN_ID ($urlId) {
-	//* //DEBUG: */ print "LOCK!");
-	///* //DEBUG: */ return;
+	//* 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,14 +984,14 @@ 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()."", false);
 	if (SURFBAR_GET_USERID() > 0) {
-		SUB_POINTS(SURFBAR_GET_USERID(), SURFBAR_GET_COSTS());
+		SUB_POINTS("surfbar", SURFBAR_GET_USERID(), SURFBAR_GET_COSTS());
 	} // END - if
 
 	// Book it to the user
-	//DEBUG_LOG(__FUNCTION__.":uid=".$GLOBALS['userid'].",reward=".SURFBAR_GET_REWARD()."");
-	ADD_POINTS_REFSYSTEM($GLOBALS['userid'], SURFBAR_GET_DATA('reward'));
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".$GLOBALS['userid'].",reward=".SURFBAR_GET_REWARD()."", false);
+	ADD_POINTS_REFSYSTEM("surfbar", $GLOBALS['userid'], SURFBAR_GET_DATA('reward'));
 }
 // Updates the statistics of current URL/userid
 function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
@@ -852,7 +1020,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 +1043,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']."", 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')",
+		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()."", false);
 
 	// 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}", false);
 	// Ask the database
 	$result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt
 FROM "._MYSQL_PREFIX."_surfbar_locks
@@ -909,7 +1077,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')."", false);
 	return ($cnt == 1);
 }
 // Determine which user hash no more points left
@@ -952,12 +1120,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}", false);
 
 		// 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!", false);
 			$UIDs['uid'][$uid] = $uid;
 			$UIDs['points'][$uid] = $points;
 			$UIDs['notified'][$uid] = $notified;
@@ -968,7 +1136,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'].")", false);
 
 	// Return result
 	return $UIDs;
@@ -1013,11 +1181,21 @@ function SURFBAR_DETERMINE_WAIT_TIME () {
 function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) {
 	global $_CONFIG;
 
+	// Make new status always lower-case
+	$newStatus = strtolower($newStatus);
+
 	// Get URL data for status comparison if missing
-	if (count($data) == 0) {
+	if ((!is_array($data)) || (count($data) == 0)) {
+		// Fetch missing URL data
 		$data = SURFBAR_GET_URL_DATA($urlId);
 	} // END - if
 
+	// Is the new status set?
+	if ((!is_string($newStatus)) || (empty($newStatus))) {
+		// Abort here, but fine!
+		return true;
+	} // END - if
+
 	// Is the status like prevStatus is saying?
 	if ($data[$urlId]['status'] != $prevStatus) {
 		// No, then abort here
@@ -1026,31 +1204,34 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array())
 
 
 	// Update the status now
-	// ---------------------- Commented out for debugging member actions! -----------------------
+	// ---------- Comment out for debugging/developing member actions! ---------
 	//SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_surfbar_urls SET status='%s' WHERE id=%s LIMIT 1",
 	//	array($newStatus, bigintval($urlId)), __FILE__, __LINE__);
-	// ---------------------- Commented out for debugging member actions! -----------------------
+	// ---------- Comment out for debugging/developing member actions! ---------
 
 	// Was that fine?
-	if (SQL_AFFECTEDROWS() != 1) {
-		// No, something went wrong
-		return false;
-	} // END - if
+	//if (SQL_AFFECTEDROWS() != 1) {
+	//	// No, something went wrong
+	//	return false;
+	//} // END - if
 
 	// Prepare content for notification routines
 	$data[$urlId]['uid']         = $data[$urlId]['userid'];
 	$data[$urlId]['frametester'] = FRAMETESTER($data[$urlId]['url']);
 	$data[$urlId]['reward']      = TRANSLATE_COMMA($_CONFIG['surfbar_static_reward']);
 	$data[$urlId]['costs']       = TRANSLATE_COMMA($_CONFIG['surfbar_static_costs']);
-	$data[$urlId]['status']      = SURFBAR_TRANSLATE_STATUS($newStatus);
-	$data[$urlId]['registered']  = MAKE_DATETIME($data[$urlId]['registered'], "2");
-	$newStatus = strtolower($newStatus);
+
+	// Do some dirt fixing here:
+	if (($data[$urlId]['status'] == "STOPPED") && ($newStatus == "pending")) {
+		// Fix for template change
+		$newStatus = "continued";
+	} // END - if
 
 	// Send admin notification
-	SURFBAR_NOTIFY_ADMIN("url_{$newStatus}", $data[$urlId]);
+	SURFBAR_NOTIFY_ADMIN("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]);
 
 	// Send user notification
-	SURFBAR_NOTIFY_USER("url_{$newStatus}", $data[$urlId]);
+	SURFBAR_NOTIFY_USER("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]);
 
 	// All done!
 	return true;
@@ -1154,17 +1335,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')."", false);
 
 		// 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}", false);
 
 			// 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}", false);
 
 				// Add this ID
 				$IDs[$url] = $last;
@@ -1172,7 +1353,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}", false);
 
 			// Ignore these old entries!
 			$ignored[] = $url;
@@ -1201,7 +1382,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()."", false);
 
 	// Fetch max rand
 	$maxRand = SQL_NUMROWS($result);
@@ -1218,7 +1399,7 @@ function SURFBAR_GET_USER_URLS () {
 	$URLs = array();
 
 	// Begin the query
-	$result = SQL_QUERY_ESC("SELECT u.id, u.userid, u.url, u.views_total, u.status, UNIX_TIMESTAMP(u.registered) AS registered, UNIX_TIMESTAMP(u.last_locked) AS last_locked, u.lock_reason AS lock_reason
+	$result = SQL_QUERY_ESC("SELECT u.id, u.userid, u.url, u.views_total, u.views_max, u.views_allowed, u.status, UNIX_TIMESTAMP(u.registered) AS registered, UNIX_TIMESTAMP(u.last_locked) AS last_locked, u.lock_reason AS lock_reason
 FROM "._MYSQL_PREFIX."_surfbar_urls AS u
 WHERE u.userid=%s AND u.status != 'DELETED'
 ORDER BY u.id ASC",
@@ -1317,7 +1498,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')."", false);
 		$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 +1526,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()."", false);
 	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", false);
 		$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", false);
 
 		// Determine waiting time
 		$SURFBAR_CACHE['time'] = SURFBAR_DETERMINE_WAIT_TIME();
@@ -1358,28 +1539,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!", false);
 			$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!", false);
 			$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()."", false);
 
 		// 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()."", false);
 		} // END - if
 
 		// Now get the id
@@ -1390,7 +1571,7 @@ LIMIT 1",
 	SQL_FREERESULT($result);
 
 	// Return result
-	//DEBUG_LOG(__FUNCTION__.":nextId={$nextId}");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "nextId={$nextId}", false);
 	return $nextId;
 }
 // -----------------------------------------------------------------------------
@@ -1400,7 +1581,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}", false);
 
 	// Default is null
 	$data = null;
@@ -1417,7 +1598,7 @@ function SURFBAR_GET_DATA ($element) {
 	}
 
 	// Return result
-	//DEBUG_LOG(__FUNCTION__.":element[$element]={$data}");
+	//DEBUG_LOG(__FUNCTION__, __LINE__, "element[$element]={$data}", false);
 	return $data;
 }
 // Getter for reward from cache