X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fsurfbar_functions.php;h=6e10e276e1c6a017be0022a2eff0cd80fb5419f9;hp=ad115ab2e51ac4892fb83a2a5f41f08d90068042;hb=4b93525eb57c07b89c127494a45ec3d5666fa71a;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index ad115ab2e5..6e10e276e1 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -197,11 +197,9 @@ function SURFBAR_MEMBER_ACTIONS ($urlId, $status) {
 	foreach ($actionArray as $actionId => $action) {
 		// Add form for this action
 		$OUT .= loadTemplate('member_surfbar_list_form', true, array(
-			'width'    => $width,
-			'id'       => bigintval($urlId),
-			'action'   => strtolower($action),
-			'title'    => '{--MEMBER_SURFBAR_ACTION_' . strtoupper($action) . '_TITLE--}',
-			'submit'   => '{--MEMBER_SURFBAR_ACTION_' . strtoupper($action) . '_SUBMIT--}',
+			'width'  => $width,
+			'url_id' => bigintval($urlId),
+			'action' => strtolower($action)
 		));
 	} // END - foreach
 
@@ -268,8 +266,8 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $urlArray) {
 // Validate if the requested action can be performed on current URL status
 function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) {
 	// Search for the requested action/status combination in database
-	$result = SQL_QUERY_ESC("SELECT new_status FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `action`='%s' AND `status`='%s' LIMIT 1",
-	array($action, $status), __FUNCTION__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT `actions_new_status` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `actions_action`='%s' AND `actions_status`='%s' LIMIT 1",
+		array($action, $status), __FUNCTION__, __LINE__);
 
 	// Is the entry there?
 	$isValid = (SQL_NUMROWS($result) == 1);
@@ -409,7 +407,7 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) {
 			$executed = SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['url_status'], $urlData['new_status'], array($urlData['id'] => $urlData));
 		} // END - if
 	} else {
-		// Not found!
+		// Not found
 		addFatalMessage(__FUNCTION__, __LINE__, '{--MEMBER_SURFBAR_EXECUTE_ACTION_404--}', $functionName);
 	}
 
@@ -665,7 +663,7 @@ function SURFBAR_NOTIFY_ADMIN ($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 = getMaskedMessage('ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT', strtoupper($messageType));
+		$subject = '{%message,ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT=' . strtoupper($messageType) . '%}';
 	} // END - if
 
 	// Translate some data if present
@@ -734,19 +732,67 @@ function translateSurfbarLimit ($limit) {
 
 // Translate the URL status
 function translateSurfbarUrlStatus ($status) {
-	// Return result
-	return sprintf("{--SURFBAR_URL_STATUS_%s--}", strtoupper($status));
+	// NULL must be handled carfefully
+	if (is_null($status)) {
+		// Is NULL, so return other language string
+		return '{--SURFBAR_URL_STATUS_NONE--}';
+	} else {
+		// Return regular result
+		return sprintf("{--SURFBAR_URL_STATUS_%s--}", strtoupper($status));
+	}
+}
+
+// Translates the given action into a link title for members
+function translateMemberSurfbarActionToTitle ($action) {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__][$action])) {
+		// Construct default return string (unknown
+		$GLOBALS[__FUNCTION__][$action] = '{%message,MEMBER_SURFBAR_ACTION_UNKNOWN_TITLE=' . $action . '%}';
+
+		// ... and the id's name
+		$messageId = 'MEMBER_SURFBAR_ACTION_' . strtoupper($action) . '_TITLE';
+
+		// Is the id there?
+		if (isMessageIdValid($messageId)) {
+			// Then use it
+			$GLOBALS[__FUNCTION__][$action] = '{--' . $messageId . '--}';
+		} // END - if
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__][$action];
+}
+
+// Translates the given action into a submit button for members
+function translateMemberSurfbarActionToSubmit ($action) {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__][$action])) {
+		// Construct default return string (unknown
+		$GLOBALS[__FUNCTION__][$action] = '{%message,MEMBER_SURFBAR_ACTION_UNKNOWN_SUBMIT=' . $action . '%}';
+
+		// ... and the id's name
+		$messageId = 'MEMBER_SURFBAR_ACTION_' . strtoupper($action) . '_SUBMIT';
+
+		// Is the id there?
+		if (isMessageIdValid($messageId)) {
+			// Then use it
+			$GLOBALS[__FUNCTION__][$action] = '{--' . $messageId . '--}';
+		} // END - if
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__][$action];
 }
 
 // Determine reward
