X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=surfbar.php;h=8f313fd4b3baadd025c05ab9bd77c2c7282c3b73;hp=80e96057aa6887a3cea03f72000d4218f1d01497;hb=ccc4a69ce9b17aa8d7b1554a3b2b017db091821b;hpb=59bd8a9805c51c895a92cc12825f4cbdfd792597

diff --git a/surfbar.php b/surfbar.php
index 80e96057aa..8f313fd4b3 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Die Surfbar selbst                               *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -31,74 +36,74 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require("inc/libs/security_functions.php");
+// Load security stuff here
+require('inc/libs/security_functions.php');
 
 // Init "action" and "what"
-global $what, $action, $startTime, $SURFBAR_CACHE;
-$SURFBAR_CACHE = array();
+$GLOBALS['cache_array']['surfbar'] = array();
 $GLOBALS['startTime'] = microtime(true);
-$GLOBALS['what'] = ""; $GLOBALS['action'] = "";
+$GLOBALS['what'] = '';
+$GLOBALS['action'] = '';
 
 // Set module
-$GLOBALS['module'] = "surfbar";
+$GLOBALS['module'] = 'surfbar';
 $GLOBALS['refid']  = 0;
 $GLOBALS['output_mode'] = 0;
 $msg = null;
 
 // Load the required file(s)
-require("inc/config.php");
+require('inc/config-global.php');
 
 // Is the script installed?
-if (isBooleanConstantAndTrue('mxchange_installed')) {
+if (isInstalled()) {
 	// Only logged in users may use this surfbar!
-	REDIRECT_ON_UNINSTALLED_EXTENSION("surfbar");
+	redirectOnUninstalledExtension('surfbar');
 
 	// No member?
 	if (!IS_MEMBER()) {
 		// Redirect
 		// @TODO Display quick login form here or redirect as configured
-		LOAD_URL("modules.php?module=index");
+		redirectToUrl('modules.php?module=index');
 	} // END - if
 
 	// Handle tasks on self-maintenance
 	SURFBAR_HANDLE_SELF_MAINTENANCE();
 
 	// Is there a check value?
-	if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isset($_GET['frame'])) && (in_array($_GET['frame'], array("stop", "stop2", "stats", "textlinks"))))) {
+	if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(REQUEST_GET('frame'), array('stop', 'stop2', 'stats', 'textlinks'))))) {
 		// Reload-lock is full, surfbar stopped so...
 		// Load header
-		LOAD_INC_ONCE("inc/header.php");
+		loadIncludeOnce('inc/header.php');
 
 		// Load template
-		if (((isset($_GET['frame'])) && ($_GET['frame'] == "stop")) || (!isset($_GET['frame']))) {
+		if (((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'stop')) || (!REQUEST_ISSET_GET('frame'))) {
 			// Load template for "start" page
-			LOAD_TEMPLATE("surfbar_frame_start");
+			LOAD_TEMPLATE('surfbar_frame_start');
 
 			// Load banner
-			LOAD_TEMPLATE("surfbar_start_banner");
+			LOAD_TEMPLATE('surfbar_start_banner');
 
 			// This makes the footer appear again
-			unset($_GET['frame']);
-		} elseif ((isset($_GET['frame'])) && ($_GET['frame'] == "stats")) {
+			REQUEST_UNSET_GET('frame');
+		} elseif ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'stats')) {
 			// Get total points amount
-			$points = GET_TOTAL_DATA($GLOBALS['userid'], "user_points", "points") - GET_TOTAL_DATA($GLOBALS['userid'], "user_data", "used_points");
+			$points = GET_TOTAL_DATA(getUserId(), 'user_points', 'points') - GET_TOTAL_DATA(getUserId(), 'user_data', 'used_points');
 
 			// Prepare content
 			$content = array(
-				'points'   => TRANSLATE_COMMA($points),
+				'points'   => translateComma($points),
 				'online'   => SURFBAR_DETERMINE_TOTAL_ONLINE(),
 				'reload'   => (getConfig('surfbar_stats_reload') * 1000),
-				'c_total'  => TRANSLATE_COMMA(getConfig('surfbar_total_counter')),
-				'c_today'  => TRANSLATE_COMMA(getConfig('surfbar_daily_counter')),
-				'c_yester' => TRANSLATE_COMMA(getConfig('surfbar_yester_counter')),
-				'c_week'   => TRANSLATE_COMMA(getConfig('surfbar_weekly_counter')),
-				'c_month'  => TRANSLATE_COMMA(getConfig('surfbar_monthly_counter')),
+				'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')),
 			);
 
 			// Load template for "stats" page
