X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fsurfbar_functions.php;h=90472980778f424292d45bb7929d5bb14445814b;hb=e5ee863933a5062292d2467fff8a51bf9a618785;hp=d04fafebe994b488235d3f1b499afab463eabd81;hpb=6d4a20b65520f17f009d2ac97845bd047a12fecf;p=mailer.git

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index d04fafebe9..9047298077 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -49,31 +49,31 @@ function doSurfbarAdminAddUrl ($url, $limit, $reload, $waiting) {
 	// Do some pre-checks
 	if (!isAdmin()) {
 		// Not an admin
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Not admin.", $url, $limit, $reload));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Not admin.", $url, $limit, $reload));
 		return FALSE;
 	} elseif (!isUrlValid($url)) {
 		// URL invalid
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Invalid URL.", $url, $limit, $reload));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Invalid URL.", $url, $limit, $reload));
 		return FALSE;
 	} elseif (ifSurfbarHasUrlUserId($url, 0)) {
 		// URL already found in surfbar!
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Already added.", $url, $limit, $reload));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Already added.", $url, $limit, $reload));
 		return FALSE;
 	} elseif (!ifSurfbarMemberAllowedMoreUrls()) {
 		// No more allowed!
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: No more URLs allowed.", $url, $limit, $reload));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: No more URLs allowed.", $url, $limit, $reload));
 		return FALSE;
 	} elseif ('' . ($limit + 0) . '' != '' . $limit . '') {
 		// Invalid limit entered
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Invalid limit entered.", $url, $limit, $reload));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Invalid limit entered.", $url, $limit, $reload));
 		return FALSE;
 	} elseif ('' . ($reload + 0) . '' != '' . $reload . '') {
 		// Invalid amount entered
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Invalid reload entered.", $url, $limit, $reload));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s: Invalid reload entered.", $url, $limit, $reload));
 		return FALSE;
 	} elseif ('' . ($waiting + 0) . '' != '' . $waiting . '') {
 		// Invalid amount entered
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,waiting=%s: Invalid waiting entered.", $url, $limit, $waiting));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,waiting=%s: Invalid waiting entered.", $url, $limit, $waiting));
 		return FALSE;
 	}
 
@@ -86,19 +86,19 @@ function doSurfbarAdminMigrateUrl ($url, $userid) {
 	// Do some pre-checks
 	if (!isAdmin()) {
 		// Not an admin
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Not admin, url=' . $url . ',userid=' . $userid);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Not admin, url=' . $url . ',userid=' . $userid);
 		return FALSE;
 	} elseif (!isUrlValid($url)) {
 		// URL invalid
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Invalid URL, url=' . $url . ',userid=' . $userid);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Invalid URL, url=' . $url . ',userid=' . $userid);
 		return FALSE;
 	} elseif (ifSurfbarHasUrlUserId($url, $userid)) {
 		// URL already found in surfbar!
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Already added, url=' . $url . ',userid=' . $userid);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Already added, url=' . $url . ',userid=' . $userid);
 		return FALSE;
 	} elseif (!ifSurfbarMemberAllowedMoreUrls($userid)) {
 		// No more allowed!
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Maximum exceeded, url=' . $url . ',userid=' . $userid);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Maximum exceeded, url=' . $url . ',userid=' . $userid);
 		return FALSE;
 	}
 
@@ -111,15 +111,15 @@ function doSurfbarAdminUnlockUrlIds ($IDs) {
 	// Is this an admin or invalid array?
 	if (!isAdmin()) {
 		// Not admin or invalid ids array
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Not admin');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Not admin');
 		return FALSE;
 	} elseif (!is_array($IDs)) {
 		// No array
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs type ' . gettype($IDs) . '!=array');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs type ' . gettype($IDs) . '!=array');
 		return FALSE;
-	} elseif (count($IDs) == 0) {
+	} elseif (!isFilledArray($IDs)) {
 		// Empty array
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs is empty');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs is empty');
 		return FALSE;
 	}
 
@@ -141,15 +141,15 @@ function doSurfbarAdminRejectUrlIds ($IDs) {
 	// Is this an admin or invalid array?
 	if (!isAdmin()) {
 		// Not admin or invalid ids array
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Not admin');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Not admin');
 		return FALSE;
 	} elseif (!is_array($IDs)) {
 		// No array
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs type ' . gettype($IDs) . '!=array');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs type ' . gettype($IDs) . '!=array');
 		return FALSE;
-	} elseif (count($IDs) == 0) {
+	} elseif (!isFilledArray($IDs)) {
 		// Empty array
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs is empty');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs is empty');
 		return FALSE;
 	}
 
@@ -175,23 +175,23 @@ function doSurfbarMemberAddUrl ($url, $limit) {
 	// Do some pre-checks
 	if (!isMember()) {
 		// Not a member
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: isMember()=false');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: isMember()=false');
 		return FALSE;
 	} elseif ((!isUrlValid($url)) && (!isAdmin())) {
 		// URL invalid
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Invalid, url=' . $url . ',limit=' . $limit);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Invalid, url=' . $url . ',limit=' . $limit);
 		return FALSE;
 	} elseif (ifSurfbarHasUrlUserId($url, getMemberId())) {
 		// URL already found in surfbar!
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Already found, url=' . $url . ',limit=' . $limit);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Already found, url=' . $url . ',limit=' . $limit);
 		return FALSE;
 	} elseif (!ifSurfbarMemberAllowedMoreUrls(getMemberId())) {
 		// No more allowed!
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Maximum exceeded, url=' . $url . ',limit=' . $limit);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Maximum exceeded, url=' . $url . ',limit=' . $limit);
 		return FALSE;
 	} elseif (''.($limit + 0).'' != ''.$limit.'') {
 		// Invalid amount entered
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Invalid limit, url=' . $url . ',limit=' . $limit);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Invalid limit, url=' . $url . ',limit=' . $limit);
 		return FALSE;
 	}
 
@@ -233,19 +233,19 @@ function doSurfbarMemberByFormData ($formData, $urlArray) {
 	// Is this a member?
 	if (!isMember()) {
 		// No member!
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: isMember()=false');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: isMember()=false');
 		return FALSE;
 	} elseif ((!isset($formData['url_id'])) || (!isset($formData['action']))) {
 		// Important form elements are missing!
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Invalid form data, required field id/action not found');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Invalid form data, required field id/action not found');
 		return FALSE;
 	} elseif (!isset($urlArray[$formData['url_id']])) {
 		// Id not found in cache
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Field url_id not found in cache');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Field url_id not found in cache');
 		return FALSE;
 	} elseif (!isSurfbarMemberActionStatusValid($formData['action'], $urlArray[$formData['url_id']]['url_status'])) {
 		// Action not allowed for current URL status
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Action not allowed to perform. action=' . $formData['action'] . ',url_status=' . $urlArray[$formData['url_id']]['url_status'] . ',url_id=' . $formData['url_id']);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Action not allowed to perform. action=' . $formData['action'] . ',url_status=' . $urlArray[$formData['url_id']]['url_status'] . ',url_id=' . $formData['url_id']);
 		return FALSE;
 	}
 
@@ -285,27 +285,27 @@ function doSurfbarMemberByFormData ($formData, $urlArray) {
 }
 
 // Getter for surfbar_actions table by given id number
