X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fsurfbar_functions.php;h=3939b0e40774716a310ddefc47c7f45934b8a9a2;hp=932259cc4087a93641850e22ff85c106936f8a77;hb=cf3765c38cf0a76f396aca291f71858936e92956;hpb=f928ad2bed60fa256d0641eaf6d2c027a2944688 diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 932259cc40..3939b0e407 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -1,7 +1,7 @@ $limit, 'reload' => $reload)); + return SURFBAR_REGISTER_URL($url, 0, 'ACTIVE', 'unlock', array('limit' => $limit, 'reload' => $reload)); } // Admin unlocked an email so we can migrate the URL -function SURFBAR_ADMIN_MIGRATE_URL ($url, $uid) { +function SURFBAR_ADMIN_MIGRATE_URL ($url, $userid) { // Do some pre-checks - if (!IS_ADMIN()) { + if (!isAdmin()) { // Not an admin return false; } elseif (!isUrlValid($url)) { // URL invalid return false; - } elseif (SURFBAR_LOOKUP_BY_URL($url, $uid)) { + } elseif (SURFBAR_LOOKUP_BY_URL($url, $userid)) { // URL already found in surfbar! return false; - } elseif (!SURFBAR_IF_USER_BOOK_MORE_URLS($uid)) { + } elseif (!SURFBAR_IF_USER_BOOK_MORE_URLS($userid)) { // No more allowed! return false; } // Register the new URL - return SURFBAR_REGISTER_URL($url, $uid, 'MIGRATED', 'migrate'); + return SURFBAR_REGISTER_URL($url, $userid, 'MIGRATED', 'migrate'); } // Admin function for unlocking URLs function SURFBAR_ADMIN_UNLOCK_URL_IDS ($IDs) { // Is this an admin or invalid array? - if (!IS_ADMIN()) { - // Not admin or invalid IDs array + if (!isAdmin()) { + // Not admin or invalid ids array return false; } elseif (!is_array($IDs)) { // No array @@ -130,8 +130,8 @@ function SURFBAR_ADMIN_UNLOCK_URL_IDS ($IDs) { // Admin function for rejecting URLs function SURFBAR_ADMIN_REJECT_URL_IDS ($IDs) { // Is this an admin or invalid array? - if (!IS_ADMIN()) { - // Not admin or invalid IDs array + if (!isAdmin()) { + // Not admin or invalid ids array return false; } elseif (!is_array($IDs)) { // No array @@ -162,16 +162,16 @@ function SURFBAR_ADMIN_REJECT_URL_IDS ($IDs) { // Member has added an URL function SURFBAR_MEMBER_ADD_URL ($url, $limit) { // Do some pre-checks - if (!IS_MEMBER()) { + if (!isMember()) { // Not a member return false; - } elseif ((!isUrlValid($url)) && (!IS_ADMIN())) { + } elseif ((!isUrlValid($url)) && (!isAdmin())) { // URL invalid return false; - } elseif (SURFBAR_LOOKUP_BY_URL($url, getUserId())) { + } elseif (SURFBAR_LOOKUP_BY_URL($url, getMemberId())) { // URL already found in surfbar! return false; - } elseif (!SURFBAR_IF_USER_BOOK_MORE_URLS(getUserId())) { + } elseif (!SURFBAR_IF_USER_BOOK_MORE_URLS(getMemberId())) { // No more allowed! return false; } elseif (''.($limit + 0).'' != ''.$limit.'') { @@ -180,13 +180,13 @@ function SURFBAR_MEMBER_ADD_URL ($url, $limit) { } // Register the new URL - return SURFBAR_REGISTER_URL($url, getUserId(), 'PENDING', 'reg', array('limit' => $limit)); + return SURFBAR_REGISTER_URL($url, getMemberId(), 'PENDING', 'reg', array('limit' => $limit)); } // Create list of actions depending on status for the user function SURFBAR_MEMBER_ACTIONS ($urlId, $status) { // Load all actions in an array for given status - $actionArray = SURFBAR_getModeAction_ARRAY($status); + $actionArray = SURFBAR_GET_ARRAY_FROM_STATUS($status); // Init HTML code $OUT = " @@ -198,7 +198,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 .= LOAD_TEMPLATE('member_surfbar_list_form', true, array( + $OUT .= loadTemplate('member_surfbar_list_form', true, array( 'width' => $width, 'id' => bigintval($urlId), 'action' => strtolower($action), @@ -216,27 +216,27 @@ function SURFBAR_MEMBER_ACTIONS ($urlId, $status) { } // Do the member form request -function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) { +function SURFBAR_MEMBER_DO_FORM ($formData, $urlArray) { // By default no action is performed $performed = false; // Is this a member? - if (!IS_MEMBER()) { + if (!isMember()) { // No member! return false; } elseif ((!isset($formData['id'])) || (!isset($formData['action']))) { // Important form elements are missing! return false; - } elseif (!isset($URLs[$formData['id']])) { - // ID not found in cache + } elseif (!isset($urlArray[$formData['id']])) { + // 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 return false; } // Secure action - $action = SQL_ESCAPE(htmlentities(strip_tags($formData['action']), ENT_QUOTES)); + $action = secureString($formData['action']); // Has it changed? if ($action != $formData['action']) { @@ -250,16 +250,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 - DEBUG_LOG(__FUNCTION__, __LINE__, "action={$formData['action']},id={$formData['id']},function={$functionName}"); + 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)); } @@ -270,7 +270,7 @@ 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", + $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? @@ -298,22 +298,22 @@ function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) { function SURFBAR_MEMBER_RETREAT_ACTION ($urlData) { // Create the data array for next function call $data = array( - $urlData['id'] => $urlData + $urlData['id'] => $urlData ); // Simply change the status here - 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 +342,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,50 +350,40 @@ 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['registered'] = generateDateTime($urlData['registered'], '2'); - $urlData['views_total'] = translateComma($urlData['views_total']); - $urlData['views_max'] = translateComma($urlData['views_max']); - $urlData['views_allowed'] = translateComma($urlData['views_allowed']); - $urlData['last_locked'] = generateDateTime($urlData['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_yes'] = ''; - $urlData['limited_no'] = ' checked="checked"'; - $urlData['limited'] = 'false'; + $urlData['limited_y'] = ''; + $urlData['limited_n'] = ' 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_yes'] = ' checked="checked"'; - $urlData['limited_no'] = ''; - $urlData['limited'] = 'true'; + $urlData['limited_y'] = ' checked="checked"'; + $urlData['limited_n'] = ''; + $urlData['limited'] = 'true'; } // END - if } // END - if // Load the form and display it - LOAD_TEMPLATE(sprintf("member_surfbar_%s_action_form", $action), false, $urlData); + loadTemplate(sprintf("member_surfbar_%s_action_form", $action), false, $urlData); // All fine by default ... ;-) return true; @@ -405,30 +395,24 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) { $executed = false; // Is limitation "no" and "limit" is > 0? - if ((isset($urlData[$action]['limited'])) && ($urlData[$action]['limited'] == 'N') && ((isset($urlData[$action]['limit'])) && ($urlData[$action]['limit'] > 0)) || (!isset($urlData[$action]['limit']))) { + if ((isset($urlData[$action]['limited'])) && ($urlData[$action]['limited'] != 'Y') && ((isset($urlData[$action]['limit'])) && ($urlData[$action]['limit'] > 0)) || (!isset($urlData[$action]['limit']))) { // Set it to unlimited - $urlData[$action]['limit'] = 0; + $urlData[$action]['limit'] = '0'; } // END - if // Construct function name $functionName = sprintf("SURFBAR_MEMBER_EXECUTE_%s_ACTION", strtoupper($action)); - // Is 'userid' set and not 'uid' ? - if ((!isset($urlData['uid'])) && (isset($urlData['userid']))) { - // Auto-fix this - $urlData['uid'] = $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); + addFatalMessage(__FUNCTION__, __LINE__, '{--MEMBER_SURFBAR_EXECUTE_ACTION_404--}', $functionName); } // Return status @@ -439,20 +423,16 @@ function SURFBAR_MEMBER_EXECUTE_EDIT_ACTION ($urlData) { // Default is nothing done $status = false; - // Translate URLs for testing - $url1 = COMPILE_CODE($urlData['url']); - $url2 = COMPILE_CODE($urlData['edit']['url']); - // 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; - } + } // END - if // Return status return $status; @@ -478,7 +458,7 @@ function SURFBAR_HANDLE_SELF_MAINTENANCE () { // 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) { @@ -499,27 +479,25 @@ function SURFBAR_HANDLE_DEPLETED_VIEWS () { // Alert users which have URLs booked and are low on points amount function SURFBAR_HANDLE_LOW_POINTS () { // Get all userids - $UIDs = SURFBAR_DETERMINE_DEPLETED_USERIDS(getConfig('surfbar_warn_low_points')); + $userids = SURFBAR_DETERMINE_DEPLETED_USERIDS(getConfig('surfbar_warn_low_points')); // "Walk" through all URLs - foreach ($UIDs['uid'] as $uid => $dummy) { + foreach ($userids['url_userid'] as $userid => $dummy) { // Is the last notification far enougth away to notify again? - if ((time() - $UIDs['notified'][$uid]) >= getConfig('surfbar_low_interval')) { + if ((time() - $userids['notified'][$userid]) >= getConfig('surfbar_low_interval')) { // Prepare content $content = array( - 'uid' => $uid, - 'low' => translateComma(getConfig('surfbar_warn_low_points')), - 'points' => translateComma($UIDs['points'][$uid]), - 'notified' => generateDateTime($UIDs['notified'][$uid]), - '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($uid), __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 } @@ -531,21 +509,21 @@ function SURFBAR_HANDLE_LOW_POINTS () { // // Looks up by an URL -function SURFBAR_LOOKUP_BY_URL ($url, $uid) { +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($uid))); + $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 @@ -557,24 +535,46 @@ function SURFBAR_GET_URL_DATA ($searchTerm, $column = 'id', $order = 'id', $sort } // END - if // Look up the record - $result = SQL_QUERY_ESC("SELECT id, userid, url, views_total, views_max, views_allowed, status, registered, last_locked, lock_reason, views_max, views_allowed, fixed_reload -FROM `{!_MYSQL_PREFIX!}_surfbar_urls` -WHERE %s='%s'".$add." -ORDER BY %s %s + $result = SQL_QUERY_ESC("SELECT + `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 . " +ORDER BY + `%s` %s %s", - array($column, $searchTerm, $order, $sort, $limit), __FUNCTION__, __LINE__); + array( + $column, + $searchTerm, + $order, + $sort, + $limit + ), __FUNCTION__, __LINE__); // Is there at least one record? if (SQL_NUMROWS($result) > 0) { // 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 @@ -587,7 +587,7 @@ ORDER BY %s %s } // 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()) { +function SURFBAR_REGISTER_URL ($url, $userid, $status = 'PENDING', $addMode = 'reg', $extraFields = array()) { // Make sure by the user registered URLs are always pending if ($addMode == 'reg') { $status = 'PENDING'; @@ -596,39 +596,36 @@ function SURFBAR_REGISTER_URL ($url, $uid, $status = 'PENDING', $addMode = 'reg' // Prepare content $content = merge_array($extraFields, array( 'url' => $url, - 'frametester' => FRAMETESTER($url), - 'uid' => $uid, - 'status' => $status, + 'frametester' => generateFrametesterUrl($url), + 'url_userid' => $userid, + 'url_status' => $status, )); // Is limit/reload set? if (!isset($config['limit'])) { - $content['limit'] = 0; + $content['limit'] = '0'; } // END - if if (!isset($config['reload'])) { - $content['reload'] = 0; + $content['reload'] = '0'; } // END - if // Insert the URL into database $content['insert_id'] = SURFBAR_INSERT_URL_BY_ARRAY($content); - // Is this ID valid? - if ($content['insert_id'] == 0) { + // Is this id valid? + if ($content['insert_id'] == '0') { // INSERT did not insert any data! return false; } // END - if - // Translate status and limit - $content['limit'] = surfbarTranslateLimit($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']; @@ -637,21 +634,21 @@ function SURFBAR_REGISTER_URL ($url, $uid, $status = 'PENDING', $addMode = 'reg' // Inserts an url by given data array and return the insert id function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) { // Get userid - $uid = bigintval($urlData['uid']); + $userid = bigintval($urlData['url_userid']); // Is the id set? - if (empty($uid)) $uid = 0; + if (empty($userid)) $userid = '0'; // 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)", - array( - $uid, - $urlData['url'], - $urlData['status'], - $urlData['limit'], - $urlData['limit'], - $urlData['reload'] - ), __FUNCTION__, __LINE__ + 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['url_status'], + $urlData['limit'], + $urlData['limit'], + $urlData['reload'] + ), __FUNCTION__, __LINE__ ); // Return insert id @@ -665,31 +662,26 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) { // Prepare subject $subject = getMessage(sprintf("ADMIN_SURFBAR_NOTIFY_%s_SUBJECT", - strtoupper($messageType) + 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 = getMaskedMessage('ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT', strtoupper($messageType)); } // END - if // Translate some data if present - if (isset($content['status'])) $content['status'] = surfbarTranslateUserStatus($content['status']); - if (isset($content['registered'])) $content['registered'] = generateDateTime($content['registered'], '2'); - if (isset($content['last_locked'])) $content['last_locked'] = generateDateTime($content['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['uid']); + 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['uid'] == 0) { + if ($content['url_userid'] == '0') { return false; } // END - if @@ -698,36 +690,42 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) { // Prepare subject $subject = getMessage(sprintf("MEMBER_SURFBAR_NOTIFY_%s_SUBJECT", - strtoupper($messageType) + 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'] = surfbarTranslateUserStatus($content['status']); - if (isset($content['registered'])) $content['registered'] = generateDateTime($content['registered'], '2'); - if (isset($content['last_locked'])) $content['last_locked'] = generateDateTime($content['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 = LOAD_EMAIL_TEMPLATE($templateName, $content, $content['uid']); + $mailText = loadEmailTemplate($templateName, $content, $content['url_userid']); // Send the email - return sendEmail($content['uid'], $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 -function surfbarTranslateLimit ($limit) { +function translateSurfbarLimit ($limit) { // Is this zero? - if ($limit == 0) { + if ($limit == '0') { // Unlimited! - $return = getMessage('MEMBER_SURFBAR_UNLIMITED_VIEWS'); + $return = '{--MEMBER_SURFBAR_UNLIMITED_VIEWS--}'; } else { // Translate comma $return = translateComma($limit); @@ -738,18 +736,12 @@ function surfbarTranslateLimit ($limit) { } // Translate the URL status -function surfbarTranslateUserStatus ($status) { +function translateSurfbarUrlStatus ($status) { // Create constant name $constantName = sprintf("SURFBAR_URL_STATUS_%s", strtoupper($status)); - // Set default translated status - $statusTranslated = '!'.$constantName.'!'; - - // Is the constant there? - if (defined($constantName)) { - // Then get it's value - $statusTranslated = constant($constantName); - } // END - if + // Get message + $statusTranslated = getMessage($constantName); // Return result return $statusTranslated; @@ -809,10 +801,10 @@ function SURFBAR_DETERMINE_TEMPLATE_NAME() { $templateName = "surfbar_frameset"; // Any frame set? ;-) - if (REQUEST_ISSET_GET('frame')) { + if (isGetRequestParameterSet('frame')) { // Use the frame as a template name part... ;-) $templateName = sprintf("surfbar_frame_%s", - REQUEST_GET('frame') + getRequestParameter('frame') ); } // END - if @@ -828,7 +820,7 @@ function SURFBAR_CHECK_RELOAD_FULL() { // Cache static reload lock $GLOBALS['surfbar_cache']['surf_lock'] = getConfig('surfbar_static_lock'); - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Fixed surf lock is ".getConfig('surfbar_static_lock')."", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Fixed surf lock is '.getConfig('surfbar_static_lock') . '', false); // Do we have dynamic model? if (getConfig('surfbar_pay_model') == 'DYNAMIC') { @@ -838,17 +830,22 @@ function SURFBAR_CHECK_RELOAD_FULL() { // 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 + `{?_MYSQL_PREFIX?}_surfbar_locks` AS l INNER JOIN - `{!_MYSQL_PREFIX!}_surfbar_urls` AS u + `{?_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 (((UNIX_TIMESTAMP(l.last_surfed) - u.fixed_reload) < 0 AND u.fixed_reload > 0) OR u.fixed_reload = 0) + l.locks_userid=%s AND + (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(l.locks_last_surfed) AND + ( + ((UNIX_TIMESTAMP(l.locks_last_surfed) - u.url_fixed_reload) < 0 AND u.url_fixed_reload > 0) OR + u.url_fixed_reload = '0' + ) LIMIT 1", - array(getUserId()), __FUNCTION__, __LINE__ + array(getMemberId()), __FUNCTION__, __LINE__ ); // Fetch row @@ -857,7 +854,7 @@ LIMIT 1", // Is it null? if (is_null($GLOBALS['surfbar_cache']['user_locks'])) { // Then fix it to zero! - $GLOBALS['surfbar_cache']['user_locks'] = 0; + $GLOBALS['surfbar_cache']['user_locks'] = '0'; } // END - if // Free result @@ -867,7 +864,7 @@ LIMIT 1", $total = SURFBAR_GET_TOTAL_URLS(); // Do we have some URLs in lock? Admins can always surf on own URLs! - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "userLocks=".SURFBAR_GET_USER_LOCKS().",total={$total}", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userLocks=".SURFBAR_GET_USER_LOCKS().",total={$total}", false); $isFull = ((SURFBAR_GET_USER_LOCKS() == $total) && ($total > 0)); // Return result @@ -875,21 +872,32 @@ LIMIT 1", } // 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 = '0') { // Determine depleted user account - $UIDs = SURFBAR_DETERMINE_DEPLETED_USERIDS(); + $userids = SURFBAR_DETERMINE_DEPLETED_USERIDS(); + + // If we dont get any user ids back, there are no URLs + if (count($userids['url_userid']) == 0) { + // No user ids found, no URLs! + return 0; + } // END - if // Is the exlude userid set? if ($excludeUserId > 0) { // Then add it - $UIDs['uid'][$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(',', $UIDs['uid']).") AND `status`='%s'", - array($status), __FUNCTION__, __LINE__ + $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 @@ -903,18 +911,18 @@ 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) { +function SURFBAR_IF_USER_BOOK_MORE_URLS ($userid = '0') { // Is this admin and userid is zero or does the user has some URLs left to book? - return ((($uid == 0) && (IS_ADMIN())) || (SURFBAR_GET_TOTAL_USER_URLS($uid, '', array("REJECTED")) < getConfig('surfbar_max_order'))); + return ((($userid == '0') && (isAdmin())) || (SURFBAR_GET_TOTAL_USER_URLS($userid, '', 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 = '') { +function SURFBAR_GET_TOTAL_USER_URLS ($userid = '0', $status = '', $exclude = '') { // Is the user 0 and user is logged in? - if (($uid == 0) && (IS_MEMBER())) { + if (($userid == '0') && (isMember())) { // Then use this userid - $uid = getUserId(); - } elseif ($uid == 0) { + $userid = getMemberId(); + } elseif ($userid == '0') { // Error! return (getConfig('surfbar_max_order') + 1); } @@ -925,20 +933,20 @@ function SURFBAR_GET_TOTAL_USER_URLS ($uid=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(" AND `url_status` IN('%s')", implode("','", $status)); } elseif (!empty($status)) { // Only URLs with this status - $add = sprintf(" AND `status`='%s'", $status); + $add = sprintf(" AND `url_status`='%s'", $status); } elseif (is_array($exclude)) { // Exclude URLs with these status - $add = sprintf(" AND `status` NOT IN('%s')", implode("','", $exclude)); + $add = sprintf(" AND `url_status` NOT IN('%s')", implode("','", $exclude)); } elseif (!empty($exclude)) { // Exclude URLs with this status - $add = sprintf(" AND `status` != '%s'", $exclude); + $add = sprintf(" AND `url_status` != '%s'", $exclude); } // Get amount from database - $cnt = GET_TOTAL_DATA($uid, 'surfbar_urls', 'id', 'userid', true, $add); + $cnt = countSumTotalData($userid, 'surfbar_urls', 'url_id', 'url_userid', true, $add); // Return result return $cnt; @@ -953,7 +961,7 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt = '') { $length = getConfig('code_length'); // Fix length to 10 - if ($length == 0) $length = 10; + if ($length == '0') $length = 10; // Generate a code until the length matches $valCode = ''; @@ -962,26 +970,26 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt = '') { if (empty($salt)) { // Generate random hashed string $GLOBALS['surfbar_cache']['salt'] = sha1(generatePassword(mt_rand(200, 255))); - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "newSalt=".SURFBAR_GET_SALT()."", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'newSalt='.SURFBAR_GET_SALT().'', false); } else { // Use this as salt! $GLOBALS['surfbar_cache']['salt'] = $salt; - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "oldSalt=".SURFBAR_GET_SALT()."", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'oldSalt='.SURFBAR_GET_SALT().'', false); } // ... and now the validation code - $valCode = generateRandomCode($length, sha1(SURFBAR_GET_SALT().':'.$urlId), getUserId()); - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "valCode={$valCode}", false); + $valCode = generateRandomCode($length, sha1(SURFBAR_GET_SALT().':'.$urlId), getMemberId()); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'valCode='.valCode.'', false); } // END - while // Hash it with md5() and salt it with the random string $hashedCode = generateHash(md5($valCode), SURFBAR_GET_SALT()); // Finally encrypt it PGP-like and return it - $valHashedCode = generatePassString($hashedCode); + $valHashedCode = encodeHashForCookie($hashedCode); // Return hashed value - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "finalValCode={$valHashedCode}", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'finalValCode='.$valHashedCode.'', false); return $valHashedCode; } @@ -994,35 +1002,35 @@ function SURFBAR_CHECK_VALIDATION_CODE ($urlId, $check, $salt) { $code = SURFBAR_GENERATE_VALIDATION_CODE($urlId, $salt); // Return result of checking hashes and salts - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, '---'.$code.'|'.$check.'---', false); - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "+++".$salt.'|'.SURFBAR_GET_DATA('last_salt')."+++", false); - return (($code == $check) && ($salt == SURFBAR_GET_DATA('last_salt'))); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '---'.$code.'|'.$check.'---', false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '+++'.$salt.'|'.SURFBAR_GET_DATA('salts_last_salt').'+++', false); + return (($code == $check) && ($salt == SURFBAR_GET_DATA('salts_last_salt'))); } // Lockdown the userid/id combination (reload lock) function SURFBAR_LOCKDOWN_ID ($urlId) { - //* DEBUG: */ print "LOCK!"; + //* DEBUG: */ debugOutput('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(getUserId(), bigintval($urlId)), __FUNCTION__, __LINE__); + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_locks` (`locks_userid`, `locks_url_id`) VALUES (%s, %s)", + array(getMemberId(), 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), getUserId()), __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__); } // 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: */ DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".SURFBAR_GET_USERID().",costs=".SURFBAR_GET_COSTS()."", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.SURFBAR_GET_USERID().',costs='.SURFBAR_GET_COSTS().'', false); if (SURFBAR_GET_USERID() > 0) { - SUB_POINTS(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), SURFBAR_GET_USERID(), SURFBAR_GET_COSTS()); + subtractPoints(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), SURFBAR_GET_USERID(), SURFBAR_GET_COSTS()); } // END - if // Book it to the user - //* 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')); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getMemberId().',reward='.SURFBAR_GET_REWARD().'', false); + addPointsThroughReferalSystem(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), getMemberId(), SURFBAR_GET_DATA('reward')); } // Updates the statistics of current URL/userid @@ -1040,18 +1048,24 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () { } // 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(getUserId(), 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) { // No, then insert entry - SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_stats` (userid,url_id,count) VALUES (%s,%s,1)", - array(getUserId(), 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 @@ -1070,21 +1084,25 @@ function SURFBAR_UPDATE_SALT_STATS () { 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(), getUserId()), __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: */ DEBUG_LOG(__FUNCTION__, __LINE__, "salt=".SURFBAR_GET_SALT().",id=".SURFBAR_GET_ID().",uid=".getUserId()."", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'salt='.SURFBAR_GET_SALT().',id='.SURFBAR_GET_ID().',userid='.getMemberId().'', 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(), getUserId(), 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: */ DEBUG_LOG(__FUNCTION__, __LINE__, "affectedRows=".SQL_AFFECTEDROWS()."", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'affectedRows='.SQL_AFFECTEDROWS().'', false); // Return if the update was okay return (SQL_AFFECTEDROWS() == 1); @@ -1092,17 +1110,19 @@ function SURFBAR_UPDATE_SALT_STATS () { // Check if the reload lock is active for given id function SURFBAR_CHECK_RELOAD_LOCK ($urlId) { - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "id={$urlId}", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $urlId . '', false); // 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` + `{?_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(getUserId(), bigintval($urlId)), __FUNCTION__, __LINE__ + array(getMemberId(), bigintval($urlId)), __FUNCTION__, __LINE__ ); // Fetch counter @@ -1112,73 +1132,73 @@ LIMIT 1", SQL_FREERESULT($result); // Return check - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "cnt={$cnt},".SURFBAR_GET_SURF_LOCK()."", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'cnt=' . $cnt . ',' . SURFBAR_GET_SURF_LOCK() . '', false); return ($cnt == 1); } // Determine which user hash no more points left function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) { // Init array - $UIDs = array( - 'uid' => array(), - 'points' => array(), - 'notified' => array(), + $userids = array( + 'url_userid' => array(), + 'points' => array(), + 'notified' => array(), ); // Do we have a current user id? - if ((IS_MEMBER()) && ($limit == 0)) { + if ((isMember()) && ($limit == '0')) { // Then add this as well - $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; + $userids['url_userid'][getMemberId()] = getMemberId(); + $userids['points'][getMemberId()] = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points'); + $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 + `{?_MYSQL_PREFIX?}_surfbar_urls` AS u INNER JOIN - `{!_MYSQL_PREFIX!}_user_data` AS d + `{?_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", - array(getUserId()), __FUNCTION__, __LINE__); + 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 + `{?_MYSQL_PREFIX?}_surfbar_urls` AS u INNER JOIN - `{!_MYSQL_PREFIX!}_user_data` AS d + `{?_MYSQL_PREFIX?}_user_data` AS d ON - u.userid=d.userid + u.url_userid=d.userid WHERE - u.`status`='ACTIVE' + 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 = 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); + $points = countSumTotalData($content['url_userid'], 'user_points', 'points') - countSumTotalData($content['url_userid'], 'user_data', 'used_points'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['url_userid']},points={$points}", false); // Shall we add this to ignore? if ($points <= $limit) { // Ignore this one! - //* DEBUG: */ 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']; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['url_userid']} has depleted points amount!", false); + $userids['url_userid'][$content['url_userid']] = $content['url_userid']; + $userids['points'][$content['url_userid']] = $points; + $userids['notified'][$content['url_userid']] = $content['notified']; } // END - if } // END - while @@ -1186,20 +1206,23 @@ ORDER BY SQL_FREERESULT($result); // Debug message - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "UIDs::count=".count($UIDs)." (with own userid=".getUserId().')', false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UIDs::count=".count($userids)." (with own userid=".getMemberId().')', false); // Return result - return $UIDs; + return $userids; } // 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_ESC("SELECT id -FROM `{!_MYSQL_PREFIX!}_surfbar_stats` -WHERE (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(last_online)) <= %s -GROUP BY userid", - array(getConfig('online_timeout')), __FUNCTION__, __LINE__); + $result = SQL_QUERY("SELECT + `stats_id` +FROM + `{?_MYSQL_PREFIX?}_surfbar_stats` +WHERE + (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(`stats_last_surfed`)) <= {?online_timeout?} +GROUP BY + `stats_userid` ASC", __FUNCTION__, __LINE__); // Fetch count $cnt = SQL_NUMROWS($result); @@ -1253,7 +1276,7 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) } // END - if // Is the status like prevStatus is saying? - if ($data[$urlId]['status'] != $prevStatus) { + if ($data[$urlId]['url_status'] != $prevStatus) { // No, then abort here return false; } // END - if @@ -1261,7 +1284,7 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) // Update the status now // ---------- Comment out for debugging/developing member actions! --------- - //SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET `status`='%s' WHERE `id`=%s LIMIT 1", + //SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `status`='%s' WHERE `url_id`=%s LIMIT 1", // array($newStatus, bigintval($urlId)), __FUNCTION__, __LINE__); // ---------- Comment out for debugging/developing member actions! --------- @@ -1274,22 +1297,22 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) // ---------- Comment out for debugging/developing member actions! --------- // Prepare content for notification routines - $data[$urlId]['uid'] = $data[$urlId]['userid']; - $data[$urlId]['frametester'] = FRAMETESTER($data[$urlId]['url']); + $data[$urlId]['url_userid'] = $data[$urlId]['url_userid']; + $data[$urlId]['frametester'] = generateFrametesterUrl($data[$urlId]['url']); $data[$urlId]['reward'] = translateComma(getConfig('surfbar_static_reward')); $data[$urlId]['costs'] = translateComma(getConfig('surfbar_static_costs')); // Do some dirty fixing here: - if (($data[$urlId]['status'] == 'STOPPED') && ($newStatus == 'pending')) { + if (($data[$urlId]['url_status'] == 'STOPPED') && ($newStatus == 'pending')) { // Fix for template change $newStatus = 'continued'; } // END - if // Send admin notification - SURFBAR_NOTIFY_ADMIN("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]); + SURFBAR_NOTIFY_ADMIN('url_' . $data[$urlId]['url_status'] . '_' . $newStatus, $data[$urlId]); // Send user notification - SURFBAR_NOTIFY_USER("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]); + SURFBAR_NOTIFY_USER('url_' . $data[$urlId]['url_status'] . '_' . $newStatus, $data[$urlId]); // All done! return true; @@ -1298,13 +1321,13 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) // Calculate minimum value for dynamic payment model function SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE () { // Addon is zero by default - $addon = 0; + $addon = '0'; // Percentage part $percent = abs(log(getConfig('surfbar_dynamic_percent') / 100 + 1)); // Get total users - $totalUsers = GET_TOTAL_DATA('CONFIRMED', 'user_data', 'userid', 'status', true); + $totalUsers = getTotalConfirmedUser(); // Get online users $onlineUsers = SURFBAR_DETERMINE_TOTAL_ONLINE(); @@ -1313,7 +1336,7 @@ function SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE () { $addon += abs(log($onlineUsers / $totalUsers + 1) * $percent * $totalUsers); // Get total URLs - $totalUrls = SURFBAR_GET_TOTAL_URLS('ACTIVE', '0'); + $totalUrls = SURFBAR_GET_TOTAL_URLS('ACTIVE', 0); // Get user's total URLs $userUrls = SURFBAR_GET_TOTAL_USER_URLS(0, 'ACTIVE'); @@ -1332,7 +1355,7 @@ function SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE () { // Calculate maximum value for dynamic payment model function SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE () { // Addon is zero by default - $addon = 0; + $addon = '0'; // Maximum value $max = log(2); @@ -1341,13 +1364,13 @@ function SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE () { $percent = abs(log(getConfig('surfbar_dynamic_percent') / 100 + 1)); // Get total users - $totalUsers = GET_TOTAL_DATA('CONFIRMED', 'user_data', 'userid', 'status', true); + $totalUsers = getTotalConfirmedUser(); // Calculate addon $addon += abs($max * $percent * $totalUsers); // Get total URLs - $totalUrls = SURFBAR_GET_TOTAL_URLS('ACTIVE', '0'); + $totalUrls = SURFBAR_GET_TOTAL_URLS('ACTIVE', 0); // Calculate addon $addon += abs($max * $percent * $totalUrls); @@ -1379,37 +1402,37 @@ 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 + $result = SQL_QUERY_ESC("SELECT `locks_id`, `locks_url_id`, UNIX_TIMESTAMP(`locks_last_surfed`) AS last_surfed FROM - {!_MYSQL_PREFIX!}_surfbar_locks + `{?_MYSQL_PREFIX?}_surfbar_locks` WHERE - userid=%s + `locks_userid`=%s ORDER BY - id ASC", array(getUserId()), + `locks_id` ASC", array(getMemberId()), __FUNCTION__, __LINE__); // Load all entries while ($content = SQL_FETCHARRAY($result)) { // Debug message - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "next - lid={$content['id']},url={$content['url_id']},rest=".(time() - $last).'/'.SURFBAR_GET_SURF_LOCK()."", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'next - lid='.$content['id'].',url='.$content['url_id'].',rest='.(time() - $content['last_surfed']).'/'.SURFBAR_GET_SURF_LOCK().'', false); // Skip entries that are too old - if (($last > (time() - SURFBAR_GET_SURF_LOCK())) && (!in_array($content['url_id'], $ignored))) { + if (($content['last_surfed'] > (time() - SURFBAR_GET_SURF_LOCK())) && (!in_array($content['url_id'], $ignored))) { // Debug message - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "okay - lid={$content['id']},url={$content['url_id']},last={$last}", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'okay - lid='.$content['id'].',url='.$content['url_id'].',last='.$content['last_surfed'].'', false); // Add only if missing or bigger - if ((!isset($IDs[$content['url_id']])) || ($IDs[$content['url_id']] > $last)) { + if ((!isset($IDs[$content['url_id']])) || ($IDs[$content['url_id']] > $content['last_surfed'])) { // Debug message - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ADD - lid={$content['id']},url={$content['url_id']},last={$last}", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ADD - lid='.$content['id'].',url='.$content['url_id'].',last='.$content['last_surfed'].'', false); - // Add this ID - $IDs[$content['url_id']] = $last; + // Add this id + $IDs[$content['url_id']] = $content['last_surfed']; $USE[$content['url_id']] = $content['id']; } // END - if } else { // Debug message - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ignore - lid={$content['id']},url={$content['url_id']},last={$last}", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ignore - lid='.$content['id'].',url='.$content['url_id'].',last='.$content['last_surfed'].'', false); // Ignore these old entries! $ignored[] = $content['url_id']; @@ -1426,19 +1449,30 @@ ORDER BY } // "Getter" for maximum random number -function SURFBAR_GET_MAX_RANDOM ($UIDs, $add) { +function SURFBAR_GET_MAX_RANDOM ($userids, $add) { // Count max availabe entries - $result = SQL_QUERY("SELECT sbu.id AS cnt -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(',', $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__); + $result = SQL_QUERY("SELECT + sbu.url_id AS cnt +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).") 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.url_id ASC", __FUNCTION__, __LINE__); // Log last query - //* DEBUG: */ DEBUG_LOG(__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().'', false); // Fetch max rand $maxRand = SQL_NUMROWS($result); @@ -1453,21 +1487,35 @@ GROUP BY sbu.id", __FUNCTION__, __LINE__); // 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.views_total, u.views_max, u.views_allowed, u.status, UNIX_TIMESTAMP(u.registered) AS registered, UNIX_TIMESTAMP(u.last_locked) AS last_locked, u.lock_reason AS lock_reason -FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS u -WHERE u.userid=%s AND u.status != 'DELETED' -ORDER BY u.id ASC", - array(getUserId()), __FUNCTION__, __LINE__); + $result = SQL_QUERY_ESC("SELECT + 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.url_userid=%s AND + u.url_status != 'DELETED' +ORDER BY + u.url_id ASC", + array(getMemberId()), __FUNCTION__, __LINE__); // Are there entries? if (SQL_NUMROWS($result) > 0) { // Load all rows while ($row = SQL_FETCHARRAY($result)) { // Add the row - $URLs[$row['id']] = $row; + $urlArray[$row['id']] = $row; } // END - while } // END - if @@ -1475,17 +1523,17 @@ ORDER BY u.id ASC", SQL_FREERESULT($result); // Return the array - return $URLs; + return $urlArray; } // "Getter" for member action array for given status -function SURFBAR_getModeAction_ARRAY ($status) { +function SURFBAR_GET_ARRAY_FROM_STATUS ($status) { // Init array $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 `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) { @@ -1504,7 +1552,7 @@ function SURFBAR_getModeAction_ARRAY ($status) { } // Reload to configured stop page -function SURFBAR_RELOAD_TO_STOP_PAGE ($page="stop") { +function SURFBAR_RELOAD_TO_STOP_PAGE ($page = 'stop') { // Internal or external? if ((getConfig('surfbar_pause_mode') == 'INTERNAL') || (getConfig('surfbar_pause_url') == '')) { // Reload to internal page @@ -1517,13 +1565,13 @@ 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) { +function SURFBAR_DETERMINE_NEXT_ID ($urlId = '0') { // Default is no id and no random number - $nextId = 0; - $randNum = 0; + $nextId = '0'; + $randNum = '0'; - // Is the ID set? - if ($urlId == 0) { + // Is the id set? + if ($urlId == '0') { // Get array with lock ids $USE = SURFBAR_GET_LOCK_IDS(); @@ -1531,7 +1579,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.','; @@ -1542,10 +1590,10 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = 0) { } // END - if // Determine depleted user account - $UIDs = SURFBAR_DETERMINE_DEPLETED_USERIDS(); + $userids = SURFBAR_DETERMINE_DEPLETED_USERIDS(); // Get maximum randomness factor - $maxRand = SURFBAR_GET_MAX_RANDOM($UIDs['uid'], $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) { @@ -1554,69 +1602,108 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = 0) { } // END - if // And query the database - //* DEBUG: */ DEBUG_LOG(__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(',', $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 + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'randNum='.$randNum.',maxRand='.$maxRand.',surfLock='.SURFBAR_GET_SURF_LOCK().'', false); + $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__ + 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(getUserId(), bigintval($urlId)), __FUNCTION__, __LINE__ + array(getMemberId(), bigintval($urlId)), __FUNCTION__, __LINE__ ); } // Is there an id number? - //* DEBUG: */ DEBUG_LOG(__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().'', false); if (SQL_NUMROWS($result) == 1) { // Load/cache data - //* DEBUG: */ DEBUG_LOG(__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: */ DEBUG_LOG(__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: */ DEBUG_LOG(__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: */ DEBUG_LOG(__FUNCTION__, __LINE__, "last_surfed - FIXED!", false); - $GLOBALS['surfbar_cache']['last_surfed'] = 0; + //* 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: */ DEBUG_LOG(__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().'', false); // Only in dynamic model add the dynamic bonus! if (getConfig('surfbar_pay_model') == '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: */ DEBUG_LOG(__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().'', false); } // END - if // Now get the id @@ -1627,7 +1714,7 @@ LIMIT 1", SQL_FREERESULT($result); // Return result - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "nextId={$nextId}", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'nextId='.$nextId.'', false); return $nextId; } @@ -1644,7 +1731,7 @@ function SURFBAR_INIT () { // Private getter for data elements function SURFBAR_GET_DATA ($element) { - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "element={$element}", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "element={$element}", false); // Default is null $data = null; @@ -1654,14 +1741,14 @@ function SURFBAR_GET_DATA ($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: */ DEBUG_LOG(__FUNCTION__, __LINE__, "element[$element]={$data}", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element[' . $element . ']=[' . gettype($data) . ']' . $data, false); return $data; } @@ -1692,13 +1779,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 @@ -1716,13 +1803,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