X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=surfbar.php;h=4bfb8caaaf44ed98aa718246ce9f4234a7a9ecbc;hb=e06775aabf59031184adf27803887ed26e501e2f;hp=e0163e4ea5c1478d3c4a69d0025f8fe2c729c90f;hpb=7fabfadce30a7bea7ce3ad1f1e2e7e5e616f2669;p=mailer.git
diff --git a/surfbar.php b/surfbar.php
index e0163e4ea5..4bfb8caaaf 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
loadTemplate('surfbar_frame_stats', false, $content);
- } elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'textlinks')) {
+ } elseif ((isGetRequestParameterSet('frame')) && (getRequestParameter('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 +141,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'
);
@@ -158,14 +148,14 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
// Load template for stopped surfbar
loadTemplate('surfbar_stopped', false, $content);
}
-} elseif ((isGetRequestElementSet('check')) && (isGetRequestElementSet('id')) && (isGetRequestElementSet('salt'))) {
+} elseif ((isGetRequestParameterSet('check')) && (isGetRequestParameterSet('id')) && (isGetRequestParameterSet('salt'))) {
// Dummy next id get
- SURFBAR_DETERMINE_NEXT_ID(getRequestElement('id'));
+ SURFBAR_DETERMINE_NEXT_ID(getRequestParameter('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 ((!SURFBAR_CHECK_RELOAD_LOCK(getRequestParameter('id'))) && (SURFBAR_CHECK_VALIDATION_CODE(getRequestParameter('id'), getRequestParameter('check'), getRequestParameter('salt')))) {
// Lock the URL (id) down
- SURFBAR_LOCKDOWN_ID(getRequestElement('id'));
+ SURFBAR_LOCKDOWN_ID(getRequestParameter('id'));
// Code is valid so pay points here
SURFBAR_PAY_POINTS();
@@ -193,7 +183,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
$isFrameset = true;
// Frame "top" set?
- if ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'top')) {
+ if ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'top')) {
// Determine next id
$nextId = SURFBAR_DETERMINE_NEXT_ID();
@@ -201,33 +191,26 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
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')) {
+ } elseif ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'start')) {
// Starter frame found so let the footer display
- unsetGetRequestElement('frame');
+ unsetGetRequestParameter('frame');
}
// Load header
loadIncludeOnce('inc/header.php');
// Load that template
- //* DEBUG: */ die("templateName={$templateName}
\ncontent=
".print_r($content, true).""); + //* DEBUG: */ die('templateName=' . $templateName . '
' . print_r($content, true) . ''); loadTemplate($templateName, false, $content); }