X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fsurfbar_functions.php;h=3939b0e40774716a310ddefc47c7f45934b8a9a2;hp=01173c9de3033f72a4ceca5cc46c3f8c4f4c8cc4;hb=cf3765c38cf0a76f396aca291f71858936e92956;hpb=b6a10f5ccfe2ff6e9e5c43f42e33966ae25ffbaa

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 01173c9de3..3939b0e407 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -216,7 +216,7 @@ function SURFBAR_MEMBER_ACTIONS ($urlId, $status) {
 }
 
 // Do the member form request
-function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
+function SURFBAR_MEMBER_DO_FORM ($formData, $urlArray) {
 	// By default no action is performed
 	$performed = false;
 
@@ -227,10 +227,10 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
 	} elseif ((!isset($formData['id'])) || (!isset($formData['action']))) {
 		// Important form elements are missing!
 		return false;
-	} elseif (!isset($URLs[$formData['id']])) {
+	} elseif (!isset($urlArray[$formData['id']])) {
 		// id not found in cache
 		return false;
-	} elseif (!SURFBAR_VALIDATE_MEMBER_ACTION_STATUS($formData['action'], $URLs[$formData['id']]['url_status'])) {
+	} elseif (!SURFBAR_VALIDATE_MEMBER_ACTION_STATUS($formData['action'], $urlArray[$formData['id']]['url_status'])) {
 		// Action not allowed for current URL status
 		return false;
 	}
