X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fsurfbar_functions.php;h=5d7c8f9a1718018e83307b7e27b2342803f39f1a;hp=3700fab3972bfde28056b928bf3c78979eea311a;hb=1fe7cf281be6832ba105934537aba5127892c576;hpb=076e28c32b079b93b73a67b0c8710d65596b76a9 diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 3700fab397..5d7c8f9a17 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -42,7 +42,7 @@ if (!defined('__SECURITY')) { // ----------------------------------------------------------------------------- // // Admin has added an URL with given user id and so on -function SURFBAR_ADMIN_ADD_URL ($url, $limit) { +function SURFBAR_ADMIN_ADD_URL ($url, $limit, $reload) { // Do some pre-checks if (!IS_ADMIN()) { // Not an admin @@ -59,10 +59,13 @@ function SURFBAR_ADMIN_ADD_URL ($url, $limit) { } elseif ("".($limit + 0)."" != "".$limit."") { // Invalid amount entered return false; + } elseif ("".($reload + 0)."" != "".$reload."") { + // Invalid amount entered + return false; } // Register the new URL - return SURFBAR_REGISTER_URL($url, "0", "ACTIVE", "unlock", $limit); + 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) { @@ -164,7 +167,7 @@ function SURFBAR_MEMBER_ADD_URL ($url, $limit) { } // Register the new URL - return SURFBAR_REGISTER_URL($url, $GLOBALS['userid'], "PENDING", "reg", $limit); + return SURFBAR_REGISTER_URL($url, $GLOBALS['userid'], "PENDING", "reg", array('limit' => $limit)); } // Create list of actions depending on status for the user function SURFBAR_MEMBER_ACTIONS ($urlId, $status) { @@ -181,13 +184,7 @@ function SURFBAR_MEMBER_ACTIONS ($urlId, $status) { // "Walk" through all actions and create forms foreach ($actionArray as $actionId=>$action) { // Add form for this action - $OUT .= sprintf(" -
- - - -
- \n", + $OUT .= sprintf(LOAD_TEMPLATE("member_surfbar_list_form", true), $width, bigintval($urlId), strtolower($action), @@ -225,8 +222,17 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) { return false; } + // Secure action + $action = SQL_ESCAPE(htmlentities(strip_tags($formData['action']), ENT_QUOTES)); + + // Has it changed? + if ($action != $formData['action']) { + // Invalid data in action found + return false; + } // END - if + // Create the function name for selected action - $functionName = sprintf("SURFBAR_MEMBER_%s_ACTION", strtoupper(SQL_ESCAPE($formData['action']))); + $functionName = sprintf("SURFBAR_MEMBER_%s_ACTION", strtoupper($action)); // Is the function there? if (function_exists($functionName)) { @@ -234,13 +240,14 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) { $URLs[$formData['id']]['new_status'] = $SURFBAR_CACHE['new_status']; // Extract URL data for call-back - $urlData = array($URLs[$formData['id']]); + $urlData = array(merge_array($URLs[$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}"); + addFatalMessage(sprintf("Invalid member action! action=%s,id=%s,function=%s", $formData['action'], $formData['id'], $functionName)); } // Return status @@ -251,7 +258,7 @@ function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) { global $SURFBAR_CACHE; // Search for the requested action/status combination in database - $result = SQL_QUERY_ESC("SELECT new_status FROM "._MYSQL_PREFIX."_surfbar_actions WHERE action='%s' AND status='%s' LIMIT 1", + $result = SQL_QUERY_ESC("SELECT new_status FROM `{!_MYSQL_PREFIX!}_surfbar_actions` WHERE `action`='%s' AND `status`='%s' LIMIT 1", array($action, $status), __FILE__, __LINE__); // Is the entry there? @@ -259,6 +266,7 @@ function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) { // Fetch the new status if found if ($isValid) { + // Load new status list($SURFBAR_CACHE['new_status']) = SQL_FETCHROW($result); } // END - if @@ -273,7 +281,7 @@ function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) { // Member actions // ----------------------------------------------------------------------------- // -// Retreat an URL +// Retreat a booked URL function SURFBAR_MEMBER_RETREAT_ACTION ($urlData) { // Create the data array for next function call $data = array( @@ -293,6 +301,146 @@ function SURFBAR_MEMBER_BOOKNOW_ACTION ($urlData) { // Simply change the status here return SURFBAR_CHANGE_STATUS ($urlData['id'], $urlData['status'], $urlData['new_status'], $data); } +// Show edit form or do the changes +function SURFBAR_MEMBER_EDIT_ACTION ($urlData) { + // Is the "execute" flag there? + if (isset($urlData['edit']['execute'])) { + // Execute the changes + return SURFBAR_MEMBER_EXECUTE_ACTION("edit", $urlData); + } // END - if + + // Display form + return SURFBAR_MEMBER_DISPLAY_ACTION_FORM("edit", $urlData); +} +// Show delete form or do the changes +function SURFBAR_MEMBER_DELETE_ACTION ($urlData) { + // Is the "execute" flag there? + if (isset($urlData['delete']['execute'])) { + // Execute the changes + return SURFBAR_MEMBER_EXECUTE_ACTION("delete", $urlData); + } // END - if + + // Display form + return SURFBAR_MEMBER_DISPLAY_ACTION_FORM("delete", $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)); +} +// Unpause stopped banner +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']; + + // Return status change + return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['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)); +} +// Display selected "action form" +function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) { + // Translate some data + $urlData['registered'] = MAKE_DATETIME($urlData['registered'], "2"); + $urlData['views_total'] = TRANSLATE_COMMA($urlData['views_total']); + $urlData['views_max'] = TRANSLATE_COMMA($urlData['views_max']); + $urlData['views_allowed'] = TRANSLATE_COMMA($urlData['views_allowed']); + $urlData['last_locked'] = MAKE_DATETIME($urlData['last_locked'], "2"); + + // Is the lock reason empty? + if (empty($urlData['lock_reason'])) { + // Fix it to three dashes + $urlData['lock_reason'] = "---"; + } // END - if + + // Include fields only for action 'edit' + if ($action == "edit") { + // Default is not limited + $urlData['limited_yes'] = ""; + $urlData['limited_no'] = " checked=\"checked\""; + $urlData['limited'] = "false"; + + // Is this URL limited? + if ($urlData['views_max'] > 0) { + // Then rewrite form data + $urlData['limited_yes'] = " checked=\"checked\""; + $urlData['limited_no'] = ""; + $urlData['limited'] = "true"; + } // END - if + } // END - if + + // Load the form and display it + LOAD_TEMPLATE(sprintf("member_surfbar_%s_action_form", $action), false, $urlData); + + // All fine by default ... ;-) + return true; +} +// Execute choosen action +function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) { + // By default nothing is executed + $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']))) { + // Set it to unlimited + $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)); + } // END - if + } else { + // Not found! + addFatalMessage(sprintf(MEMBER_SURFBAR_EXECUTE_ACTION_404, $functionName)); + } + + // Return status + return $executed; +} +// "Execute edit" function: Update changed data +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)) { + // Run the query + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET url='%s', views_allowed=%s, views_max=%s WHERE id=%s AND `status`='%s' LIMIT 1", + array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['status']), __FILE__, __LINE__); + + // All fine + $status = true; + } + + // Return status + return $status; +} +// "Execute delete" function: Does nothing... +function SURFBAR_MEMBER_EXECUTE_DELETE_ACTION ($urlData) { + // Nothing special to do (see above function for such "special actions" to perform) + return true; +} // // ----------------------------------------------------------------------------- // Self-maintenance functions @@ -309,7 +457,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", "views_max", "id", "ASC", "id", " AND views_allowed>0 AND `status`='ACTIVE'"); // Do we have some entries? if (count($urlArray) > 0) { @@ -331,26 +479,26 @@ function SURFBAR_HANDLE_LOW_POINTS () { global $_CONFIG; // Get all userids - $UIDs = SURFBAR_DETERMINE_DEPLETED_USERIDS($_CONFIG['surfbar_warn_low_points']); + $UIDs = SURFBAR_DETERMINE_DEPLETED_USERIDS(getConfig('surfbar_warn_low_points')); // "Walk" through all URLs foreach ($UIDs['uid'] as $uid => $dummy) { // Is the last notification far enougth away to notify again? - if ((time() - $UIDs['notified'][$uid]) >= $_CONFIG['surfbar_low_interval']) { + if ((time() - $UIDs['notified'][$uid]) >= getConfig('surfbar_low_interval')) { // Prepare content $content = array( 'uid' => $uid, - 'low' => TRANSLATE_COMMA($_CONFIG['surfbar_warn_low_points']), + 'low' => TRANSLATE_COMMA(getConfig('surfbar_warn_low_points')), 'points' => TRANSLATE_COMMA($UIDs['points'][$uid]), 'notified' => MAKE_DATETIME($UIDs['notified'][$uid]), - 'interval' => CREATE_FANCY_TIME($_CONFIG['surfbar_low_interval']) + 'interval' => CREATE_FANCY_TIME(getConfig('surfbar_low_interval')) ); // 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", + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET surfbar_low_notified=NOW() WHERE userid=%s LIMIT 1", array($uid), __FILE__, __LINE__); } // END - if } // END - foreach @@ -388,8 +536,8 @@ function SURFBAR_GET_URL_DATA ($searchTerm, $column="id", $order="id", $sort="AS } // END - if // Look up the record - $result = SQL_QUERY_ESC("SELECT id, userid, url, views_total, status, registered, last_locked, lock_reason, views_max, views_allowed -FROM "._MYSQL_PREFIX."_surfbar_urls + $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 %s", @@ -417,20 +565,23 @@ ORDER BY %s %s return $lastUrlData; } // 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", $limit=0) { +function SURFBAR_REGISTER_URL ($url, $uid, $status="PENDING", $addMode="reg", $extraFields = array()) { global $_CONFIG; // Make sure by the user registered URLs are always pending if ($addMode == "reg") $status = "PENDING"; // Prepare content - $content = array( + $content = merge_array($extraFields, array( 'url' => $url, 'frametester' => FRAMETESTER($url), 'uid' => $uid, 'status' => $status, - 'limit' => $limit - ); + )); + + // Is limit/reload set? + if (!isset($config['limit'])) $content['limit'] = 0; + if (!isset($config['reload'])) $content['reload'] = 0; // Insert the URL into database $content['insert_id'] = SURFBAR_INSERT_URL_BY_ARRAY($content); @@ -442,11 +593,10 @@ function SURFBAR_REGISTER_URL ($url, $uid, $status="PENDING", $addMode="reg", $l } // END - if // Translate status and limit - $content['status'] = SURFBAR_TRANSLATE_STATUS($content['status']); $content['limit'] = SURFBAR_TRANSLATE_LIMIT($content['limit']); // If in reg-mode we notify admin - if (($addMode == "reg") || ($_CONFIG['surfbar_notify_admin_unlock'] == "Y")) { + if (($addMode == "reg") || (getConfig('surfbar_notify_admin_unlock') == "Y")) { // Notify admin even when he as unlocked an email SURFBAR_NOTIFY_ADMIN("url_{$addMode}", $content); } // END - if @@ -466,13 +616,14 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) { if (empty($uid)) $uid = 0; // Just run the insert query for now - SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_urls (userid,url,status,views_max,views_allowed) VALUES (%s,'%s','%s','%s','%s')", + 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['limit'], + $urlData['reload'] ), __FILE__, __LINE__ ); @@ -487,10 +638,25 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) { // Set default subject if following eval() wents wrong $subject = ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT; - // Prepare subject - $subject = constant(sprintf("ADMIN_SURFBAR_NOTIFY_%s_SUBJECT", + // Create constant name + $constantName = sprintf("ADMIN_SURFBAR_NOTIFY_%s_SUBJECT", strtoupper($messageType) - )); + ); + + // Prepare subject + if (defined($constantName)) { + $subject = constant($constantName); + } else { + addFatalMessage(getMessage('ADMIN_SURFBAR_NOTIFY_SUBJECT_404'), $constantName); + } + + // Translate some data if present + if (isset($content['status'])) $content['status'] = SURFBAR_TRANSLATE_STATUS($content['status']); + if (isset($content['registered'])) $content['registered'] = MAKE_DATETIME($content['registered'], "2"); + if (isset($content['last_locked'])) $content['last_locked'] = MAKE_DATETIME($content['last_locked'], "2"); + if (isset($content['views_total'])) $content['views_total'] = TRANSLATE_COMMA($content['views_total']); + if (isset($content['views_allowed'])) $content['views_allowed'] = TRANSLATE_COMMA($content['views_allowed']); + if (isset($content['views_max'])) $content['views_max'] = TRANSLATE_COMMA($content['views_max']); // Send the notification out return SEND_ADMIN_NOTIFICATION($subject, $templateName, $content, $content['uid']); @@ -508,10 +674,25 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) { // Set default subject if following eval() wents wrong $subject = MEMBER_SURFBAR_NOTIFY_DEFAULT_SUBJECT; - // Prepare subject - $subject = constant(sprintf("MEMBER_SURFBAR_NOTIFY_%s_SUBJECT", + // Create constant name + $constantName = sprintf("MEMBER_SURFBAR_NOTIFY_%s_SUBJECT", strtoupper($messageType) - )); + ); + + // Prepare subject + if (defined($constantName)) { + $subject = constant($constantName); + } else { + addFatalMessage(getMessage('MEMBER_SURFBAR_NOTIFY_SUBJECT_404'), $constantName); + } + + // Translate some data if present + if (isset($content['status'])) $content['status'] = SURFBAR_TRANSLATE_STATUS($content['status']); + if (isset($content['registered'])) $content['registered'] = MAKE_DATETIME($content['registered'], "2"); + if (isset($content['last_locked'])) $content['last_locked'] = MAKE_DATETIME($content['last_locked'], "2"); + if (isset($content['views_total'])) $content['views_total'] = TRANSLATE_COMMA($content['views_total']); + if (isset($content['views_allowed'])) $content['views_allowed'] = TRANSLATE_COMMA($content['views_allowed']); + if (isset($content['views_max'])) $content['views_max'] = TRANSLATE_COMMA($content['views_max']); // Load template $mailText = LOAD_EMAIL_TEMPLATE($templateName, $content, $content['uid']); @@ -541,10 +722,10 @@ function SURFBAR_TRANSLATE_STATUS ($status) { // Set default translated status $statusTranslated = "!".$constantName."!"; - // Generate eval() command + // Is the constant there? if (defined($constantName)) { - $eval = "\$statusTranslated = ".$constantName.";"; - eval($eval); + // Then get it's value + $statusTranslated = constant($constantName); } // END - if // Return result @@ -555,10 +736,10 @@ function SURFBAR_DETERMINE_REWARD ($onlyMin=false) { global $_CONFIG; // Static values are default - $reward = $_CONFIG['surfbar_static_reward']; + $reward = getConfig('surfbar_static_reward'); // Do we have static or dynamic? - if ($_CONFIG['surfbar_pay_model'] == "DYNAMIC") { + if (getConfig('surfbar_pay_model') == "DYNAMIC") { // "Calculate" dynamic reward if ($onlyMin) { $reward += SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE(); @@ -575,10 +756,10 @@ function SURFBAR_DETERMINE_COSTS ($onlyMin=false) { global $_CONFIG; // Static costs is default - $costs = $_CONFIG['surfbar_static_costs']; + $costs = getConfig('surfbar_static_costs'); // Do we have static or dynamic? - if ($_CONFIG['surfbar_pay_model'] == "DYNAMIC") { + if (getConfig('surfbar_pay_model') == "DYNAMIC") { // "Calculate" dynamic costs if ($onlyMin) { $costs += SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE(); @@ -624,18 +805,20 @@ function SURFBAR_CHECK_RELOAD_FULL() { $isFull = true; // Cache static reload lock - $SURFBAR_CACHE['surf_lock'] = $_CONFIG['surfbar_static_lock']; - //DEBUG_LOG(__FUNCTION__, __LINE__, "Fixed surf lock is ".$_CONFIG['surfbar_static_lock']."", false); + $SURFBAR_CACHE['surf_lock'] = getConfig('surfbar_static_lock'); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Fixed surf lock is ".getConfig('surfbar_static_lock')."", false); // Do we have dynamic model? - if ($_CONFIG['surfbar_pay_model'] == "DYNAMIC") { + if (getConfig('surfbar_pay_model') == "DYNAMIC") { // "Calculate" dynamic lock $SURFBAR_CACHE['surf_lock'] += SURFBAR_CALCULATE_DYNAMIC_ADD(); } // END - if // Ask the database - $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt FROM "._MYSQL_PREFIX."_surfbar_locks -WHERE userid=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_DATA('surf_lock').") < UNIX_TIMESTAMP(last_surfed) + $result = SQL_QUERY_ESC("SELECT COUNT(l.id) AS cnt FROM `{!_MYSQL_PREFIX!}_surfbar_locks` AS l +INNER JOIN `{!_MYSQL_PREFIX!}_surfbar_urls` AS u +ON u.id=l.url_id +WHERE l.userid=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(l.last_surfed) AND (((UNIX_TIMESTAMP(l.last_surfed) - u.fixed_reload) < 0 AND u.fixed_reload > 0) OR u.fixed_reload = 0) LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__ ); @@ -656,8 +839,8 @@ LIMIT 1", $total = SURFBAR_GET_TOTAL_URLS(); // Do we have some URLs in lock? Admins can always surf on own URLs! - //DEBUG_LOG(__FUNCTION__, __LINE__, "userLocks=".SURFBAR_GET_DATA('user_locks').",total={$total}", false); - $isFull = ((SURFBAR_GET_DATA('user_locks') == $total) && ($total > 0)); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "userLocks=".SURFBAR_GET_USER_LOCKS().",total={$total}", false); + $isFull = ((SURFBAR_GET_USER_LOCKS() == $total) && ($total > 0)); // Return result return $isFull; @@ -675,8 +858,8 @@ function SURFBAR_GET_TOTAL_URLS ($status="ACTIVE", $excludeUserId=0) { // 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'", +FROM `{!_MYSQL_PREFIX!}_surfbar_urls` +WHERE userid NOT IN (".implode(",", $UIDs['uid']).") AND `status`='%s'", array($status), __FILE__, __LINE__ ); @@ -694,7 +877,7 @@ function SURFBAR_IF_USER_BOOK_MORE_URLS ($uid=0) { global $_CONFIG; // Is this admin and userid is zero or does the user has some URLs left to book? - return ((($uid == 0) && (IS_ADMIN())) || (SURFBAR_GET_TOTAL_USER_URLS($uid, "", array("REJECTED")) < $_CONFIG['surfbar_max_order'])); + return ((($uid == 0) && (IS_ADMIN())) || (SURFBAR_GET_TOTAL_USER_URLS($uid, "", array("REJECTED")) < getConfig('surfbar_max_order'))); } // Get total amount of URLs of given status for current user function SURFBAR_GET_TOTAL_USER_URLS ($uid=0, $status="",$exclude="") { @@ -706,7 +889,7 @@ function SURFBAR_GET_TOTAL_USER_URLS ($uid=0, $status="",$exclude="") { $uid = $GLOBALS['userid']; } elseif ($uid == 0) { // Error! - return ($_CONFIG['surfbar_max_order'] + 1); + return (getConfig('surfbar_max_order') + 1); } // Default is all URLs @@ -718,7 +901,7 @@ function SURFBAR_GET_TOTAL_USER_URLS ($uid=0, $status="",$exclude="") { $ADD = sprintf(" AND status IN('%s')", implode("','", $status)); } elseif (!empty($status)) { // Only URLs with this status - $ADD = sprintf(" AND status='%s'", $status); + $ADD = sprintf(" AND `status`='%s'", $status); } elseif (is_array($exclude)) { // Exclude URLs with these status $ADD = sprintf(" AND status NOT IN('%s')", implode("','", $exclude)); @@ -729,10 +912,10 @@ function SURFBAR_GET_TOTAL_USER_URLS ($uid=0, $status="",$exclude="") { // Get amount from database $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt -FROM "._MYSQL_PREFIX."_surfbar_urls +FROM `{!_MYSQL_PREFIX!}_surfbar_urls` WHERE userid=%s".$ADD." LIMIT %s", - array($uid, $_CONFIG['surfbar_max_order']), __FILE__, __LINE__ + array($uid, getConfig('surfbar_max_order')), __FILE__, __LINE__ ); // Fetch row @@ -752,7 +935,7 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt="") { $SURFBAR_CACHE['salt'] = "INVALID"; // Get code length from config - $length = $_CONFIG['code_length']; + $length = getConfig('code_length'); // Fix length to 10 if ($length == 0) $length = 10; @@ -764,16 +947,16 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt="") { if (empty($salt)) { // Generate random hashed string $SURFBAR_CACHE['salt'] = sha1(GEN_PASS(255)); - //DEBUG_LOG(__FUNCTION__, __LINE__, "newSalt=".SURFBAR_GET_SALT()."", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "newSalt=".SURFBAR_GET_SALT()."", false); } else { // Use this as salt! $SURFBAR_CACHE['salt'] = $salt; - //DEBUG_LOG(__FUNCTION__, __LINE__, "oldSalt=".SURFBAR_GET_SALT()."", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "oldSalt=".SURFBAR_GET_SALT()."", false); } // ... and now the validation code $valCode = GEN_RANDOM_CODE($length, sha1(SURFBAR_GET_SALT().":".$urlId), $GLOBALS['userid']); - //DEBUG_LOG(__FUNCTION__, __LINE__, "valCode={$valCode}", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "valCode={$valCode}", false); } // END - while // Hash it with md5() and salt it with the random string @@ -783,7 +966,7 @@ function SURFBAR_GENERATE_VALIDATION_CODE ($urlId, $salt="") { $valHashedCode = generatePassString($hashedCode); // Return hashed value - //DEBUG_LOG(__FUNCTION__, __LINE__, "finalValCode={$valHashedCode}", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "finalValCode={$valHashedCode}", false); return $valHashedCode; } // Check validation code @@ -797,8 +980,8 @@ function SURFBAR_CHECK_VALIDATION_CODE ($urlId, $check, $salt) { $code = SURFBAR_GENERATE_VALIDATION_CODE($urlId, $salt); // Return result of checking hashes and salts - //DEBUG_LOG(__FUNCTION__, __LINE__, "---".$code."|".$check."---", false); - //DEBUG_LOG(__FUNCTION__, __LINE__, "+++".$salt."|".SURFBAR_GET_DATA('last_salt')."+++", false); + //* 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'))); } // Lockdown the userid/id combination (reload lock) @@ -806,24 +989,26 @@ function SURFBAR_LOCKDOWN_ID ($urlId) { //* DEBUG: */ print "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` (userid, url_id) VALUES (%s, %s)", array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __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 url_id=%s AND userid=%s LIMIT 1", array(bigintval($urlId), $GLOBALS['userid']), __FILE__, __LINE__); } -// Pay points to the user and remove it from the sender -function SURFBAR_PAY_POINTS ($urlId) { +// Pay points to the user and remove it from the sender if userid is given else it is a "sponsored surf" +function SURFBAR_PAY_POINTS () { + global $_CONFIG; + // Remove it from the URL owner - //DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".SURFBAR_GET_USERID().",costs=".SURFBAR_GET_COSTS()."", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".SURFBAR_GET_USERID().",costs=".SURFBAR_GET_COSTS()."", false); if (SURFBAR_GET_USERID() > 0) { - SUB_POINTS(SURFBAR_GET_USERID(), SURFBAR_GET_COSTS()); + SUB_POINTS(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), SURFBAR_GET_USERID(), SURFBAR_GET_COSTS()); } // END - if // Book it to the user - //DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".$GLOBALS['userid'].",reward=".SURFBAR_GET_REWARD()."", false); - ADD_POINTS_REFSYSTEM($GLOBALS['userid'], SURFBAR_GET_DATA('reward')); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "uid=".$GLOBALS['userid'].",reward=".SURFBAR_GET_REWARD()."", false); + ADD_POINTS_REFSYSTEM(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), $GLOBALS['userid'], SURFBAR_GET_DATA('reward')); } // Updates the statistics of current URL/userid function SURFBAR_UPDATE_INSERT_STATS_RECORD () { @@ -833,7 +1018,7 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () { $ADD = ""; // Get allowed views - $allowed = SURFBAR_GET_ALLOWED_VIEWS(); + $allowed = SURFBAR_GET_VIEWS_ALLOWED(); // Do we have a limit? if ($allowed > 0) { @@ -842,25 +1027,25 @@ 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 views_total=views_total+1".$ADD." WHERE id=%s LIMIT 1", array(SURFBAR_GET_ID()), __FILE__, __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", + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_stats` SET count=count+1 WHERE userid=%s AND url_id=%s LIMIT 1", array($GLOBALS['userid'], SURFBAR_GET_ID()), __FILE__, __LINE__); // 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)", + SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_stats` (userid,url_id,count) VALUES (%s,%s,1)", array($GLOBALS['userid'], SURFBAR_GET_ID()), __FILE__, __LINE__); } // END - if // Update total/daily/weekly/monthly counter - $_CONFIG['surfbar_total_counter']++; - $_CONFIG['surfbar_daily_counter']++; - $_CONFIG['surfbar_weekly_counter']++; - $_CONFIG['surfbar_monthly_counter']++; + incrementConfigEntry('surfbar_total_counter'); + incrementConfigEntry('surfbar_daily_counter'); + incrementConfigEntry('surfbar_weekly_counter'); + incrementConfigEntry('surfbar_monthly_counter'); // Update config as well UPDATE_CONFIG(array("surfbar_total_counter", "surfbar_daily_counter", "surfbar_weekly_counter", "surfbar_monthly_counter"), array(1,1,1,1), "+"); @@ -871,32 +1056,32 @@ 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", + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_salts` SET last_salt='%s' WHERE url_id=%s AND userid=%s LIMIT 1", array(SURFBAR_GET_SALT(), SURFBAR_GET_ID(), $GLOBALS['userid']), __FILE__, __LINE__); // Debug message - //DEBUG_LOG(__FUNCTION__, __LINE__, "salt=".SURFBAR_GET_SALT().",id=".SURFBAR_GET_ID().",uid=".$GLOBALS['userid']."", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "salt=".SURFBAR_GET_SALT().",id=".SURFBAR_GET_ID().",uid=".$GLOBALS['userid']."", 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')", + SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_salts` (url_id,userid,last_salt) VALUES (%s, %s, '%s')", array(SURFBAR_GET_ID(), $GLOBALS['userid'], SURFBAR_GET_SALT()), __FILE__, __LINE__); } // END - if // Debug message - //DEBUG_LOG(__FUNCTION__, __LINE__, "affectedRows=".SQL_AFFECTEDROWS()."", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "affectedRows=".SQL_AFFECTEDROWS()."", false); // Return if the update was okay return (SQL_AFFECTEDROWS() == 1); } // Check if the reload lock is active for given id function SURFBAR_CHECK_RELOAD_LOCK ($urlId) { - //DEBUG_LOG(__FUNCTION__, __LINE__, "id={$urlId}", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "id={$urlId}", false); // Ask the database $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt -FROM "._MYSQL_PREFIX."_surfbar_locks -WHERE userid=%s AND url_id=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_DATA('surf_lock').") < UNIX_TIMESTAMP(last_surfed) +FROM `{!_MYSQL_PREFIX!}_surfbar_locks` +WHERE userid=%s AND url_id=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(last_surfed) ORDER BY last_surfed ASC LIMIT 1", array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__ @@ -909,7 +1094,7 @@ LIMIT 1", SQL_FREERESULT($result); // Return check - //DEBUG_LOG(__FUNCTION__, __LINE__, "cnt={$cnt},".SURFBAR_GET_DATA('surf_lock')."", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "cnt={$cnt},".SURFBAR_GET_SURF_LOCK()."", false); return ($cnt == 1); } // Determine which user hash no more points left @@ -930,20 +1115,20 @@ function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) { // Get all userid except logged in one $result = SQL_QUERY_ESC("SELECT u.userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified -FROM "._MYSQL_PREFIX."_surfbar_urls AS u -INNER JOIN "._MYSQL_PREFIX."_user_data AS d +FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS u +INNER JOIN `{!_MYSQL_PREFIX!}_user_data` AS d ON u.userid=d.userid -WHERE u.userid NOT IN (%s,0) AND u.status='ACTIVE' +WHERE u.userid NOT IN (%s,0) AND u.`status`='ACTIVE' GROUP BY u.userid ORDER BY u.userid ASC", array($GLOBALS['userid']), __FILE__, __LINE__); } else { // Get all userid $result = SQL_QUERY("SELECT u.userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified -FROM "._MYSQL_PREFIX."_surfbar_urls AS u -INNER JOIN "._MYSQL_PREFIX."_user_data AS d +FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS u +INNER JOIN `{!_MYSQL_PREFIX!}_user_data` AS d ON u.userid=d.userid -WHERE u.status='ACTIVE' +WHERE u.`status`='ACTIVE' GROUP BY u.userid ORDER BY u.userid ASC", __FILE__, __LINE__); } @@ -952,12 +1137,12 @@ ORDER BY u.userid ASC", __FILE__, __LINE__); while (list($uid, $notified) = SQL_FETCHROW($result)) { // Get total points $points = GET_TOTAL_DATA($uid, "user_points", "points") - GET_TOTAL_DATA($uid, "user_data", "used_points"); - //DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$uid},points={$points}", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$uid},points={$points}", false); // Shall we add this to ignore? if ($points <= $limit) { // Ignore this one! - //DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$uid} has depleted points amount!", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$uid} has depleted points amount!", false); $UIDs['uid'][$uid] = $uid; $UIDs['points'][$uid] = $points; $UIDs['notified'][$uid] = $notified; @@ -968,7 +1153,7 @@ ORDER BY u.userid ASC", __FILE__, __LINE__); SQL_FREERESULT($result); // Debug message - //DEBUG_LOG(__FUNCTION__, __LINE__, "UIDs::count=".count($UIDs)." (with own userid=".$GLOBALS['userid'].")", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "UIDs::count=".count($UIDs)." (with own userid=".$GLOBALS['userid'].")", false); // Return result return $UIDs; @@ -979,10 +1164,10 @@ 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 +FROM `{!_MYSQL_PREFIX!}_surfbar_stats` WHERE (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(last_online)) <= %s GROUP BY userid", - array($_CONFIG['online_timeout']), __FILE__, __LINE__); + array(getConfig('online_timeout')), __FILE__, __LINE__); // Fetch count $cnt = SQL_NUMROWS($result); @@ -995,13 +1180,20 @@ GROUP BY userid", } // Determine waiting time for one URL function SURFBAR_DETERMINE_WAIT_TIME () { - global $_CONFIG; + // Get fixed reload lock + $fixed = SURFBAR_GET_FIXED_RELOAD(); + + // Is the fixed reload time set? + if ($fixed > 0) { + // Return it + return $fixed; + } // END - if // Static time is default - $time = $_CONFIG['surfbar_static_time']; + $time = getConfig('surfbar_static_time'); // Which payment model do we have? - if ($_CONFIG['surfbar_pay_model'] == "DYNAMIC") { + if (getConfig('surfbar_pay_model') == "DYNAMIC") { // "Calculate" dynamic time $time += SURFBAR_CALCULATE_DYNAMIC_ADD(); } // END - if @@ -1013,11 +1205,21 @@ function SURFBAR_DETERMINE_WAIT_TIME () { function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) { global $_CONFIG; + // Make new status always lower-case + $newStatus = strtolower($newStatus); + // Get URL data for status comparison if missing - if (count($data) == 0) { + if ((!is_array($data)) || (count($data) == 0)) { + // Fetch missing URL data $data = SURFBAR_GET_URL_DATA($urlId); } // END - if + // Is the new status set? + if ((!is_string($newStatus)) || (empty($newStatus))) { + // Abort here, but fine! + return true; + } // END - if + // Is the status like prevStatus is saying? if ($data[$urlId]['status'] != $prevStatus) { // No, then abort here @@ -1026,31 +1228,34 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) // Update the status now - // ---------------------- Commented out for debugging member actions! ----------------------- - //SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_surfbar_urls SET status='%s' WHERE id=%s LIMIT 1", + // ---------- Comment out for debugging/developing member actions! --------- + //SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET `status`='%s' WHERE id=%s LIMIT 1", // array($newStatus, bigintval($urlId)), __FILE__, __LINE__); - // ---------------------- Commented out for debugging member actions! ----------------------- + // ---------- Comment out for debugging/developing member actions! --------- // Was that fine? - if (SQL_AFFECTEDROWS() != 1) { - // No, something went wrong - return false; - } // END - if + //if (SQL_AFFECTEDROWS() != 1) { + // // No, something went wrong + // return false; + //} // END - if // Prepare content for notification routines $data[$urlId]['uid'] = $data[$urlId]['userid']; $data[$urlId]['frametester'] = FRAMETESTER($data[$urlId]['url']); - $data[$urlId]['reward'] = TRANSLATE_COMMA($_CONFIG['surfbar_static_reward']); - $data[$urlId]['costs'] = TRANSLATE_COMMA($_CONFIG['surfbar_static_costs']); - $data[$urlId]['status'] = SURFBAR_TRANSLATE_STATUS($newStatus); - $data[$urlId]['registered'] = MAKE_DATETIME($data[$urlId]['registered'], "2"); - $newStatus = strtolower($newStatus); + $data[$urlId]['reward'] = TRANSLATE_COMMA(getConfig('surfbar_static_reward')); + $data[$urlId]['costs'] = TRANSLATE_COMMA(getConfig('surfbar_static_costs')); + + // Do some dirty fixing here: + if (($data[$urlId]['status'] == "STOPPED") && ($newStatus == "pending")) { + // Fix for template change + $newStatus = "continued"; + } // END - if // Send admin notification - SURFBAR_NOTIFY_ADMIN("url_{$newStatus}", $data[$urlId]); + SURFBAR_NOTIFY_ADMIN("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]); // Send user notification - SURFBAR_NOTIFY_USER("url_{$newStatus}", $data[$urlId]); + SURFBAR_NOTIFY_USER("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]); // All done! return true; @@ -1063,7 +1268,7 @@ function SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE () { $addon = 0; // Percentage part - $percent = abs(log($_CONFIG['surfbar_dynamic_percent'] / 100 + 1)); + $percent = abs(log(getConfig('surfbar_dynamic_percent') / 100 + 1)); // Get total users $totalUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true); @@ -1101,7 +1306,7 @@ function SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE () { $max = log(2); // Percentage part - $percent = abs(log($_CONFIG['surfbar_dynamic_percent'] / 100 + 1)); + $percent = abs(log(getConfig('surfbar_dynamic_percent') / 100 + 1)); // Get total users $totalUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true); @@ -1144,7 +1349,7 @@ function SURFBAR_GET_LOCK_IDS () { // Get all id from locks within the timestamp $result = SQL_QUERY_ESC("SELECT id, url_id, UNIX_TIMESTAMP(last_surfed) AS last FROM - "._MYSQL_PREFIX."_surfbar_locks + {!_MYSQL_PREFIX!}_surfbar_locks WHERE userid=%s ORDER BY @@ -1154,17 +1359,17 @@ ORDER BY // Load all entries while (list($lid, $url, $last) = SQL_FETCHROW($result)) { // Debug message - //DEBUG_LOG(__FUNCTION__, __LINE__, "next - lid={$lid},url={$url},rest=".(time() - $last)."/".SURFBAR_GET_DATA('surf_lock')."", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "next - lid={$lid},url={$url},rest=".(time() - $last)."/".SURFBAR_GET_SURF_LOCK()."", false); // Skip entries that are too old - if (($last > (time() - SURFBAR_GET_DATA('surf_lock'))) && (!in_array($url, $ignored))) { + if (($last > (time() - SURFBAR_GET_SURF_LOCK())) && (!in_array($url, $ignored))) { // Debug message - //DEBUG_LOG(__FUNCTION__, __LINE__, "okay - lid={$lid},url={$url},last={$last}", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "okay - lid={$lid},url={$url},last={$last}", false); // Add only if missing or bigger if ((!isset($IDs[$url])) || ($IDs[$url] > $last)) { // Debug message - //DEBUG_LOG(__FUNCTION__, __LINE__, "ADD - lid={$lid},url={$url},last={$last}", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ADD - lid={$lid},url={$url},last={$last}", false); // Add this ID $IDs[$url] = $last; @@ -1172,7 +1377,7 @@ ORDER BY } // END - if } else { // Debug message - //DEBUG_LOG(__FUNCTION__, __LINE__, "ignore - lid={$lid},url={$url},last={$last}", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ignore - lid={$lid},url={$url},last={$last}", false); // Ignore these old entries! $ignored[] = $url; @@ -1192,16 +1397,16 @@ function SURFBAR_GET_MAX_RANDOM ($UIDs, $ADD) { global $_CONFIG; // 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 +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 +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." +WHERE sbu.userid NOT IN (".implode(",", $UIDs).") AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND sbu.`status`='ACTIVE'".$ADD." GROUP BY sbu.id", __FILE__, __LINE__); // Log last query - //DEBUG_LOG(__FUNCTION__, __LINE__, "lastQuery=".$_CONFIG['db_last_query']."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS()."", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "lastQuery=".getConfig('db_last_query')."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS()."", false); // Fetch max rand $maxRand = SQL_NUMROWS($result); @@ -1218,8 +1423,8 @@ function SURFBAR_GET_USER_URLS () { $URLs = array(); // Begin the query - $result = SQL_QUERY_ESC("SELECT u.id, u.userid, u.url, u.views_total, 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 + $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($GLOBALS['userid']), __FILE__, __LINE__); @@ -1245,7 +1450,7 @@ function SURFBAR_GET_ACTION_ARRAY ($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", + $result = SQL_QUERY_ESC("SELECT action FROM `{!_MYSQL_PREFIX!}_surfbar_actions` WHERE `status`='%s' ORDER BY `id` ASC", array($status), __FILE__, __LINE__); // Some entries there? @@ -1264,15 +1469,13 @@ function SURFBAR_GET_ACTION_ARRAY ($status) { } // Reload to configured stop page function SURFBAR_RELOAD_TO_STOP_PAGE($page="stop") { - global $_CONFIG; - // Internal or external? - if (($_CONFIG['surfbar_pause_mode'] == "INTERNAL") || (empty($_CONFIG['surfbar_pause_url']))) { + if ((getConfig('surfbar_pause_mode') == "INTERNAL") || (getConfig('surfbar_pause_url') == "")) { // Reload to internal page LOAD_URL("surfbar.php?frame=".$page); } else { // Reload to external page - LOAD_URL($_CONFIG['surfbar_pause_url']); + LOAD_CONFIGURED_URL('surfbar_pause_url'); } } @@ -1317,14 +1520,14 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = 0) { } // END - if // And query the database - //DEBUG_LOG(__FUNCTION__, __LINE__, "randNum={$randNum},maxRand={$maxRand},surfLock=".SURFBAR_GET_DATA('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 -FROM "._MYSQL_PREFIX."_surfbar_urls AS sbu -LEFT JOIN "._MYSQL_PREFIX."_surfbar_salts AS sbs + //* 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 +LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_locks` AS l ON sbu.id=l.url_id -WHERE sbu.userid NOT IN (".implode(",", $UIDs['uid']).") AND sbu.status='ACTIVE' AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))".$ADD." +WHERE sbu.userid NOT IN (".implode(",", $UIDs['uid']).") AND sbu.`status`='ACTIVE' AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))".$ADD." GROUP BY sbu.id ORDER BY l.last_surfed ASC, sbu.id ASC LIMIT %s,1", @@ -1332,25 +1535,25 @@ LIMIT %s,1", ); } 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 -FROM "._MYSQL_PREFIX."_surfbar_urls AS sbu -LEFT JOIN "._MYSQL_PREFIX."_surfbar_salts AS sbs + $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 +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)) +WHERE sbu.userid != %s AND sbu.`status`='ACTIVE' AND sbu.id=%s AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) LIMIT 1", array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__ ); } // Is there an id number? - //DEBUG_LOG(__FUNCTION__, __LINE__, "lastQuery=".$_CONFIG['db_last_query']."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS()."", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "lastQuery=".getConfig('db_last_query')."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS()."", false); if (SQL_NUMROWS($result) == 1) { // Load/cache data - //DEBUG_LOG(__FUNCTION__, __LINE__, "count(".count($SURFBAR_CACHE).") - BEFORE", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "count(".count($SURFBAR_CACHE).") - BEFORE", false); $SURFBAR_CACHE = merge_array($SURFBAR_CACHE, SQL_FETCHARRAY($result)); - //DEBUG_LOG(__FUNCTION__, __LINE__, "count(".count($SURFBAR_CACHE).") - AFTER", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "count(".count($SURFBAR_CACHE).") - AFTER", false); // Determine waiting time $SURFBAR_CACHE['time'] = SURFBAR_DETERMINE_WAIT_TIME(); @@ -1358,28 +1561,28 @@ LIMIT 1", // Is the last salt there? if (is_null($SURFBAR_CACHE['last_salt'])) { // Then repair it wit the static! - //DEBUG_LOG(__FUNCTION__, __LINE__, "last_salt - FIXED!", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "last_salt - FIXED!", false); $SURFBAR_CACHE['last_salt'] = ""; } // END - if // Fix missing last_surfed if ((!isset($SURFBAR_CACHE['last_surfed'])) || (is_null($SURFBAR_CACHE['last_surfed']))) { // Fix it here - //DEBUG_LOG(__FUNCTION__, __LINE__, "last_surfed - FIXED!", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "last_surfed - FIXED!", false); $SURFBAR_CACHE['last_surfed'] = 0; } // END - if // Get base/fixed reward and costs $SURFBAR_CACHE['reward'] = SURFBAR_DETERMINE_REWARD(); $SURFBAR_CACHE['costs'] = SURFBAR_DETERMINE_COSTS(); - //DEBUG_LOG(__FUNCTION__, __LINE__, "BASE/STATIC - reward=".SURFBAR_GET_REWARD()."|costs=".SURFBAR_GET_COSTS()."", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "BASE/STATIC - reward=".SURFBAR_GET_REWARD()."|costs=".SURFBAR_GET_COSTS()."", false); // Only in dynamic model add the dynamic bonus! - if ($_CONFIG['surfbar_pay_model'] == "DYNAMIC") { + if (getConfig('surfbar_pay_model') == "DYNAMIC") { // Calculate dynamic reward/costs and add it $SURFBAR_CACHE['reward'] += SURFBAR_CALCULATE_DYNAMIC_ADD(); $SURFBAR_CACHE['costs'] += SURFBAR_CALCULATE_DYNAMIC_ADD(); - //DEBUG_LOG(__FUNCTION__, __LINE__, "DYNAMIC+ - reward=".SURFBAR_GET_REWARD()."|costs=".SURFBAR_GET_COSTS()."", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "DYNAMIC+ - reward=".SURFBAR_GET_REWARD()."|costs=".SURFBAR_GET_COSTS()."", false); } // END - if // Now get the id @@ -1390,7 +1593,7 @@ LIMIT 1", SQL_FREERESULT($result); // Return result - //DEBUG_LOG(__FUNCTION__, __LINE__, "nextId={$nextId}", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "nextId={$nextId}", false); return $nextId; } // ----------------------------------------------------------------------------- @@ -1400,7 +1603,7 @@ LIMIT 1", // Private getter for data elements function SURFBAR_GET_DATA ($element) { global $SURFBAR_CACHE; - //DEBUG_LOG(__FUNCTION__, __LINE__, "element={$element}", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "element={$element}", false); // Default is null $data = null; @@ -1412,12 +1615,12 @@ function SURFBAR_GET_DATA ($element) { } else { // END - if print("
");
 		print_r($SURFBAR_CACHE);