-			LOAD_TEMPLATE("surfbar_frame_stats", false, $content);
-		} elseif ((isset($_GET['frame'])) && ($_GET['frame'] == "textlinks")) {
+			LOAD_TEMPLATE('surfbar_frame_stats', false, $content);
+		} elseif ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'textlinks')) {
 			// Prepare content
 			$content = array(
 				'online'   => SURFBAR_DETERMINE_TOTAL_ONLINE(),
@@ -106,26 +111,26 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 			);
 
 			// Load template for "stats" page
-			LOAD_TEMPLATE("surfbar_frame_textlinks", false, $content);
+			LOAD_TEMPLATE('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"
+				'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);
+			LOAD_TEMPLATE('surfbar_stopped', false, $content);
 		}
-	} elseif ((isset($_GET['check'])) && (isset($_GET['id'])) && (isset($_GET['salt']))) {
+	} elseif ((REQUEST_ISSET_GET(('check'))) && (REQUEST_ISSET_GET('id')) && (REQUEST_ISSET_GET(('salt')))) {
 		// Dummy next id get
-		SURFBAR_DETERMINE_NEXT_ID($_GET['id']);
+		SURFBAR_DETERMINE_NEXT_ID(REQUEST_GET('id'));
 
 		// Check reload lock and validation code
-		if ((!SURFBAR_CHECK_RELOAD_LOCK($_GET['id'])) && (SURFBAR_CHECK_VALIDATION_CODE($_GET['id'], $_GET['check'], $_GET['salt']))) {
+		if ((!SURFBAR_CHECK_RELOAD_LOCK(REQUEST_GET('id'))) && (SURFBAR_CHECK_VALIDATION_CODE(REQUEST_GET('id'), REQUEST_GET('check'), REQUEST_GET('salt')))) {
 			// Lock the URL (id) down
-			SURFBAR_LOCKDOWN_ID($_GET['id']);
+			SURFBAR_LOCKDOWN_ID(REQUEST_GET('id'));
 
 			// Code is valid so pay points here
 			SURFBAR_PAY_POINTS();
@@ -144,13 +149,13 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 		$GLOBALS['footer_sent'] = 1;
 	} else {
 		// Prepare content
-		$content = "";
+		$content = '';
 
 		// Determine template name
 		$templateName = SURFBAR_DETERMINE_TEMPLATE_NAME();
 
 		// Frame "top" set?
-		if ((isset($_GET['frame'])) && ($_GET['frame'] == "top")) {
+		if ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'top')) {
 			// Determine next id
 			$nextId = SURFBAR_DETERMINE_NEXT_ID();
 
@@ -161,30 +166,30 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 					'id'          => $nextId,
 					'check'       => SURFBAR_GENERATE_VALIDATION_CODE($nextId),
 					'salt'        => SURFBAR_GET_SALT(),
-					'reward'      => TRANSLATE_COMMA(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(),
 					'reload'      => SURFBAR_GET_RELOAD_TIME($nextId),
-					'xxx'         => str_repeat("X", strlen(SURFBAR_GET_RELOAD_TIME($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('stop2');
 			}
-		} elseif ((isset($_GET['frame'])) && ($_GET['frame'] == "start")) {
+		} elseif ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'start')) {
 			// Starter frame found so let the footer display
-			unset($_GET['frame']);
+			REQUEST_UNSET_GET('frame');
 		} else {
 			// Load header in frameset mode
 			$isFrameset = true;
 		}
 
 		// Load header
-		LOAD_INC_ONCE("inc/header.php");
+		loadIncludeOnce('inc/header.php');
 
 		// Load that template
 		//* DEBUG: */ die("templateName={$templateName}<br />\n<strong>content</strong>=<pre>".print_r($content, true)."</pre>");
@@ -192,11 +197,14 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 	}
 
 	// Load footer
-	LOAD_INC_ONCE("inc/footer.php");
+	loadIncludeOnce('inc/footer.php');
 } else {
 	// You have to install first!
-	LOAD_URL("install.php");
+	redirectToUrl('install.php');
 }
 
 // Really all done here... ;-)
+shutdown();
+
+//
 ?>