X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fsurfbar_functions.php;h=f97cab7c4bd97c8e9d176b1c1d6e230e6ecd70b0;hb=c5e685ff1b1bd296243b9bfcd8921969fa09d53f;hp=5d7c8f9a1718018e83307b7e27b2342803f39f1a;hpb=1fe7cf281be6832ba105934537aba5127892c576;p=mailer.git

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 5d7c8f9a17..f97cab7c4b 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -146,8 +146,6 @@ function SURFBAR_ADMIN_REJECT_URL_IDS ($IDs) {
 //
 // Member has added an URL
 function SURFBAR_MEMBER_ADD_URL ($url, $limit) {
-	global $_CONFIG;
-
 	// Do some pre-checks
 	if (!IS_MEMBER()) {
 		// Not a member
@@ -247,7 +245,7 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
 	} else {
 		// Log invalid request
 		DEBUG_LOG(__FUNCTION__, __LINE__, " action={$formData['action']},id={$formData['id']},function={$functionName}");
-		addFatalMessage(sprintf("Invalid member action! action=%s,id=%s,function=%s", $formData['action'], $formData['id'], $functionName));
+		addFatalMessage("Invalid member action! action=%s,id=%s,function=%s", array($formData['action'], $formData['id'], $functionName));
 	}
 
 	// Return status
@@ -407,7 +405,7 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) {
 		} // END - if
 	} else {
 		// Not found!
-		addFatalMessage(sprintf(MEMBER_SURFBAR_EXECUTE_ACTION_404, $functionName));
+		addFatalMessage(MEMBER_SURFBAR_EXECUTE_ACTION_404, $functionName);
 	}
 
 	// Return status
@@ -474,10 +472,9 @@ function SURFBAR_HANDLE_DEPLETED_VIEWS () {
 		} // END - foreach
 	} // END - if
 }
+
 // Alert users which have URLs booked and are low on points amount
 function SURFBAR_HANDLE_LOW_POINTS () {
-	global $_CONFIG;
-
 	// Get all userids
 	$UIDs = SURFBAR_DETERMINE_DEPLETED_USERIDS(getConfig('surfbar_warn_low_points'));
 
@@ -503,11 +500,13 @@ function SURFBAR_HANDLE_LOW_POINTS () {
 		} // END - if
 	} // END - foreach
 }
+
 //
 // -----------------------------------------------------------------------------
 //                               Generic functions
 // -----------------------------------------------------------------------------
 //