-		debug_print_backtrace();
-		die("
"); + print(""); + debug_report_bug(); } // Return result - //DEBUG_LOG(__FUNCTION__, __LINE__, "element[$element]={$data}", false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "element[$element]={$data}", false); return $data; } // Getter for reward from cache @@ -1451,7 +1654,7 @@ function SURFBAR_GET_USERID () { return SURFBAR_GET_DATA('userid'); } // Getter for user reload locks -function SURFBAR_GET_USER_RELOAD_LOCK () { +function SURFBAR_GET_USER_LOCKS () { // Get data element and return its contents return SURFBAR_GET_DATA('user_locks'); } @@ -1461,9 +1664,19 @@ function SURFBAR_GET_RELOAD_TIME () { return SURFBAR_GET_DATA('time'); } // Getter for allowed views -function SURFBAR_GET_ALLOWED_VIEWS () { +function SURFBAR_GET_VIEWS_ALLOWED () { // Get data element and return its contents return SURFBAR_GET_DATA('views_allowed'); } +// Getter for fixed reload +function SURFBAR_GET_FIXED_RELOAD () { + // Get data element and return its contents + return SURFBAR_GET_DATA('fixed_reload'); +} +// Getter for surf lock +function SURFBAR_GET_SURF_LOCK () { + // Get data element and return its contents + return SURFBAR_GET_DATA('surf_lock'); +} // ?>