@@ -250,10 +250,10 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
 	// Is the function there?
 	if (function_exists($functionName)) {
 		// Add new status
-		$URLs[$formData['id']]['new_status'] = SURFBAR_GET_NEW_STATUS('new_status');
+		$urlArray[$formData['id']]['new_status'] = SURFBAR_GET_NEW_STATUS('new_status');
 
 		// Extract URL data for call-back
-		$urlData = array(merge_array($URLs[$formData['id']], array($action => $formData)));
+		$urlData = array(merge_array($urlArray[$formData['id']], array($action => $formData)));
 
 		// Action found so execute it
 		$performed = call_user_func_array($functionName, $urlData);
@@ -298,7 +298,7 @@ function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) {
 function SURFBAR_MEMBER_RETREAT_ACTION ($urlData) {
 	// Create the data array for next function call
 	$data = array(
-	$urlData['id'] => $urlData
+		$urlData['id'] => $urlData
 	);
 
 	// Simply change the status here
@@ -309,7 +309,7 @@ function SURFBAR_MEMBER_RETREAT_ACTION ($urlData) {
 function SURFBAR_MEMBER_BOOKNOW_ACTION ($urlData) {
 	// Create the data array for next function call
 	$data = array(
-	$urlData['id'] => $urlData
+		$urlData['id'] => $urlData
 	);
 
 	// Simply change the status here
@@ -366,12 +366,6 @@ function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) {
 	// Translate some data if present
 	$content = SURFBAR_PREPARE_CONTENT_FOR_TEMPLATE($content);
 
-	// 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
@@ -418,7 +412,7 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) {
 		} // END - if
 	} else {
 		// Not found!
-		addFatalMessage(__FUNCTION__, __LINE__, getMessage('MEMBER_SURFBAR_EXECUTE_ACTION_404'), $functionName);
+		addFatalMessage(__FUNCTION__, __LINE__, '{--MEMBER_SURFBAR_EXECUTE_ACTION_404--}', $functionName);
 	}
 
 	// Return status
@@ -488,16 +482,14 @@ function SURFBAR_HANDLE_LOW_POINTS () {
 	$userids = SURFBAR_DETERMINE_DEPLETED_USERIDS(getConfig('surfbar_warn_low_points'));
 
 	// "Walk" through all URLs
-	foreach ($userids['userid'] as $userid => $dummy) {
+	foreach ($userids['url_userid'] as $userid => $dummy) {
 		// Is the last notification far enougth away to notify again?
 		if ((time() - $userids['notified'][$userid]) >= getConfig('surfbar_low_interval')) {
 			// Prepare content
 			$content = array(
-				'userid'      => $userid,
-				'low'      => translateComma(getConfig('surfbar_warn_low_points')),
-				'points'   => translateComma($userids['points'][$userid]),
-				'notified' => generateDateTime($userids['notified'][$userid]),
-				'interval' => createFancyTime(getConfig('surfbar_low_interval'))
+				'url_userid' => $userid,
+				'points'     => $userids['points'][$userid],
+				'notified'   => $userids['notified'][$userid]
 			);
 
 			// Notify this user
@@ -560,7 +552,7 @@ function SURFBAR_GET_URL_DATA ($searchTerm, $column = 'url_id', $order = 'url_id
 FROM
 	`{?_MYSQL_PREFIX?}_surfbar_urls`
 WHERE
-	`%s`='%s'".$add."
+	`%s`='%s'" . $add . "
 ORDER BY
 	`%s` %s
 %s",
@@ -626,9 +618,6 @@ function SURFBAR_REGISTER_URL ($url, $userid, $status = 'PENDING', $addMode = 'r
 		return false;
 	} // END - if
 
-	// Translate status and limit
-	$content['limit'] = translateSurfbarLimit($content['limit']);
-
 	// If in reg-mode we notify admin
 	if (($addMode == 'reg') || (getConfig('surfbar_notify_admin_unlock') == 'Y')) {
 		// Notify admin even when he as unlocked an email
@@ -686,13 +675,13 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) {
 	$content = SURFBAR_PREPARE_CONTENT_FOR_TEMPLATE($content);
 
 	// Send the notification out
-	return sendAdminNotification($subject, $templateName, $content, $content['userid']);
+	return sendAdminNotification($subject, $templateName, $content, $content['url_userid']);
 }
 
 // Notify the user about the performed action
 function SURFBAR_NOTIFY_USER ($messageType, $content) {
 	// Skip notification if userid is zero
-	if ($content['userid'] == '0') {
+	if ($content['url_userid'] == '0') {
 		return false;
 	} // END - if
 
@@ -707,29 +696,25 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
 	// Is the subject line there?
 	if ((substr($subject, 0, 1) == '!') && (substr($subject, -1, 1) == '!')) {
 		// Set default subject if following eval() wents wrong
-		$subject = getMessage('MEMBER_SURFBAR_NOTIFY_DEFAULT_SUBJECT');
+		$subject = '{--MEMBER_SURFBAR_NOTIFY_DEFAULT_SUBJECT--}';
 	} // END - if
 
 	// Translate some data if present
 	$content = SURFBAR_PREPARE_CONTENT_FOR_TEMPLATE($content);
 
 	// Load template
-	$mailText = loadEmailTemplate($templateName, $content, $content['userid']);
+	$mailText = loadEmailTemplate($templateName, $content, $content['url_userid']);
 
 	// Send the email
-	return sendEmail($content['userid'], $subject, $mailText);
+	return sendEmail($content['url_userid'], $subject, $mailText);
 }
 
 // Translates some data for template usage
 // @TODO Can't we use our new expression language instead of this ugly code?
 function SURFBAR_PREPARE_CONTENT_FOR_TEMPLATE ($content) {
 	// Prepare some code
-	if (isset($content['url_status']))      $content['url_status']      = translateSurfbarUrlStatus($content['url_status']);
 	if (isset($content['url_registered']))  $content['url_registered']  = generateDateTime($content['url_registered'], 2);
 	if (isset($content['url_last_locked'])) $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2);
-	if (isset($content['url_views_total'])) $content['url_views_total'] = translateComma($content['url_views_total']);
-	if (isset($content['url_views_allowed']))   $content['url_views_allowed']   = translateComma($content['url_views_allowed']);
-	if (isset($content['views_max']))       $content['views_max']       = translateComma($content['views_max']);
 
 	// Return translated content
 	return $content;
@@ -740,7 +725,7 @@ function translateSurfbarLimit ($limit) {
 	// Is this zero?
 	if ($limit == '0') {
 		// Unlimited!
-		$return = getMessage('MEMBER_SURFBAR_UNLIMITED_VIEWS');
+		$return = '{--MEMBER_SURFBAR_UNLIMITED_VIEWS--}';
 	} else {
 		// Translate comma
 		$return = translateComma($limit);
@@ -819,7 +804,7 @@ function SURFBAR_DETERMINE_TEMPLATE_NAME() {
 	if (isGetRequestParameterSet('frame')) {
 		// Use the frame as a template name part... ;-)
 		$templateName = sprintf("surfbar_frame_%s",
-		getRequestParameter('frame')
+			getRequestParameter('frame')
 		);
 	} // END - if
 
@@ -892,7 +877,7 @@ function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = '0') {
 	$userids = SURFBAR_DETERMINE_DEPLETED_USERIDS();
 
 	// If we dont get any user ids back, there are no URLs
-	if (count($userids['userid']) == 0) {
+	if (count($userids['url_userid']) == 0) {
 		// No user ids found, no URLs!
 		return 0;
 	} // END - if
@@ -900,7 +885,7 @@ function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = '0') {
 	// Is the exlude userid set?
 	if ($excludeUserId > 0) {
 		// Then add it
-		$userids['userid'][$excludeUserId] = $excludeUserId;
+		$userids['url_userid'][$excludeUserId] = $excludeUserId;
 	} // END - if
 
 	// Get amount from database
@@ -909,7 +894,7 @@ function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = '0') {
 FROM
 	`{?_MYSQL_PREFIX?}_surfbar_urls`
 WHERE
-	`url_userid` NOT IN (".implode(', ', $userids['userid']).") AND
+	`url_userid` NOT IN (".implode(', ', $userids['url_userid']).") AND
 	`url_status`='%s'
 LIMIT 1",
 		array($status), __FUNCTION__, __LINE__
@@ -1024,7 +1009,7 @@ function SURFBAR_CHECK_VALIDATION_CODE ($urlId, $check, $salt) {
 
 // Lockdown the userid/id combination (reload lock)
 function SURFBAR_LOCKDOWN_ID ($urlId) {
-	//* DEBUG: */ outputHtml('LOCK!');
+	//* DEBUG: */ debugOutput('LOCK!');
 	///* DEBUG: */ return;
 	// Just add it to the database
 	SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_locks` (`locks_userid`, `locks_url_id`) VALUES (%s, %s)",
@@ -1155,15 +1140,15 @@ LIMIT 1",
 function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) {
 	// Init array
 	$userids = array(
-		'userid'      => array(),
-		'points'   => array(),
-		'notified' => array(),
+		'url_userid'   => array(),
+		'points'       => array(),
+		'notified'     => array(),
 	);
 
 	// Do we have a current user id?
 	if ((isMember()) && ($limit == '0')) {
 		// Then add this as well
-		$userids['userid'][getMemberId()]      = getMemberId();
+		$userids['url_userid'][getMemberId()]      = getMemberId();
 		$userids['points'][getMemberId()]   = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
 		$userids['notified'][getMemberId()] = '0';
 
@@ -1204,16 +1189,16 @@ ORDER BY
 	// Load all userid
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Get total points
-		$points = countSumTotalData($content['userid'], 'user_points', 'points') - countSumTotalData($content['userid'], 'user_data', 'used_points');
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['userid']},points={$points}", false);
+		$points = countSumTotalData($content['url_userid'], 'user_points', 'points') - countSumTotalData($content['url_userid'], 'user_data', 'used_points');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['url_userid']},points={$points}", false);
 
 		// Shall we add this to ignore?
 		if ($points <= $limit) {
 			// Ignore this one!
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['userid']} has depleted points amount!", false);
-			$userids['userid'][$content['userid']]      = $content['userid'];
-			$userids['points'][$content['userid']]   = $points;
-			$userids['notified'][$content['userid']] = $content['notified'];
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['url_userid']} has depleted points amount!", false);
+			$userids['url_userid'][$content['url_userid']]      = $content['url_userid'];
+			$userids['points'][$content['url_userid']]   = $points;
+			$userids['notified'][$content['url_userid']] = $content['notified'];
 		} // END - if
 	} // END - while
 
@@ -1299,7 +1284,7 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array())
 
 	// Update the status now
 	// ---------- Comment out for debugging/developing member actions! ---------
-	//SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `status`='%s' WHERE `id`=%s LIMIT 1",
+	//SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `status`='%s' WHERE `url_id`=%s LIMIT 1",
 	//	array($newStatus, bigintval($urlId)), __FUNCTION__, __LINE__);
 	// ---------- Comment out for debugging/developing member actions! ---------
 
@@ -1312,7 +1297,7 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array())
 	// ---------- Comment out for debugging/developing member actions! ---------
 
 	// Prepare content for notification routines
-	$data[$urlId]['userid']         = $data[$urlId]['userid'];
+	$data[$urlId]['url_userid']  = $data[$urlId]['url_userid'];
 	$data[$urlId]['frametester'] = generateFrametesterUrl($data[$urlId]['url']);
 	$data[$urlId]['reward']      = translateComma(getConfig('surfbar_static_reward'));
 	$data[$urlId]['costs']       = translateComma(getConfig('surfbar_static_costs'));
@@ -1342,7 +1327,7 @@ function SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE () {
 	$percent = abs(log(getConfig('surfbar_dynamic_percent') / 100 + 1));
 
 	// Get total users
-	$totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true);
+	$totalUsers = getTotalConfirmedUser();
 
 	// Get online users
 	$onlineUsers = SURFBAR_DETERMINE_TOTAL_ONLINE();
@@ -1379,7 +1364,7 @@ function SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE () {
 	$percent = abs(log(getConfig('surfbar_dynamic_percent') / 100 + 1));
 
 	// Get total users
-	$totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true);
+	$totalUsers = getTotalConfirmedUser();
 
 	// Calculate addon
 	$addon += abs($max * $percent * $totalUsers);
@@ -1502,7 +1487,7 @@ GROUP BY
 // Load all URLs of the current user and return it as an array
 function SURFBAR_GET_USER_URLS () {
 	// Init array
-	$URLs = array();
+	$urlArray = array();
 
 	// Begin the query
 	$result = SQL_QUERY_ESC("SELECT
@@ -1530,7 +1515,7 @@ ORDER BY
 		// Load all rows
 		while ($row = SQL_FETCHARRAY($result)) {
 			// Add the row
-			$URLs[$row['id']] = $row;
+			$urlArray[$row['id']] = $row;
 		} // END - while
 	} // END - if
 
@@ -1538,7 +1523,7 @@ ORDER BY
 	SQL_FREERESULT($result);
 
 	// Return the array
-	return $URLs;
+	return $urlArray;
 }
 
 // "Getter" for member action array for given status
@@ -1608,7 +1593,7 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = '0') {
 		$userids = SURFBAR_DETERMINE_DEPLETED_USERIDS();
 
 		// Get maximum randomness factor
-		$maxRand = SURFBAR_GET_MAX_RANDOM($userids['userid'], $add);
+		$maxRand = SURFBAR_GET_MAX_RANDOM($userids['url_userid'], $add);
 
 		// If more than one URL can be called generate the random number!
 		if ($maxRand > 1) {
@@ -1639,7 +1624,7 @@ LEFT JOIN
 ON
 	sbu.url_id=l.locks_url_id
 WHERE
-	sbu.url_userid NOT IN (".implode(',', $userids['userid']).") AND
+	sbu.url_userid NOT IN (".implode(',', $userids['url_userid']).") AND
 	sbu.url_status='ACTIVE' AND
 	(sbu.url_views_allowed=0 OR (sbu.url_views_allowed > 0 AND sbu.url_views_max > 0))
 	".$add."
@@ -1756,14 +1741,14 @@ function SURFBAR_GET_DATA ($element) {
 		// Then take it
 		$data = $GLOBALS['surfbar_cache'][$element];
 	} else { // END - if
-		print("<pre>");
+		print('<pre>');
 		print_r($GLOBALS['surfbar_cache']);
-		print("</pre>");
-		debug_report_bug();
+		print('</pre>');
+		debug_report_bug(__FUNCTION__, __LINE__, 'Element ' . $element . ' not found.');
 	}
 
 	// Return result
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "element[$element]={$data}", false);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element[' . $element . ']=[' . gettype($data) . ']' . $data, false);
 	return $data;
 }