X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=surfbar.php;h=67762880e0d9e773ce62c0b9fead5d5910f50ad3;hb=a66a97024f76413c095a1bdc4235ba70002631d5;hp=8194064e4a21c565c488c4665abb0440eead29e0;hpb=916bba4f00ee924f0d88b8fc273dee5bfb798aed;p=mailer.git
diff --git a/surfbar.php b/surfbar.php
index 8194064e4a..67762880e0 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -1,7 +1,7 @@
translateComma($points),
- 'online' => SURFBAR_DETERMINE_TOTAL_ONLINE(),
- 'reload' => (getConfig('surfbar_stats_reload') * 1000),
- 'c_total' => translateComma(getConfig('surfbar_total_counter')),
- 'c_today' => translateComma(getConfig('surfbar_daily_counter')),
- 'c_yester' => translateComma(getConfig('surfbar_yester_counter')),
- 'c_week' => translateComma(getConfig('surfbar_weekly_counter')),
- 'c_month' => translateComma(getConfig('surfbar_monthly_counter')),
+ 'points' => getTotalPoints(getMemberId()),
+ 'reload' => (getSurfbarStatsReload() * 1000)
);
// Load template for "stats" page
- loadTemplate('surfbar_frame_stats', false, $content);
- } elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'textlinks')) {
+ loadTemplate('surfbar_frame_stats', FALSE, $content);
+ } elseif ((!isFullPage()) && (getRequestElement('frame') == 'textlinks')) {
// Prepare content
$content = array(
- 'online' => SURFBAR_DETERMINE_TOTAL_ONLINE(),
- 'reload' => (getConfig('surfbar_stats_reload') * 1000)
+ 'reload' => (getSurfbarStatsReload() * 1000)
);
// Load template for "stats" page
- loadTemplate('surfbar_frame_textlinks', false, $content);
+ loadTemplate('surfbar_frame_textlinks', FALSE, $content);
} else {
// Prepare content
$content = array(
- 'restart' => getConfig('surfbar_restart_time'),
- 'start' => str_repeat('X', strlen(getConfig('surfbar_restart_time'))),
- 'autostart' => (getConfig('surfbar_autostart') == 'Y') ? 'true' : 'false'
+ 'start' => str_repeat('X', strlen(getSurfbarRestartTime())),
+ 'autostart' => (isSurfbarAutoStartEnabled()) ? 'true' : 'false'
);
// Load template for stopped surfbar
- loadTemplate('surfbar_stopped', false, $content);
+ loadTemplate('surfbar_stopped', FALSE, $content);
}
} elseif ((isGetRequestElementSet('check')) && (isGetRequestElementSet('id')) && (isGetRequestElementSet('salt'))) {
// Dummy next id get
- SURFBAR_DETERMINE_NEXT_ID(getRequestElement('id'));
+ determineSurfbarNextId(getRequestElement('id'));
// Check reload lock and validation code
- if ((!SURFBAR_CHECK_RELOAD_LOCK(getRequestElement('id'))) && (SURFBAR_CHECK_VALIDATION_CODE(getRequestElement('id'), getRequestElement('check'), getRequestElement('salt')))) {
+ if ((!ifSurfbarReloadLock(getRequestElement('id'))) && (isSurfbarValidationCodeValid(getRequestElement('id'), getRequestElement('check'), getRequestElement('salt')))) {
// Lock the URL (id) down
- SURFBAR_LOCKDOWN_ID(getRequestElement('id'));
+ addSurfbarReloadLockById(getRequestElement('id'));
// Code is valid so pay points here
- SURFBAR_PAY_POINTS();
+ doSurfbarPayPoints();
// Check if reload is full
- if (SURFBAR_CHECK_RELOAD_FULL()) {
+ if (isSurfbarReloadFull()) {
// Then load waiting page
- SURFBAR_RELOAD_TO_STOP_PAGE();
+ redirectToSurfbarStopPage();
} // END - if
+
+ // Load header to avoid a bug
+ loadIncludeOnce('inc/header.php');
} else {
// Reload to stop frame!
- SURFBAR_RELOAD_TO_STOP_PAGE();
+ redirectToSurfbarStopPage();
}
// All done, so fix notice for footer.php
- $GLOBALS['footer_sent'] = 1;
+ $GLOBALS['__footer_sent'] = 1;
} else {
// Prepare content
$content = '';
- // Determine template name
- $templateName = SURFBAR_DETERMINE_TEMPLATE_NAME();
-
- // Load header in frameset mode is the default
- $isFrameset = true;
-
// Frame "top" set?
- if ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'top')) {
+ if ((!isFullPage()) && (getRequestElement('frame') == 'top')) {
// Determine next id
- $nextId = SURFBAR_DETERMINE_NEXT_ID();
+ $nextId = determineSurfbarNextId();
+ //* DEBUG: */ exit('nextId='.$nextId);
// Is there a valid id?
if ($nextId > 0) {
// Then prepare other content
$content = array(
- 'id' => $nextId,
- 'check' => SURFBAR_GENERATE_VALIDATION_CODE($nextId),
- 'salt' => SURFBAR_GET_SALT(),
- 'reward' => translateComma(SURFBAR_GET_REWARD($nextId)),
- 'url' => SURFBAR_GET_URL($nextId),
- 'curr_reload' => SURFBAR_GET_USER_LOCKS(),
- 'max_urls' => SURFBAR_GET_TOTAL_URLS(),
- 'reload' => SURFBAR_GET_RELOAD_TIME($nextId),
- 'xxx' => str_repeat('X', strlen(SURFBAR_GET_RELOAD_TIME($nextId)))
+ 'url_id' => $nextId,
+ 'xxx' => str_repeat('X', strlen(getSurfbarWaitingTime($nextId))),
);
// Update salt (double-call lock!) and statistics
- SURFBAR_UPDATE_SALT_STATS();
+ updateSurfbarSaltStatistics();
} else {
// Load new URL
- SURFBAR_RELOAD_TO_STOP_PAGE('stop2');
+ redirectToSurfbarStopPage('stop');
}
- } elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'start')) {
+ } elseif ((!isFullPage()) && (getRequestElement('frame') == 'start')) {
// Starter frame found so let the footer display
unsetGetRequestElement('frame');
}
@@ -226,13 +205,16 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
// Load header
loadIncludeOnce('inc/header.php');
+ // Determine template name
+ $templateName = determineSurfbarTemplateName();
+
// Load that template
- //* DEBUG: */ die("templateName={$templateName}
\ncontent=
".print_r($content, true).""); - loadTemplate($templateName, false, $content); + //* DEBUG: */ exit('templateName=' . $templateName . '
' . print_r($content, TRUE) . ''); + loadTemplate($templateName, FALSE, $content); } // Load footer -$GLOBALS['footer_sent'] = 3; +$GLOBALS['__footer_sent'] = 3; loadIncludeOnce('inc/footer.php'); // [EOF]