X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=surfbar.php;h=7a328c8f202d4ccf3ac92540cce4ae11fbb2b759;hp=13e583ca25841ef4905b584a53d63698c7132a0d;hb=5071030af40e69ca4284642f44758964e18f5be8;hpb=a090e351c49fe021fb3064325694da03402332e0

diff --git a/surfbar.php b/surfbar.php
index 13e583ca25..7a328c8f20 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,18 +52,18 @@ $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
@@ -73,7 +73,7 @@ if (isInstalled()) {
 	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')))) {
@@ -91,14 +91,14 @@ if (isInstalled()) {
 
 			// 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
@@ -118,12 +118,12 @@ if (isInstalled()) {
 				'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);
+				// 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'));
 
@@ -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(),
@@ -189,7 +189,7 @@ if (isInstalled()) {
 		}
 
 		// 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... ;-)