X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=surfbar.php;h=69a3e241e76950f9cc0cd56dd3a9443ee3eee69a;hp=d119e1bd83ba59198cb06078d7fddaec8ff2a9fe;hb=aa1d1076b9115580ea07374b9c470f5a0c40ca07;hpb=0fd6858b423d41e7eee9ffa3d5138d318e08cc1c diff --git a/surfbar.php b/surfbar.php index d119e1bd83..69a3e241e7 100644 --- a/surfbar.php +++ b/surfbar.php @@ -1,7 +1,7 @@ SURFBAR_DETERMINE_TOTAL_ONLINE(), @@ -115,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(); @@ -158,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(); @@ -182,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 @@ -197,10 +228,11 @@ 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 +$GLOBALS['footer_sent'] = 3; loadIncludeOnce('inc/footer.php'); // [EOF]