X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fsurfbar_functions.php;h=6716188e18beb2db07f90446beb5c3292fd587a1;hp=d550d625e26f675c15d3000db8731e740a73f7cc;hb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;hpb=aaf81b8f35512782d34f78c1a0dac8b42d745393 diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index d550d625e2..6716188e18 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -1,7 +1,7 @@ $formData))); + $urlData = array(merge_array($urlArray[$formData['id']], array($action => $formData))); // Action found so execute it $performed = call_user_func_array($functionName, $urlData); @@ -297,11 +298,11 @@ 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) @@ -312,7 +313,7 @@ function SURFBAR_MEMBER_BOOKNOW_ACTION ($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 @@ -341,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 @@ -349,25 +350,21 @@ 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); + // Translate some data if present + $content = SURFBAR_PREPARE_CONTENT_FOR_TEMPLATE($content); // Is the lock reason empty? if (empty($urlData['lock_reason'])) { @@ -383,7 +380,7 @@ function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) { $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'] = ''; @@ -412,18 +409,12 @@ 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! @@ -440,10 +431,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; @@ -473,7 +464,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) { @@ -494,18 +485,18 @@ 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['userid'] as $userid => $dummy) { + foreach ($userids['userid'] as $userid => $dummy) { // Is the last notification far enougth away to notify again? - if ((time() - $UIDs['notified'][$userid]) >= getConfig('surfbar_low_interval')) { + if ((time() - $userids['notified'][$userid]) >= getConfig('surfbar_low_interval')) { // Prepare content $content = array( - 'userid' => $userid, + 'userid' => $userid, 'low' => translateComma(getConfig('surfbar_warn_low_points')), - 'points' => translateComma($UIDs['points'][$userid]), - 'notified' => generateDateTime($UIDs['notified'][$userid]), + 'points' => translateComma($userids['points'][$userid]), + 'notified' => generateDateTime($userids['notified'][$userid]), 'interval' => createFancyTime(getConfig('surfbar_low_interval')) ); @@ -513,8 +504,8 @@ function SURFBAR_HANDLE_LOW_POINTS () { 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 } @@ -528,19 +519,19 @@ function SURFBAR_HANDLE_LOW_POINTS () { // 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 @@ -552,24 +543,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 @@ -592,8 +605,8 @@ function SURFBAR_REGISTER_URL ($url, $userid, $status = 'PENDING', $addMode = 'r $content = merge_array($extraFields, array( 'url' => $url, 'frametester' => generateFrametesterUrl($url), - 'userid' => $userid, - 'status' => $status, + 'url_userid' => $userid, + 'url_status' => $status, )); // Is limit/reload set? @@ -613,17 +626,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']; @@ -632,21 +642,21 @@ 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'; // 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( - $userid, - $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 @@ -666,16 +676,11 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) { // Is the subject line there? if ((substr($subject, 0, 1) == '!') && (substr($subject, -1, 1) == '!')) { // Set default subject if following eval() wents wrong - $subject = 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'] = translateSurfbarUrlStatus($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['userid']); @@ -693,7 +698,7 @@ 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? @@ -703,12 +708,7 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) { } // END - if // Translate some data if present - if (isset($content['status'])) $content['status'] = translateSurfbarUrlStatus($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 = loadEmailTemplate($templateName, $content, $content['userid']); @@ -717,6 +717,17 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) { return sendEmail($content['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 translateSurfbarLimit ($limit) { // Is this zero? @@ -737,14 +748,8 @@ 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; @@ -804,10 +809,10 @@ function SURFBAR_DETERMINE_TEMPLATE_NAME() { $templateName = "surfbar_frameset"; // Any frame set? ;-) - if (isGetRequestElementSet('frame')) { + if (isGetRequestParameterSet('frame')) { // Use the frame as a template name part... ;-) $templateName = sprintf("surfbar_frame_%s", - getRequestElement('frame') + getRequestParameter('frame') ); } // END - if @@ -833,15 +838,20 @@ 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 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 (((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(getMemberId()), __FUNCTION__, __LINE__ ); @@ -872,10 +882,10 @@ 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') { // 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($UIDs['userid']) == '0') { + if (count($userids['userid']) == 0) { // No user ids found, no URLs! return 0; } // END - if @@ -883,13 +893,18 @@ function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = '0') { // Is the exlude userid set? if ($excludeUserId > 0) { // Then add it - $UIDs['userid'][$excludeUserId] = $excludeUserId; + $userids['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['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['userid']).") AND + `url_status`='%s' +LIMIT 1", array($status), __FUNCTION__, __LINE__ ); @@ -906,11 +921,11 @@ WHERE `userid` NOT IN (".implode(', ', $UIDs['userid']).") AND `status`='%s'", // Check wether the user is allowed to book more URLs function SURFBAR_IF_USER_BOOK_MORE_URLS ($userid = '0') { // Is this admin and userid is zero or does the user has some URLs left to book? - return ((($userid == '0') && (isAdmin())) || (SURFBAR_GET_TOTAL_USER_URLS($userid, '', array("REJECTED")) < getConfig('surfbar_max_order'))); + return ((($userid == '0') && (isAdmin())) || (SURFBAR_GET_TOTAL_USER_URLS($userid, '', array('REJECTED')) < getConfig('surfbar_max_order'))); } // 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 = '0', $status = '', $exclude = '') { // Is the user 0 and user is logged in? if (($userid == '0') && (isMember())) { // Then use this userid @@ -926,20 +941,20 @@ 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(" 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 = countSumTotalData($userid, 'surfbar_urls', 'id', 'userid', true, $add); + $cnt = countSumTotalData($userid, 'surfbar_urls', 'url_id', 'url_userid', true, $add); // Return result return $cnt; @@ -979,7 +994,7 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt = '') { $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: */ logDebugMessage(__FUNCTION__, __LINE__, 'finalValCode='.$valHashedCode.'', false); @@ -996,8 +1011,8 @@ function SURFBAR_CHECK_VALIDATION_CODE ($urlId, $check, $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__, '+++'.$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) @@ -1005,11 +1020,11 @@ 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)", + 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", + 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__); } @@ -1041,18 +1056,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(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) { // 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 @@ -1071,8 +1092,12 @@ 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(), 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); @@ -1080,7 +1105,7 @@ function SURFBAR_UPDATE_SALT_STATS () { // 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')", + 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 @@ -1095,13 +1120,15 @@ function SURFBAR_UPDATE_SALT_STATS () { function SURFBAR_CHECK_RELOAD_LOCK ($urlId) { //* 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` 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__ ); @@ -1120,7 +1147,7 @@ LIMIT 1", // Determine which user hash no more points left function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) { // Init array - $UIDs = array( + $userids = array( 'userid' => array(), 'points' => array(), 'notified' => array(), @@ -1129,42 +1156,42 @@ function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) { // Do we have a current user id? if ((isMember()) && ($limit == '0')) { // Then add this as well - $UIDs['userid'][getMemberId()] = getMemberId(); - $UIDs['points'][getMemberId()] = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points'); - $UIDs['notified'][getMemberId()] = '0'; + $userids['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 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_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 @@ -1177,9 +1204,9 @@ ORDER BY if ($points <= $limit) { // Ignore this one! //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['userid']} has depleted points amount!", false); - $UIDs['userid'][$content['userid']] = $content['userid']; - $UIDs['points'][$content['userid']] = $points; - $UIDs['notified'][$content['userid']] = $content['notified']; + $userids['userid'][$content['userid']] = $content['userid']; + $userids['points'][$content['userid']] = $points; + $userids['notified'][$content['userid']] = $content['notified']; } // END - if } // END - while @@ -1187,23 +1214,23 @@ ORDER BY SQL_FREERESULT($result); // Debug message - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UIDs::count=".count($UIDs)." (with own userid=".getMemberId().')', 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("SELECT - `id` + `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); @@ -1245,7 +1272,7 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) $newStatus = strtolower($newStatus); // Get URL data for status comparison if missing - if ((!is_array($data)) || (count($data) == '0')) { + if ((!is_array($data)) || (count($data) == 0)) { // Fetch missing URL data $data = SURFBAR_GET_URL_DATA($urlId); } // END - if @@ -1257,7 +1284,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 @@ -1284,16 +1311,16 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) $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; @@ -1383,13 +1410,13 @@ 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 @@ -1430,16 +1457,27 @@ 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: */ logDebugMessage(__FUNCTION__, __LINE__, 'lastQuery='.getConfig('db_last_query').'|numRows='.SQL_NUMROWS($result).'|Affected='.SQL_AFFECTEDROWS().'', false); @@ -1457,13 +1495,27 @@ 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", + $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? @@ -1471,7 +1523,7 @@ ORDER BY u.id ASC", // Load all rows while ($row = SQL_FETCHARRAY($result)) { // Add the row - $URLs[$row['id']] = $row; + $urlArray[$row['id']] = $row; } // END - while } // END - if @@ -1479,7 +1531,7 @@ ORDER BY u.id ASC", SQL_FREERESULT($result); // Return the array - return $URLs; + return $urlArray; } // "Getter" for member action array for given status @@ -1488,8 +1540,8 @@ 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 `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) { @@ -1508,7 +1560,7 @@ function SURFBAR_GET_ARRAY_FROM_STATUS ($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 @@ -1535,7 +1587,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.','; @@ -1546,10 +1598,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['userid'], $add); + $maxRand = SURFBAR_GET_MAX_RANDOM($userids['userid'], $add); // If more than one URL can be called generate the random number! if ($maxRand > 1) { @@ -1559,27 +1611,66 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = '0') { // 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(',', $UIDs['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 + $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['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__ ); @@ -1597,10 +1688,10 @@ LIMIT 1", $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'] = ''; + $GLOBALS['surfbar_cache']['salts_last_salt'] = ''; } // END - if // Fix missing last_surfed @@ -1658,14 +1749,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('Element ' . $element . ' not found.'); } // Return result - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "element[$element]={$data}", false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element[' . $element . ']=[' . gettype($data) . ']' . $data, false); return $data; } @@ -1696,13 +1787,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 @@ -1720,13 +1811,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