X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=surfbar.php;h=1dc43451c404946ce55bc829dcac3d52e915e01b;hp=e0163e4ea5c1478d3c4a69d0025f8fe2c729c90f;hb=f0e095401c24cf94f760de965c39f7ae35d32d25;hpb=7fabfadce30a7bea7ce3ad1f1e2e7e5e616f2669
diff --git a/surfbar.php b/surfbar.php
index e0163e4ea5..1dc43451c4 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
@@ -141,8 +131,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
} 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
@@ -150,7 +139,6 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
} 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'
);
@@ -175,6 +163,9 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
// 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();
@@ -186,37 +177,25 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
// 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')) {
// 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(),
- '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(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 ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'start')) {
// Starter frame found so let the footer display
@@ -226,8 +205,11 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
// 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).""); + //* DEBUG: */ die('templateName=' . $templateName . '
' . print_r($content, true) . ''); loadTemplate($templateName, false, $content); }