X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=surfbar.php;h=a97cdd5a996f8efaf7ccfb21fbfc6c4f1abd09a4;hp=ec7ce0e6f1242262fe5c278d9d7ba5d1b1b33d05;hb=498f14a6cae9f79913b07da2778c68b57b7dcdef;hpb=fe1e1d3b8291b1ca991e3d2e639cb28097c53d74

diff --git a/surfbar.php b/surfbar.php
index ec7ce0e6f1..a97cdd5a99 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/05/2008 *
- * ===============                              Last change: 09/05/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 09/05/2008 *
+ * ===================                          Last change: 09/05/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : surfbar.php                                      *
@@ -17,7 +17,7 @@
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,36 +44,32 @@ $GLOBALS['startTime'] = microtime(true);
 
 // Set module
 $GLOBALS['module'] = 'surfbar';
-$GLOBALS['refid']  = 0;
-$GLOBALS['output_mode'] = 0;
+$GLOBALS['output_mode'] = '0';
 $GLOBALS['header_sent'] = 3;
 
 // Load the required file(s)
 require('inc/config-global.php');
 
+// Set content type
+setContentType('text/html');
+
 // Is a frame active?
-if (REQUEST_ISSET_GET('frame')) {
+if (isGetRequestElementSet('frame')) {
 	// Then we need to set header_sent to 0
-	$GLOBALS['header_sent'] = 0;
-} // END - if
-
-// Is the script installed?
-if (!isInstalled()) {
-	// You have to install first!
-	redirectToUrl('install.php');
+	$GLOBALS['header_sent'] = '0';
 } // END - if
 
 // Only logged in users may use this surfbar!
 redirectOnUninstalledExtension('surfbar');
 
 // No member?
-if (!IS_MEMBER()) {
+if (!isMember()) {
 	// Should we display login window or redirect to main page?
-	if ((getConfig('surfbar_guest_login_form') == 'Y') && (EXT_IS_ACTIVE('user'))) {
+	if ((getConfig('surfbar_guest_login_form') == 'Y') && (isExtensionActive('user'))) {
 		// Is the form sent?
-		if ((isFormSent()) && (REQUEST_ISSET_POST('id')) && (REQUEST_ISSET_POST('password'))) {
+		if ((isFormSent()) && (isPostRequestElementSet('id')) && (isPostRequestElementSet('password'))) {
 			// Do the login procedure
-			$URL = USER_DO_LOGIN(REQUEST_POST('id'), REQUEST_POST('password'), basename(__FILE__));
+			$URL = doUserLogin(postRequestElement('id'), postRequestElement('password'), basename(__FILE__), basename(__FILE__) . '?code=');
 
 			// And redirect to the URL
 			redirectToUrl($URL);
@@ -81,8 +77,14 @@ if (!IS_MEMBER()) {
 			// Load header
 			loadIncludeOnce('inc/header.php');
 
+			// Is there a 'code' provided?
+			if (isGetRequestElementSet('code')) {
+				// Then generate an error message
+				loadTemplate('admin_settings_saved', false, getMessageFromErrorCode(getRequestElement('code')));
+			} // END - if
+
 			// Display login form
-			LOAD_TEMPLATE('surfbar_login_form');
+			loadTemplate('surfbar_login_form');
 
 			// Allow footer here
 			$GLOBALS['header_sent'] = 2;
@@ -103,24 +105,24 @@ SURFBAR_INIT();
 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()) || ((isGetRequestElementSet('frame')) && (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 (((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'stop')) || (!REQUEST_ISSET_GET('frame'))) {
+	if (((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'stop')) || (!isGetRequestElementSet('frame'))) {
 		// Load template for "start" page
-		LOAD_TEMPLATE('surfbar_frame_start');
+		loadTemplate('surfbar_frame_start');
 
 		// Load banner
-		LOAD_TEMPLATE('surfbar_start_banner');
+		loadTemplate('surfbar_start_banner');
 
 		// This makes the footer appear again
-		REQUEST_UNSET_GET('frame');
-	} elseif ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'stats')) {
+		unsetGetRequestElement('frame');
+	} elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'stats')) {
 		// Get total points amount
-		$points = GET_TOTAL_DATA(getUserId(), 'user_points', 'points') - GET_TOTAL_DATA(getUserId(), 'user_data', 'used_points');
+		$points = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
 
 		// Prepare content
 		$content = array(
@@ -135,8 +137,8 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
 		);
 
 		// Load template for "stats" page
-		LOAD_TEMPLATE('surfbar_frame_stats', false, $content);
-	} elseif ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'textlinks')) {
+		loadTemplate('surfbar_frame_stats', false, $content);
+	} elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'textlinks')) {
 		// Prepare content
 		$content = array(
 			'online'   => SURFBAR_DETERMINE_TOTAL_ONLINE(),
@@ -144,7 +146,7 @@ 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(
@@ -154,16 +156,16 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
 		);
 
 		// 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 ((isGetRequestElementSet('check')) && (isGetRequestElementSet('id')) && (isGetRequestElementSet('salt'))) {
 	// Dummy next id get
-	SURFBAR_DETERMINE_NEXT_ID(REQUEST_GET('id'));
+	SURFBAR_DETERMINE_NEXT_ID(getRequestElement('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(getRequestElement('id'))) && (SURFBAR_CHECK_VALIDATION_CODE(getRequestElement('id'), getRequestElement('check'), getRequestElement('salt')))) {
 		// Lock the URL (id) down
-		SURFBAR_LOCKDOWN_ID(REQUEST_GET('id'));
+		SURFBAR_LOCKDOWN_ID(getRequestElement('id'));
 
 		// Code is valid so pay points here
 		SURFBAR_PAY_POINTS();
@@ -191,7 +193,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
 	$isFrameset = true;
 
 	// Frame "top" set?
-	if ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'top')) {
+	if ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'top')) {
 		// Determine next id
 		$nextId = SURFBAR_DETERMINE_NEXT_ID();
 
@@ -202,7 +204,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
 				'id'          => $nextId,
 				'check'       => SURFBAR_GENERATE_VALIDATION_CODE($nextId),
 				'salt'        => SURFBAR_GET_SALT(),
-				'points'      => translateComma(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(),
@@ -216,9 +218,9 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
 			// Load new URL
 			SURFBAR_RELOAD_TO_STOP_PAGE('stop2');
 		}
-	} elseif ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'start')) {
+	} elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'start')) {
 		// Starter frame found so let the footer display
-		REQUEST_UNSET_GET('frame');
+		unsetGetRequestElement('frame');
 	}
 
 	// Load header
@@ -226,7 +228,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
 
 	// Load that template
 	//* DEBUG: */ die("templateName={$templateName}<br />\n<strong>content</strong>=<pre>".print_r($content, true)."</pre>");
-	LOAD_TEMPLATE($templateName, false, $content);
+	loadTemplate($templateName, false, $content);
 }
 
 // Load footer