-function SURFBAR_DETERMINE_REWARD ($onlyMin=false) {
+function SURFBAR_DETERMINE_REWARD ($onlyMin = false) {
 	// Static values are default
 	$reward = getConfig('surfbar_static_reward');
 
 	// Do we have static or dynamic?
-	if (getConfig('surfbar_pay_model') == 'DYNAMIC') {
+	if (getSurfbarPaymentModel() == 'DYNAMIC') {
 		// "Calculate" dynamic reward
-		if ($onlyMin) {
+		if ($onlyMin === true) {
 			$reward += SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE();
 		} else {
 			$reward += SURFBAR_CALCULATE_DYNAMIC_ADD();
@@ -763,7 +809,7 @@ function SURFBAR_DETERMINE_COSTS ($onlyMin=false) {
 	$costs  = getConfig('surfbar_static_costs');
 
 	// Do we have static or dynamic?
-	if (getConfig('surfbar_pay_model') == 'DYNAMIC') {
+	if (getSurfbarPaymentModel() == 'DYNAMIC') {
 		// "Calculate" dynamic costs
 		if ($onlyMin) {
 			$costs += SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE();
@@ -789,7 +835,7 @@ function SURFBAR_CALCULATE_DYNAMIC_ADD () {
 // Determine right template name
 function SURFBAR_DETERMINE_TEMPLATE_NAME() {
 	// Default is the frameset
-	$templateName = "surfbar_frameset";
+	$templateName = 'surfbar_frameset';
 
 	// Any frame set? ;-)
 	if (isGetRequestParameterSet('frame')) {
@@ -814,26 +860,26 @@ function SURFBAR_CHECK_RELOAD_FULL () {
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Fixed surf lock is '.getConfig('surfbar_static_lock') . '', false);
 
 	// Do we have dynamic model?
-	if (getConfig('surfbar_pay_model') == 'DYNAMIC') {
+	if (getSurfbarPaymentModel() == 'DYNAMIC') {
 		// "Calculate" dynamic lock
 		$GLOBALS['surfbar_cache']['surf_lock'] += SURFBAR_CALCULATE_DYNAMIC_ADD();
 	} // END - if
 
 	// Ask the database
 	$result = SQL_QUERY_ESC("SELECT
-	COUNT(l.locks_id) AS cnt
+	COUNT(l.`locks_id`) AS `cnt`
 FROM
 	`{?_MYSQL_PREFIX?}_surfbar_locks` AS l
 INNER JOIN
 	`{?_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() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(l.locks_last_surfed) AND
+	l.`locks_userid`=%s AND
+	(UNIX_TIMESTAMP() - {%%pipe,SURFBAR_GET_SURF_LOCK%%}) < 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__
@@ -907,7 +953,7 @@ LIMIT 1",
 // Check wether the user is allowed to book more URLs
 function SURFBAR_IF_USER_BOOK_MORE_URLS ($userid = '0') {
 	// Is this admin and userid is zero or does the user has some URLs left to book?
-	return ((($userid == '0') && (isAdmin())) || (SURFBAR_GET_TOTAL_USER_URLS($userid, '', array('REJECTED')) < getConfig('surfbar_max_order')));
+	return ((($userid == '0') && (isAdmin())) || (SURFBAR_GET_TOTAL_USER_URLS($userid, '', array('REJECTED')) < getSurfbarMaxOrder()));
 }
 
 // Get total amount of URLs of given status for current user
@@ -918,7 +964,7 @@ function SURFBAR_GET_TOTAL_USER_URLS ($userid = '0', $status = '', $exclude = ''
 		$userid = getMemberId();
 	} elseif ($userid == '0') {
 		// Error!
-		return (getConfig('surfbar_max_order') + 1);
+		return (getSurfbarMaxOrder() + 1);
 	}
 
 	// Default is all URLs
@@ -949,13 +995,19 @@ function SURFBAR_GET_TOTAL_USER_URLS ($userid = '0', $status = '', $exclude = ''
 // Generate a validation code for the given id number
 function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt = '') {
 	// @TODO Invalid salt should be refused
+	$length = '0';
 	$GLOBALS['surfbar_cache']['salt'] = 'INVALID';
 
-	// Get code length from config
-	$length = getCodeLength();
+	// Is extension ext-other there?
+	if (isExtensionActive('other')) {
+		// Get code length from config
+		$length = getCodeLength();
+	} // END - if
 
 	// Fix length to 10
-	if ($length == '0') $length = 10;
+	if ($length == '0') {
+		$length = 10;
+	} // END - if
 
 	// Generate a code until the length matches
 	$valCode = '';
@@ -972,7 +1024,7 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt = '') {
 		}
 
 		// ... and now the validation code
-		$valCode = generateRandomCode($length, sha1(SURFBAR_GET_SALT().':'.$urlId), getMemberId());
+		$valCode = generateRandomCode($length, sha1(SURFBAR_GET_SALT() . getEncryptSeperator() . $urlId), getMemberId());
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'valCode='.valCode.'', false);
 	} // END - while
 
@@ -1019,7 +1071,7 @@ function SURFBAR_PAY_POINTS () {
 	// Remove it from the URL owner
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.SURFBAR_GET_USERID().',costs='.SURFBAR_GET_COSTS().'', false);
 	if (isValidUserId(SURFBAR_GET_USERID())) {
-		subtractPoints(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), SURFBAR_GET_USERID(), SURFBAR_GET_COSTS());
+		subtractPoints(sprintf("surfbar_%s", getSurfbarPaymentModel()), SURFBAR_GET_USERID(), SURFBAR_GET_COSTS());
 	} // END - if
 
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getMemberId().',reward='.SURFBAR_GET_REWARD().'', false);
@@ -1027,7 +1079,7 @@ function SURFBAR_PAY_POINTS () {
 	unset($GLOBALS['ref_level']);
 
 	// Book it to the user
-	addPointsThroughReferalSystem(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), getMemberId(), SURFBAR_GET_REWARD());
+	addPointsThroughReferalSystem(sprintf("surfbar_%s", getSurfbarPaymentModel()), getMemberId(), SURFBAR_GET_REWARD());
 }
 
 // Updates the statistics of current URL/userid
@@ -1160,13 +1212,14 @@ FROM
 INNER JOIN
 	`{?_MYSQL_PREFIX?}_user_data` AS d
 ON
-	u.url_userid=d.userid
+	u.`url_userid`=d.`userid`
 WHERE
-	u.url_userid NOT IN (%s,0) AND u.url_status='ACTIVE'
+	u.`url_userid` NOT IN (%s,0) 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
@@ -1177,13 +1230,14 @@ FROM
 INNER JOIN
 	`{?_MYSQL_PREFIX?}_user_data` AS d
 ON
-	u.url_userid=d.userid
+	u.`url_userid`=d.`userid`
 WHERE
-	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
@@ -1249,7 +1303,7 @@ function SURFBAR_DETERMINE_WAIT_TIME () {
 	$time = getConfig('surfbar_static_time');
 
 	// Which payment model do we have?
-	if (getConfig('surfbar_pay_model') == 'DYNAMIC') {
+	if (getSurfbarPaymentModel() == 'DYNAMIC') {
 		// "Calculate" dynamic time
 		$time += SURFBAR_CALCULATE_DYNAMIC_ADD();
 	} // END - if
@@ -1499,13 +1553,13 @@ function SURFBAR_GET_USER_URLS () {
 	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
+	UNIX_TIMESTAMP(u.`url_last_locked`) AS `url_last_locked`,
+	u.`url_lock_reason`
 FROM
 	`{?_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",
 	array(getMemberId()), __FUNCTION__, __LINE__);
@@ -1515,7 +1569,7 @@ ORDER BY
 		// Load all rows
 		while ($row = SQL_FETCHARRAY($result)) {
 			// Add the row
-			$urlArray[$row['id']] = $row;
+			$urlArray[$row['url_id']] = $row;
 		} // END - while
 	} // END - if
 
@@ -1532,7 +1586,7 @@ function SURFBAR_GET_ARRAY_FROM_STATUS ($status) {
 	$returnArray = array();
 
 	// Get all assigned actions
-	$result = SQL_QUERY_ESC("SELECT `action` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `actions_status`='%s' ORDER BY `actions_id` ASC",
+	$result = SQL_QUERY_ESC("SELECT `actions_action` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `actions_status`='%s' ORDER BY `actions_id` ASC",
 		array($status), __FUNCTION__, __LINE__);
 
 	// Some entries there?
@@ -1540,7 +1594,7 @@ function SURFBAR_GET_ARRAY_FROM_STATUS ($status) {
 		// Load all actions
 		// @TODO This can be somehow rewritten
 		while ($content = SQL_FETCHARRAY($result)) {
-			$returnArray[] = $content['action'];
+			$returnArray[] = $content['actions_action'];
 		} // END - if
 	} // END - if
 
@@ -1579,7 +1633,7 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = '0') {
 		$add = '';
 		if (count($USE) > 0) {
 			// 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.',';
@@ -1624,12 +1678,12 @@ LEFT JOIN
 ON
 	sbu.url_id=l.locks_url_id
 WHERE
-	sbu.url_userid NOT IN (".implode(',', $userids['url_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."
 GROUP BY
-	sbu.url_id
+	sbu.`url_id`
 ORDER BY
 	l.locks_last_surfed ASC,
 	sbu.url_id ASC
@@ -1699,7 +1753,7 @@ LIMIT 1",
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'BASE/STATIC - reward='.SURFBAR_GET_REWARD().'|costs='.SURFBAR_GET_COSTS().'', false);
 
 		// Only in dynamic model add the dynamic bonus!
-		if (getConfig('surfbar_pay_model') == 'DYNAMIC') {
+		if (getSurfbarPaymentModel() == 'DYNAMIC') {
 			// Calculate dynamic reward/costs and add it
 			$GLOBALS['surfbar_cache']['reward'] += SURFBAR_CALCULATE_DYNAMIC_ADD();
 			$GLOBALS['surfbar_cache']['costs']  += SURFBAR_CALCULATE_DYNAMIC_ADD();
@@ -1725,49 +1779,61 @@ LIMIT 1",
 // "Getter" for surfbar_dynamic_percent
 function getSurfbarDynamicPercent () {
 	// Do we have cache?
-	if (!isset($GLOBALS['surfbar_dynamic_percent'])) {
+	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
-		$GLOBALS['surfbar_dynamic_percent'] = getConfig('surfbar_dynamic_percent');
+		$GLOBALS[__FUNCTION__] = getConfig('surfbar_dynamic_percent');
 	} // END - if
 
 	// Return cache
-	return $GLOBALS['surfbar_dynamic_percent'];
+	return $GLOBALS[__FUNCTION__];
 }
 
 // "Getter" for surfbar_static_reward
 function getSurfbarStaticReward () {
 	// Do we have cache?
-	if (!isset($GLOBALS['surfbar_static_reward'])) {
+	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
-		$GLOBALS['surfbar_static_reward'] = getConfig('surfbar_static_reward');
+		$GLOBALS[__FUNCTION__] = getConfig('surfbar_static_reward');
 	} // END - if
 
 	// Return cache
-	return $GLOBALS['surfbar_static_reward'];
+	return $GLOBALS[__FUNCTION__];
 }
 
 // "Getter" for surfbar_static_time
 function getSurfbarStaticTime () {
 	// Do we have cache?
-	if (!isset($GLOBALS['surfbar_static_time'])) {
+	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
-		$GLOBALS['surfbar_static_time'] = getConfig('surfbar_static_time');
+		$GLOBALS[__FUNCTION__] = getConfig('surfbar_static_time');
 	} // END - if
 
 	// Return cache
-	return $GLOBALS['surfbar_static_time'];
+	return $GLOBALS[__FUNCTION__];
 }
 
 // "Getter" for surfbar_max_order
 function getSurfbarMaxOrder () {
 	// Do we have cache?
-	if (!isset($GLOBALS['surfbar_max_order'])) {
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('surfbar_max_order');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for surfbar_payment_model
+function getSurfbarPaymentModel () {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
-		$GLOBALS['surfbar_max_order'] = getConfig('surfbar_max_order');
+		$GLOBALS[__FUNCTION__] = getConfig('surfbar_payment_model');
 	} // END - if
 
 	// Return cache
-	return $GLOBALS['surfbar_max_order'];
+	return $GLOBALS[__FUNCTION__];
 }
 
 // -----------------------------------------------------------------------------