X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=surfbar.php;h=2c29e256912e536f57870f1a5edad723706d9f87;hb=2272395931106029a0b99b09b85852cd024deb1e;hp=2da2cea3a24d336961e972f62e249739ed61c2d0;hpb=df407c3a035aa8fb211d7191d7a0bb0c64197cc3;p=mailer.git
diff --git a/surfbar.php b/surfbar.php
index 2da2cea3a2..2c29e25691 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' => (getConfig('surfbar_stats_reload') * 1000)
);
// Load template for "stats" page
- LOAD_TEMPLATE('surfbar_frame_stats', false, $content);
- } elseif ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'textlinks')) {
+ loadTemplate('surfbar_frame_stats', false, $content);
+ } elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'textlinks')) {
// Prepare content
$content = array(
- 'online' => SURFBAR_DETERMINE_TOTAL_ONLINE(),
- 'reload' => (getConfig('surfbar_stats_reload') * 1000)
+ 'reload' => (getConfig('surfbar_stats_reload') * 1000)
);
// Load template for "stats" page
- LOAD_TEMPLATE('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'
);
// Load template for stopped surfbar
- LOAD_TEMPLATE('surfbar_stopped', false, $content);
+ loadTemplate('surfbar_stopped', false, $content);
}
-} elseif ((REQUEST_ISSET_GET('check')) && (REQUEST_ISSET_GET('id')) && (REQUEST_ISSET_GET('salt'))) {
+} elseif ((isGetRequestElementSet('check')) && (isGetRequestElementSet('id')) && (isGetRequestElementSet('salt'))) {
// Dummy next id get
- SURFBAR_DETERMINE_NEXT_ID(REQUEST_GET('id'));
+ SURFBAR_DETERMINE_NEXT_ID(getRequestElement('id'));
// Check reload lock and validation code
- if ((!SURFBAR_CHECK_RELOAD_LOCK(REQUEST_GET('id'))) && (SURFBAR_CHECK_VALIDATION_CODE(REQUEST_GET('id'), REQUEST_GET('check'), REQUEST_GET('salt')))) {
+ if ((!SURFBAR_CHECK_RELOAD_LOCK(getRequestElement('id'))) && (SURFBAR_CHECK_VALIDATION_CODE(getRequestElement('id'), getRequestElement('check'), getRequestElement('salt')))) {
// Lock the URL (id) down
- SURFBAR_LOCKDOWN_ID(REQUEST_GET('id'));
+ SURFBAR_LOCKDOWN_ID(getRequestElement('id'));
// Code is valid so pay points here
SURFBAR_PAY_POINTS();
@@ -150,6 +163,9 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
// Then load waiting page
SURFBAR_RELOAD_TO_STOP_PAGE();
} // END - if
+
+ // Load header to avoid a bug
+ loadIncludeOnce('inc/header.php');
} else {
// Reload to stop frame!
SURFBAR_RELOAD_TO_STOP_PAGE();
@@ -161,49 +177,40 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
// 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 ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'top')) {
+ if ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'top')) {
// Determine next id
$nextId = SURFBAR_DETERMINE_NEXT_ID();
+ //* DEBUG: */ die('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(),
- 'points' => 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(SURFBAR_GET_RELOAD_TIME($nextId))),
);
// Update salt (double-call lock!) and statistics
SURFBAR_UPDATE_SALT_STATS();
} else {
// Load new URL
- SURFBAR_RELOAD_TO_STOP_PAGE('stop2');
+ SURFBAR_RELOAD_TO_STOP_PAGE('stop');
}
- } elseif ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'start')) {
+ } elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'start')) {
// Starter frame found so let the footer display
- REQUEST_UNSET_GET('frame');
+ unsetGetRequestElement('frame');
}
// Load header
loadIncludeOnce('inc/header.php');
+ // Determine template name
+ $templateName = SURFBAR_DETERMINE_TEMPLATE_NAME();
+
// Load that template
- //* DEBUG: */ die("templateName={$templateName}
\ncontent=
".print_r($content, true).""); - LOAD_TEMPLATE($templateName, false, $content); + //* DEBUG: */ die('templateName=' . $templateName . '
' . print_r($content, true) . ''); + loadTemplate($templateName, false, $content); } // Load footer