X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fsurfbar_functions.php;h=546f27d070e173ca008032eadfb5a18612041195;hb=b47f7363125a751ecd04146fc82b11bb7b050d00;hp=543f145bdbe9374f5984f097273dbb63959d07ee;hpb=1c4e78c5d68b97b82a3b930aa6db1e6df188f653;p=mailer.git diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 543f145bdb..546f27d070 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -189,8 +189,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)); @@ -208,8 +208,8 @@ function SURFBAR_MEMBER_ACTIONS ($urlId, $status) { } // END - foreach // Close table - $OUT .= " -
\n"; + $OUT .= ' +'; // Return code return $OUT; @@ -366,25 +366,19 @@ function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) { // Translate some data if present $content = SURFBAR_PREPARE_CONTENT_FOR_TEMPLATE($content); - // Is the lock reason empty? - if (empty($urlData['url_lock_reason'])) { - // Fix it to three dashes - $urlData['url_lock_reason'] = '---'; - } // END - if - // 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 @@ -418,7 +412,7 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) { } // END - if } else { // Not found! - addFatalMessage(__FUNCTION__, __LINE__, getMessage('MEMBER_SURFBAR_EXECUTE_ACTION_404'), $functionName); + addFatalMessage(__FUNCTION__, __LINE__, '{--MEMBER_SURFBAR_EXECUTE_ACTION_404--}', $functionName); } // Return status @@ -571,7 +565,7 @@ ORDER BY ), __FUNCTION__, __LINE__); // Is there at least one record? - if (SQL_NUMROWS($result) > 0) { + if (!SQL_HASZERONUMS($result)) { // Then load all! while ($dataRow = SQL_FETCHARRAY($result)) { // Shall we group these results? @@ -602,7 +596,6 @@ function SURFBAR_REGISTER_URL ($url, $userid, $status = 'PENDING', $addMode = 'r // Prepare content $content = merge_array($extraFields, array( 'url' => $url, - 'frametester' => generateFrametesterUrl($url), 'url_userid' => $userid, 'url_status' => $status, )); @@ -667,9 +660,9 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) { $templateName = sprintf("admin_surfbar_%s", $messageType); // Prepare subject - $subject = getMessage(sprintf("ADMIN_SURFBAR_NOTIFY_%s_SUBJECT", + $subject = sprintf("{--ADMIN_SURFBAR_NOTIFY_%s_SUBJECT--}", strtoupper($messageType) - )); + ); // Is the subject line there? if ((substr($subject, 0, 1) == '!') && (substr($subject, -1, 1) == '!')) { @@ -695,14 +688,14 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) { $templateName = sprintf("member_surfbar_%s", $messageType); // Prepare subject - $subject = getMessage(sprintf("MEMBER_SURFBAR_NOTIFY_%s_SUBJECT", + $subject = sprintf("{--MEMBER_SURFBAR_NOTIFY_%s_SUBJECT--}", strtoupper($messageType) - )); + ); // Is the subject line there? if ((substr($subject, 0, 1) == '!') && (substr($subject, -1, 1) == '!')) { // Set default subject if following eval() wents wrong - $subject = getMessage('MEMBER_SURFBAR_NOTIFY_DEFAULT_SUBJECT'); + $subject = '{--MEMBER_SURFBAR_NOTIFY_DEFAULT_SUBJECT--}'; } // END - if // Translate some data if present @@ -731,7 +724,7 @@ function translateSurfbarLimit ($limit) { // Is this zero? if ($limit == '0') { // Unlimited! - $return = getMessage('MEMBER_SURFBAR_UNLIMITED_VIEWS'); + $return = '{--MEMBER_SURFBAR_UNLIMITED_VIEWS--}'; } else { // Translate comma $return = translateComma($limit); @@ -743,14 +736,8 @@ function translateSurfbarLimit ($limit) { // Translate the URL status function translateSurfbarUrlStatus ($status) { - // Create constant name - $constantName = sprintf("SURFBAR_URL_STATUS_%s", strtoupper($status)); - - // Get message - $statusTranslated = getMessage($constantName); - // Return result - return $statusTranslated; + return sprintf("{--SURFBAR_URL_STATUS_%s--}", strtoupper($status)); } // Determine reward @@ -820,7 +807,7 @@ function SURFBAR_DETERMINE_TEMPLATE_NAME() { // Check if the "reload lock" of the current user is full, call this function // before you call SURFBAR_CHECK_RELOAD_LOCK(). -function SURFBAR_CHECK_RELOAD_FULL() { +function SURFBAR_CHECK_RELOAD_FULL () { // Default is full! $isFull = true; @@ -912,6 +899,9 @@ LIMIT 1", // Free result SQL_FREERESULT($result); + // Debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'cnt=' . $cnt); + // Return result return $cnt; } @@ -1030,7 +1020,7 @@ function SURFBAR_LOCKDOWN_ID ($urlId) { function SURFBAR_PAY_POINTS () { // Remove it from the URL owner //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.SURFBAR_GET_USERID().',costs='.SURFBAR_GET_COSTS().'', false); - if (SURFBAR_GET_USERID() > 0) { + if (isValidUserId(SURFBAR_GET_USERID())) { subtractPoints(sprintf("surfbar_%s", getConfig('surfbar_pay_model')), SURFBAR_GET_USERID(), SURFBAR_GET_COSTS()); } // END - if @@ -1089,6 +1079,9 @@ function SURFBAR_UPDATE_SALT_STATS () { // Update statistics record SURFBAR_UPDATE_INSERT_STATS_RECORD(); + // Update salt + SURFBAR_GENERATE_VALIDATION_CODE(SURFBAR_GET_ID()); + // Simply store the salt from cache away in database... 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( @@ -1154,9 +1147,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 @@ -1195,16 +1188,16 @@ ORDER BY // 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 @@ -1221,14 +1214,14 @@ 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); @@ -1470,10 +1463,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__); @@ -1517,7 +1510,7 @@ ORDER BY array(getMemberId()), __FUNCTION__, __LINE__); // Are there entries? - if (SQL_NUMROWS($result) > 0) { + if (!SQL_HASZERONUMS($result)) { // Load all rows while ($row = SQL_FETCHARRAY($result)) { // Add the row @@ -1542,7 +1535,7 @@ function SURFBAR_GET_ARRAY_FROM_STATUS ($status) { array($status), __FUNCTION__, __LINE__); // Some entries there? - if (SQL_NUMROWS($result) > 0) { + if (!SQL_HASZERONUMS($result)) { // Load all actions // @TODO This can be somehow rewritten while ($content = SQL_FETCHARRAY($result)) { @@ -1724,6 +1717,58 @@ LIMIT 1", return $nextId; } +// ---------------------------------------------------------------------------- +// Wrapper function +// ---------------------------------------------------------------------------- + +// "Getter" for surfbar_dynamic_percent +function getSurfbarDynamicPercent () { + // Do we have cache? + if (!isset($GLOBALS['surfbar_dynamic_percent'])) { + // Determine it + $GLOBALS['surfbar_dynamic_percent'] = getConfig('surfbar_dynamic_percent'); + } // END - if + + // Return cache + return $GLOBALS['surfbar_dynamic_percent']; +} + +// "Getter" for surfbar_static_reward +function getSurfbarStaticReward () { + // Do we have cache? + if (!isset($GLOBALS['surfbar_static_reward'])) { + // Determine it + $GLOBALS['surfbar_static_reward'] = getConfig('surfbar_static_reward'); + } // END - if + + // Return cache + return $GLOBALS['surfbar_static_reward']; +} + +// "Getter" for surfbar_static_time +function getSurfbarStaticTime () { + // Do we have cache? + if (!isset($GLOBALS['surfbar_static_time'])) { + // Determine it + $GLOBALS['surfbar_static_time'] = getConfig('surfbar_static_time'); + } // END - if + + // Return cache + return $GLOBALS['surfbar_static_time']; +} + +// "Getter" for surfbar_max_order +function getSurfbarMaxOrder () { + // Do we have cache? + if (!isset($GLOBALS['surfbar_max_order'])) { + // Determine it + $GLOBALS['surfbar_max_order'] = getConfig('surfbar_max_order'); + } // END - if + + // Return cache + return $GLOBALS['surfbar_max_order']; +} + // ----------------------------------------------------------------------------- // PLEASE DO NOT ADD ANY OTHER FUNCTIONS BELOW THIS LINE IF THEY DON'T "WRAP" // THE $GLOBALS['surfbar_cache'] ARRAY!