X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=surfbar.php;h=9fce26b80c2c3247ac7ddd3d13625f3f195cae91;hp=2c29e256912e536f57870f1a5edad723706d9f87;hb=08a9a052ddd67568fa7bcc98c4300ce0cc6bfdc0;hpb=3161d70d2c3a86649dd16a7909ec16f801f16e4e

diff --git a/surfbar.php b/surfbar.php
index 2c29e25691..9fce26b80c 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,12 +39,12 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
-$GLOBALS['startTime'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(true);
 
 // Set module output mode
-$GLOBALS['module'] = 'surfbar';
-$GLOBALS['output_mode'] = '0';
-$GLOBALS['header_sent'] = 3;
+$GLOBALS['__module']      = 'surfbar';
+$GLOBALS['__output_mode'] = '0';
+$GLOBALS['__header_sent'] = 3;
 
 // Load the required file(s)
 require('inc/config-global.php');
@@ -53,9 +53,9 @@ require('inc/config-global.php');
 setContentType('text/html');
 
 // Is a frame active?
-if (isGetRequestElementSet('frame')) {
+if (!isFullPage()) {
 	// Then we need to set header_sent to 0
-	$GLOBALS['header_sent'] = '0';
+	$GLOBALS['__header_sent'] = '0';
 } // END - if
 
 // Only logged in users may use this surfbar!
@@ -64,9 +64,9 @@ redirectOnUninstalledExtension('surfbar');
 // No member?
 if (!isMember()) {
 	// Should we display login window or redirect to main page?
-	if ((getConfig('surfbar_guest_login_form') == 'Y') && (isExtensionActive('user'))) {
+	if ((isSurfbarGuestLoginFormEnabled()) && (isExtensionActive('user'))) {
 		// Is the form sent?
-		if ((isFormSent()) && (isPostRequestElementSet('id')) && (isPostRequestElementSet('password'))) {
+		if ((isFormSent('login')) && (isPostRequestElementSet('id')) && (isPostRequestElementSet('password'))) {
 			// Do the login procedure
 			$url = doUserLogin(postRequestElement('id'), postRequestElement('password'), basename(__FILE__), basename(__FILE__) . '?code=');
 
@@ -86,7 +86,7 @@ if (!isMember()) {
 			loadTemplate('surfbar_login_form');
 
 			// Allow footer here
-			$GLOBALS['header_sent'] = 2;
+			$GLOBALS['__header_sent'] = 2;
 
 			// Load footer
 			loadIncludeOnce('inc/footer.php');
@@ -98,19 +98,19 @@ if (!isMember()) {
 } // END - if
 
 // Initialize the surfbar
-SURFBAR_INIT();
+initSurfbar();
 
 // Handle tasks on self-maintenance
-SURFBAR_HANDLE_SELF_MAINTENANCE();
+doSurfbarSelfMaintenance();
 
 // Is there a check value?
-if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_array(getRequestElement('frame'), array('stop', 'stop2', 'stats', 'textlinks'))))) {
+if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('frame'), array('stop', 'stop2', 'stats', 'textlinks'))))) {
 	// Reload-lock is full, surfbar stopped so...
 	// Load header
 	loadIncludeOnce('inc/header.php');
 
 	// Load template
-	if (((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'stop2')) || (!isGetRequestElementSet('frame'))) {
+	if (((!isFullPage()) && (getRequestElement('frame') == 'stop2')) || (isFullPage())) {
 		// Load template for "start" page
 		loadTemplate('surfbar_frame_start');
 
@@ -119,19 +119,19 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
 
 		// This makes the footer appear again
 		unsetGetRequestElement('frame');
-	} elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'stats')) {
+	} elseif ((!isFullPage()) && (getRequestElement('frame') == 'stats')) {
 		// Prepare content
 		$content = array(
 			'points' => getTotalPoints(getMemberId()),
-			'reload' => (getConfig('surfbar_stats_reload') * 1000)
+			'reload' => (getSurfbarStatsReload() * 1000)
 		);
 
 		// Load template for "stats" page
 		loadTemplate('surfbar_frame_stats', false, $content);
-	} elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'textlinks')) {
+	} elseif ((!isFullPage()) && (getRequestElement('frame') == 'textlinks')) {
 		// Prepare content
 		$content = array(
-			'reload' => (getConfig('surfbar_stats_reload') * 1000)
+			'reload' => (getSurfbarStatsReload() * 1000)
 		);
 
 		// Load template for "stats" page
@@ -139,8 +139,8 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
 	} else {
 		// Prepare content
 		$content = array(
-			'start'     => str_repeat('X', strlen(getConfig('surfbar_restart_time'))),
-			'autostart' => (getConfig('surfbar_autostart') == 'Y') ? 'true' : 'false'
+			'start'     => str_repeat('X', strlen(getSurfbarRestartTime())),
+			'autostart' => (isSurfbarAutoStartEnbaled()) ? 'true' : 'false'
 		);
 
 		// Load template for stopped surfbar
@@ -148,56 +148,56 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
 	}
 } elseif ((isGetRequestElementSet('check')) && (isGetRequestElementSet('id')) && (isGetRequestElementSet('salt'))) {
 	// Dummy next id get
-	SURFBAR_DETERMINE_NEXT_ID(getRequestElement('id'));
+	determineSurfbarNextId(getRequestElement('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 ((!ifSurfbarReloadLock(getRequestElement('id'))) && (isSurfbarValidationCodeValid(getRequestElement('id'), getRequestElement('check'), getRequestElement('salt')))) {
 		// Lock the URL (id) down
-		SURFBAR_LOCKDOWN_ID(getRequestElement('id'));
+		addSurfbarReloadLockById(getRequestElement('id'));
 
 		// Code is valid so pay points here
-		SURFBAR_PAY_POINTS();
+		doSurfbarPayPoints();
 
 		// Check if reload is full
-		if (SURFBAR_CHECK_RELOAD_FULL()) {
+		if (isSurfbarReloadFull()) {
 			// Then load waiting page
-			SURFBAR_RELOAD_TO_STOP_PAGE();
+			redirectToSurfbarStopPage();
 		} // END - if
 
 		// Load header to avoid a bug
 		loadIncludeOnce('inc/header.php');
 	} else {
 		// Reload to stop frame!
-		SURFBAR_RELOAD_TO_STOP_PAGE();
+		redirectToSurfbarStopPage();
 	}
 
 	// All done, so fix notice for footer.php
-	$GLOBALS['footer_sent'] = 1;
+	$GLOBALS['__footer_sent'] = 1;
 } else {
 	// Prepare content
 	$content = '';
 
 	// Frame "top" set?
-	if ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'top')) {
+	if ((!isFullPage()) && (getRequestElement('frame') == 'top')) {
 		// Determine next id
-		$nextId = SURFBAR_DETERMINE_NEXT_ID();
-		//* DEBUG: */ die('nextId='.$nextId);
+		$nextId = determineSurfbarNextId();
+		//* DEBUG: */ exit('nextId='.$nextId);
 
 		// Is there a valid id?
 		if ($nextId > 0) {
 			// Then prepare other content
 			$content = array(
 				'url_id' => $nextId,
-				'xxx'    => str_repeat('X', strlen(SURFBAR_GET_RELOAD_TIME($nextId))),
+				'xxx'    => str_repeat('X', strlen(gerSurfbarReloadTime($nextId))),
 			);
 
 			// Update salt (double-call lock!) and statistics
-			SURFBAR_UPDATE_SALT_STATS();
+			updateSurfbarSaltStatistics();
 		} else {
 			// Load new URL
-			SURFBAR_RELOAD_TO_STOP_PAGE('stop');
+			redirectToSurfbarStopPage('stop');
 		}
-	} elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'start')) {
+	} elseif ((!isFullPage()) && (getRequestElement('frame') == 'start')) {
 		// Starter frame found so let the footer display
 		unsetGetRequestElement('frame');
 	}
@@ -206,15 +206,15 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
 	loadIncludeOnce('inc/header.php');
 
 	// Determine template name
-	$templateName = SURFBAR_DETERMINE_TEMPLATE_NAME();
+	$templateName = determineSurfbarTemplateName();
 
 	// Load that template
-	//* DEBUG: */ die('templateName=' . $templateName . '<br /><strong>content</strong>=<pre>' . print_r($content, true) . '</pre>');
+	//* DEBUG: */ exit('templateName=' . $templateName . '<br /><strong>content</strong>=<pre>' . print_r($content, true) . '</pre>');
 	loadTemplate($templateName, false, $content);
 }
 
 // Load footer
-$GLOBALS['footer_sent'] = 3;
+$GLOBALS['__footer_sent'] = 3;
 loadIncludeOnce('inc/footer.php');
 
 // [EOF]