X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=surfbar.php;h=1dc43451c404946ce55bc829dcac3d52e915e01b;hp=306b92190cc011d885a0b4dd523a5d05ff7028e6;hb=fc9a6d12d5143014c74aa0e9ed0810b93f20b118;hpb=49248176a5638be80b148ef55d0dc8c334522bf3

diff --git a/surfbar.php b/surfbar.php
index 306b92190c..1dc43451c4 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                                      *
@@ -14,11 +14,10 @@
  * $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                  *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -42,36 +41,60 @@ require('inc/libs/security_functions.php');
 // Init start time
 $GLOBALS['startTime'] = microtime(true);
 
-// Set module
-$GLOBALS['module'] = 'surfbar';
-$GLOBALS['refid']  = 0;
-$GLOBALS['output_mode'] = 0;
+// Set module output mode
+$GLOBALS['__module'] = 'surfbar';
+$GLOBALS['output_mode'] = '0';
 $GLOBALS['header_sent'] = 3;
-$msg = null;
 
 // 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()) {
-	// Redirect
-	// @TODO Display quick login form here or redirect as configured
-	redirectToUrl('modules.php?module=index');
+if (!isMember()) {
+	// Should we display login window or redirect to main page?
+	if ((getConfig('surfbar_guest_login_form') == 'Y') && (isExtensionActive('user'))) {
+		// Is the form sent?
+		if ((isFormSent()) && (isPostRequestElementSet('id')) && (isPostRequestElementSet('password'))) {
+			// Do the login procedure
+			$url = doUserLogin(postRequestElement('id'), postRequestElement('password'), basename(__FILE__), basename(__FILE__) . '?code=');
+
+			// And redirect to the URL
+			redirectToUrl($url);
+		} else {
+			// Load header
+			loadIncludeOnce('inc/header.php');
+
+			// Is there a 'code' provided?
+			if (isGetRequestElementSet('code')) {
+				// Then generate an error message
+				displayMessage(getMessageFromErrorCode(getRequestElement('code')));
+			} // END - if
+
+			// Display login form
+			loadTemplate('surfbar_login_form');
+
+			// Allow footer here
+			$GLOBALS['header_sent'] = 2;
+
+			// Load footer
+			loadIncludeOnce('inc/footer.php');
+		}
+	} else {
+		// Redirect
+		redirectToUrl('modules.php?module=index');
+	}
 } // END - if
 
 // Initialize the surfbar
@@ -81,67 +104,56 @@ 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') == 'stop2')) || (!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')) {
-		// Get total points amount
-		$points = GET_TOTAL_DATA(getUserId(), 'user_points', 'points') - GET_TOTAL_DATA(getUserId(), 'user_data', 'used_points');
-
+		unsetGetRequestElement('frame');
+	} elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'stats')) {
 		// Prepare content
 		$content = array(
-			'points'   => translateComma($points),
-			'online'   => SURFBAR_DETERMINE_TOTAL_ONLINE(),
-			'reload'   => (getConfig('surfbar_stats_reload') * 1000),
-			'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')),
+			'points' => getTotalPoints(getMemberId()),
+			'reload' => (getConfig('surfbar_stats_reload') * 1000)
 		);
 
 		// 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(),
-			'reload'   => (getConfig('surfbar_stats_reload') * 1000)
+			'reload' => (getConfig('surfbar_stats_reload') * 1000)
 		);
 
 		// Load template for "stats" page
-		LOAD_TEMPLATE('surfbar_frame_textlinks', false, $content);
+		loadTemplate('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'
 		);
 
 		// 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();
@@ -151,6 +163,9 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
 			// Then load waiting page
 			SURFBAR_RELOAD_TO_STOP_PAGE();
 		} // END - if
+
+		// Load header to avoid a bug
+		loadIncludeOnce('inc/header.php');
 	} else {
 		// Reload to stop frame!
 		SURFBAR_RELOAD_TO_STOP_PAGE();
@@ -162,49 +177,40 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
 	// Prepare content
 	$content = '';
 
-	// Determine template name
-	$templateName = SURFBAR_DETERMINE_TEMPLATE_NAME();
-
 	// 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();
+		//* DEBUG: */ die('nextId='.$nextId);
 
 		// Is there a valid id?
 		if ($nextId > 0) {
 			// Then prepare other content
 			$content = array(
-				'id'          => $nextId,
-				'check'       => SURFBAR_GENERATE_VALIDATION_CODE($nextId),
-				'salt'        => SURFBAR_GET_SALT(),
-				'points'      => 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)))
+				'url_id' => $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('stop');
 		}
-	} 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');
-	} else {
-		// Load header in frameset mode
-		$isFrameset = true;
+		unsetGetRequestElement('frame');
 	}
 
 	// Load header
 	loadIncludeOnce('inc/header.php');
 
+	// Determine template name
+	$templateName = SURFBAR_DETERMINE_TEMPLATE_NAME();
+
 	// Load that template
-	//* DEBUG: */ die("templateName={$templateName}<br />\n<strong>content</strong>=<pre>".print_r($content, true)."</pre>");
-	LOAD_TEMPLATE($templateName, false, $content);
+	//* DEBUG: */ die('templateName=' . $templateName . '<br /><strong>content</strong>=<pre>' . print_r($content, true) . '</pre>');
+	loadTemplate($templateName, false, $content);
 }
 
 // Load footer