X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=surfbar.php;h=fb6a5dd02c7fdf057c51c92b7569a88e662047ba;hb=2db0c4748f83158403f14ac2a08bd7a25315f936;hp=380de444c1a9be2113e27541ff97bbf0c018ebd3;hpb=3f51c40f4fede87228216f9285b745a339e3891d;p=mailer.git
diff --git a/surfbar.php b/surfbar.php
index 380de444c1..fb6a5dd02c 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -1,7 +1,7 @@
SURFBAR_DETERMINE_TOTAL_ONLINE(),
@@ -122,26 +147,25 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
);
// 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 ((isGetRequestParameterSet('check')) && (isGetRequestParameterSet('id')) && (isGetRequestParameterSet('salt'))) {
// Dummy next id get
- SURFBAR_DETERMINE_NEXT_ID(REQUEST_GET('id'));
+ SURFBAR_DETERMINE_NEXT_ID(getRequestParameter('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(getRequestParameter('id'))) && (SURFBAR_CHECK_VALIDATION_CODE(getRequestParameter('id'), getRequestParameter('check'), getRequestParameter('salt')))) {
// Lock the URL (id) down
- SURFBAR_LOCKDOWN_ID(REQUEST_GET('id'));
+ SURFBAR_LOCKDOWN_ID(getRequestParameter('id'));
// Code is valid so pay points here
SURFBAR_PAY_POINTS();
@@ -165,8 +189,11 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
// 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 ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'top')) {
// Determine next id
$nextId = SURFBAR_DETERMINE_NEXT_ID();
@@ -174,10 +201,10 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
if ($nextId > 0) {
// Then prepare other content
$content = array(
- 'id' => $nextId,
+ 'url_id' => $nextId,
'check' => SURFBAR_GENERATE_VALIDATION_CODE($nextId),
'salt' => SURFBAR_GET_SALT(),
- 'points' => translateComma(SURFBAR_GET_REWARD($nextId)),
+ 'reward' => translateComma(SURFBAR_GET_REWARD($nextId)),
'url' => SURFBAR_GET_URL($nextId),
'curr_reload' => SURFBAR_GET_USER_LOCKS(),
'max_urls' => SURFBAR_GET_TOTAL_URLS(),
@@ -189,14 +216,11 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
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 ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'start')) {
// Starter frame found so let the footer display
- REQUEST_UNSET_GET('frame');
- } else {
- // Load header in frameset mode
- $isFrameset = true;
+ unsetGetRequestParameter('frame');
}
// Load header
@@ -204,7 +228,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
// Load that template
//* DEBUG: */ die("templateName={$templateName}
\ncontent=
".print_r($content, true).""); - LOAD_TEMPLATE($templateName, false, $content); + loadTemplate($templateName, false, $content); } // Load footer