+
 // Looks up by an URL
 function SURFBAR_LOOKUP_BY_URL ($url, $uid) {
 	// Now lookup that given URL by itself
@@ -516,6 +515,7 @@ function SURFBAR_LOOKUP_BY_URL ($url, $uid) {
 	// Was it found?
 	return (count($urlArray) > 0);
 }
+
 // Load URL data by given search term and column
 function SURFBAR_GET_URL_DATA ($searchTerm, $column="id", $order="id", $sort="ASC", $group="id", $add="") {
 	global $lastUrlData;
@@ -564,10 +564,9 @@ ORDER BY %s %s
 	// Return the result
 	return $lastUrlData;
 }
+
 // Registers an URL with the surfbar. You should have called SURFBAR_LOOKUP_BY_URL() first!
 function SURFBAR_REGISTER_URL ($url, $uid, $status="PENDING", $addMode="reg", $extraFields = array()) {
-	global $_CONFIG;
-
 	// Make sure by the user registered URLs are always pending
 	if ($addMode == "reg") $status = "PENDING";
 
@@ -607,6 +606,7 @@ function SURFBAR_REGISTER_URL ($url, $uid, $status="PENDING", $addMode="reg", $e
 	// Return the insert id
 	return $content['insert_id'];
 }
+
 // Inserts an url by given data array and return the insert id
 function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
 	// Get userid
@@ -630,25 +630,22 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
 	// Return insert id
 	return SQL_INSERTID();
 }
+
 // Notify admin(s) with a selected message and content
 function SURFBAR_NOTIFY_ADMIN ($messageType, $content) {
 	// Prepare template name
 	$templateName = sprintf("admin_surfbar_%s", $messageType);
 
-	// Set default subject if following eval() wents wrong
-	$subject = ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT;
-
-	// Create constant name
-	$constantName = sprintf("ADMIN_SURFBAR_NOTIFY_%s_SUBJECT",
+	// Prepare subject
+	$subject = getMessage(sprintf("ADMIN_SURFBAR_NOTIFY_%s_SUBJECT",
 		strtoupper($messageType)
-	);
+	));
 
-	// Prepare subject
-	if (defined($constantName)) {
-		$subject = constant($constantName);
-	} else {
-		addFatalMessage(getMessage('ADMIN_SURFBAR_NOTIFY_SUBJECT_404'), $constantName);
-	}
+	// Is the subject line there?
+	if ((substr($subject, 0, 1) == "!") && (substr($subject, -1, 1) == "!")) {
+		// Set default subject if following eval() wents wrong
+		$subject = getMessage('ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT');
+	} // END - if
 
 	// Translate some data if present
 	if (isset($content['status']))        $content['status']        = SURFBAR_TRANSLATE_STATUS($content['status']);
@@ -661,6 +658,7 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) {
 	// Send the notification out
 	return SEND_ADMIN_NOTIFICATION($subject, $templateName, $content, $content['uid']);
 }
+
 // Notify the user about the performed action
 function SURFBAR_NOTIFY_USER ($messageType, $content) {
 	// Skip notification if userid is zero
@@ -671,20 +669,16 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
 	// Prepare template name
 	$templateName = sprintf("member_surfbar_%s", $messageType);
 
-	// Set default subject if following eval() wents wrong
-	$subject = MEMBER_SURFBAR_NOTIFY_DEFAULT_SUBJECT;
-
-	// Create constant name
-	$constantName = sprintf("MEMBER_SURFBAR_NOTIFY_%s_SUBJECT",
+	// Prepare subject
+	$subject = getMessage(sprintf("MEMBER_SURFBAR_NOTIFY_%s_SUBJECT",
 		strtoupper($messageType)
-	);
+	));
 
-	// Prepare subject
-	if (defined($constantName)) {
-		$subject = constant($constantName);
-	} else {
-		addFatalMessage(getMessage('MEMBER_SURFBAR_NOTIFY_SUBJECT_404'), $constantName);
-	}
+	// 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');
+	} // END - if
 
 	// Translate some data if present
 	if (isset($content['status']))        $content['status']        = SURFBAR_TRANSLATE_STATUS($content['status']);
@@ -733,8 +727,6 @@ function SURFBAR_TRANSLATE_STATUS ($status) {
 }
 // Determine reward
 function SURFBAR_DETERMINE_REWARD ($onlyMin=false) {
-	global $_CONFIG;
-
 	// Static values are default
 	$reward = getConfig('surfbar_static_reward');
 
@@ -753,8 +745,6 @@ function SURFBAR_DETERMINE_REWARD ($onlyMin=false) {
 }
 // Determine costs
 function SURFBAR_DETERMINE_COSTS ($onlyMin=false) {
-	global $_CONFIG;
-
 	// Static costs is default
 	$costs  = getConfig('surfbar_static_costs');
 
@@ -799,7 +789,7 @@ function SURFBAR_DETERMINE_TEMPLATE_NAME() {
 // Check if the "reload lock" of the current user is full, call this function
 // before you call SURFBAR_CHECK_RELOAD_LOCK().
 function SURFBAR_CHECK_RELOAD_FULL() {
-	global $SURFBAR_CACHE, $_CONFIG;
+	global $SURFBAR_CACHE;
 
 	// Default is full!
 	$isFull = true;
@@ -874,15 +864,11 @@ WHERE userid NOT IN (".implode(",", $UIDs['uid']).") AND `status`='%s'",
 }
 // Check wether the user is allowed to book more URLs
 function SURFBAR_IF_USER_BOOK_MORE_URLS ($uid=0) {
-	global $_CONFIG;
-
 	// Is this admin and userid is zero or does the user has some URLs left to book?
 	return ((($uid == 0) && (IS_ADMIN())) || (SURFBAR_GET_TOTAL_USER_URLS($uid, "", array("REJECTED")) < getConfig('surfbar_max_order')));
 }
 // Get total amount of URLs of given status for current user
 function SURFBAR_GET_TOTAL_USER_URLS ($uid=0, $status="",$exclude="") {
-	global $_CONFIG;
-
 	// Is the user 0 and user is logged in?
 	if (($uid == 0) && (IS_MEMBER())) {
 		// Then use this userid
@@ -929,7 +915,7 @@ LIMIT %s",
 }
 // Generate a validation code for the given id number
 function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt="") {
-	global $_CONFIG, $SURFBAR_CACHE;
+	global $SURFBAR_CACHE;
 
 	// @TODO Invalid salt should be refused
 	$SURFBAR_CACHE['salt'] = "INVALID";
@@ -998,8 +984,6 @@ function SURFBAR_LOCKDOWN_ID ($urlId) {
 }
 // Pay points to the user and remove it from the sender if userid is given else it is a "sponsored surf"
 function SURFBAR_PAY_POINTS () {
-	global $_CONFIG;
-
 	// Remove it from the URL owner
 	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".SURFBAR_GET_USERID().",costs=".SURFBAR_GET_COSTS()."", false);
 	if (SURFBAR_GET_USERID() > 0) {
@@ -1012,8 +996,6 @@ function SURFBAR_PAY_POINTS () {
 }
 // Updates the statistics of current URL/userid
 function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
-	global $_CONFIG;
-
 	// Init add
 	$ADD = "";
 
@@ -1160,8 +1142,6 @@ ORDER BY u.userid ASC", __FILE__, __LINE__);
 }
 // Determine how many users are Online in surfbar
 function SURFBAR_DETERMINE_TOTAL_ONLINE () {
-	global $_CONFIG;
-
 	// Count all users in surfbar modue and return the value
 	$result = SQL_QUERY_ESC("SELECT id
 FROM `{!_MYSQL_PREFIX!}_surfbar_stats`
@@ -1203,8 +1183,6 @@ function SURFBAR_DETERMINE_WAIT_TIME () {
 }
 // Changes the status of an URL from given to other
 function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) {
-	global $_CONFIG;
-
 	// Make new status always lower-case
 	$newStatus = strtolower($newStatus);
 
@@ -1262,8 +1240,6 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array())
 }
 // Calculate minimum value for dynamic payment model
 function SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE () {
-	global $_CONFIG;
-
 	// Addon is zero by default
 	$addon = 0;
 
@@ -1297,8 +1273,6 @@ function SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE () {
 }
 // Calculate maximum value for dynamic payment model
 function SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE () {
-	global $_CONFIG;
-
 	// Addon is zero by default
 	$addon = 0;
 
@@ -1325,8 +1299,6 @@ function SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE () {
 }
 // Calculate dynamic lock
 function SURFBAR_CALCULATE_DYNAMIC_LOCK () {
-	global $_CONFIG;
-
 	// Default lock is 30 seconds
 	$addon = 30;
 
@@ -1394,7 +1366,6 @@ ORDER BY
 }
 // "Getter" for maximum random number
 function SURFBAR_GET_MAX_RANDOM ($UIDs, $ADD) {
-	global $_CONFIG;
 	// Count max availabe entries
 	$result = SQL_QUERY("SELECT sbu.id AS cnt
 FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS sbu
@@ -1482,7 +1453,7 @@ function SURFBAR_RELOAD_TO_STOP_PAGE($page="stop") {
 // Determine next id for surfbar or get data for given id, always call this before you call other
 // getters below this function!!!
 function SURFBAR_DETERMINE_NEXT_ID ($urlId = 0) {
-	global $SURFBAR_CACHE, $_CONFIG;
+	global $SURFBAR_CACHE;
 
 	// Default is no id and no random number
 	$nextId = 0;