X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fsurfbar_functions.php;h=6babc26648a71476ff46913158b757cd07042a6d;hp=d928ad7df4cda025a3a27a0d0aa90ba4df3a826f;hb=ee0625c4882bb462985c504abf65a3ef0e7bf1eb;hpb=c47144dd555bbab4acdf9085e4623900dedb0e7c
diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index d928ad7df4..6babc26648 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Funktionen fuer die Surfbar *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $Date:: $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -146,8 +151,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
@@ -155,10 +158,10 @@ function SURFBAR_MEMBER_ADD_URL ($url, $limit) {
} elseif (!VALIDATE_URL($url)) {
// URL invalid
return false;
- } elseif (SURFBAR_LOOKUP_BY_URL($url, $GLOBALS['userid'])) {
+ } elseif (SURFBAR_LOOKUP_BY_URL($url, getUserId())) {
// URL already found in surfbar!
return false;
- } elseif (!SURFBAR_IF_USER_BOOK_MORE_URLS($GLOBALS['userid'])) {
+ } elseif (!SURFBAR_IF_USER_BOOK_MORE_URLS(getUserId())) {
// No more allowed!
return false;
} elseif ("".($limit + 0)."" != "".$limit."") {
@@ -167,7 +170,7 @@ function SURFBAR_MEMBER_ADD_URL ($url, $limit) {
}
// Register the new URL
- return SURFBAR_REGISTER_URL($url, $GLOBALS['userid'], "PENDING", "reg", array('limit' => $limit));
+ return SURFBAR_REGISTER_URL($url, getUserId(), "PENDING", "reg", array('limit' => $limit));
}
// Create list of actions depending on status for the user
function SURFBAR_MEMBER_ACTIONS ($urlId, $status) {
@@ -184,13 +187,7 @@ function SURFBAR_MEMBER_ACTIONS ($urlId, $status) {
// "Walk" through all actions and create forms
foreach ($actionArray as $actionId=>$action) {
// Add form for this action
- $OUT .= sprintf(" |
-
- | \n",
+ $OUT .= sprintf(LOAD_TEMPLATE("member_surfbar_list_form", true),
$width,
bigintval($urlId),
strtolower($action),
@@ -208,8 +205,6 @@ function SURFBAR_MEMBER_ACTIONS ($urlId, $status) {
}
// Do the member form request
function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
- global $SURFBAR_CACHE;
-
// By default no action is performed
$performed = false;
@@ -243,7 +238,7 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
// Is the function there?
if (function_exists($functionName)) {
// Add new status
- $URLs[$formData['id']]['new_status'] = $SURFBAR_CACHE['new_status'];
+ $URLs[$formData['id']]['new_status'] = $GLOBALS['cache_array']['surfbar']['new_status'];
// Extract URL data for call-back
$urlData = array(merge_array($URLs[$formData['id']], array($action => $formData)));
@@ -253,7 +248,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(__FUNCTION__, __LINE__, "Invalid member action! action=%s,id=%s,function=%s", array($formData['action'], $formData['id'], $functionName));
}
// Return status
@@ -261,11 +256,9 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
}
// Validate if the requested action can be performed on current URL status
function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) {
- global $SURFBAR_CACHE;
-
// 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), __FILE__, __LINE__);
+ $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__);
// Is the entry there?
$isValid = (SQL_NUMROWS($result) == 1);
@@ -273,7 +266,7 @@ function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) {
// Fetch the new status if found
if ($isValid) {
// Load new status
- list($SURFBAR_CACHE['new_status']) = SQL_FETCHROW($result);
+ list($GLOBALS['cache_array']['surfbar']['new_status']) = SQL_FETCHROW($result);
} // END - if
// Free result
@@ -413,7 +406,7 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) {
} // END - if
} else {
// Not found!
- addFatalMessage(sprintf(MEMBER_SURFBAR_EXECUTE_ACTION_404, $functionName));
+ addFatalMessage(__FUNCTION__, __LINE__, getMessage('MEMBER_SURFBAR_EXECUTE_ACTION_404'), $functionName);
}
// Return status
@@ -433,7 +426,7 @@ function SURFBAR_MEMBER_EXECUTE_EDIT_ACTION ($urlData) {
//if (($urlData['views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) {
// Run the query
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET url='%s', views_allowed=%s, views_max=%s WHERE id=%s AND `status`='%s' LIMIT 1",
- array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['status']), __FILE__, __LINE__);
+ array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['status']), __FUNCTION__, __LINE__);
// All fine
$status = true;
@@ -480,10 +473,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'));
@@ -505,15 +497,17 @@ function SURFBAR_HANDLE_LOW_POINTS () {
// Update last notified
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET surfbar_low_notified=NOW() WHERE userid=%s LIMIT 1",
- array($uid), __FILE__, __LINE__);
+ array($uid), __FUNCTION__, __LINE__);
} // 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
@@ -522,12 +516,11 @@ 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;
-
// By default nothing is found
- $lastUrlData = array();
+ $GLOBALS['last_url_data'] = array();
// Is the column an id number?
if (($column == "id") || ($column == "userid")) {
@@ -547,7 +540,7 @@ FROM `{!_MYSQL_PREFIX!}_surfbar_urls`
WHERE %s='%s'".$add."
ORDER BY %s %s
%s",
- array($column, $searchTerm, $order, $sort, $limit), __FILE__, __LINE__);
+ array($column, $searchTerm, $order, $sort, $limit), __FUNCTION__, __LINE__);
// Is there at least one record?
if (SQL_NUMROWS($result) > 0) {
@@ -556,10 +549,10 @@ ORDER BY %s %s
// Shall we group these results?
if ($group == "id") {
// Add the row by id as index
- $lastUrlData[$dataRow['id']] = $dataRow;
+ $GLOBALS['last_url_data'][$dataRow['id']] = $dataRow;
} else {
// Group entries
- $lastUrlData[$dataRow[$group]][$dataRow['id']] = $dataRow;
+ $GLOBALS['last_url_data'][$dataRow[$group]][$dataRow['id']] = $dataRow;
}
} // END - while
} // END - if
@@ -568,12 +561,11 @@ ORDER BY %s %s
SQL_FREERESULT($result);
// Return the result
- return $lastUrlData;
+ return $GLOBALS['last_url_data'];
}
+
// 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";
@@ -613,6 +605,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,31 +623,28 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
$urlData['limit'],
$urlData['limit'],
$urlData['reload']
- ), __FILE__, __LINE__
+ ), __FUNCTION__, __LINE__
);
// 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(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']);
@@ -667,6 +657,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
@@ -677,20 +668,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(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']);
@@ -739,8 +726,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');
@@ -759,8 +744,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');
@@ -792,10 +775,10 @@ function SURFBAR_DETERMINE_TEMPLATE_NAME() {
$templateName = "surfbar_frameset";
// Any frame set? ;-)
- if (isset($_GET['frame'])) {
+ if (REQUEST_ISSET_GET(('frame'))) {
// Use the frame as a template name part... ;-)
$templateName = sprintf("surfbar_frame_%s",
- SQL_ESCAPE($_GET['frame'])
+ REQUEST_GET(('frame'))
);
} // END - if
@@ -805,19 +788,17 @@ 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;
-
// Default is full!
$isFull = true;
// Cache static reload lock
- $SURFBAR_CACHE['surf_lock'] = getConfig('surfbar_static_lock');
+ $GLOBALS['cache_array']['surfbar']['surf_lock'] = getConfig('surfbar_static_lock');
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Fixed surf lock is ".getConfig('surfbar_static_lock')."", false);
// Do we have dynamic model?
if (getConfig('surfbar_pay_model') == "DYNAMIC") {
// "Calculate" dynamic lock
- $SURFBAR_CACHE['surf_lock'] += SURFBAR_CALCULATE_DYNAMIC_ADD();
+ $GLOBALS['cache_array']['surfbar']['surf_lock'] += SURFBAR_CALCULATE_DYNAMIC_ADD();
} // END - if
// Ask the database
@@ -826,16 +807,16 @@ INNER JOIN `{!_MYSQL_PREFIX!}_surfbar_urls` AS u
ON u.id=l.url_id
WHERE l.userid=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(l.last_surfed) AND (((UNIX_TIMESTAMP(l.last_surfed) - u.fixed_reload) < 0 AND u.fixed_reload > 0) OR u.fixed_reload = 0)
LIMIT 1",
- array($GLOBALS['userid']), __FILE__, __LINE__
+ array(getUserId()), __FUNCTION__, __LINE__
);
// Fetch row
- list($SURFBAR_CACHE['user_locks']) = SQL_FETCHROW($result);
+ list($GLOBALS['cache_array']['surfbar']['user_locks']) = SQL_FETCHROW($result);
// Is it null?
- if (is_null($SURFBAR_CACHE['user_locks'])) {
+ if (is_null($GLOBALS['cache_array']['surfbar']['user_locks'])) {
// Then fix it to zero!
- $SURFBAR_CACHE['user_locks'] = 0;
+ $GLOBALS['cache_array']['surfbar']['user_locks'] = 0;
} // END - if
// Free result
@@ -866,7 +847,7 @@ function SURFBAR_GET_TOTAL_URLS ($status="ACTIVE", $excludeUserId=0) {
$result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt
FROM `{!_MYSQL_PREFIX!}_surfbar_urls`
WHERE userid NOT IN (".implode(",", $UIDs['uid']).") AND `status`='%s'",
- array($status), __FILE__, __LINE__
+ array($status), __FUNCTION__, __LINE__
);
// Fetch row
@@ -880,48 +861,44 @@ 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
- $uid = $GLOBALS['userid'];
+ $uid = getUserId();
} elseif ($uid == 0) {
// Error!
return (getConfig('surfbar_max_order') + 1);
}
// Default is all URLs
- $ADD = "";
+ $add = "";
// Is the status set?
if (is_array($status)) {
// Only URLs with these status
- $ADD = sprintf(" AND status IN('%s')", implode("','", $status));
+ $add = sprintf(" AND status IN('%s')", implode("','", $status));
} elseif (!empty($status)) {
// Only URLs with this status
- $ADD = sprintf(" AND `status`='%s'", $status);
+ $add = sprintf(" AND `status`='%s'", $status);
} elseif (is_array($exclude)) {
// Exclude URLs with these status
- $ADD = sprintf(" AND status NOT IN('%s')", implode("','", $exclude));
+ $add = sprintf(" AND status NOT IN('%s')", implode("','", $exclude));
} elseif (!empty($exclude)) {
// Exclude URLs with this status
- $ADD = sprintf(" AND status != '%s'", $exclude);
+ $add = sprintf(" AND status != '%s'", $exclude);
}
// Get amount from database
$result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt
FROM `{!_MYSQL_PREFIX!}_surfbar_urls`
-WHERE userid=%s".$ADD."
+WHERE userid=%s".$add."
LIMIT %s",
- array($uid, getConfig('surfbar_max_order')), __FILE__, __LINE__
+ array($uid, getConfig('surfbar_max_order')), __FUNCTION__, __LINE__
);
// Fetch row
@@ -935,10 +912,8 @@ LIMIT %s",
}
// Generate a validation code for the given id number
function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt="") {
- global $_CONFIG, $SURFBAR_CACHE;
-
// @TODO Invalid salt should be refused
- $SURFBAR_CACHE['salt'] = "INVALID";
+ $GLOBALS['cache_array']['surfbar']['salt'] = "INVALID";
// Get code length from config
$length = getConfig('code_length');
@@ -952,16 +927,16 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt="") {
// Is the salt set?
if (empty($salt)) {
// Generate random hashed string
- $SURFBAR_CACHE['salt'] = sha1(GEN_PASS(255));
+ $GLOBALS['cache_array']['surfbar']['salt'] = sha1(GEN_PASS(255));
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "newSalt=".SURFBAR_GET_SALT()."", false);
} else {
// Use this as salt!
- $SURFBAR_CACHE['salt'] = $salt;
+ $GLOBALS['cache_array']['surfbar']['salt'] = $salt;
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "oldSalt=".SURFBAR_GET_SALT()."", false);
}
// ... and now the validation code
- $valCode = GEN_RANDOM_CODE($length, sha1(SURFBAR_GET_SALT().":".$urlId), $GLOBALS['userid']);
+ $valCode = generateRandomCodde($length, sha1(SURFBAR_GET_SALT().":".$urlId), getUserId());
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "valCode={$valCode}", false);
} // END - while
@@ -977,8 +952,6 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt="") {
}
// Check validation code
function SURFBAR_CHECK_VALIDATION_CODE ($urlId, $check, $salt) {
- global $SURFBAR_CACHE;
-
// Secure id number
$urlId = bigintval($urlId);
@@ -996,16 +969,14 @@ function SURFBAR_LOCKDOWN_ID ($urlId) {
///* DEBUG: */ return;
// Just add it to the database
SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_locks` (userid, url_id) VALUES (%s, %s)",
- array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__);
+ array(getUserId(), bigintval($urlId)), __FUNCTION__, __LINE__);
// Remove the salt from database
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_surfbar_salts` WHERE url_id=%s AND userid=%s LIMIT 1",
- array(bigintval($urlId), $GLOBALS['userid']), __FILE__, __LINE__);
+ array(bigintval($urlId), getUserId()), __FUNCTION__, __LINE__);
}
// 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) {
@@ -1013,15 +984,13 @@ function SURFBAR_PAY_POINTS () {
} // END - if
// Book it to the user
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".$GLOBALS['userid'].",reward=".SURFBAR_GET_REWARD()."", false);
- ADD_POINTS_REFSYSTEM(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), $GLOBALS['userid'], SURFBAR_GET_DATA('reward'));
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".getUserId().",reward=".SURFBAR_GET_REWARD()."", false);
+ ADD_POINTS_REFSYSTEM(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), getUserId(), SURFBAR_GET_DATA('reward'));
}
// Updates the statistics of current URL/userid
function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
- global $_CONFIG;
-
// Init add
- $ADD = "";
+ $add = "";
// Get allowed views
$allowed = SURFBAR_GET_VIEWS_ALLOWED();
@@ -1029,29 +998,29 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
// Do we have a limit?
if ($allowed > 0) {
// Then count views_max down!
- $ADD .= ",views_max=views_max-1";
+ $add .= ",views_max=views_max-1";
} // END - if
// Update URL stats
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET views_total=views_total+1".$ADD." WHERE id=%s LIMIT 1",
- array(SURFBAR_GET_ID()), __FILE__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET views_total=views_total+1".$add." WHERE id=%s LIMIT 1",
+ array(SURFBAR_GET_ID()), __FUNCTION__, __LINE__);
// Update the stats entry
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_stats` SET count=count+1 WHERE userid=%s AND url_id=%s LIMIT 1",
- array($GLOBALS['userid'], SURFBAR_GET_ID()), __FILE__, __LINE__);
+ array(getUserId(), SURFBAR_GET_ID()), __FUNCTION__, __LINE__);
// Was that update okay?
if (SQL_AFFECTEDROWS() < 1) {
// No, then insert entry
SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_stats` (userid,url_id,count) VALUES (%s,%s,1)",
- array($GLOBALS['userid'], SURFBAR_GET_ID()), __FILE__, __LINE__);
+ array(getUserId(), SURFBAR_GET_ID()), __FUNCTION__, __LINE__);
} // END - if
// Update total/daily/weekly/monthly counter
- $_CONFIG['surfbar_total_counter']++;
- $_CONFIG['surfbar_daily_counter']++;
- $_CONFIG['surfbar_weekly_counter']++;
- $_CONFIG['surfbar_monthly_counter']++;
+ incrementConfigEntry('surfbar_total_counter');
+ incrementConfigEntry('surfbar_daily_counter');
+ incrementConfigEntry('surfbar_weekly_counter');
+ incrementConfigEntry('surfbar_monthly_counter');
// Update config as well
UPDATE_CONFIG(array("surfbar_total_counter", "surfbar_daily_counter", "surfbar_weekly_counter", "surfbar_monthly_counter"), array(1,1,1,1), "+");
@@ -1063,16 +1032,16 @@ function SURFBAR_UPDATE_SALT_STATS () {
// Simply store the salt from cache away in database...
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_salts` SET last_salt='%s' WHERE url_id=%s AND userid=%s LIMIT 1",
- array(SURFBAR_GET_SALT(), SURFBAR_GET_ID(), $GLOBALS['userid']), __FILE__, __LINE__);
+ array(SURFBAR_GET_SALT(), SURFBAR_GET_ID(), getUserId()), __FUNCTION__, __LINE__);
// Debug message
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "salt=".SURFBAR_GET_SALT().",id=".SURFBAR_GET_ID().",uid=".$GLOBALS['userid']."", false);
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "salt=".SURFBAR_GET_SALT().",id=".SURFBAR_GET_ID().",uid=".getUserId()."", false);
// Was that okay?
if (SQL_AFFECTEDROWS() < 1) {
// Insert missing entry!
SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_salts` (url_id,userid,last_salt) VALUES (%s, %s, '%s')",
- array(SURFBAR_GET_ID(), $GLOBALS['userid'], SURFBAR_GET_SALT()), __FILE__, __LINE__);
+ array(SURFBAR_GET_ID(), getUserId(), SURFBAR_GET_SALT()), __FUNCTION__, __LINE__);
} // END - if
// Debug message
@@ -1090,7 +1059,7 @@ FROM `{!_MYSQL_PREFIX!}_surfbar_locks`
WHERE userid=%s AND url_id=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(last_surfed)
ORDER BY last_surfed ASC
LIMIT 1",
- array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__
+ array(getUserId(), bigintval($urlId)), __FUNCTION__, __LINE__
);
// Fetch counter
@@ -1115,9 +1084,9 @@ function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) {
// Do we have a current user id?
if ((IS_MEMBER()) && ($limit == 0)) {
// Then add this as well
- $UIDs['uid'][$GLOBALS['userid']] = $GLOBALS['userid'];
- $UIDs['points'][$GLOBALS['userid']] = GET_TOTAL_DATA($GLOBALS['userid'], "user_points", "points") - GET_TOTAL_DATA($GLOBALS['userid'], "user_data", "used_points");
- $UIDs['notified'][$GLOBALS['userid']] = 0;
+ $UIDs['uid'][getUserId()] = getUserId();
+ $UIDs['points'][getUserId()] = GET_TOTAL_DATA(getUserId(), "user_points", "points") - GET_TOTAL_DATA(getUserId(), "user_data", "used_points");
+ $UIDs['notified'][getUserId()] = 0;
// Get all userid except logged in one
$result = SQL_QUERY_ESC("SELECT u.userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified
@@ -1127,7 +1096,7 @@ ON u.userid=d.userid
WHERE u.userid NOT IN (%s,0) AND u.`status`='ACTIVE'
GROUP BY u.userid
ORDER BY u.userid ASC",
- array($GLOBALS['userid']), __FILE__, __LINE__);
+ array(getUserId()), __FUNCTION__, __LINE__);
} else {
// Get all userid
$result = SQL_QUERY("SELECT u.userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified
@@ -1136,22 +1105,22 @@ INNER JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
ON u.userid=d.userid
WHERE u.`status`='ACTIVE'
GROUP BY u.userid
-ORDER BY u.userid ASC", __FILE__, __LINE__);
+ORDER BY u.userid ASC", __FUNCTION__, __LINE__);
}
// Load all userid
- while (list($uid, $notified) = SQL_FETCHROW($result)) {
+ while ($content = SQL_FETCHARRAY($result)) {
// Get total points
- $points = GET_TOTAL_DATA($uid, "user_points", "points") - GET_TOTAL_DATA($uid, "user_data", "used_points");
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$uid},points={$points}", false);
+ $points = GET_TOTAL_DATA($content['userid'], "user_points", "points") - GET_TOTAL_DATA($content['userid'], "user_data", "used_points");
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$content['userid']},points={$points}", false);
// Shall we add this to ignore?
if ($points <= $limit) {
// Ignore this one!
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$uid} has depleted points amount!", false);
- $UIDs['uid'][$uid] = $uid;
- $UIDs['points'][$uid] = $points;
- $UIDs['notified'][$uid] = $notified;
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$content['userid']} has depleted points amount!", false);
+ $UIDs['uid'][$content['userid']] = $content['userid'];
+ $UIDs['points'][$content['userid']] = $points;
+ $UIDs['notified'][$content['userid']] = $content['notified'];
} // END - if
} // END - while
@@ -1159,21 +1128,19 @@ ORDER BY u.userid ASC", __FILE__, __LINE__);
SQL_FREERESULT($result);
// Debug message
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "UIDs::count=".count($UIDs)." (with own userid=".$GLOBALS['userid'].")", false);
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "UIDs::count=".count($UIDs)." (with own userid=".getUserId().")", false);
// Return result
return $UIDs;
}
// 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`
WHERE (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(last_online)) <= %s
GROUP BY userid",
- array(getConfig('online_timeout')), __FILE__, __LINE__);
+ array(getConfig('online_timeout')), __FUNCTION__, __LINE__);
// Fetch count
$cnt = SQL_NUMROWS($result);
@@ -1209,8 +1176,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);
@@ -1236,14 +1201,16 @@ 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",
- // array($newStatus, bigintval($urlId)), __FILE__, __LINE__);
+ // array($newStatus, bigintval($urlId)), __FUNCTION__, __LINE__);
// ---------- Comment out for debugging/developing member actions! ---------
// Was that fine?
+ // ---------- Comment out for debugging/developing member actions! ---------
//if (SQL_AFFECTEDROWS() != 1) {
// // No, something went wrong
// return false;
//} // END - if
+ // ---------- Comment out for debugging/developing member actions! ---------
// Prepare content for notification routines
$data[$urlId]['uid'] = $data[$urlId]['userid'];
@@ -1268,8 +1235,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;
@@ -1303,8 +1268,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;
@@ -1331,8 +1294,6 @@ function SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE () {
}
// Calculate dynamic lock
function SURFBAR_CALCULATE_DYNAMIC_LOCK () {
- global $_CONFIG;
-
// Default lock is 30 seconds
$addon = 30;
@@ -1355,40 +1316,40 @@ function SURFBAR_GET_LOCK_IDS () {
// Get all id from locks within the timestamp
$result = SQL_QUERY_ESC("SELECT id, url_id, UNIX_TIMESTAMP(last_surfed) AS last
FROM
- {!MYSQL_PREFIX!}_surfbar_locks
+ {!_MYSQL_PREFIX!}_surfbar_locks
WHERE
userid=%s
ORDER BY
- id ASC", array($GLOBALS['userid']),
- __FILE__, __LINE__);
+ id ASC", array(getUserId()),
+ __FUNCTION__, __LINE__);
// Load all entries
- while (list($lid, $url, $last) = SQL_FETCHROW($result)) {
+ while ($content = SQL_FETCHARRAY($result)) {
// Debug message
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "next - lid={$lid},url={$url},rest=".(time() - $last)."/".SURFBAR_GET_SURF_LOCK()."", false);
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "next - lid={$content['id']},url={$content['url_id']},rest=".(time() - $last)."/".SURFBAR_GET_SURF_LOCK()."", false);
// Skip entries that are too old
- if (($last > (time() - SURFBAR_GET_SURF_LOCK())) && (!in_array($url, $ignored))) {
+ if (($last > (time() - SURFBAR_GET_SURF_LOCK())) && (!in_array($content['url_id'], $ignored))) {
// Debug message
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "okay - lid={$lid},url={$url},last={$last}", false);
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "okay - lid={$content['id']},url={$content['url_id']},last={$last}", false);
// Add only if missing or bigger
- if ((!isset($IDs[$url])) || ($IDs[$url] > $last)) {
+ if ((!isset($IDs[$content['url_id']])) || ($IDs[$content['url_id']] > $last)) {
// Debug message
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ADD - lid={$lid},url={$url},last={$last}", false);
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ADD - lid={$content['id']},url={$content['url_id']},last={$last}", false);
// Add this ID
- $IDs[$url] = $last;
- $USE[$url] = $lid;
+ $IDs[$content['url_id']] = $last;
+ $USE[$content['url_id']] = $content['id'];
} // END - if
} else {
// Debug message
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ignore - lid={$lid},url={$url},last={$last}", false);
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ignore - lid={$content['id']},url={$content['url_id']},last={$last}", false);
// Ignore these old entries!
- $ignored[] = $url;
- unset($IDs[$url]);
- unset($USE[$url]);
+ $ignored[] = $content['url_id'];
+ unset($IDs[$content['url_id']]);
+ unset($USE[$content['url_id']]);
}
} // END - while
@@ -1399,8 +1360,7 @@ ORDER BY
return $USE;
}
// "Getter" for maximum random number
-function SURFBAR_GET_MAX_RANDOM ($UIDs, $ADD) {
- global $_CONFIG;
+function SURFBAR_GET_MAX_RANDOM ($UIDs, $add) {
// Count max availabe entries
$result = SQL_QUERY("SELECT sbu.id AS cnt
FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS sbu
@@ -1408,8 +1368,8 @@ LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_salts` AS sbs
ON sbu.id=sbs.url_id
LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_locks` AS l
ON sbu.id=l.url_id
-WHERE sbu.userid NOT IN (".implode(",", $UIDs).") AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND sbu.`status`='ACTIVE'".$ADD."
-GROUP BY sbu.id", __FILE__, __LINE__);
+WHERE sbu.userid NOT IN (".implode(",", $UIDs).") AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND sbu.`status`='ACTIVE'".$add."
+GROUP BY sbu.id", __FUNCTION__, __LINE__);
// Log last query
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "lastQuery=".getConfig('db_last_query')."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS()."", false);
@@ -1433,7 +1393,7 @@ function SURFBAR_GET_USER_URLS () {
FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS u
WHERE u.userid=%s AND u.status != 'DELETED'
ORDER BY u.id ASC",
- array($GLOBALS['userid']), __FILE__, __LINE__);
+ array(getUserId()), __FUNCTION__, __LINE__);
// Are there entries?
if (SQL_NUMROWS($result) > 0) {
@@ -1457,13 +1417,14 @@ function SURFBAR_GET_ACTION_ARRAY ($status) {
// Get all assigned actions
$result = SQL_QUERY_ESC("SELECT action FROM `{!_MYSQL_PREFIX!}_surfbar_actions` WHERE `status`='%s' ORDER BY `id` ASC",
- array($status), __FILE__, __LINE__);
+ array($status), __FUNCTION__, __LINE__);
// Some entries there?
if (SQL_NUMROWS($result) > 0) {
// Load all actions
- while (list($action) = SQL_FETCHROW($result)) {
- $returnArray[] = $action;
+ // @TODO This can be somehow rewritten
+ while ($content = SQL_FETCHARRAY($result)) {
+ $returnArray[] = $content['action'];
} // END - if
} // END - if
@@ -1488,8 +1449,6 @@ 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;
-
// Default is no id and no random number
$nextId = 0;
$randNum = 0;
@@ -1500,24 +1459,24 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = 0) {
$USE = SURFBAR_GET_LOCK_IDS();
// Shall we add some URL ids to ignore?
- $ADD = "";
+ $add = "";
if (count($USE) > 0) {
// Ignore some!
- $ADD = " AND sbu.id NOT IN (";
+ $add = " AND sbu.id NOT IN (";
foreach ($USE as $url_id => $lid) {
// Add URL id
- $ADD .= $url_id.",";
+ $add .= $url_id.",";
} // END - foreach
// Add closing bracket
- $ADD = substr($ADD, 0, -1) . ")";
+ $add = substr($add, 0, -1) . ")";
} // END - if
// Determine depleted user account
$UIDs = SURFBAR_DETERMINE_DEPLETED_USERIDS();
// Get maximum randomness factor
- $maxRand = SURFBAR_GET_MAX_RANDOM($UIDs['uid'], $ADD);
+ $maxRand = SURFBAR_GET_MAX_RANDOM($UIDs['uid'], $add);
// If more than one URL can be called generate the random number!
if ($maxRand > 1) {
@@ -1533,11 +1492,11 @@ LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_salts` AS sbs
ON sbu.id=sbs.url_id
LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_locks` AS l
ON sbu.id=l.url_id
-WHERE sbu.userid NOT IN (".implode(",", $UIDs['uid']).") AND sbu.`status`='ACTIVE' AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))".$ADD."
+WHERE sbu.userid NOT IN (".implode(",", $UIDs['uid']).") AND sbu.`status`='ACTIVE' AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))".$add."
GROUP BY sbu.id
ORDER BY l.last_surfed ASC, sbu.id ASC
LIMIT %s,1",
- array($randNum), __FILE__, __LINE__
+ array($randNum), __FUNCTION__, __LINE__
);
} else {
// Get data from specified id number
@@ -1549,7 +1508,7 @@ LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_locks` AS l
ON sbu.id=l.url_id
WHERE sbu.userid != %s AND sbu.`status`='ACTIVE' AND sbu.id=%s AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))
LIMIT 1",
- array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__
+ array(getUserId(), bigintval($urlId)), __FUNCTION__, __LINE__
);
}
@@ -1557,37 +1516,37 @@ LIMIT 1",
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "lastQuery=".getConfig('db_last_query')."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS()."", false);
if (SQL_NUMROWS($result) == 1) {
// Load/cache data
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "count(".count($SURFBAR_CACHE).") - BEFORE", false);
- $SURFBAR_CACHE = merge_array($SURFBAR_CACHE, SQL_FETCHARRAY($result));
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "count(".count($SURFBAR_CACHE).") - AFTER", false);
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "count(".count($GLOBALS['cache_array']['surfbar']).") - BEFORE", false);
+ $GLOBALS['cache_array']['surfbar'] = merge_array($GLOBALS['cache_array']['surfbar'], SQL_FETCHARRAY($result));
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "count(".count($GLOBALS['cache_array']['surfbar']).") - AFTER", false);
// Determine waiting time
- $SURFBAR_CACHE['time'] = SURFBAR_DETERMINE_WAIT_TIME();
+ $GLOBALS['cache_array']['surfbar']['time'] = SURFBAR_DETERMINE_WAIT_TIME();
// Is the last salt there?
- if (is_null($SURFBAR_CACHE['last_salt'])) {
+ if (is_null($GLOBALS['cache_array']['surfbar']['last_salt'])) {
// Then repair it wit the static!
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "last_salt - FIXED!", false);
- $SURFBAR_CACHE['last_salt'] = "";
+ $GLOBALS['cache_array']['surfbar']['last_salt'] = "";
} // END - if
// Fix missing last_surfed
- if ((!isset($SURFBAR_CACHE['last_surfed'])) || (is_null($SURFBAR_CACHE['last_surfed']))) {
+ if ((!isset($GLOBALS['cache_array']['surfbar']['last_surfed'])) || (is_null($GLOBALS['cache_array']['surfbar']['last_surfed']))) {
// Fix it here
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "last_surfed - FIXED!", false);
- $SURFBAR_CACHE['last_surfed'] = 0;
+ $GLOBALS['cache_array']['surfbar']['last_surfed'] = 0;
} // END - if
// Get base/fixed reward and costs
- $SURFBAR_CACHE['reward'] = SURFBAR_DETERMINE_REWARD();
- $SURFBAR_CACHE['costs'] = SURFBAR_DETERMINE_COSTS();
+ $GLOBALS['cache_array']['surfbar']['reward'] = SURFBAR_DETERMINE_REWARD();
+ $GLOBALS['cache_array']['surfbar']['costs'] = SURFBAR_DETERMINE_COSTS();
//* DEBUG: */ DEBUG_LOG(__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") {
// Calculate dynamic reward/costs and add it
- $SURFBAR_CACHE['reward'] += SURFBAR_CALCULATE_DYNAMIC_ADD();
- $SURFBAR_CACHE['costs'] += SURFBAR_CALCULATE_DYNAMIC_ADD();
+ $GLOBALS['cache_array']['surfbar']['reward'] += SURFBAR_CALCULATE_DYNAMIC_ADD();
+ $GLOBALS['cache_array']['surfbar']['costs'] += SURFBAR_CALCULATE_DYNAMIC_ADD();
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "DYNAMIC+ - reward=".SURFBAR_GET_REWARD()."|costs=".SURFBAR_GET_COSTS()."", false);
} // END - if
@@ -1603,26 +1562,25 @@ LIMIT 1",
return $nextId;
}
// -----------------------------------------------------------------------------
-// PLEASE DO NOT ADD ANY OTHER FUNCTIONS BELOW THIS LINE ELSE THEY "WRAP" THE
-// $SURFBAR_CACHE ARRAY!
+// PLEASE DO NOT ADD ANY OTHER FUNCTIONS BELOW THIS LINE IF THEY DON'T "WRAP"
+// THE $GLOBALS['cache_array']['surfbar'] ARRAY!
// -----------------------------------------------------------------------------
// Private getter for data elements
function SURFBAR_GET_DATA ($element) {
- global $SURFBAR_CACHE;
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "element={$element}", false);
// Default is null
$data = null;
// Is the entry there?
- if (isset($SURFBAR_CACHE[$element])) {
+ if (isset($GLOBALS['cache_array']['surfbar'][$element])) {
// Then take it
- $data = $SURFBAR_CACHE[$element];
+ $data = $GLOBALS['cache_array']['surfbar'][$element];
} else { // END - if
print("");
- print_r($SURFBAR_CACHE);
- debug_print_backtrace();
- die("");
+ print_r($GLOBALS['cache_array']['surfbar']);
+ print("");
+ debug_report_bug();
}
// Return result