X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=surfbar.php;h=8f313fd4b3baadd025c05ab9bd77c2c7282c3b73;hb=3203112d9be14c2df49bd6b3b618b17fd950cc09;hp=13e583ca25841ef4905b584a53d63698c7132a0d;hpb=a090e351c49fe021fb3064325694da03402332e0;p=mailer.git

diff --git a/surfbar.php b/surfbar.php
index 13e583ca25..8f313fd4b3 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -36,7 +36,7 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
+// Load security stuff here
 require('inc/libs/security_functions.php');
 
 // Init "action" and "what"
@@ -52,31 +52,31 @@ $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 (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()) || ((REQUEST_ISSET_GET(('frame'))) && (in_array(REQUEST_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 (((REQUEST_ISSET_GET(('frame'))) && (REQUEST_GET('frame') == 'stop')) || (!REQUEST_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');
 
@@ -84,26 +84,26 @@ if (isInstalled()) {
 			LOAD_TEMPLATE('surfbar_start_banner');
 
 			// This makes the footer appear again
-			REQUEST_UNSET_GET(('frame'));
-		} elseif ((REQUEST_ISSET_GET(('frame'))) && (REQUEST_GET('frame') == 'stats')) {
+			REQUEST_UNSET_GET('frame');
+		} elseif ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'stats')) {
 			// Get total points amount
 			$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 ((REQUEST_ISSET_GET(('frame'))) && (REQUEST_GET('frame') == 'textlinks')) {
+		} elseif ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'textlinks')) {
 			// Prepare content
 			$content = array(
 				'online'   => SURFBAR_DETERMINE_TOTAL_ONLINE(),
@@ -123,7 +123,7 @@ if (isInstalled()) {
 			// Load template for stopped surfbar
 			LOAD_TEMPLATE('surfbar_stopped', false, $content);
 		}
-	} elseif ((REQUEST_ISSET_GET(('check'))) && (REQUEST_ISSET_GET(('id'))) && (REQUEST_ISSET_GET(('salt')))) {
+	} elseif ((REQUEST_ISSET_GET(('check'))) && (REQUEST_ISSET_GET('id')) && (REQUEST_ISSET_GET(('salt')))) {
 		// Dummy next id get
 		SURFBAR_DETERMINE_NEXT_ID(REQUEST_GET('id'));
 
@@ -155,7 +155,7 @@ if (isInstalled()) {
 		$templateName = SURFBAR_DETERMINE_TEMPLATE_NAME();
 
 		// Frame "top" set?
-		if ((REQUEST_ISSET_GET(('frame'))) && (REQUEST_GET('frame') == 'top')) {
+		if ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'top')) {
 			// Determine next id
 			$nextId = SURFBAR_DETERMINE_NEXT_ID();
 
@@ -166,7 +166,7 @@ if (isInstalled()) {
 					'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(),
@@ -180,16 +180,16 @@ if (isInstalled()) {
 				// Load new URL
 				SURFBAR_RELOAD_TO_STOP_PAGE('stop2');
 			}
-		} elseif ((REQUEST_ISSET_GET(('frame'))) && (REQUEST_GET('frame') == 'start')) {
+		} elseif ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'start')) {
 			// Starter frame found so let the footer display
-			REQUEST_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>");
@@ -197,10 +197,10 @@ if (isInstalled()) {
 	}
 
 	// 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... ;-)