X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fsurfbar_functions.php;h=6e10e276e1c6a017be0022a2eff0cd80fb5419f9;hp=9feb142f5a05c29b82cdcc842483ba499175d36a;hb=4b93525eb57c07b89c127494a45ec3d5666fa71a;hpb=30ae22f62ae87c53a56baf0d134569ba91011111 diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 9feb142f5a..6e10e276e1 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -14,11 +14,9 @@ * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * * $Author:: $ * - * Needs to be in all Files and every File needs "svn propset * - * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -40,7 +38,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // ----------------------------------------------------------------------------- // Admin functions @@ -189,8 +187,8 @@ function SURFBAR_MEMBER_ACTIONS ($urlId, $status) { $actionArray = SURFBAR_GET_ARRAY_FROM_STATUS($status); // Init HTML code - $OUT = " -\n"; + $OUT = '
+'; // Calculate width $width = round(100 / count($actionArray)); @@ -199,17 +197,15 @@ function SURFBAR_MEMBER_ACTIONS ($urlId, $status) { foreach ($actionArray as $actionId => $action) { // Add form for this action $OUT .= loadTemplate('member_surfbar_list_form', true, array( - 'width' => $width, - 'id' => bigintval($urlId), - 'action' => strtolower($action), - 'title' => '{--MEMBER_SURFBAR_ACTION_' . strtoupper($action) . '_TITLE--}', - 'submit' => '{--MEMBER_SURFBAR_ACTION_' . strtoupper($action) . '_SUBMIT--}', + 'width' => $width, + 'url_id' => bigintval($urlId), + 'action' => strtolower($action) )); } // END - foreach // Close table - $OUT .= " -
\n"; + $OUT .= ' +'; // Return code return $OUT; @@ -270,8 +266,8 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $urlArray) { // Validate if the requested action can be performed on current URL status function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) { // Search for the requested action/status combination in database - $result = SQL_QUERY_ESC("SELECT new_status FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `action`='%s' AND `status`='%s' LIMIT 1", - array($action, $status), __FUNCTION__, __LINE__); + $result = SQL_QUERY_ESC("SELECT `actions_new_status` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `actions_action`='%s' AND `actions_status`='%s' LIMIT 1", + array($action, $status), __FUNCTION__, __LINE__); // Is the entry there? $isValid = (SQL_NUMROWS($result) == 1); @@ -369,16 +365,16 @@ function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) { // Include fields only for action 'edit' if ($action == 'edit') { // Default is not limited - $urlData['limited_y'] = ''; - $urlData['limited_n'] = ' checked="checked"'; - $urlData['limited'] = 'false'; + $urlData['limited_yes'] = ''; + $urlData['limited_no'] = ' checked="checked"'; + $urlData['limited'] = 'false'; // Is this URL limited? if (SURFBAR_GET_VIEWS_MAX() > 0) { // Then rewrite form data - $urlData['limited_y'] = ' checked="checked"'; - $urlData['limited_n'] = ''; - $urlData['limited'] = 'true'; + $urlData['limited_yes'] = ' checked="checked"'; + $urlData['limited_no'] = ''; + $urlData['limited'] = 'true'; } // END - if } // END - if @@ -411,7 +407,7 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) { $executed = SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['url_status'], $urlData['new_status'], array($urlData['id'] => $urlData)); } // END - if } else { - // Not found! + // Not found addFatalMessage(__FUNCTION__, __LINE__, '{--MEMBER_SURFBAR_EXECUTE_ACTION_404--}', $functionName); } @@ -667,7 +663,7 @@ 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 = getMaskedMessage('ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT', strtoupper($messageType)); + $subject = '{%message,ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT=' . strtoupper($messageType) . '%}'; } // END - if // Translate some data if present @@ -727,7 +723,7 @@ function translateSurfbarLimit ($limit) { $return = '{--MEMBER_SURFBAR_UNLIMITED_VIEWS--}'; } else { // Translate comma - $return = translateComma($limit); + $return = '{%pipe,translateComma=' . $limit . '%}'; } // Return value @@ -736,19 +732,67 @@ function translateSurfbarLimit ($limit) { // Translate the URL status function translateSurfbarUrlStatus ($status) { - // Return result - return sprintf("{--SURFBAR_URL_STATUS_%s--}", strtoupper($status)); + // NULL must be handled carfefully + if (is_null($status)) { + // Is NULL, so return other language string + return '{--SURFBAR_URL_STATUS_NONE--}'; + } else { + // Return regular result + return sprintf("{--SURFBAR_URL_STATUS_%s--}", strtoupper($status)); + } +} + +// Translates the given action into a link title for members +function translateMemberSurfbarActionToTitle ($action) { + // Do we have cache? + if (!isset($GLOBALS[__FUNCTION__][$action])) { + // Construct default return string (unknown + $GLOBALS[__FUNCTION__][$action] = '{%message,MEMBER_SURFBAR_ACTION_UNKNOWN_TITLE=' . $action . '%}'; + + // ... and the id's name + $messageId = 'MEMBER_SURFBAR_ACTION_' . strtoupper($action) . '_TITLE'; + + // Is the id there? + if (isMessageIdValid($messageId)) { + // Then use it + $GLOBALS[__FUNCTION__][$action] = '{--' . $messageId . '--}'; + } // END - if + } // END - if + + // Return cache + return $GLOBALS[__FUNCTION__][$action]; +} + +// Translates the given action into a submit button for members +function translateMemberSurfbarActionToSubmit ($action) { + // Do we have cache? + if (!isset($GLOBALS[__FUNCTION__][$action])) { + // Construct default return string (unknown + $GLOBALS[__FUNCTION__][$action] = '{%message,MEMBER_SURFBAR_ACTION_UNKNOWN_SUBMIT=' . $action . '%}'; + + // ... and the id's name + $messageId = 'MEMBER_SURFBAR_ACTION_' . strtoupper($action) . '_SUBMIT'; + + // Is the id there? + if (isMessageIdValid($messageId)) { + // Then use it + $GLOBALS[__FUNCTION__][$action] = '{--' . $messageId . '--}'; + } // END - if + } // END - if + + // Return cache + return $GLOBALS[__FUNCTION__][$action]; } // Determine reward -function SURFBAR_DETERMINE_REWARD ($onlyMin=false) { +function SURFBAR_DETERMINE_REWARD ($onlyMin = false) { // Static values are default $reward = getConfig('surfbar_static_reward'); // Do we have static or dynamic? - if (getConfig('surfbar_pay_model') == 'DYNAMIC') { + if (getSurfbarPaymentModel() == 'DYNAMIC') { // "Calculate" dynamic reward - if ($onlyMin) { + if ($onlyMin === true) { $reward += SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE(); } else { $reward += SURFBAR_CALCULATE_DYNAMIC_ADD(); @@ -765,7 +809,7 @@ function SURFBAR_DETERMINE_COSTS ($onlyMin=false) { $costs = getConfig('surfbar_static_costs'); // Do we have static or dynamic? - if (getConfig('surfbar_pay_model') == 'DYNAMIC') { + if (getSurfbarPaymentModel() == 'DYNAMIC') { // "Calculate" dynamic costs if ($onlyMin) { $costs += SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE(); @@ -791,7 +835,7 @@ function SURFBAR_CALCULATE_DYNAMIC_ADD () { // Determine right template name function SURFBAR_DETERMINE_TEMPLATE_NAME() { // Default is the frameset - $templateName = "surfbar_frameset"; + $templateName = 'surfbar_frameset'; // Any frame set? ;-) if (isGetRequestParameterSet('frame')) { @@ -816,26 +860,26 @@ function SURFBAR_CHECK_RELOAD_FULL () { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Fixed surf lock is '.getConfig('surfbar_static_lock') . '', false); // Do we have dynamic model? - if (getConfig('surfbar_pay_model') == 'DYNAMIC') { + if (getSurfbarPaymentModel() == 'DYNAMIC') { // "Calculate" dynamic lock $GLOBALS['surfbar_cache']['surf_lock'] += SURFBAR_CALCULATE_DYNAMIC_ADD(); } // END - if // Ask the database $result = SQL_QUERY_ESC("SELECT - COUNT(l.locks_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.url_id=l.locks_url_id + u.`url_id`=l.`locks_url_id` WHERE - l.locks_userid=%s AND - (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(l.locks_last_surfed) AND + l.`locks_userid`=%s AND + (UNIX_TIMESTAMP() - {%%pipe,SURFBAR_GET_SURF_LOCK%%}) < UNIX_TIMESTAMP(l.`locks_last_surfed`) AND ( - ((UNIX_TIMESTAMP(l.locks_last_surfed) - u.url_fixed_reload) < 0 AND u.url_fixed_reload > 0) OR - u.url_fixed_reload = '0' + ((UNIX_TIMESTAMP(l.`locks_last_surfed`) - u.`url_fixed_reload`) < 0 AND u.`url_fixed_reload` > 0) OR + u.`url_fixed_reload` = 0 ) LIMIT 1", array(getMemberId()), __FUNCTION__, __LINE__ @@ -876,7 +920,7 @@ function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = '0') { } // END - if // Is the exlude userid set? - if ($excludeUserId > 0) { + if (isValidUserId($excludeUserId)) { // Then add it $userids['url_userid'][$excludeUserId] = $excludeUserId; } // END - if @@ -894,22 +938,22 @@ LIMIT 1", ); // Fetch row - list($cnt) = SQL_FETCHROW($result); + list($count) = SQL_FETCHROW($result); // Free result SQL_FREERESULT($result); // Debug message - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'cnt=' . $cnt); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'cnt=' . $count); // Return result - return $cnt; + return $count; } // Check wether the user is allowed to book more URLs function SURFBAR_IF_USER_BOOK_MORE_URLS ($userid = '0') { // 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')) < getSurfbarMaxOrder())); } // Get total amount of URLs of given status for current user @@ -920,7 +964,7 @@ function SURFBAR_GET_TOTAL_USER_URLS ($userid = '0', $status = '', $exclude = '' $userid = getMemberId(); } elseif ($userid == '0') { // Error! - return (getConfig('surfbar_max_order') + 1); + return (getSurfbarMaxOrder() + 1); } // Default is all URLs @@ -942,22 +986,28 @@ function SURFBAR_GET_TOTAL_USER_URLS ($userid = '0', $status = '', $exclude = '' } // Get amount from database - $cnt = countSumTotalData($userid, 'surfbar_urls', 'url_id', 'url_userid', true, $add); + $count = countSumTotalData($userid, 'surfbar_urls', 'url_id', 'url_userid', true, $add); // Return result - return $cnt; + return $count; } // Generate a validation code for the given id number function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt = '') { // @TODO Invalid salt should be refused + $length = '0'; $GLOBALS['surfbar_cache']['salt'] = 'INVALID'; - // Get code length from config - $length = getConfig('code_length'); + // Is extension ext-other there? + if (isExtensionActive('other')) { + // Get code length from config + $length = getCodeLength(); + } // END - if // Fix length to 10 - if ($length == '0') $length = 10; + if ($length == '0') { + $length = 10; + } // END - if // Generate a code until the length matches $valCode = ''; @@ -974,7 +1024,7 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt = '') { } // ... and now the validation code - $valCode = generateRandomCode($length, sha1(SURFBAR_GET_SALT().':'.$urlId), getMemberId()); + $valCode = generateRandomCode($length, sha1(SURFBAR_GET_SALT() . getEncryptSeperator() . $urlId), getMemberId()); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'valCode='.valCode.'', false); } // END - while @@ -1021,12 +1071,15 @@ function SURFBAR_PAY_POINTS () { // Remove it from the URL owner //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.SURFBAR_GET_USERID().',costs='.SURFBAR_GET_COSTS().'', false); if (isValidUserId(SURFBAR_GET_USERID())) { - subtractPoints(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), SURFBAR_GET_USERID(), SURFBAR_GET_COSTS()); + subtractPoints(sprintf("surfbar_%s", getSurfbarPaymentModel()), SURFBAR_GET_USERID(), SURFBAR_GET_COSTS()); } // END - if - // Book it to the user //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.getMemberId().',reward='.SURFBAR_GET_REWARD().'', false); - addPointsThroughReferalSystem(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), getMemberId(), SURFBAR_GET_DATA('reward')); + // @TODO Try to rewrite the following unset() + unset($GLOBALS['ref_level']); + + // Book it to the user + addPointsThroughReferalSystem(sprintf("surfbar_%s", getSurfbarPaymentModel()), getMemberId(), SURFBAR_GET_REWARD()); } // Updates the statistics of current URL/userid @@ -1055,7 +1108,7 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () { ), __FUNCTION__, __LINE__); // Was that update okay? - if (SQL_AFFECTEDROWS() < 1) { + if (SQL_HASZEROAFFECTED()) { // No, then insert entry SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_stats` (`stats_userid`, `stats_url_id`, `stats_count`) VALUES (%s,%s,1)", array( @@ -1094,7 +1147,7 @@ function SURFBAR_UPDATE_SALT_STATS () { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'salt='.SURFBAR_GET_SALT().',id='.SURFBAR_GET_ID().',userid='.getMemberId().'', false); // Was that okay? - if (SQL_AFFECTEDROWS() < 1) { + if (SQL_HASZEROAFFECTED()) { // Insert missing entry! 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__); @@ -1104,7 +1157,7 @@ function SURFBAR_UPDATE_SALT_STATS () { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'affectedRows='.SQL_AFFECTEDROWS().'', false); // Return if the update was okay - return (SQL_AFFECTEDROWS() == 1); + return (!SQL_HASZEROAFFECTED()); } // Check if the reload lock is active for given id @@ -1125,14 +1178,14 @@ LIMIT 1", ); // Fetch counter - list($cnt) = SQL_FETCHROW($result); + list($count) = SQL_FETCHROW($result); // Free result SQL_FREERESULT($result); // Return check - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'cnt=' . $cnt . ',' . SURFBAR_GET_SURF_LOCK() . '', false); - return ($cnt == 1); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'cnt=' . $count . ',' . SURFBAR_GET_SURF_LOCK() . '', false); + return ($count == 1); } // Determine which user hash no more points left @@ -1147,9 +1200,9 @@ function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) { // Do we have a current user id? if ((isMember()) && ($limit == '0')) { // Then add this as well - $userids['url_userid'][getMemberId()] = getMemberId(); - $userids['points'][getMemberId()] = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points'); - $userids['notified'][getMemberId()] = '0'; + $userids['url_userid'][getMemberId()] = getMemberId(); + $userids['points'][getMemberId()] = getTotalPoints(getMemberId()); + $userids['notified'][getMemberId()] = '0'; // Get all userid except logged in one $result = SQL_QUERY_ESC("SELECT @@ -1159,13 +1212,14 @@ FROM INNER JOIN `{?_MYSQL_PREFIX?}_user_data` AS d ON - u.url_userid=d.userid + u.`url_userid`=d.`userid` WHERE - u.url_userid NOT IN (%s,0) AND u.url_status='ACTIVE' + u.`url_userid` NOT IN (%s,0) AND + u.`url_status`='ACTIVE' GROUP BY - u.url_userid + u.`url_userid` ORDER BY - u.url_userid ASC", + u.`url_userid` ASC", array(getMemberId()), __FUNCTION__, __LINE__); } else { // Get all userid @@ -1176,28 +1230,29 @@ FROM INNER JOIN `{?_MYSQL_PREFIX?}_user_data` AS d ON - u.url_userid=d.userid + u.`url_userid`=d.`userid` WHERE - u.url_status='ACTIVE' + u.`url_userid` > 0 AND + u.`url_status`='ACTIVE' GROUP BY - u.url_userid + u.`url_userid` ORDER BY - u.url_userid ASC", __FUNCTION__, __LINE__); + u.`url_userid` ASC", __FUNCTION__, __LINE__); } // Load all userid while ($content = SQL_FETCHARRAY($result)) { // Get total points - $points = countSumTotalData($content['url_userid'], 'user_points', 'points') - countSumTotalData($content['url_userid'], 'user_data', 'used_points'); + $points = getTotalPoints($content['url_userid']); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['url_userid']},points={$points}", false); // Shall we add this to ignore? if ($points <= $limit) { // Ignore this one! //* 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']; + $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 @@ -1214,23 +1269,23 @@ ORDER BY // Determine how many users are Online in surfbar function SURFBAR_DETERMINE_TOTAL_ONLINE () { // Count all users in surfbar modue and return the value - $result = SQL_QUERY("SELECT + $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__); + `stats_userid` ASC', __FUNCTION__, __LINE__); // Fetch count - $cnt = SQL_NUMROWS($result); + $count = SQL_NUMROWS($result); // Free result SQL_FREERESULT($result); // Return result - return $cnt; + return $count; } // Determine waiting time for one URL @@ -1248,7 +1303,7 @@ function SURFBAR_DETERMINE_WAIT_TIME () { $time = getConfig('surfbar_static_time'); // Which payment model do we have? - if (getConfig('surfbar_pay_model') == 'DYNAMIC') { + if (getSurfbarPaymentModel() == 'DYNAMIC') { // "Calculate" dynamic time $time += SURFBAR_CALCULATE_DYNAMIC_ADD(); } // END - if @@ -1297,9 +1352,9 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) // Prepare content for notification routines $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')); + $data[$urlId]['frametester'] = '{%pipe,generateFrametesterUrl=' . $data[$urlId]['url'] . '%}'; + $data[$urlId]['reward'] = '{%config,translateComma=surfbar_static_reward%}'; + $data[$urlId]['costs'] = '{%config,translateComma=surfbar_static_costs%}'; // Do some dirty fixing here: if (($data[$urlId]['url_status'] == 'STOPPED') && ($newStatus == 'pending')) { @@ -1463,10 +1518,10 @@ LEFT JOIN ON sbu.url_id=l.locks_url_id WHERE - sbu.url_userid NOT IN (".implode(',', $userids).") AND + 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." + " . $add . " GROUP BY sbu.url_id ASC", __FUNCTION__, __LINE__); @@ -1498,13 +1553,13 @@ function SURFBAR_GET_USER_URLS () { 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 + 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' + u.`url_userid`=%s AND + u.`url_status` != 'DELETED' ORDER BY u.url_id ASC", array(getMemberId()), __FUNCTION__, __LINE__); @@ -1514,7 +1569,7 @@ ORDER BY // Load all rows while ($row = SQL_FETCHARRAY($result)) { // Add the row - $urlArray[$row['id']] = $row; + $urlArray[$row['url_id']] = $row; } // END - while } // END - if @@ -1531,7 +1586,7 @@ 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 `actions_status`='%s' ORDER BY `actions_id` ASC", + $result = SQL_QUERY_ESC("SELECT `actions_action` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `actions_status`='%s' ORDER BY `actions_id` ASC", array($status), __FUNCTION__, __LINE__); // Some entries there? @@ -1539,7 +1594,7 @@ function SURFBAR_GET_ARRAY_FROM_STATUS ($status) { // Load all actions // @TODO This can be somehow rewritten while ($content = SQL_FETCHARRAY($result)) { - $returnArray[] = $content['action']; + $returnArray[] = $content['actions_action']; } // END - if } // END - if @@ -1563,7 +1618,7 @@ function SURFBAR_RELOAD_TO_STOP_PAGE ($page = 'stop') { } // Determine next id for surfbar or get data for given id, always call this before you call other -// getters below this function!!! +// getters below this function! function SURFBAR_DETERMINE_NEXT_ID ($urlId = '0') { // Default is no id and no random number $nextId = '0'; @@ -1578,7 +1633,7 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = '0') { $add = ''; if (count($USE) > 0) { // Ignore some! - $add = " AND sbu.url_id NOT IN ("; + $add = " AND sbu.`url_id` NOT IN ("; foreach ($USE as $url_id => $lid) { // Add URL id $add .= $url_id.','; @@ -1623,12 +1678,12 @@ LEFT JOIN ON sbu.url_id=l.locks_url_id WHERE - sbu.url_userid NOT IN (".implode(',', $userids['url_userid']).") AND + 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 + sbu.`url_id` ORDER BY l.locks_last_surfed ASC, sbu.url_id ASC @@ -1698,7 +1753,7 @@ LIMIT 1", //* 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') { + if (getSurfbarPaymentModel() == 'DYNAMIC') { // Calculate dynamic reward/costs and add it $GLOBALS['surfbar_cache']['reward'] += SURFBAR_CALCULATE_DYNAMIC_ADD(); $GLOBALS['surfbar_cache']['costs'] += SURFBAR_CALCULATE_DYNAMIC_ADD(); @@ -1717,6 +1772,70 @@ LIMIT 1", return $nextId; } +// ---------------------------------------------------------------------------- +// Wrapper function +// ---------------------------------------------------------------------------- + +// "Getter" for surfbar_dynamic_percent +function getSurfbarDynamicPercent () { + // Do we have cache? + if (!isset($GLOBALS[__FUNCTION__])) { + // Determine it + $GLOBALS[__FUNCTION__] = getConfig('surfbar_dynamic_percent'); + } // END - if + + // Return cache + return $GLOBALS[__FUNCTION__]; +} + +// "Getter" for surfbar_static_reward +function getSurfbarStaticReward () { + // Do we have cache? + if (!isset($GLOBALS[__FUNCTION__])) { + // Determine it + $GLOBALS[__FUNCTION__] = getConfig('surfbar_static_reward'); + } // END - if + + // Return cache + return $GLOBALS[__FUNCTION__]; +} + +// "Getter" for surfbar_static_time +function getSurfbarStaticTime () { + // Do we have cache? + if (!isset($GLOBALS[__FUNCTION__])) { + // Determine it + $GLOBALS[__FUNCTION__] = getConfig('surfbar_static_time'); + } // END - if + + // Return cache + return $GLOBALS[__FUNCTION__]; +} + +// "Getter" for surfbar_max_order +function getSurfbarMaxOrder () { + // Do we have cache? + if (!isset($GLOBALS[__FUNCTION__])) { + // Determine it + $GLOBALS[__FUNCTION__] = getConfig('surfbar_max_order'); + } // END - if + + // Return cache + return $GLOBALS[__FUNCTION__]; +} + +// "Getter" for surfbar_payment_model +function getSurfbarPaymentModel () { + // Do we have cache? + if (!isset($GLOBALS[__FUNCTION__])) { + // Determine it + $GLOBALS[__FUNCTION__] = getConfig('surfbar_payment_model'); + } // END - if + + // Return cache + return $GLOBALS[__FUNCTION__]; +} + // ----------------------------------------------------------------------------- // PLEASE DO NOT ADD ANY OTHER FUNCTIONS BELOW THIS LINE IF THEY DON'T "WRAP" // THE $GLOBALS['surfbar_cache'] ARRAY!