-function getSurfbarActionsDataById ($columnName, $id) {
+function getSurfbarActionsDataFromId ($columnName, $id) {
 	// Is cache set?
 	if (!isset($GLOBALS[__FUNCTION__][$id][$columnName])) {
 		// Default is not found
 		$GLOBALS[__FUNCTION__][$id][$columnName] = '*INVALID*';
 
 		// Search for it
-		$result = SQL_QUERY_ESC("SELECT `%s` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `actions_id`=%s LIMIT 1",
+		$result = sqlQueryEscaped("SELECT `%s` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `actions_id`=%s LIMIT 1",
 			array(
 				$columnName,
 				bigintval($id)
 			), __FUNCTION__, __LINE__);
 
 		// Is there an entry?
-		if (SQL_NUMROWS($result) == 1) {
+		if (sqlNumRows($result) == 1) {
 			// Load it
-			list($GLOBALS[__FUNCTION__][$id][$columnName]) = SQL_FETCHROW($result);
+			list($GLOBALS[__FUNCTION__][$id][$columnName]) = sqlFetchRow($result);
 		} // END - if
 
 		// Free result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	} // END - if
 
 	// Return value
@@ -315,26 +315,26 @@ function getSurfbarActionsDataById ($columnName, $id) {
 // Validate if the requested action can be performed on current URL status
 function isSurfbarMemberActionStatusValid ($action, $status) {
 	// Search for the requested action/status combination in database
-	$result = SQL_QUERY_ESC("SELECT `actions_new_status` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `actions_action`='%s' AND `actions_status`='%s' LIMIT 1",
+	$result = sqlQueryEscaped("SELECT `actions_new_status` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `actions_action`='%s' AND `actions_status`='%s' LIMIT 1",
 		array(
 			strtoupper($action),
 			strtoupper($status)
 		), __FUNCTION__, __LINE__);
 
 	// Is the entry there?
-	$isValid = (SQL_NUMROWS($result) == 1);
+	$isValid = (sqlNumRows($result) == 1);
 
 	// Debug message
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'action=' . $action . ',status=' . $status . ',isValid=' . intval($isValid));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'action=' . $action . ',status=' . $status . ',isValid=' . intval($isValid));
 
 	// Fetch the new status if found
 	if ($isValid === TRUE) {
 		// Load new status
-		list($GLOBALS['surfbar_cache']['new_status']) = SQL_FETCHROW($result);
+		list($GLOBALS['surfbar_cache']['new_status']) = sqlFetchRow($result);
 	} // END - if
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return status
 	return $isValid;
@@ -476,9 +476,9 @@ function executeSurfbarMemberEditAction ($urlData) {
 
 	// Has the URL or limit changed?
 	if (TRUE) {
-		//if (($urlData['url_views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) {
+		// @TODO if (($urlData['url_views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) {
 		// Run the query
-		SQL_QUERY_ESC("UPDATE
+		sqlQueryEscaped("UPDATE
 	`{?_MYSQL_PREFIX?}_surfbar_urls`
 SET
 	`url`='%s',
@@ -526,10 +526,10 @@ function doSurfbarSelfMaintenance () {
 // Handle URLs which limit has depleted
 function doHandleSurfbarDepletedViews () {
 	// Get all URLs
-	$urlArray = getSurfbarUrlData(0, 'url_views_max', 'url_id', 'ASC', 'url_id', " AND `url_views_allowed` > 0 AND `url_status`='ACTIVE'");
+	$urlArray = getSurfbarUrlData('0', 'url_views_max', 'url_id', 'ASC', 'url_id', " AND `url_views_allowed` > 0 AND `url_status`='ACTIVE'");
 
 	// Are there some entries?
-	if (count($urlArray) > 0) {
+	if (isFilledArray($urlArray)) {
 		// Then handle all!
 		foreach ($urlArray as $id => $urlData) {
 			// Backup data
@@ -566,7 +566,7 @@ function doHandleSurfbarLowPoints () {
 			doSurfbarNotifyMember('low_points', $content);
 
 			// Update last notified
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `surfbar_low_notified`=NOW() WHERE `userid`=%s LIMIT 1",
+			sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `surfbar_low_notified`=NOW() WHERE `userid`=%s LIMIT 1",
 				array($userid), __FUNCTION__, __LINE__);
 		} // END - if
 	} // END - foreach
@@ -584,7 +584,7 @@ function ifSurfbarHasUrlUserId ($url, $userid) {
 	$urlArray = getSurfbarUrlData($url, 'url', 'url_id', 'ASC', 'url_id', sprintf(" AND `url_userid`=%s", bigintval($userid)));
 
 	// Was it found?
-	return (count($urlArray) > 0);
+	return isFilledArray($urlArray);
 }
 
 // Load URL data by given search term and column
@@ -601,13 +601,14 @@ function getSurfbarUrlData ($searchTerm, $column = 'url_id', $order = 'url_id',
 	// If the column is 'url_id' there can be only one entry
 	$limit = '';
 	if ($column == 'url_id') {
-		$limit = "LIMIT 1";
+		$limit = 'LIMIT 1';
 	} // END - if
 
 	// Look up the record
-	$result = SQL_QUERY_ESC("SELECT
+	$result = sqlQueryEscaped("SELECT
 	`url_id`,
 	`url_userid`,
+	`url_package_id`,
 	`url`,
 	`url_views_total`,
 	`url_views_max`,
@@ -636,9 +637,9 @@ ORDER BY
 		), __FUNCTION__, __LINE__);
 
 	// Is there at least one record?
-	if (!SQL_HASZERONUMS($result)) {
+	if (!ifSqlHasZeroNumRows($result)) {
 		// Then load all!
-		while ($dataRow = SQL_FETCHARRAY($result)) {
+		while ($dataRow = sqlFetchArray($result)) {
 			// Shall we group these results?
 			if ($group == 'url_id') {
 				// Add the row by id as index
@@ -651,7 +652,7 @@ ORDER BY
 	} // END - if
 
 	// Free the result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return the result
 	return $GLOBALS['last_url_data'];
@@ -715,7 +716,7 @@ function insertSurfbarUrlByArray ($urlData) {
 	} // END - if
 
 	// Just run the insert query for now
-	SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_urls` (`url_userid`, `url`, `url_status`, `url_views_max`, `url_views_allowed`, `url_fixed_reload`, `url_fixed_waiting`) VALUES (%s, '%s', '%s', %s, %s, %s, %s)",
+	sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_urls` (`url_userid`, `url`, `url_status`, `url_views_max`, `url_views_allowed`, `url_fixed_reload`, `url_fixed_waiting`) VALUES (%s, '%s', '%s', %s, %s, %s, %s)",
 		array(
 			$userid,
 			$urlData['url'],
@@ -727,8 +728,8 @@ function insertSurfbarUrlByArray ($urlData) {
 		), __FUNCTION__, __LINE__
 	);
 
-	// Return insert id
-	return SQL_INSERTID();
+	// Return secured insert id
+	return getSqlInsertId();
 }
 
 // Notify admin(s) with a selected message and content
@@ -935,7 +936,7 @@ function determineSurfbarTemplateName() {
  * before you call ifSurfbarReloadLock().
  */
 function isSurfbarReloadFull () {
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Fixed surf lock is ' . getConfig('surfbar_static_lock') . ' - ENTERED!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Fixed surf lock is ' . getConfig('surfbar_static_lock') . ' - ENTERED!');
 	// Default is full!
 	$isFull = TRUE;
 
@@ -943,35 +944,35 @@ function isSurfbarReloadFull () {
 	$GLOBALS['surfbar_cache']['surf_lock'] = getConfig('surfbar_static_lock');
 
 	// Is there dynamic model?
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'surf_lock=' . $GLOBALS['surfbar_cache']['surf_lock'] . ' - BEFORE');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'surf_lock=' . $GLOBALS['surfbar_cache']['surf_lock'] . ' - BEFORE');
 	if (getSurfbarPaymentModel() == 'DYNAMIC') {
 		// "Calculate" dynamic lock
 		$GLOBALS['surfbar_cache']['surf_lock'] += calculateSurfbarDynamicAddValue();
 	} // END - if
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'surf_lock=' . $GLOBALS['surfbar_cache']['surf_lock'] . ' - AFTER');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'surf_lock=' . $GLOBALS['surfbar_cache']['surf_lock'] . ' - AFTER');
 
 	// Ask the database
-	$result = SQL_QUERY_ESC("SELECT
-	COUNT(l.`locks_id`) AS `cnt`
+	$result = sqlQueryEscaped("SELECT
+	COUNT(`l`.`locks_id`) AS `cnt`
 FROM
-	`{?_MYSQL_PREFIX?}_surfbar_locks` AS l
+	`{?_MYSQL_PREFIX?}_surfbar_locks` AS `l`
 INNER JOIN
-	`{?_MYSQL_PREFIX?}_surfbar_urls` AS u
+	`{?_MYSQL_PREFIX?}_surfbar_urls` AS `u`
 ON
-	u.`url_id`=l.`locks_url_id`
+	`u`.`url_id`=`l`.`locks_url_id`
 WHERE
-	l.`locks_userid`=%s AND
-	(UNIX_TIMESTAMP() - {%%pipe,getSurfbarSurfLock%%}) < UNIX_TIMESTAMP(l.`locks_last_surfed`) AND
+	`l`.`locks_userid`=%s AND
+	(UNIX_TIMESTAMP() - {%%pipe,getSurfbarSurfLock%%}) < UNIX_TIMESTAMP(`l`.`locks_last_surfed`) AND
 	(
-		((UNIX_TIMESTAMP(l.`locks_last_surfed`) - u.`url_fixed_reload`) < 0 AND u.`url_fixed_reload` > 0) OR
-		u.`url_fixed_reload` = 0
+		((UNIX_TIMESTAMP(`l`.`locks_last_surfed`) - `u`.`url_fixed_reload`) < 0 AND `u`.`url_fixed_reload` > 0) OR
+		`u`.`url_fixed_reload` = 0
 	)
 LIMIT 1",
 		array(getMemberId()), __FUNCTION__, __LINE__
 	);
 
 	// Fetch row
-	list($GLOBALS['surfbar_cache']['user_locks']) = SQL_FETCHROW($result);
+	list($GLOBALS['surfbar_cache']['user_locks']) = sqlFetchRow($result);
 
 	// Is it null?
 	if (is_null($GLOBALS['surfbar_cache']['user_locks'])) {
@@ -980,7 +981,7 @@ LIMIT 1",
 	} // END - if
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Get total URLs
 	$total = getSurfbarTotalUrls();
@@ -989,7 +990,7 @@ LIMIT 1",
 	$isFull = ((getSurfbarUserLocks() == $total) && ($total > 0));
 
 	// Return result
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userLocks=' . getSurfbarUserLocks() . ',total=' . $total . ',isFull=' . intval($isFull) . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userLocks=' . getSurfbarUserLocks() . ',total=' . $total . ',isFull=' . intval($isFull) . ' - EXIT!');
 	return $isFull;
 }
 
@@ -999,37 +1000,37 @@ function getSurfbarTotalUrls ($status = 'ACTIVE', $excludeUserId = NULL) {
 	$userids = determineSurfbarDepletedUserids();
 
 	// If we dont get any user ids back, there are no URLs
-	if (count($userids['url_userid']) == 0) {
+	if (!isFilledArray($userids['url_userid'])) {
 		// No user ids found, no URLs!
 		return 0;
 	} // END - if
 
 	// Is the exlude userid set?
-	if (isValidUserId($excludeUserId)) {
+	if (isValidId($excludeUserId)) {
 		// Then add it
 		$userids['url_userid'][$excludeUserId] = $excludeUserId;
 	} // END - if
 
 	// Get amount from database
-	$result = SQL_QUERY_ESC("SELECT
-	COUNT(`url_id`) AS cnt
+	$result = sqlQueryEscaped("SELECT
+	COUNT(`url_id`) AS `cnt`
 FROM
 	`{?_MYSQL_PREFIX?}_surfbar_urls`
 WHERE
-	(`url_userid` NOT IN (".implode(', ', $userids['url_userid']).") OR `url_userid` IS NULL) AND
+	(`url_userid` NOT IN (" . implode(', ', $userids['url_userid']) . ") OR `url_userid` IS NULL) AND
 	`url_status`='%s'
 LIMIT 1",
 		array($status), __FUNCTION__, __LINE__
 	);
 
 	// Fetch row
-	list($count) = SQL_FETCHROW($result);
+	list($count) = sqlFetchRow($result);
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Debug message
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'cnt=' . $count . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'cnt=' . $count . ' - EXIT!');
 
 	// Return result
 	return $count;
@@ -1079,16 +1080,16 @@ function getSurfbarTotalUserUrls ($userid = NULL, $status = '', $exclude = '') {
 
 // Generate a validation code for the given id number
 function generateSurfbarValidationCode ($urlId, $salt = '') {
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',salt=' . $salt . ' - ENTERED!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',salt=' . $salt . ' - ENTERED!');
 	// Init hash with invalid value
 	if (empty($salt)) {
 		 // Generate random hashed string
 		$GLOBALS['surfbar_cache']['salt'] = sha1(generatePassword(mt_rand(200, 255)));
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'newSalt='.getSurfbarSalt().'', FALSE);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'newSalt='.getSurfbarSalt().'', FALSE);
 	} else {
 		// Use this as salt!
 		$GLOBALS['surfbar_cache']['salt'] = $salt;
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'oldSalt='.getSurfbarSalt().'', FALSE);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'oldSalt='.getSurfbarSalt().'', FALSE);
 	}
 
 	// Hash it with md5() and salt it with the random string
@@ -1098,13 +1099,13 @@ function generateSurfbarValidationCode ($urlId, $salt = '') {
 	$valHashedCode = encodeHashForCookie($hashedCode);
 
 	// Return hashed value
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',salt=' . $salt . ',urlId=' . $urlId . ',salt=' . $salt . ',valHashedCode=' . $valHashedCode . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',salt=' . $salt . ',urlId=' . $urlId . ',salt=' . $salt . ',valHashedCode=' . $valHashedCode . ' - EXIT!');
 	return $valHashedCode;
 }
 
 // Check validation code
 function isSurfbarValidationCodeValid ($urlId, $check, $salt) {
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',check=' . $check . ',salt=' . $salt . ' - ENTERED!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',check=' . $check . ',salt=' . $salt . ' - ENTERED!');
 	// Secure id number
 	$urlId = bigintval($urlId);
 
@@ -1112,20 +1113,20 @@ function isSurfbarValidationCodeValid ($urlId, $check, $salt) {
 	$code = generateSurfbarValidationCode($urlId, $salt);
 
 	// Return result of checking hashes and salts
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',(code==check)=' . intval($code == $check) . ',(salt==salts_last_salt)=' . intval($salt == getSurfbarData('salts_last_salt')) . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',(code==check)=' . intval($code == $check) . ',(salt==salts_last_salt)=' . intval($salt == getSurfbarData('salts_last_salt')) . ' - EXIT!');
 	return (($code == $check) && ($salt == getSurfbarData('salts_last_salt')));
 }
 
 // Lockdown the userid/id combination (reload lock)
 function addSurfbarReloadLockById ($urlId) {
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',getMemberId()=' . getMemberId() . ' - ENTERED!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',getMemberId()=' . getMemberId() . ' - ENTERED!');
 	// Search for an entry
 	$countLock = countSumTotalData(getMemberId(), 'surfbar_locks', 'locks_id', 'locks_userid', TRUE, ' AND `locks_url_id`=' . bigintval($urlId));
 
 	// Is there no record?
 	if ($countLock == 0) {
 		// Just add it to the database
-		SQL_QUERY_ESC('INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_locks` (`locks_userid`, `locks_url_id`) VALUES (%s, %s)',
+		sqlQueryEscaped('INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_locks` (`locks_userid`, `locks_url_id`) VALUES (%s, %s)',
 			array(
 				getMemberId(),
 				bigintval($urlId)
@@ -1133,31 +1134,31 @@ function addSurfbarReloadLockById ($urlId) {
 	} // END - if
 
 	// Remove the salt from database
-	SQL_QUERY_ESC('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_surfbar_salts` WHERE `salts_url_id`=%s AND `salts_userid`=%s LIMIT 1',
+	sqlQueryEscaped('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_surfbar_salts` WHERE `salts_url_id`=%s AND `salts_userid`=%s LIMIT 1',
 		array(
 			bigintval($urlId),
 			getMemberId()
 		), __FUNCTION__, __LINE__);
 
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',getMemberId()=' . getMemberId() . ',SQL_AFFECTEDROWS()=' . SQL_AFFECTEDROWS() . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',getMemberId()=' . getMemberId() . ',sqlAffectedRows()=' . sqlAffectedRows() . ' - EXIT!');
 }
 
 // Pay points to the user and remove it from the sender if userid is given else it is a "sponsored surf"
 function doSurfbarPayPoints () {
 	// Remove it from the URL owner
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getSurfbarUserid().',costs='.getSurfbarCosts() . ' - ENTERED!');
-	if (isValidUserId(getSurfbarUserid())) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getSurfbarUserid().',costs='.getSurfbarCosts() . ' - ENTERED!');
+	if (isValidId(getSurfbarUserid())) {
 		// Subtract points and ignore return status
 		subtractPoints(sprintf("surfbar_%s", getSurfbarPaymentModel()), getSurfbarUserid(), getSurfbarCosts());
 	} // END - if
 
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getMemberId().',reward='.getSurfbarReward());
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getMemberId().',reward='.getSurfbarReward());
 	// Init referral system here
 	initReferralSystem();
 
 	// Book it to the user and ignore return status
 	addPointsThroughReferralSystem(sprintf("surfbar:%s", getSurfbarPaymentModel()), getMemberId(), getSurfbarReward());
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getSurfbarUserid().',costs='.getSurfbarCosts() . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getSurfbarUserid().',costs='.getSurfbarCosts() . ' - EXIT!');
 }
 
 // Updates the statistics of current URL/userid
@@ -1175,20 +1176,20 @@ function updateInsertSurfbarStatisticsRecord () {
 	} // END - if
 
 	// Update URL stats
-	SQL_QUERY_ESC('UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `url_views_total`=`url_views_total`+1' . $add . ' WHERE `url_id`=%s LIMIT 1',
+	sqlQueryEscaped('UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `url_views_total`=`url_views_total`+1' . $add . ' WHERE `url_id`=%s LIMIT 1',
 		array(getSurfbarId()), __FUNCTION__, __LINE__);
 
 	// Update the stats entry
-	SQL_QUERY_ESC('UPDATE `{?_MYSQL_PREFIX?}_surfbar_stats` SET `stats_count`=`stats_count`+1 WHERE `stats_userid`=%s AND `stats_url_id`=%s LIMIT 1',
+	sqlQueryEscaped('UPDATE `{?_MYSQL_PREFIX?}_surfbar_stats` SET `stats_count`=`stats_count`+1 WHERE `stats_userid`=%s AND `stats_url_id`=%s LIMIT 1',
 		array(
 			getMemberId(),
 			getSurfbarId()
 		), __FUNCTION__, __LINE__);
 
 	// Was that update okay?
-	if (SQL_HASZEROAFFECTED()) {
+	if (ifSqlHasZeroAffectedRows()) {
 		// No, then insert entry
-		SQL_QUERY_ESC('INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_stats` (`stats_userid`, `stats_url_id`, `stats_count`) VALUES (%s,%s,1)',
+		sqlQueryEscaped('INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_stats` (`stats_userid`, `stats_url_id`, `stats_count`) VALUES (%s,%s,1)',
 			array(
 				getMemberId(),
 				getSurfbarId()
@@ -1220,7 +1221,7 @@ function updateSurfbarSaltStatistics () {
 	updateInsertSurfbarStatisticsRecord();
 
 	// Simply store the salt from cache away in database...
-	SQL_QUERY_ESC("UPDATE
+	sqlQuery("UPDATE
 	`{?_MYSQL_PREFIX?}_surfbar_salts`
 SET
 	`salts_last_salt`='{%pipe,getSurfbarSalt%}'
@@ -1230,12 +1231,12 @@ WHERE
 LIMIT 1", __FUNCTION__, __LINE__);
 
 	// Debug message
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'salt=' . getSurfbarSalt() . ',id=' . getSurfbarId() . ',userid=' . getMemberId() . ',SQL_AFFECTEDROWS()=' . SQL_AFFECTEDROWS() . ' - UPDATE!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'salt=' . getSurfbarSalt() . ',id=' . getSurfbarId() . ',userid=' . getMemberId() . ',sqlAffectedRows()=' . sqlAffectedRows() . ' - UPDATE!');
 
 	// Was that okay?
-	if (SQL_HASZEROAFFECTED()) {
+	if (ifSqlHasZeroAffectedRows()) {
 		// Insert missing entry!
-		SQL_QUERY("INSERT INTO
+		sqlQuery("INSERT INTO
 	`{?_MYSQL_PREFIX?}_surfbar_salts`
 (
 	`salts_url_id`,
@@ -1249,17 +1250,17 @@ LIMIT 1", __FUNCTION__, __LINE__);
 	} // END - if
 
 	// Debug message
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'affectedRows=' . SQL_AFFECTEDROWS() . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'affectedRows=' . sqlAffectedRows() . ' - EXIT!');
 
 	// Return if the update was okay
-	return (!SQL_HASZEROAFFECTED());
+	return (!ifSqlHasZeroAffectedRows());
 }
 
 // Check if the reload lock is active for given id
 function ifSurfbarReloadLock ($urlId) {
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $urlId . ' -  ENTERED!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $urlId . ' -  ENTERED!');
 	// Ask the database
-	$result = SQL_QUERY_ESC('SELECT COUNT(`locks_id`) AS `cnt`
+	$result = sqlQueryEscaped('SELECT COUNT(`locks_id`) AS `cnt`
 FROM
 	`{?_MYSQL_PREFIX?}_surfbar_locks`
 WHERE
@@ -1273,13 +1274,13 @@ LIMIT 1',
 	);
 
 	// Fetch counter
-	list($count) = SQL_FETCHROW($result);
+	list($count) = sqlFetchRow($result);
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return check
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',count=' . $count . ',getSurfbarSurfLock()=' . getSurfbarSurfLock() . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',count=' . $count . ',getSurfbarSurfLock()=' . getSurfbarSurfLock() . ' - EXIT!');
 	return ($count == 1);
 }
 
@@ -1300,52 +1301,54 @@ function determineSurfbarDepletedUserids ($limit=0) {
 		$userids['notified'][getMemberId()]   = '0';
 
 		// Get all userid except logged in one
-		$result = SQL_QUERY_ESC("SELECT
-	u.url_userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified
+		$result = sqlQueryEscaped("SELECT
+	`u`.`url_userid`,
+	UNIX_TIMESTAMP(`d`.`surfbar_low_notified`) AS `notified`
 FROM
-	`{?_MYSQL_PREFIX?}_surfbar_urls` AS u
+	`{?_MYSQL_PREFIX?}_surfbar_urls` AS `u`
 INNER JOIN
-	`{?_MYSQL_PREFIX?}_user_data` AS d
+	`{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-	u.`url_userid`=d.`userid`
+	`u`.`url_userid`=`d`.`userid`
 WHERE
-	u.`url_userid` NOT IN (%s) AND
-	u.`url_userid` IS NOT NULL AND
-	u.`url_status`='ACTIVE'
+	`u`.`url_userid` NOT IN (%s) AND
+	`u`.`url_userid` IS NOT NULL AND
+	`u`.`url_status`='ACTIVE'
 GROUP BY
-	u.`url_userid`
+	`u`.`url_userid`
 ORDER BY
-	u.`url_userid` ASC",
+	`u`.`url_userid` ASC",
 			array(getMemberId()), __FUNCTION__, __LINE__);
 	} else {
 		// Get all userid
-		$result = SQL_QUERY("SELECT
-	u.url_userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified
+		$result = sqlQuery("SELECT
+	`u`.`url_userid`,
+	UNIX_TIMESTAMP(`d`.`surfbar_low_notified`) AS `notified`
 FROM
-	`{?_MYSQL_PREFIX?}_surfbar_urls` AS u
+	`{?_MYSQL_PREFIX?}_surfbar_urls` AS `u`
 INNER JOIN
-	`{?_MYSQL_PREFIX?}_user_data` AS d
+	`{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-	u.`url_userid`=d.`userid`
+	`u`.`url_userid`=`d`.`userid`
 WHERE
-	u.`url_userid` > 0 AND
-	u.`url_status`='ACTIVE'
+	`u`.`url_userid` > 0 AND
+	`u`.`url_status`='ACTIVE'
 GROUP BY
-	u.`url_userid`
+	`u`.`url_userid`
 ORDER BY
-	u.`url_userid` ASC", __FUNCTION__, __LINE__);
+	`u`.`url_userid` ASC", __FUNCTION__, __LINE__);
 	}
 
 	// Load all userid
-	while ($content = SQL_FETCHARRAY($result)) {
+	while ($content = sqlFetchArray($result)) {
 		// Get total points
 		$points = getTotalPoints($content['url_userid']);
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $content['url_userid'] . ',points=' . $points);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $content['url_userid'] . ',points=' . $points);
 
 		// Shall we add this to ignore?
 		if ($points <= $limit) {
 			// Ignore this one!
-			/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $content['url_userid'] . ' has depleted points amount!');
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $content['url_userid'] . ' has depleted points amount!');
 			$userids['url_userid'][$content['url_userid']] = $content['url_userid'];
 			$userids['points'][$content['url_userid']]     = $points;
 			$userids['notified'][$content['url_userid']]   = $content['notified'];
@@ -1353,10 +1356,10 @@ ORDER BY
 	} // END - while
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Debug message
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UIDs::count=' . count($userids) . ' (with own userid=' . getMemberId() . ')');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UIDs::count=' . count($userids) . ' (with own userid=' . getMemberId() . ')');
 
 	// Return result
 	return $userids;
@@ -1365,7 +1368,7 @@ ORDER BY
 // Determine how many users are Online in surfbar
 function determineSurfbarTotalOnline () {
 	// Count all users in surfbar modue and return the value
-	$result = SQL_QUERY('SELECT
+	$result = sqlQuery('SELECT
 	`stats_id`
 FROM
 	`{?_MYSQL_PREFIX?}_surfbar_stats`
@@ -1375,10 +1378,10 @@ GROUP BY
 	`stats_userid` ASC', __FUNCTION__, __LINE__);
 
 	// Fetch count
-	$count = SQL_NUMROWS($result);
+	$count = sqlNumRows($result);
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return result
 	return $count;
@@ -1389,14 +1392,14 @@ function determineSurfbarWaitingTime () {
 	// Get fixed reload lock
 	$fixed = getSurfbarFixedWaitingTime();
 
-	// Is the fixed reload time set?
+	// Is the URL's fixed waiting time set?
 	if ($fixed > 0) {
 		// Return it
 		return $fixed;
 	} // END - if
 
 	// Static time is default
-	$time = getConfig('surfbar_static_time');
+	$time = getSurfbarStaticTime();
 
 	// Which payment model do we have?
 	if (getSurfbarPaymentModel() == 'DYNAMIC') {
@@ -1410,37 +1413,36 @@ function determineSurfbarWaitingTime () {
 
 // Changes the status of an URL from given to other
 function changeSurfbarUrlStatus ($urlId, $prevStatus, $newStatus, $data = array()) {
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',prevStatus=' . $prevStatus . ',data[]=' . gettype($data) . ',newStatus=' . $newStatus . ' - ENTERED!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',prevStatus=' . $prevStatus . ',data[]=' . gettype($data) . ',newStatus=' . $newStatus . ' - ENTERED!');
 	// Make new status always lower-case
 	$newStatus = strtolower($newStatus);
 
 	// Get URL data for status comparison if missing
-	if ((!is_array($data)) || (count($data) == 0)) {
+	if (!isFilledArray($data)) {
 		// Fetch missing URL data
 		$data = getSurfbarUrlData($urlId);
 	} // END - if
 
 	// Prepare array
-	$filterData =  array(
+	$filterData = array(
 		'url_id'      => $urlId,
 		'prev_status' => $prevStatus,
 		'new_status'  => $newStatus,
 		'data'        => $data,
-		'abort'       => NULL
 	);
 
 	// Run pre filter chain
 	$filterData = runFilterChain('pre_change_surfbar_url_status', $filterData);
 
 	// Abort here?
-	if (!is_null($filterData['abort'])) {
+	if (isFilterChainAborted()) {
 		// Abort here
-		return $filterData['abort'];
+		return FALSE;
 	} // END - if
 
 	// Update the status now
 	// ---------- Comment out for debugging/developing member actions! ---------
-	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `url_status`='%s' WHERE `url_id`=%s LIMIT 1",
+	sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `url_status`='%s' WHERE `url_id`=%s LIMIT 1",
 		array(
 			$newStatus,
 			bigintval($urlId)
@@ -1449,7 +1451,7 @@ function changeSurfbarUrlStatus ($urlId, $prevStatus, $newStatus, $data = array(
 
 	// Was that fine?
 	// ---------- Comment out for debugging/developing member actions! ---------
-	if (SQL_AFFECTEDROWS() != 1) {
+	if (sqlAffectedRows() != 1) {
 		// No, something went wrong
 		return FALSE;
 	} // END - if
@@ -1462,7 +1464,7 @@ function changeSurfbarUrlStatus ($urlId, $prevStatus, $newStatus, $data = array(
 	assert(isset($filterData['data']));
 
 	// All done!
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',prevStatus=' . $prevStatus . ',newStatus=' . $newStatus . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',prevStatus=' . $prevStatus . ',newStatus=' . $newStatus . ' - EXIT!');
 	return TRUE;
 }
 
@@ -1550,7 +1552,7 @@ function getSurfbarLockIdsArray () {
 	$ignored = array();
 
 	// Get all id from locks within the timestamp
-	$result = SQL_QUERY_ESC("SELECT
+	$result = sqlQueryEscaped("SELECT
 	`locks_id`,
 	`locks_url_id`,
 	UNIX_TIMESTAMP(`locks_last_surfed`) AS `last_surfed`
@@ -1563,19 +1565,19 @@ ORDER BY
 	__FUNCTION__, __LINE__);
 
 	// Load all entries
-	while ($content = SQL_FETCHARRAY($result)) {
+	while ($content = sqlFetchArray($result)) {
 		// Debug message
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'next - lid='.$content['locks_id'].',url='.$content['locks_url_id'].',rest='.(time() - $content['last_surfed']).'/'.getSurfbarSurfLock());
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'next - lid='.$content['locks_id'].',url='.$content['locks_url_id'].',rest='.(time() - $content['last_surfed']).'/'.getSurfbarSurfLock());
 
 		// Skip entries that are too old
 		if (($content['last_surfed'] > (time() - getSurfbarSurfLock())) && (!in_array($content['locks_url_id'], $ignored))) {
 			// Debug message
-			/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'okay - lid='.$content['locks_id'].',url='.$content['locks_url_id'].',last='.$content['last_surfed']);
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'okay - lid='.$content['locks_id'].',url='.$content['locks_url_id'].',last='.$content['last_surfed']);
 
 			// Add only if missing or bigger
 			if ((!isset($IDs[$content['locks_url_id']])) || ($IDs[$content['locks_url_id']] > $content['last_surfed'])) {
 				// Debug message
-				/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ADD - lid='.$content['locks_id'].',url='.$content['locks_url_id'].',last='.$content['last_surfed']);
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ADD - lid='.$content['locks_id'].',url='.$content['locks_url_id'].',last='.$content['last_surfed']);
 
 				// Add this id
 				$IDs[$content['locks_url_id']] = $content['last_surfed'];
@@ -1583,7 +1585,7 @@ ORDER BY
 			} // END - if
 		} else {
 			// Debug message
-			/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ignore - lid='.$content['locks_id'].',url='.$content['locks_url_id'].',last='.$content['last_surfed']);
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ignore - lid='.$content['locks_id'].',url='.$content['locks_url_id'].',last='.$content['last_surfed']);
 
 			// Ignore these old entries!
 			array_push($ignored, $content['locks_url_id']);
@@ -1593,7 +1595,7 @@ ORDER BY
 	} // END - while
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return array
 	return $USE;
@@ -1602,34 +1604,34 @@ ORDER BY
 // "Getter" for maximum random number
 function getSurfbarMaximumRandom ($userids, $add) {
 	// Count max availabe entries
-	$result = SQL_QUERY("SELECT
-	sbu.url_id AS cnt
+	$result = sqlQuery("SELECT
+	`sbu`.`url_id` AS `cnt`
 FROM
-	`{?_MYSQL_PREFIX?}_surfbar_urls` AS sbu
+	`{?_MYSQL_PREFIX?}_surfbar_urls` AS `sbu`
 LEFT JOIN
-	`{?_MYSQL_PREFIX?}_surfbar_salts` AS sbs
+	`{?_MYSQL_PREFIX?}_surfbar_salts` AS `sbs`
 ON
-	sbu.url_id=sbs.salts_url_id
+	`sbu`.`url_id`=`sbs`.`salts_url_id`
 LEFT JOIN
-	`{?_MYSQL_PREFIX?}_surfbar_locks` AS l
+	`{?_MYSQL_PREFIX?}_surfbar_locks` AS `l`
 ON
-	sbu.url_id=l.locks_url_id
+	`sbu`.`url_id`=`l`.`locks_url_id`
 WHERE
-	sbu.url_userid NOT IN (" . implode(',', $userids) . ") AND
-	(sbu.url_views_allowed=0 OR (sbu.url_views_allowed > 0 AND sbu.url_views_max > 0)) AND
-	sbu.url_status='ACTIVE'
+	`sbu`.`url_userid` NOT IN (" . implode(',', $userids) . ") AND
+	(`sbu`.`url_views_allowed`=0 OR (`sbu`.`url_views_allowed` > 0 AND `sbu`.`url_views_max` > 0)) AND
+	`sbu`.`url_status`='ACTIVE'
 	" . $add . "
 GROUP BY
-	sbu.url_id ASC", __FUNCTION__, __LINE__);
+	`sbu`.`url_id` ASC", __FUNCTION__, __LINE__);
 
 	// Log last query
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'lastQuery='.getConfig('db_last_query').'|numRows='.SQL_NUMROWS($result).'|Affected='.SQL_AFFECTEDROWS());
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'lastQuery='.getConfig('db_last_query').'|numRows='.sqlNumRows($result).'|Affected='.sqlAffectedRows());
 
 	// Fetch max rand
-	$maxRand = SQL_NUMROWS($result);
+	$maxRand = sqlNumRows($result);
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return value
 	return $maxRand;
@@ -1641,37 +1643,38 @@ function getSurfbarUserUrls () {
 	$urlArray = array();
 
 	// Begin the query
-	$result = SQL_QUERY_ESC("SELECT
-	u.`url_id`,
-	u.`url_userid`,
-	u.`url`,
-	u.`url_status`,
-	u.`url_views_total`,
-	u.`url_views_max`,
-	u.`url_views_allowed`,
-	UNIX_TIMESTAMP(u.`url_registered`) AS `url_registered`,
-	UNIX_TIMESTAMP(u.`url_last_locked`) AS `url_last_locked`,
-	u.`url_lock_reason`
+	$result = sqlQueryEscaped("SELECT
+	`u`.`url_id`,
+	`u`.`url_userid`,
+	`u`.`url_package_id`,
+	`u`.`url`,
+	`u`.`url_status`,
+	`u`.`url_views_total`,
+	`u`.`url_views_max`,
+	`u`.`url_views_allowed`,
+	UNIX_TIMESTAMP(`u`.`url_registered`) AS `url_registered`,
+	UNIX_TIMESTAMP(`u`.`url_last_locked`) AS `url_last_locked`,
+	`u`.`url_lock_reason`
 FROM
-	`{?_MYSQL_PREFIX?}_surfbar_urls` AS u
+	`{?_MYSQL_PREFIX?}_surfbar_urls` AS `u`
 WHERE
-	u.`url_userid`=%s AND
-	u.`url_status` != 'DELETED'
+	`u`.`url_userid`=%s AND
+	`u`.`url_status` != 'DELETED'
 ORDER BY
-	u.`url_id` ASC",
+	`u`.`url_id` ASC",
 		array(getMemberId()), __FUNCTION__, __LINE__);
 
 	// Are there entries?
-	if (!SQL_HASZERONUMS($result)) {
+	if (!ifSqlHasZeroNumRows($result)) {
 		// Load all rows
-		while ($row = SQL_FETCHARRAY($result)) {
+		while ($row = sqlFetchArray($result)) {
 			// Add the row
 			$urlArray[$row['url_id']] = $row;
 		} // END - while
 	} // END - if
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return the array
 	return $urlArray;
@@ -1683,20 +1686,20 @@ function getSurfbarArrayFromStatus ($status) {
 	$returnArray = array();
 
 	// Get all assigned actions
-	$result = SQL_QUERY_ESC("SELECT `actions_action` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `actions_status`='%s' ORDER BY `actions_id` ASC",
+	$result = sqlQueryEscaped("SELECT `actions_action` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `actions_status`='%s' ORDER BY `actions_id` ASC",
 		array($status), __FUNCTION__, __LINE__);
 
 	// Some entries there?
-	if (!SQL_HASZERONUMS($result)) {
+	if (!ifSqlHasZeroNumRows($result)) {
 		// Load all actions
 		// @TODO This can be somehow rewritten
-		while ($content = SQL_FETCHARRAY($result)) {
+		while ($content = sqlFetchArray($result)) {
 			array_push($returnArray, $content['actions_action']);
 		} // END - if
 	} // END - if
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return result
 	return $returnArray;
@@ -1705,7 +1708,7 @@ function getSurfbarArrayFromStatus ($status) {
 // Reload to configured stop page
 function redirectToSurfbarStopPage ($page = 'stop') {
 	// Internal or external?
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'page=' . $page . ' - ENTERED!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'page=' . $page . ' - ENTERED!');
 	if ((getConfig('surfbar_pause_mode') == 'INTERNAL') || (getConfig('surfbar_pause_url') == '')) {
 		// Reload to internal page
 		redirectToUrl('surfbar.php?frame=' . $page);
@@ -1720,7 +1723,7 @@ function redirectToSurfbarStopPage ($page = 'stop') {
  * before you call other getters below this function!
  */
 function determineSurfbarNextId ($urlId = NULL) {
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ' - ENTERED!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ' - ENTERED!');
 	// Default is no id and no random number
 	$nextId = '0';
 	$randNum = '0';
@@ -1732,9 +1735,9 @@ function determineSurfbarNextId ($urlId = NULL) {
 
 		// Shall we add some URL ids to ignore?
 		$add = '';
-		if (count($USE) > 0) {
+		if (isFilledArray($USE)) {
 			// Ignore some!
-			$add = " AND sbu.`url_id` NOT IN (";
+			$add = " AND `sbu`.`url_id` NOT IN (";
 			foreach ($USE as $url_id => $lid) {
 				// Add URL id
 				$add .= $url_id.',';
@@ -1757,79 +1760,81 @@ function determineSurfbarNextId ($urlId = NULL) {
 		} // END - if
 
 		// And query the database
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'randNum='.$randNum.',maxRand='.$maxRand.',surfLock='.getSurfbarSurfLock());
-		$result = SQL_QUERY_ESC("SELECT
-	sbu.url_id,
-	sbu.url_userid,
-	sbu.url,
-	sbs.salts_last_salt,
-	sbu.url_views_total,
-	sbu.url_views_max,
-	sbu.url_views_allowed,
-	UNIX_TIMESTAMP(l.locks_last_surfed) AS last_surfed,
-	sbu.url_fixed_reload
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'randNum='.$randNum.',maxRand='.$maxRand.',surfLock='.getSurfbarSurfLock());
+		$result = sqlQueryEscaped("SELECT
+	`sbu`.`url_id`,
+	`sbu`.`url_userid`,
+	`sbu`.`url_package_id`,
+	`sbu`.`url`,
+	`sbs`.`salts_last_salt`,
+	`sbu`.`url_views_total`,
+	`sbu`.`url_views_max`,
+	`sbu`.`url_views_allowed`,
+	UNIX_TIMESTAMP(`l`.`locks_last_surfed`) AS `last_surfed`,
+	`sbu`.`url_fixed_reload`
 FROM
-	`{?_MYSQL_PREFIX?}_surfbar_urls` AS sbu
+	`{?_MYSQL_PREFIX?}_surfbar_urls` AS `sbu`
 LEFT JOIN
-	`{?_MYSQL_PREFIX?}_surfbar_salts` AS sbs
+	`{?_MYSQL_PREFIX?}_surfbar_salts` AS `sbs`
 ON
-	sbu.url_id=sbs.salts_url_id
+	`sbu`.`url_id`=`sbs`.`salts_url_id`
 LEFT JOIN
-	`{?_MYSQL_PREFIX?}_surfbar_locks` AS l
+	`{?_MYSQL_PREFIX?}_surfbar_locks` AS `l`
 ON
-	sbu.url_id=l.locks_url_id
+	`sbu`.`url_id`=`l`.`locks_url_id`
 WHERE
-	(sbu.`url_userid` NOT IN (".implode(',', $userids['url_userid']).") OR sbu.`url_userid` IS NULL) AND
-	sbu.url_status='ACTIVE' AND
-	(sbu.url_views_allowed=0 OR (sbu.url_views_allowed > 0 AND sbu.url_views_max > 0))
+	(`sbu`.`url_userid` NOT IN (" . implode(',', $userids['url_userid']) . ") OR `sbu`.`url_userid` IS NULL) AND
+	`sbu`.`url_status`='ACTIVE' AND
+	(`sbu`.`url_views_allowed`=0 OR (`sbu`.`url_views_allowed` > 0 AND `sbu`.`url_views_max` > 0))
 	" . $add . "
 GROUP BY
-	sbu.`url_id`
+	`sbu`.`url_id`
 ORDER BY
-	l.locks_last_surfed ASC,
-	sbu.url_id ASC
+	`l`.`locks_last_surfed` ASC,
+	`sbu`.`url_id` ASC
 LIMIT %s,1",
 			array($randNum), __FUNCTION__, __LINE__
 		);
 	} else {
 		// Get data from specified id number
-		$result = SQL_QUERY_ESC("SELECT
-	sbu.url_id,
-	sbu.url_userid,
-	sbu.url,
-	sbs.salts_last_salt,
-	sbu.url_views_total,
-	sbu.url_views_max,
-	sbu.url_views_allowed,
-	UNIX_TIMESTAMP(l.locks_last_surfed) AS last_surfed,
-	sbu.url_fixed_reload
+		$result = sqlQueryEscaped("SELECT
+	`sbu`.`url_id`,
+	`sbu`.`url_userid`,
+	`sbu`.`url_package_id`,
+	`sbu`.`url`,
+	`sbs`.`salts_last_salt`,
+	`sbu`.`url_views_total`,
+	`sbu`.`url_views_max`,
+	`sbu`.`url_views_allowed`,
+	UNIX_TIMESTAMP(`l`.`locks_last_surfed`) AS `last_surfed`,
+	`sbu`.`url_fixed_reload`
 FROM
-	`{?_MYSQL_PREFIX?}_surfbar_urls` AS sbu
+	`{?_MYSQL_PREFIX?}_surfbar_urls` AS `sbu`
 LEFT JOIN
-	`{?_MYSQL_PREFIX?}_surfbar_salts` AS sbs
+	`{?_MYSQL_PREFIX?}_surfbar_salts` AS `sbs`
 ON
-	sbu.url_id=sbs.salts_url_id
+	`sbu`.`url_id`=`sbs`.`salts_url_id`
 LEFT JOIN
-	`{?_MYSQL_PREFIX?}_surfbar_locks` AS l
+	`{?_MYSQL_PREFIX?}_surfbar_locks` AS `l`
 ON
-	sbu.url_id=l.locks_url_id
+	`sbu`.`url_id`=`l`.`locks_url_id`
 WHERE
-	(sbu.url_userid != %s OR sbu.url_userid IS NULL) AND
-	sbu.url_status='ACTIVE' AND
-	sbu.url_id=%s AND
-	(sbu.url_views_allowed=0 OR (sbu.url_views_allowed > 0 AND sbu.url_views_max > 0))
+	(`sbu`.`url_userid` != %s OR `sbu`.`url_userid` IS NULL) AND
+	`sbu`.`url_status`='ACTIVE' AND
+	`sbu`.`url_id`=%s AND
+	(`sbu`.`url_views_allowed` = 0 OR (`sbu`.`url_views_allowed` > 0 AND `sbu`.`url_views_max` > 0))
 LIMIT 1",
 			array(getMemberId(), bigintval($urlId)), __FUNCTION__, __LINE__
 		);
 	}
 
 	// Is there an id number?
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'lastQuery='.getConfig('db_last_query').'|numRows='.SQL_NUMROWS($result).'|Affected='.SQL_AFFECTEDROWS());
-	if (SQL_NUMROWS($result) == 1) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'lastQuery='.getConfig('db_last_query').'|numRows='.sqlNumRows($result).'|Affected='.sqlAffectedRows());
+	if (sqlNumRows($result) == 1) {
 		// Load/cache data
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'count('.count($GLOBALS['surfbar_cache']).') - BEFORE', FALSE);
-		$GLOBALS['surfbar_cache'] = merge_array($GLOBALS['surfbar_cache'], SQL_FETCHARRAY($result));
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'count('.count($GLOBALS['surfbar_cache']).') - AFTER', FALSE);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'count('.count($GLOBALS['surfbar_cache']).') - BEFORE', FALSE);
+		$GLOBALS['surfbar_cache'] = merge_array($GLOBALS['surfbar_cache'], sqlFetchArray($result));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'count('.count($GLOBALS['surfbar_cache']).') - AFTER', FALSE);
 
 		// Determine waiting time
 		$GLOBALS['surfbar_cache']['waiting'] = determineSurfbarWaitingTime();
@@ -1837,28 +1842,28 @@ LIMIT 1",
 		// Is the last salt there?
 		if (is_null($GLOBALS['surfbar_cache']['salts_last_salt'])) {
 			// Then repair it wit the static!
-			/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'last_salt - FIXED!', FALSE);
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'last_salt - FIXED!', FALSE);
 			$GLOBALS['surfbar_cache']['salts_last_salt'] = '';
 		} // END - if
 
 		// Fix missing last_surfed
 		if ((!isset($GLOBALS['surfbar_cache']['last_surfed'])) || (is_null($GLOBALS['surfbar_cache']['last_surfed']))) {
 			// Fix it here
-			/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'last_surfed - FIXED!', FALSE);
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'last_surfed - FIXED!', FALSE);
 			$GLOBALS['surfbar_cache']['last_surfed'] = '0';
 		} // END - if
 
 		// Get base/fixed reward and costs
 		$GLOBALS['surfbar_cache']['reward'] = determineSurfbarReward();
 		$GLOBALS['surfbar_cache']['costs']  = determineSurfbarCosts();
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'BASE/STATIC - reward='.getSurfbarReward().'|costs='.getSurfbarCosts());
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'BASE/STATIC - reward='.getSurfbarReward().'|costs='.getSurfbarCosts());
 
 		// Only in dynamic model add the dynamic bonus!
 		if (getSurfbarPaymentModel() == 'DYNAMIC') {
 			// Calculate dynamic reward/costs and add it
 			$GLOBALS['surfbar_cache']['reward'] += calculateSurfbarDynamicAddValue();
 			$GLOBALS['surfbar_cache']['costs']  += calculateSurfbarDynamicAddValue();
-			/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'DYNAMIC+ - reward='.getSurfbarReward().'|costs='.getSurfbarCosts());
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'DYNAMIC+ - reward='.getSurfbarReward().'|costs='.getSurfbarCosts());
 		} // END - if
 
 		// Now get the id
@@ -1866,13 +1871,31 @@ LIMIT 1",
 	} // END - if
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return result
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',nextId=' . $nextId . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',nextId=' . $nextId . ' - EXIT!');
 	return $nextId;
 }
 
+// Generates an URL to the given booking package
+function generateSurfbarPackageLink ($packageId) {
+	// Base URL
+	$url  = '{%url=modules.php?module=admin&amp;what=list_surfbar_packages';
+
+	// Is package id given?
+	if (isValidId($packageId)) {
+		// Then add it
+		$url .= '&amp;package_id=' . bigintval($packageId);
+	} // END - if
+
+	// Finish URL EL code
+	$url .= '%}';
+
+	// Return it
+	return $url;
+}
+
 //-----------------------------------------------------------------------------
 // Wrapper function
 //-----------------------------------------------------------------------------
@@ -1978,7 +2001,7 @@ function isSurfbarAutoStartEnabled () {
 	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
-		$GLOBALS[__FUNCTION__] = (getSurfbarAutoStart() == 'Y');
+		$GLOBALS[__FUNCTION__] = ((isConfigEntry('surfbar_auto_start')) && (getSurfbarAutoStart() == 'Y'));
 	} // END - if
 
 	// Return cache
@@ -2126,7 +2149,7 @@ function initSurfbar () {
 // Private getter for data elements
 function getSurfbarData ($element) {
 	// Debug message
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ' - ENTERED!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ' - ENTERED!');
 
 	// Default is null
 	$data = NULL;
@@ -2138,7 +2161,7 @@ function getSurfbarData ($element) {
 	} // END - if
 
 	// Return result
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element[' . $element . ']=[' . gettype($data) . ']' . $data . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element[' . $element . ']=[' . gettype($data) . ']' . $data . ' - EXIT!');
 	return $data;
 }
 
@@ -2214,6 +2237,12 @@ function getSurfbarFixedWaitingTime () {
 	return getSurfbarData('url_fixed_waiting');
 }
 
+// Getter for package id
+function getSurfbarPackageId () {
+	// Get data element and return its contents
+	return getSurfbarData('url_package_id');
+}
+
 // Getter for surf lock
 function getSurfbarSurfLock () {
 	// Get data element and return its contents