X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fsurfbar_functions.php;h=f1b2cb882bc27ccf4c9bee4c62b269c3540857b1;hb=4cf6094cc3cbebfda691fa797e00fe674bbb329c;hp=9b1b5be02c7aebc701859df0594ed6bdce5d5c44;hpb=8d7f183d20c336ca455fe1076dc0a99e31758734;p=mailer.git
diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 9b1b5be02c..f1b2cb882b 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -14,12 +14,10 @@
* $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 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -40,38 +38,38 @@
// Some security stuff...
if (!defined('__SECURITY')) {
die();
-}
+} // END - if
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// Admin functions
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
//
// Admin has added an URL with given user id and so on
function SURFBAR_ADMIN_ADD_URL ($url, $limit, $reload) {
// Do some pre-checks
if (!isAdmin()) {
// Not an admin
- 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
- 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 (SURFBAR_LOOKUP_BY_URL($url, 0)) {
// URL already found in surfbar!
- 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 (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
// No more allowed!
- 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
- 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
- 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;
}
@@ -84,15 +82,19 @@ function SURFBAR_ADMIN_MIGRATE_URL ($url, $userid) {
// Do some pre-checks
if (!isAdmin()) {
// Not an admin
+ /* 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);
return false;
} elseif (SURFBAR_LOOKUP_BY_URL($url, $userid)) {
// URL already found in surfbar!
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Already added, url=' . $url . ',userid=' . $userid);
return false;
} elseif (!SURFBAR_IF_USER_BOOK_MORE_URLS($userid)) {
// No more allowed!
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot migrate URL: Maximum exceeded, url=' . $url . ',userid=' . $userid);
return false;
}
@@ -105,12 +107,15 @@ function SURFBAR_ADMIN_UNLOCK_URL_IDS ($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');
return false;
} elseif (!is_array($IDs)) {
// No array
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs type ' . gettype($IDs) . '!=array');
return false;
} elseif (count($IDs) == 0) {
// Empty array
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs is empty');
return false;
}
@@ -132,12 +137,15 @@ function SURFBAR_ADMIN_REJECT_URL_IDS ($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');
return false;
} elseif (!is_array($IDs)) {
// No array
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs type ' . gettype($IDs) . '!=array');
return false;
} elseif (count($IDs) == 0) {
// Empty array
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: IDs is empty');
return false;
}
@@ -155,27 +163,32 @@ function SURFBAR_ADMIN_REJECT_URL_IDS ($IDs) {
}
//
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// Member functions
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
//
// Member has added an URL
function SURFBAR_MEMBER_ADD_URL ($url, $limit) {
// Do some pre-checks
if (!isMember()) {
// Not a member
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Not member');
return false;
} elseif ((!isUrlValid($url)) && (!isAdmin())) {
// URL invalid
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Invalid, url=' . $url . ',limit=' . $limit);
return false;
} elseif (SURFBAR_LOOKUP_BY_URL($url, getMemberId())) {
// URL already found in surfbar!
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Already found, url=' . $url . ',limit=' . $limit);
return false;
} elseif (!SURFBAR_IF_USER_BOOK_MORE_URLS(getMemberId())) {
// No more allowed!
+ /* 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);
return false;
}
@@ -189,8 +202,8 @@ function SURFBAR_MEMBER_ACTIONS ($urlId, $status) {
$actionArray = SURFBAR_GET_ARRAY_FROM_STATUS($status);
// Init HTML code
- $OUT = "
-\n";
+ $OUT = '
+';
// Calculate width
$width = round(100 / count($actionArray));
@@ -198,40 +211,42 @@ function SURFBAR_MEMBER_ACTIONS ($urlId, $status) {
// "Walk" through all actions and create forms
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--}',
+ $OUT .= loadTemplate('member_list_surfbar_form', true, array(
+ 'width' => $width,
+ 'url_id' => bigintval($urlId),
+ 'action' => strtolower($action)
));
} // END - foreach
// Close table
- $OUT .= "
-
\n";
+ $OUT .= '
+
';
// Return code
return $OUT;
}
// 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;
// Is this a member?
if (!isMember()) {
// No member!
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Not member');
return false;
} elseif ((!isset($formData['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');
return false;
- } elseif (!isset($URLs[$formData['id']])) {
- // id not found in cache
+ } elseif (!isset($urlArray[$formData['id']])) {
+ // Id not found in cache
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot add URL: Field id not found in cache');
return false;
- } elseif (!SURFBAR_VALIDATE_MEMBER_ACTION_STATUS($formData['action'], $URLs[$formData['id']]['status'])) {
+ } elseif (!SURFBAR_VALIDATE_MEMBER_ACTION_STATUS($formData['action'], $urlArray[$formData['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['id']]['url_status'] . 'id=' . $formData['id']);
return false;
}
@@ -250,17 +265,16 @@ 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);
} else {
// Log invalid request
- logDebugMessage(__FUNCTION__, __LINE__, "action={$formData['action']},id={$formData['id']},function={$functionName}");
- addFatalMessage(__FUNCTION__, __LINE__, "Invalid member action! action=%s,id=%s,function=%s", array($formData['action'], $formData['id'], $functionName));
+ debug_report_bug(__FUNCTION__, __LINE__, 'Invalid member action! action=' . $formData['action'] . ',id=' . $formData['id'] . ',function=' . $functionName);
}
// Return status
@@ -270,8 +284,8 @@ 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) {
// 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);
@@ -290,30 +304,30 @@ function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) {
}
//
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// Member actions
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
//
// Retreat a booked URL
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
- return SURFBAR_CHANGE_STATUS ($urlData['id'], $urlData['status'], $urlData['new_status'], $data);
+ return SURFBAR_CHANGE_STATUS ($urlData['id'], $urlData['url_status'], $urlData['new_status'], $data);
}
// Book an URL now (from migration)
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
- return SURFBAR_CHANGE_STATUS ($urlData['id'], $urlData['status'], $urlData['new_status'], $data);
+ return SURFBAR_CHANGE_STATUS ($urlData['id'], $urlData['url_status'], $urlData['new_status'], $data);
}
// Show edit form or do the changes
@@ -342,7 +356,7 @@ function SURFBAR_MEMBER_DELETE_ACTION ($urlData) {
// Pause active banner
function SURFBAR_MEMBER_PAUSE_ACTION ($urlData) {
- return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData));
+ return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['url_status'], $urlData['new_status'], array($urlData['id'] => $urlData));
}
// Unpause stopped banner
@@ -350,45 +364,35 @@ function SURFBAR_MEMBER_UNPAUSE_ACTION ($urlData) {
// Fix missing entry for template
$urlData['edit'] = $urlData['unpause'];
$urlData['edit']['url'] = $urlData['url'];
- $urlData['edit']['limit'] = $urlData['views_max'];
+ $urlData['edit']['limit'] = SURFBAR_GET_VIEWS_MAX();
// Return status change
- return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData));
+ return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['url_status'], $urlData['new_status'], array($urlData['id'] => $urlData));
}
// Resubmit locked URL
function SURFBAR_MEMBER_RESUBMIT_ACTION ($urlData) {
- return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData));
+ return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['url_status'], $urlData['new_status'], array($urlData['id'] => $urlData));
}
// Display selected "action form"
function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) {
- // Translate some data
- $urlData['url_registered'] = generateDateTime($urlData['url_registered'], 2);
- $urlData['views_total'] = translateComma($urlData['views_total']);
- $urlData['views_max'] = translateComma($urlData['views_max']);
- $urlData['views_allowed'] = translateComma($urlData['views_allowed']);
- $urlData['url_last_locked'] = generateDateTime($urlData['url_last_locked'], 2);
-
- // Is the lock reason empty?
- if (empty($urlData['lock_reason'])) {
- // Fix it to three dashes
- $urlData['lock_reason'] = '---';
- } // END - if
+ // Translate some data if present
+ $content = SURFBAR_PREPARE_CONTENT_FOR_TEMPLATE($content);
// Include fields only for action 'edit'
if ($action == 'edit') {
// Default is not limited
- $urlData['limited_y'] = '';
- $urlData['limited_n'] = ' checked="checked"';
- $urlData['limited'] = 'false';
+ $urlData['limited_yes'] = '';
+ $urlData['limited_no'] = ' checked="checked"';
+ $urlData['limited'] = 'false';
// Is this URL limited?
- if ($urlData['views_max'] > 0) {
+ if (SURFBAR_GET_VIEWS_MAX() > 0) {
// Then rewrite form data
- $urlData['limited_y'] = ' checked="checked"';
- $urlData['limited_n'] = '';
- $urlData['limited'] = 'true';
+ $urlData['limited_yes'] = ' checked="checked"';
+ $urlData['limited_no'] = '';
+ $urlData['limited'] = 'true';
} // END - if
} // END - if
@@ -413,22 +417,16 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) {
// Construct function name
$functionName = sprintf("SURFBAR_MEMBER_EXECUTE_%s_ACTION", strtoupper($action));
- // Is 'userid' set and not 'userid' ?
- if ((!isset($urlData['userid'])) && (isset($urlData['userid']))) {
- // Auto-fix this
- $urlData['userid'] = $urlData['userid'];
- } // END - if
-
// Is that function there?
if (function_exists($functionName)) {
// Execute the function
if (call_user_func_array($functionName, array($urlData)) == true) {
// Update status as well
- $executed = SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData));
+ $executed = SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['url_status'], $urlData['new_status'], array($urlData['id'] => $urlData));
} // END - if
} else {
- // Not found!
- addFatalMessage(__FUNCTION__, __LINE__, getMessage('MEMBER_SURFBAR_EXECUTE_ACTION_404'), $functionName);
+ // Not found
+ debug_report_bug(__FUNCTION__, __LINE__, 'Callback function ' . $functionName . ' not found.');
}
// Return status
@@ -441,10 +439,10 @@ function SURFBAR_MEMBER_EXECUTE_EDIT_ACTION ($urlData) {
// Has the URL or limit changed?
if (true) {
- //if (($urlData['views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) {
+ //if (($urlData['url_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']), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `url`='%s', `url_views_allowed`=%s, `url_views_max`=%s WHERE `url_id`=%s AND `status`='%s' LIMIT 1",
+ array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['url_status']), __FUNCTION__, __LINE__);
// All fine
$status = true;
@@ -459,9 +457,9 @@ function SURFBAR_MEMBER_EXECUTE_DELETE_ACTION ($urlData) {
return true;
}
//
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// Self-maintenance functions
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
//
// Main function
function SURFBAR_HANDLE_SELF_MAINTENANCE () {
@@ -471,10 +469,11 @@ function SURFBAR_HANDLE_SELF_MAINTENANCE () {
// Handle low-points amounts
SURFBAR_HANDLE_LOW_POINTS();
}
+
// Handle URLs which limit has depleted
function SURFBAR_HANDLE_DEPLETED_VIEWS () {
// Get all URLs
- $urlArray = SURFBAR_GET_URL_DATA(0, 'views_max', 'id', 'ASC', 'id', " AND views_allowed>0 AND `status`='ACTIVE'");
+ $urlArray = SURFBAR_GET_URL_DATA(0, 'url_views_max', 'url_id', 'ASC', 'url_id', " AND `url_views_allowed` > 0 AND `url_status`='ACTIVE'");
// Do we have some entries?
if (count($urlArray) > 0) {
@@ -484,7 +483,9 @@ function SURFBAR_HANDLE_DEPLETED_VIEWS () {
$data = $urlData;
// Rewrite array for next call
- $urlData[$id] = $data;
+ $urlData = array(
+ $id => $data
+ );
// Handle the status
SURFBAR_CHANGE_STATUS($id, 'ACTIVE', 'DEPLETED', $urlData);
@@ -498,50 +499,48 @@ 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
SURFBAR_NOTIFY_USER('low_points', $content);
// Update last notified
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET surfbar_low_notified=NOW() WHERE `userid`=%s LIMIT 1",
- array($userid), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `surfbar_low_notified`=NOW() WHERE `userid`=%s LIMIT 1",
+ array($userid), __FUNCTION__, __LINE__);
} // END - if
} // END - foreach
}
//
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// Generic functions
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
//
// Looks up by an URL
function SURFBAR_LOOKUP_BY_URL ($url, $userid) {
// Now lookup that given URL by itself
- $urlArray = SURFBAR_GET_URL_DATA($url, 'url', 'id', 'ASC', 'id', sprintf(" AND `userid`=%s", bigintval($userid)));
+ $urlArray = SURFBAR_GET_URL_DATA($url, 'url', 'url_id', 'ASC', 'url_id', sprintf(" AND `url_userid`=%s", bigintval($userid)));
// 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 = '') {
+function SURFBAR_GET_URL_DATA ($searchTerm, $column = 'url_id', $order = 'url_id', $sort = 'ASC', $group = 'url_id', $add = '') {
// By default nothing is found
$GLOBALS['last_url_data'] = array();
// Is the column an id number?
- if (($column == 'id') || ($column == 'userid')) {
+ if (($column == 'url_id') || ($column == 'url_userid')) {
// Extra secure input
$searchTerm = bigintval($searchTerm);
} // END - if
@@ -554,14 +553,23 @@ function SURFBAR_GET_URL_DATA ($searchTerm, $column = 'id', $order = 'id', $sort
// Look up the record
$result = SQL_QUERY_ESC("SELECT
- `id`, `userid`, `url`,
- `views_total`, `views_max`, `views_allowed`, `status`,
- UNIX_TIMESTAMP(`registered`) AS `url_registered`, UNIX_TIMESTAMP(`last_locked`) AS `url_last_locked`, `lock_reason`,
- `views_max`, `views_allowed`, `fixed_reload`
+ `url_id`,
+ `url_userid`,
+ `url`,
+ `url_views_total`,
+ `url_views_max`,
+ `url_views_allowed`,
+ `url_status`,
+ UNIX_TIMESTAMP(`url_registered`) AS `url_registered`,
+ UNIX_TIMESTAMP(`url_last_locked`) AS `url_last_locked`,
+ `url_lock_reason`,
+ `url_views_max`,
+ `url_views_allowed`,
+ `url_fixed_reload`
FROM
`{?_MYSQL_PREFIX?}_surfbar_urls`
WHERE
- `%s`='%s'".$add."
+ `%s`='%s'" . $add . "
ORDER BY
`%s` %s
%s",
@@ -574,16 +582,16 @@ ORDER BY
), __FUNCTION__, __LINE__);
// Is there at least one record?
- if (SQL_NUMROWS($result) > 0) {
+ if (!SQL_HASZERONUMS($result)) {
// Then load all!
while ($dataRow = SQL_FETCHARRAY($result)) {
// Shall we group these results?
- if ($group == 'id') {
+ if ($group == 'url_id') {
// Add the row by id as index
- $GLOBALS['last_url_data'][$dataRow['id']] = $dataRow;
+ $GLOBALS['last_url_data'][$dataRow['url_id']] = $dataRow;
} else {
// Group entries
- $GLOBALS['last_url_data'][$dataRow[$group]][$dataRow['id']] = $dataRow;
+ $GLOBALS['last_url_data'][$dataRow[$group]][$dataRow['url_id']] = $dataRow;
}
} // END - while
} // END - if
@@ -605,16 +613,15 @@ function SURFBAR_REGISTER_URL ($url, $userid, $status = 'PENDING', $addMode = 'r
// Prepare content
$content = merge_array($extraFields, array(
'url' => $url,
- 'frametester' => generateFrametesterUrl($url),
- 'userid' => $userid,
- 'status' => $status,
+ 'url_userid' => $userid,
+ 'url_status' => $status,
));
// Is limit/reload set?
- if (!isset($config['limit'])) {
+ if (!isset($content['limit'])) {
$content['limit'] = '0';
} // END - if
- if (!isset($config['reload'])) {
+ if (!isset($content['reload'])) {
$content['reload'] = '0';
} // END - if
@@ -627,17 +634,14 @@ 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
- SURFBAR_NOTIFY_ADMIN("url_{$addMode}", $content);
+ SURFBAR_NOTIFY_ADMIN('url_' . $addMode, $content);
} // END - if
// Send mail to user
- SURFBAR_NOTIFY_USER("url_{$addMode}", $content);
+ SURFBAR_NOTIFY_USER('url_' . $addMode, $content);
// Return the insert id
return $content['insert_id'];
@@ -646,17 +650,19 @@ function SURFBAR_REGISTER_URL ($url, $userid, $status = 'PENDING', $addMode = 'r
// Inserts an url by given data array and return the insert id
function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
// Get userid
- $userid = bigintval($urlData['userid']);
+ $userid = bigintval($urlData['url_userid']);
// Is the id set?
- if (empty($userid)) $userid = '0';
+ if (empty($userid)) {
+ $userid = 'NULL';
+ } // END - if
// Just run the insert query for now
- SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_urls` (userid,url,status,views_max,views_allowed,fixed_reload) VALUES (%s,'%s','%s',%s,%s,%s)",
+ SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_urls` (`url_userid`,`url`,`url_status`,`url_views_max`,`url_views_allowed`,`url_fixed_reload`) VALUES (%s,'%s','%s',%s,%s,%s)",
array(
$userid,
$urlData['url'],
- $urlData['status'],
+ $urlData['url_status'],
$urlData['limit'],
$urlData['limit'],
$urlData['reload']
@@ -673,32 +679,27 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) {
$templateName = sprintf("admin_surfbar_%s", $messageType);
// Prepare subject
- $subject = getMessage(sprintf("ADMIN_SURFBAR_NOTIFY_%s_SUBJECT",
+ $subject = sprintf("{--ADMIN_SURFBAR_NOTIFY_%s_SUBJECT--}",
strtoupper($messageType)
- ));
+ );
// 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');
+ $subject = '{%message,ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT=' . strtoupper($messageType) . '%}';
} // END - if
// Translate some data if present
- if (isset($content['status'])) $content['status'] = translateSurfbarUrlStatus($content['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['views_total'])) $content['views_total'] = translateComma($content['views_total']);
- if (isset($content['views_allowed'])) $content['views_allowed'] = translateComma($content['views_allowed']);
- if (isset($content['views_max'])) $content['views_max'] = translateComma($content['views_max']);
+ $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
@@ -706,29 +707,35 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
$templateName = sprintf("member_surfbar_%s", $messageType);
// Prepare subject
- $subject = getMessage(sprintf("MEMBER_SURFBAR_NOTIFY_%s_SUBJECT",
- strtoupper($messageType)
- ));
+ $subject = sprintf("{--MEMBER_SURFBAR_NOTIFY_%s_SUBJECT--}",
+ strtoupper($messageType)
+ );
// 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
- if (isset($content['status'])) $content['status'] = translateSurfbarUrlStatus($content['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['views_total'])) $content['views_total'] = translateComma($content['views_total']);
- if (isset($content['views_allowed'])) $content['views_allowed'] = translateComma($content['views_allowed']);
- if (isset($content['views_max'])) $content['views_max'] = translateComma($content['views_max']);
+ $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_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);
+
+ // Return translated content
+ return $content;
}
// Translates the limit
@@ -736,10 +743,10 @@ 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);
+ $return = '{%pipe,translateComma=' . $limit . '%}';
}
// Return value
@@ -748,25 +755,67 @@ function translateSurfbarLimit ($limit) {
// Translate the URL status
function translateSurfbarUrlStatus ($status) {
- // Create constant name
- $constantName = sprintf("SURFBAR_URL_STATUS_%s", strtoupper($status));
+ // NULL must be handled carfefully
+ if ((is_null($status)) || (trim($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));
+ }
+}
- // Get message
- $statusTranslated = getMessage($constantName);
+// 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 . '%}';
- // Return result
- return $statusTranslated;
+ // ... 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();
@@ -783,7 +832,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();
@@ -809,13 +858,13 @@ 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')) {
+ if (isGetRequestElementSet('frame')) {
// Use the frame as a template name part... ;-)
$templateName = sprintf("surfbar_frame_%s",
- getRequestParameter('frame')
+ getRequestElement('frame')
);
} // END - if
@@ -825,35 +874,37 @@ 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() {
+function SURFBAR_CHECK_RELOAD_FULL () {
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Fixed surf lock is ' . getConfig('surfbar_static_lock') . ' - ENTERED!');
// Default is full!
$isFull = true;
// Cache static reload lock
$GLOBALS['surfbar_cache']['surf_lock'] = getConfig('surfbar_static_lock');
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Fixed surf lock is '.getConfig('surfbar_static_lock') . '', false);
// Do we have dynamic model?
- if (getConfig('surfbar_pay_model') == 'DYNAMIC') {
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'surf_lock=' . $GLOBALS['surfbar_cache']['surf_lock'] . ' - BEFORE');
+ if (getSurfbarPaymentModel() == 'DYNAMIC') {
// "Calculate" dynamic lock
$GLOBALS['surfbar_cache']['surf_lock'] += SURFBAR_CALCULATE_DYNAMIC_ADD();
} // END - if
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'surf_lock=' . $GLOBALS['surfbar_cache']['surf_lock'] . ' - AFTER');
// Ask the database
$result = SQL_QUERY_ESC("SELECT
- COUNT(l.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.id=l.url_id
+ u.`url_id`=l.`locks_url_id`
WHERE
- l.userid=%s AND
- (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(l.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.last_surfed) - u.fixed_reload) < 0 AND u.fixed_reload > 0) OR
- u.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__
@@ -875,62 +926,70 @@ LIMIT 1",
$total = SURFBAR_GET_TOTAL_URLS();
// Do we have some URLs in lock? Admins can always surf on own URLs!
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userLocks=".SURFBAR_GET_USER_LOCKS().",total={$total}", false);
$isFull = ((SURFBAR_GET_USER_LOCKS() == $total) && ($total > 0));
// Return result
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userLocks=' . SURFBAR_GET_USER_LOCKS() . ',total=' . $total . 'isFull=' . intval($isFull) . ' - EXIT!');
return $isFull;
}
// Get total amount of URLs of given status for current user or of ACTIVE URLs by default
-function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = '0') {
+function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = NULL) {
// Determine depleted user account
$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
// Is the exlude userid set?
- if ($excludeUserId > 0) {
+ if (isValidUserId($excludeUserId)) {
// Then add it
- $userids['userid'][$excludeUserId] = $excludeUserId;
+ $userids['url_userid'][$excludeUserId] = $excludeUserId;
} // END - if
// Get amount from database
- $result = SQL_QUERY_ESC("SELECT COUNT(`id`) AS cnt
-FROM `{?_MYSQL_PREFIX?}_surfbar_urls`
-WHERE `userid` NOT IN (".implode(', ', $userids['userid']).") AND `status`='%s'",
+ $result = SQL_QUERY_ESC("SELECT
+ COUNT(`url_id`) AS cnt
+FROM
+ `{?_MYSQL_PREFIX?}_surfbar_urls`
+WHERE
+ `url_userid` NOT IN (".implode(', ', $userids['url_userid']).") AND
+ `url_status`='%s'
+LIMIT 1",
array($status), __FUNCTION__, __LINE__
);
// Fetch row
- list($cnt) = SQL_FETCHROW($result);
+ list($count) = SQL_FETCHROW($result);
// Free result
SQL_FREERESULT($result);
+ // Debug message
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'cnt=' . $count);
+
// Return result
- return $cnt;
+ return $count;
}
// Check wether the user is allowed to book more URLs
-function SURFBAR_IF_USER_BOOK_MORE_URLS ($userid = '0') {
+function SURFBAR_IF_USER_BOOK_MORE_URLS ($userid = NULL) {
// 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 (((is_null($userid)) && (isAdmin())) || (SURFBAR_GET_TOTAL_USER_URLS($userid, '', array('REJECTED')) < getSurfbarMaxOrder()));
}
// Get total amount of URLs of given status for current user
-function SURFBAR_GET_TOTAL_USER_URLS ($userid = '0', $status = '',$exclude = '') {
+function SURFBAR_GET_TOTAL_USER_URLS ($userid = NULL, $status = '', $exclude = '') {
// Is the user 0 and user is logged in?
- if (($userid == '0') && (isMember())) {
+ if ((is_null($userid)) && (isMember())) {
// Then use this userid
$userid = getMemberId();
- } elseif ($userid == '0') {
+ } elseif (is_null($userid)) {
// Error!
- return (getConfig('surfbar_max_order') + 1);
+ return (getSurfbarMaxOrder() + 1);
}
// Default is all URLs
@@ -939,68 +998,53 @@ function SURFBAR_GET_TOTAL_USER_URLS ($userid = '0', $status = '',$exclude = '')
// Is the status set?
if (is_array($status)) {
// Only URLs with these status
- $add = sprintf(" AND `status` IN('%s')", implode("','", $status));
+ $add = sprintf(" WHERE `url_status` IN('%s')", implode("','", $status));
} elseif (!empty($status)) {
// Only URLs with this status
- $add = sprintf(" AND `status`='%s'", $status);
+ $add = sprintf(" WHERE `url_status`='%s'", $status);
} elseif (is_array($exclude)) {
// Exclude URLs with these status
- $add = sprintf(" AND `status` NOT IN('%s')", implode("','", $exclude));
+ $add = sprintf(" WHERE `url_status` NOT IN('%s')", implode("','", $exclude));
} elseif (!empty($exclude)) {
// Exclude URLs with this status
- $add = sprintf(" AND `status` != '%s'", $exclude);
+ $add = sprintf(" WHERE `url_status` != '%s'", $exclude);
}
// Get amount from database
- $cnt = countSumTotalData($userid, 'surfbar_urls', 'id', 'userid', true, $add);
+ $count = countSumTotalData($userid, 'surfbar_urls', 'url_id', 'url_userid', true, $add);
// Return result
- return $cnt;
+ return $count;
}
// Generate a validation code for the given id number
function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt = '') {
- // @TODO Invalid salt should be refused
- $GLOBALS['surfbar_cache']['salt'] = 'INVALID';
-
- // Get code length from config
- $length = getConfig('code_length');
-
- // Fix length to 10
- if ($length == '0') $length = 10;
-
- // Generate a code until the length matches
- $valCode = '';
- while (strlen($valCode) != $length) {
- // Is the salt set?
- if (empty($salt)) {
- // Generate random hashed string
- $GLOBALS['surfbar_cache']['salt'] = sha1(generatePassword(mt_rand(200, 255)));
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'newSalt='.SURFBAR_GET_SALT().'', false);
- } else {
- // Use this as salt!
- $GLOBALS['surfbar_cache']['salt'] = $salt;
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'oldSalt='.SURFBAR_GET_SALT().'', false);
- }
-
- // ... and now the validation code
- $valCode = generateRandomCode($length, sha1(SURFBAR_GET_SALT().':'.$urlId), getMemberId());
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'valCode='.valCode.'', false);
- } // END - while
+ /* 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='.SURFBAR_GET_SALT().'', false);
+ } else {
+ // Use this as salt!
+ $GLOBALS['surfbar_cache']['salt'] = $salt;
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'oldSalt='.SURFBAR_GET_SALT().'', false);
+ }
// Hash it with md5() and salt it with the random string
- $hashedCode = generateHash(md5($valCode), SURFBAR_GET_SALT());
+ $hashedCode = generateHash(md5($urlId . getEncryptSeperator() . getMemberId()), SURFBAR_GET_SALT());
// Finally encrypt it PGP-like and return it
$valHashedCode = encodeHashForCookie($hashedCode);
// Return hashed value
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'finalValCode='.$valHashedCode.'', false);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',salt=' . $salt . ',urlId=' . $urlId . ',salt=' . $salt . ',valHashedCode=' . $valHashedCode . ' - EXIT!');
return $valHashedCode;
}
// Check validation code
function SURFBAR_CHECK_VALIDATION_CODE ($urlId, $check, $salt) {
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',check=' . $check . ',salt=' . $salt . ' - ENTERED!');
// Secure id number
$urlId = bigintval($urlId);
@@ -1008,35 +1052,52 @@ function SURFBAR_CHECK_VALIDATION_CODE ($urlId, $check, $salt) {
$code = SURFBAR_GENERATE_VALIDATION_CODE($urlId, $salt);
// Return result of checking hashes and salts
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '---'.$code.'|'.$check.'---', false);
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '+++'.$salt.'|'.SURFBAR_GET_DATA('last_salt').'+++', false);
- return (($code == $check) && ($salt == SURFBAR_GET_DATA('last_salt')));
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',(code==check)=' . intval($code == $check) . ',(salt==salts_last_salt)=' . intval($salt == SURFBAR_GET_DATA('salts_last_salt')) . ' - EXIT!');
+ return (($code == $check) && ($salt == SURFBAR_GET_DATA('salts_last_salt')));
}
// Lockdown the userid/id combination (reload lock)
function SURFBAR_LOCKDOWN_ID ($urlId) {
- //* DEBUG: */ outputHtml('LOCK!');
- ///* DEBUG: */ return;
- // Just add it to the database
- SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_locks` (`userid`, `url_id`) VALUES (%s, %s)",
- array(getMemberId(), bigintval($urlId)), __FUNCTION__, __LINE__);
+ /* 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));
+
+ // Do we have 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)',
+ array(
+ getMemberId(),
+ bigintval($urlId)
+ ), __FUNCTION__, __LINE__);
+ } // END - if
// 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), getMemberId()), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC('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!');
}
// 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 () {
// Remove it from the URL owner
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.SURFBAR_GET_USERID().',costs='.SURFBAR_GET_COSTS().'', false);
- if (SURFBAR_GET_USERID() > 0) {
- subtractPoints(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), SURFBAR_GET_USERID(), SURFBAR_GET_COSTS());
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.SURFBAR_GET_USERID().',costs='.SURFBAR_GET_COSTS() . ' - ENTERED!');
+ if (isValidUserId(SURFBAR_GET_USERID())) {
+ // Subtract points and ignore return status
+ subtractPoints(sprintf("surfbar_%s", getSurfbarPaymentModel()), SURFBAR_GET_USERID(), SURFBAR_GET_COSTS());
} // END - if
- // Book it to the user
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getMemberId().',reward='.SURFBAR_GET_REWARD().'', false);
- addPointsThroughReferalSystem(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), getMemberId(), SURFBAR_GET_DATA('reward'));
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getMemberId().',reward='.SURFBAR_GET_REWARD());
+ // Init referal system here
+ initReferalSystem();
+
+ // Book it to the user and ignore return status
+ addPointsThroughReferalSystem(sprintf("surfbar:%s", getSurfbarPaymentModel()), getMemberId(), SURFBAR_GET_REWARD());
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.SURFBAR_GET_USERID().',costs='.SURFBAR_GET_COSTS() . ' - EXIT!');
}
// Updates the statistics of current URL/userid
@@ -1050,22 +1111,28 @@ 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 .= ', `url_views_max`=`url_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",
+ SQL_QUERY_ESC('UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `url_views_total`=`url_views_total`+1' . $add . ' WHERE `url_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(getMemberId(), SURFBAR_GET_ID()), __FUNCTION__, __LINE__);
+ 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',
+ array(
+ getMemberId(),
+ SURFBAR_GET_ID()
+ ), __FUNCTION__, __LINE__);
// Was that update okay?
- if (SQL_AFFECTEDROWS() < 1) {
+ if (SQL_HASZEROAFFECTED()) {
// No, then insert entry
- SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_stats` (userid,url_id,count) VALUES (%s,%s,1)",
- array(getMemberId(), SURFBAR_GET_ID()), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC('INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_stats` (`stats_userid`,`stats_url_id`,`stats_count`) VALUES (%s,%s,1)',
+ array(
+ getMemberId(),
+ SURFBAR_GET_ID()
+ ), __FUNCTION__, __LINE__);
} // END - if
// Update total/daily/weekly/monthly counter
@@ -1080,119 +1147,140 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
// Update the salt for validation and statistics
function SURFBAR_UPDATE_SALT_STATS () {
+ // Update salt
+ SURFBAR_GENERATE_VALIDATION_CODE(SURFBAR_GET_ID());
+
+ // Make sure only valid salts can pass
+ if (SURFBAR_GET_SALT() == 'INVALID') {
+ // Invalid provided
+ debug_report_bug(__FUNCTION__, __LINE__, 'Invalid salt provided, id=' . SURFBAR_GET_ID() . ',getMemberId()=' . getMemberId());
+ } // END - if
+
// Update statistics record
SURFBAR_UPDATE_INSERT_STATS_RECORD();
// 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(), getMemberId()), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_surfbar_salts` SET `salts_last_salt`='%s' WHERE `salts_url_id`=%s AND `salts_userid`=%s LIMIT 1",
+ array(
+ SURFBAR_GET_SALT(),
+ SURFBAR_GET_ID(),
+ getMemberId()
+ ), __FUNCTION__, __LINE__);
// Debug message
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'salt='.SURFBAR_GET_SALT().',id='.SURFBAR_GET_ID().',userid='.getMemberId().'', false);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'salt=' . SURFBAR_GET_SALT() . ',id=' . SURFBAR_GET_ID() . ',userid=' . getMemberId() . ',SQL_AFFECTEDROWS()=' . SQL_AFFECTEDROWS() . ' - UPDATE!');
// Was that okay?
- if (SQL_AFFECTEDROWS() < 1) {
+ if (SQL_HASZEROAFFECTED()) {
// 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(), getMemberId(), SURFBAR_GET_SALT()), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_salts` (`salts_url_id`,`salts_userid`,`salts_last_salt`) VALUES (%s, %s, '%s')",
+ array(
+ SURFBAR_GET_ID(),
+ getMemberId(),
+ SURFBAR_GET_SALT()
+ ), __FUNCTION__, __LINE__);
} // END - if
// Debug message
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'affectedRows='.SQL_AFFECTEDROWS().'', false);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'affectedRows=' . SQL_AFFECTEDROWS() . ' - EXIT!');
// Return if the update was okay
- return (SQL_AFFECTEDROWS() == 1);
+ return (!SQL_HASZEROAFFECTED());
}
// Check if the reload lock is active for given id
function SURFBAR_CHECK_RELOAD_LOCK ($urlId) {
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $urlId . '', false);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $urlId . ' - ENTERED!');
// Ask the database
- $result = SQL_QUERY_ESC("SELECT COUNT(`id`) AS cnt
+ $result = SQL_QUERY_ESC("SELECT COUNT(`locks_id`) AS cnt
FROM
`{?_MYSQL_PREFIX?}_surfbar_locks`
WHERE
- `userid`=%s AND `url_id`=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(`last_surfed`)
+ `locks_userid`=%s AND
+ `locks_url_id`=%s AND
+ (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(`locks_last_surfed`)
ORDER BY
- `last_surfed` ASC
+ `locks_last_surfed` ASC
LIMIT 1",
array(getMemberId(), bigintval($urlId)), __FUNCTION__, __LINE__
);
// Fetch counter
- list($cnt) = SQL_FETCHROW($result);
+ list($count) = SQL_FETCHROW($result);
// Free result
SQL_FREERESULT($result);
// Return check
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'cnt=' . $cnt . ',' . SURFBAR_GET_SURF_LOCK() . '', false);
- return ($cnt == 1);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',count=' . $count . ',SURFBAR_GET_SURF_LOCK()=' . SURFBAR_GET_SURF_LOCK() . ' - EXIT!');
+ return ($count == 1);
}
// Determine which user hash no more points left
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['points'][getMemberId()] = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
- $userids['notified'][getMemberId()] = '0';
+ $userids['url_userid'][getMemberId()] = getMemberId();
+ $userids['points'][getMemberId()] = getTotalPoints(getMemberId());
+ $userids['notified'][getMemberId()] = '0';
// Get all userid except logged in one
$result = SQL_QUERY_ESC("SELECT
- u.userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified
+ u.url_userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified
FROM
`{?_MYSQL_PREFIX?}_surfbar_urls` AS u
INNER JOIN
`{?_MYSQL_PREFIX?}_user_data` AS d
ON
- u.userid=d.userid
+ u.`url_userid`=d.`userid`
WHERE
- u.userid NOT IN (%s,0) AND u.`status`='ACTIVE'
+ u.`url_userid` NOT IN (%s,0) AND
+ u.`url_status`='ACTIVE'
GROUP BY
- u.userid
+ u.`url_userid`
ORDER BY
- u.userid ASC",
+ u.`url_userid` ASC",
array(getMemberId()), __FUNCTION__, __LINE__);
} else {
// Get all userid
$result = SQL_QUERY("SELECT
- u.userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified
+ u.url_userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified
FROM
`{?_MYSQL_PREFIX?}_surfbar_urls` AS u
INNER JOIN
`{?_MYSQL_PREFIX?}_user_data` AS d
ON
- u.userid=d.userid
+ u.`url_userid`=d.`userid`
WHERE
- u.`status`='ACTIVE'
+ u.`url_userid` > 0 AND
+ u.`url_status`='ACTIVE'
GROUP BY
- u.userid
+ u.`url_userid`
ORDER BY
- u.userid ASC", __FUNCTION__, __LINE__);
+ u.`url_userid` ASC", __FUNCTION__, __LINE__);
}
// 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 = getTotalPoints($content['url_userid']);
+ /* 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['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!');
+ $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
@@ -1200,7 +1288,7 @@ ORDER BY
SQL_FREERESULT($result);
// Debug message
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UIDs::count=".count($userids)." (with own userid=".getMemberId().')', false);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UIDs::count=' . count($userids) . ' (with own userid=' . getMemberId() . ')');
// Return result
return $userids;
@@ -1209,23 +1297,23 @@ ORDER BY
// Determine how many users are Online in surfbar
function SURFBAR_DETERMINE_TOTAL_ONLINE () {
// Count all users in surfbar modue and return the value
- $result = SQL_QUERY("SELECT
- `id`
+ $result = SQL_QUERY('SELECT
+ `stats_id`
FROM
`{?_MYSQL_PREFIX?}_surfbar_stats`
WHERE
- (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(`last_surfed`)) <= {?online_timeout?}
+ (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(`stats_last_surfed`)) <= {?online_timeout?}
GROUP BY
- `userid` ASC", __FUNCTION__, __LINE__);
+ `stats_userid` ASC', __FUNCTION__, __LINE__);
// Fetch count
- $cnt = SQL_NUMROWS($result);
+ $count = SQL_NUMROWS($result);
// Free result
SQL_FREERESULT($result);
// Return result
- return $cnt;
+ return $count;
}
// Determine waiting time for one URL
@@ -1243,7 +1331,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
@@ -1253,7 +1341,8 @@ function SURFBAR_DETERMINE_WAIT_TIME () {
}
// Changes the status of an URL from given to other
-function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) {
+function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data = array()) {
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',prevStatus=' . $prevStatus . ',newStatus=' . $newStatus . ' - ENTERED!');
// Make new status always lower-case
$newStatus = strtolower($newStatus);
@@ -1263,52 +1352,49 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array())
$data = SURFBAR_GET_URL_DATA($urlId);
} // END - if
- // Is the new status set?
- if ((!is_string($newStatus)) || (empty($newStatus))) {
- // Abort here, but fine!
- return true;
- } // END - if
+ // Prepare array
+ $filterData = array(
+ 'url_id' => $urlId,
+ 'prev_status' => $prevStatus,
+ 'new_status' => $newStatus,
+ 'data' => $data,
+ 'abort' => null
+ );
- // Is the status like prevStatus is saying?
- if ($data[$urlId]['status'] != $prevStatus) {
- // No, then abort here
- return false;
- } // END - if
+ // Run pre filter chain
+ $filterData = runFilterChain('pre_change_surfbar_url_status', $filterData);
+ // Abort here?
+ if (!is_null($filterData['abort'])) {
+ // Abort here
+ return $filterData['abort'];
+ }
// 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)), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `url_status`='%s' WHERE `url_id`=%s LIMIT 1",
+ 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]['userid'] = $data[$urlId]['userid'];
- $data[$urlId]['frametester'] = generateFrametesterUrl($data[$urlId]['url']);
- $data[$urlId]['reward'] = translateComma(getConfig('surfbar_static_reward'));
- $data[$urlId]['costs'] = translateComma(getConfig('surfbar_static_costs'));
-
- // Do some dirty fixing here:
- if (($data[$urlId]['status'] == 'STOPPED') && ($newStatus == 'pending')) {
- // Fix for template change
- $newStatus = 'continued';
+ if (SQL_AFFECTEDROWS() != 1) {
+ // No, something went wrong
+ return false;
} // END - if
+ // ---------- Comment out for debugging/developing member actions! ---------
- // Send admin notification
- SURFBAR_NOTIFY_ADMIN("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]);
+ // Run post filter chain
+ $filterData = runFilterChain('post_change_surfbar_url_status', $filterData);
- // Send user notification
- SURFBAR_NOTIFY_USER("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]);
+ // Extract data from it again
+ $data = $filterData['data'];
// All done!
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',prevStatus=' . $prevStatus . ',newStatus=' . $newStatus . ' - EXIT!');
return true;
}
@@ -1321,7 +1407,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();
@@ -1358,7 +1444,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);
@@ -1396,42 +1482,45 @@ function SURFBAR_GET_LOCK_IDS () {
$ignored = array();
// Get all id from locks within the timestamp
- $result = SQL_QUERY_ESC("SELECT `id`, `url_id`, UNIX_TIMESTAMP(`last_surfed`) AS last_surfed
+ $result = SQL_QUERY_ESC("SELECT
+ `locks_id`,
+ `locks_url_id`,
+ UNIX_TIMESTAMP(`locks_last_surfed`) AS `last_surfed`
FROM
`{?_MYSQL_PREFIX?}_surfbar_locks`
WHERE
- `userid`=%s
+ `locks_userid`=%s
ORDER BY
- `id` ASC", array(getMemberId()),
+ `locks_id` ASC", array(getMemberId()),
__FUNCTION__, __LINE__);
// Load all entries
while ($content = SQL_FETCHARRAY($result)) {
// Debug message
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'next - lid='.$content['id'].',url='.$content['url_id'].',rest='.(time() - $content['last_surfed']).'/'.SURFBAR_GET_SURF_LOCK().'', false);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'next - lid='.$content['locks_id'].',url='.$content['locks_url_id'].',rest='.(time() - $content['last_surfed']).'/'.SURFBAR_GET_SURF_LOCK());
// Skip entries that are too old
- if (($content['last_surfed'] > (time() - SURFBAR_GET_SURF_LOCK())) && (!in_array($content['url_id'], $ignored))) {
+ if (($content['last_surfed'] > (time() - SURFBAR_GET_SURF_LOCK())) && (!in_array($content['locks_url_id'], $ignored))) {
// Debug message
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'okay - lid='.$content['id'].',url='.$content['url_id'].',last='.$content['last_surfed'].'', false);
+ /* 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['url_id']])) || ($IDs[$content['url_id']] > $content['last_surfed'])) {
+ if ((!isset($IDs[$content['locks_url_id']])) || ($IDs[$content['locks_url_id']] > $content['last_surfed'])) {
// Debug message
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ADD - lid='.$content['id'].',url='.$content['url_id'].',last='.$content['last_surfed'].'', false);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ADD - lid='.$content['locks_id'].',url='.$content['locks_url_id'].',last='.$content['last_surfed']);
// Add this id
- $IDs[$content['url_id']] = $content['last_surfed'];
- $USE[$content['url_id']] = $content['id'];
+ $IDs[$content['locks_url_id']] = $content['last_surfed'];
+ $USE[$content['locks_url_id']] = $content['locks_id'];
} // END - if
} else {
// Debug message
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ignore - lid='.$content['id'].',url='.$content['url_id'].',last='.$content['last_surfed'].'', false);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ignore - lid='.$content['locks_id'].',url='.$content['locks_url_id'].',last='.$content['last_surfed']);
// Ignore these old entries!
- $ignored[] = $content['url_id'];
- unset($IDs[$content['url_id']]);
- unset($USE[$content['url_id']]);
+ $ignored[] = $content['locks_url_id'];
+ unset($IDs[$content['locks_url_id']]);
+ unset($USE[$content['locks_url_id']]);
}
} // END - while
@@ -1446,27 +1535,27 @@ ORDER BY
function SURFBAR_GET_MAX_RANDOM ($userids, $add) {
// Count max availabe entries
$result = SQL_QUERY("SELECT
- sbu.id AS cnt
+ sbu.url_id AS cnt
FROM
`{?_MYSQL_PREFIX?}_surfbar_urls` AS sbu
LEFT JOIN
`{?_MYSQL_PREFIX?}_surfbar_salts` AS sbs
ON
- sbu.id=sbs.url_id
+ sbu.url_id=sbs.salts_url_id
LEFT JOIN
`{?_MYSQL_PREFIX?}_surfbar_locks` AS l
ON
- sbu.id=l.url_id
+ sbu.url_id=l.locks_url_id
WHERE
- sbu.userid NOT IN (".implode(',', $userids).") AND
- (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND
- sbu.`status`='ACTIVE'
- ".$add."
+ 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.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().'', false);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'lastQuery='.getConfig('db_last_query').'|numRows='.SQL_NUMROWS($result).'|Affected='.SQL_AFFECTEDROWS());
// Fetch max rand
$maxRand = SQL_NUMROWS($result);
@@ -1481,30 +1570,35 @@ 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
- u.id, u.userid, u.url, u.status,
- u.views_total, u.views_max, u.views_allowed,
- UNIX_TIMESTAMP(u.registered) AS url_registered,
- UNIX_TIMESTAMP(u.last_locked) AS url_last_locked,
- u.lock_reason AS lock_reason
+ 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`
FROM
`{?_MYSQL_PREFIX?}_surfbar_urls` AS u
WHERE
- u.userid=%s AND
- u.status != 'DELETED'
+ u.`url_userid`=%s AND
+ u.`url_status` != 'DELETED'
ORDER BY
- u.id ASC",
+ u.url_id ASC",
array(getMemberId()), __FUNCTION__, __LINE__);
// Are there entries?
- if (SQL_NUMROWS($result) > 0) {
+ if (!SQL_HASZERONUMS($result)) {
// Load all rows
while ($row = SQL_FETCHARRAY($result)) {
// Add the row
- $URLs[$row['id']] = $row;
+ $urlArray[$row['url_id']] = $row;
} // END - while
} // END - if
@@ -1512,7 +1606,7 @@ ORDER BY
SQL_FREERESULT($result);
// Return the array
- return $URLs;
+ return $urlArray;
}
// "Getter" for member action array for given status
@@ -1521,15 +1615,15 @@ 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 `status`='%s' ORDER BY `id` ASC",
- array($status), __FUNCTION__, __LINE__);
+ $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?
- if (SQL_NUMROWS($result) > 0) {
+ if (!SQL_HASZERONUMS($result)) {
// 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
@@ -1543,6 +1637,7 @@ function SURFBAR_GET_ARRAY_FROM_STATUS ($status) {
// Reload to configured stop page
function SURFBAR_RELOAD_TO_STOP_PAGE ($page = 'stop') {
// Internal or external?
+ /* 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);
@@ -1553,14 +1648,15 @@ 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') {
+// getters below this function!
+function SURFBAR_DETERMINE_NEXT_ID ($urlId = NULL) {
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ' - ENTERED!');
// Default is no id and no random number
$nextId = '0';
$randNum = '0';
// Is the id set?
- if ($urlId == '0') {
+ if (is_null($urlId)) {
// Get array with lock ids
$USE = SURFBAR_GET_LOCK_IDS();
@@ -1568,7 +1664,7 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = '0') {
$add = '';
if (count($USE) > 0) {
// Ignore some!
- $add = " AND sbu.id NOT IN (";
+ $add = " AND sbu.`url_id` NOT IN (";
foreach ($USE as $url_id => $lid) {
// Add URL id
$add .= $url_id.',';
@@ -1582,7 +1678,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) {
@@ -1591,69 +1687,108 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = '0') {
} // END - if
// And query the database
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'randNum='.$randNum.',maxRand='.$maxRand.',surfLock='.SURFBAR_GET_SURF_LOCK().'', false);
- $result = SQL_QUERY_ESC("SELECT sbu.id, sbu.userid, sbu.url, sbs.last_salt, sbu.views_total, sbu.views_max, sbu.views_allowed, UNIX_TIMESTAMP(l.last_surfed) AS last_surfed, sbu.fixed_reload
-FROM `{?_MYSQL_PREFIX?}_surfbar_urls` AS sbu
-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(',', $userids['userid']).") 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
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'randNum='.$randNum.',maxRand='.$maxRand.',surfLock='.SURFBAR_GET_SURF_LOCK());
+ $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
+FROM
+ `{?_MYSQL_PREFIX?}_surfbar_urls` AS sbu
+LEFT JOIN
+ `{?_MYSQL_PREFIX?}_surfbar_salts` AS sbs
+ON
+ sbu.url_id=sbs.salts_url_id
+LEFT JOIN
+ `{?_MYSQL_PREFIX?}_surfbar_locks` AS l
+ON
+ sbu.url_id=l.locks_url_id
+WHERE
+ 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`
+ORDER BY
+ 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.id, sbu.userid, sbu.url, sbs.last_salt, sbu.views_total, sbu.views_max, sbu.views_allowed, UNIX_TIMESTAMP(l.last_surfed) AS last_surfed, sbu.fixed_reload
-FROM `{?_MYSQL_PREFIX?}_surfbar_urls` AS sbu
-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 != %s AND sbu.`status`='ACTIVE' AND sbu.id=%s AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))
+ $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
+FROM
+ `{?_MYSQL_PREFIX?}_surfbar_urls` AS sbu
+LEFT JOIN
+ `{?_MYSQL_PREFIX?}_surfbar_salts` AS sbs
+ON
+ sbu.url_id=sbs.salts_url_id
+LEFT JOIN
+ `{?_MYSQL_PREFIX?}_surfbar_locks` AS l
+ON
+ sbu.url_id=l.locks_url_id
+WHERE
+ sbu.url_userid != %s 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().'', false);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'lastQuery='.getConfig('db_last_query').'|numRows='.SQL_NUMROWS($result).'|Affected='.SQL_AFFECTEDROWS());
if (SQL_NUMROWS($result) == 1) {
// Load/cache data
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'count('.count($GLOBALS['surfbar_cache']).') - BEFORE', false);
+ /* 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']).') - AFTER', false);
// Determine waiting time
$GLOBALS['surfbar_cache']['time'] = SURFBAR_DETERMINE_WAIT_TIME();
// Is the last salt there?
- if (is_null($GLOBALS['surfbar_cache']['last_salt'])) {
+ if (is_null($GLOBALS['surfbar_cache']['salts_last_salt'])) {
// Then repair it wit the static!
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'last_salt - FIXED!', false);
- $GLOBALS['surfbar_cache']['last_salt'] = '';
+ /* 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'] = SURFBAR_DETERMINE_REWARD();
$GLOBALS['surfbar_cache']['costs'] = SURFBAR_DETERMINE_COSTS();
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'BASE/STATIC - reward='.SURFBAR_GET_REWARD().'|costs='.SURFBAR_GET_COSTS().'', false);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'BASE/STATIC - reward='.SURFBAR_GET_REWARD().'|costs='.SURFBAR_GET_COSTS());
// 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();
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'DYNAMIC+ - reward='.SURFBAR_GET_REWARD().'|costs='.SURFBAR_GET_COSTS().'', false);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'DYNAMIC+ - reward='.SURFBAR_GET_REWARD().'|costs='.SURFBAR_GET_COSTS());
} // END - if
// Now get the id
@@ -1664,14 +1799,78 @@ LIMIT 1",
SQL_FREERESULT($result);
// Return result
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'nextId='.$nextId.'', false);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'urlId=' . $urlId . ',nextId=' . $nextId . ' - EXIT!');
return $nextId;
}
-// -----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+// Wrapper function
+//-----------------------------------------------------------------------------
+
+// "Getter" for surfbar_dynamic_percent
+function getSurfbarDynamicPercent () {
+ // Do we have cache?
+ if (!isset($GLOBALS[__FUNCTION__])) {
+ // Determine it
+ $GLOBALS[__FUNCTION__] = getConfig('surfbar_dynamic_percent');
+ } // END - if
+
+ // Return cache
+ return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for surfbar_static_reward
+function getSurfbarStaticReward () {
+ // Do we have cache?
+ if (!isset($GLOBALS[__FUNCTION__])) {
+ // Determine it
+ $GLOBALS[__FUNCTION__] = getConfig('surfbar_static_reward');
+ } // END - if
+
+ // Return cache
+ return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for surfbar_static_time
+function getSurfbarStaticTime () {
+ // Do we have cache?
+ if (!isset($GLOBALS[__FUNCTION__])) {
+ // Determine it
+ $GLOBALS[__FUNCTION__] = getConfig('surfbar_static_time');
+ } // END - if
+
+ // Return cache
+ return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for surfbar_max_order
+function getSurfbarMaxOrder () {
+ // Do we have cache?
+ 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[__FUNCTION__] = getConfig('surfbar_payment_model');
+ } // END - if
+
+ // Return cache
+ return $GLOBALS[__FUNCTION__];
+}
+
+//------------------------------------------------------------------------------
// PLEASE DO NOT ADD ANY OTHER FUNCTIONS BELOW THIS LINE IF THEY DON'T "WRAP"
// THE $GLOBALS['surfbar_cache'] ARRAY!
-// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// Initializes the surfbar
function SURFBAR_INIT () {
@@ -1681,24 +1880,24 @@ function SURFBAR_INIT () {
// Private getter for data elements
function SURFBAR_GET_DATA ($element) {
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "element={$element}", false);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ' - ENTERED!');
// Default is null
- $data = null;
+ $data = NULL;
// Is the entry there?
if (isset($GLOBALS['surfbar_cache'][$element])) {
// Then take it
$data = $GLOBALS['surfbar_cache'][$element];
} else { // END - if
- print("");
+ print('');
print_r($GLOBALS['surfbar_cache']);
- print("");
- debug_report_bug();
+ print('');
+ 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 . ' - EXIT!');
return $data;
}
@@ -1729,13 +1928,13 @@ function SURFBAR_GET_SALT () {
// Getter for id from cache
function SURFBAR_GET_ID () {
// Get data element and return its contents
- return SURFBAR_GET_DATA('id');
+ return SURFBAR_GET_DATA('url_id');
}
// Getter for userid from cache
function SURFBAR_GET_USERID () {
// Get data element and return its contents
- return SURFBAR_GET_DATA('userid');
+ return SURFBAR_GET_DATA('url_userid');
}
// Getter for user reload locks
@@ -1753,13 +1952,19 @@ function SURFBAR_GET_RELOAD_TIME () {
// Getter for allowed views
function SURFBAR_GET_VIEWS_ALLOWED () {
// Get data element and return its contents
- return SURFBAR_GET_DATA('views_allowed');
+ return SURFBAR_GET_DATA('url_views_allowed');
+}
+
+// Getter for maximum views
+function SURFBAR_GET_VIEWS_MAX () {
+ // Get data element and return its contents
+ return SURFBAR_GET_DATA('url_views_max');
}
// Getter for fixed reload
function SURFBAR_GET_FIXED_RELOAD () {
// Get data element and return its contents
- return SURFBAR_GET_DATA('fixed_reload');
+ return SURFBAR_GET_DATA('url_fixed_reload');
}
// Getter for surf lock
@@ -1774,5 +1979,11 @@ function SURFBAR_GET_NEW_STATUS () {
return SURFBAR_GET_DATA('new_status');
}
+// Getter for last salt
+function SURFBAR_GET_LAST_SALT () {
+ // Get data element and return its contents
+ return SURFBAR_GET_DATA('salts_last_salt');
+}
+
// [EOF]
?>