X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=surfbar.php;h=d65986193579c31409ff9397d53c0c4cabba1839;hp=2249305aaae7ee7fc02f2e0c83d7768b226f80a4;hb=04b69ac9f33369cbf654396c4a42cb1fff710ff4;hpb=d52beaaad0b8388fec7f9f3cece88ef98a833751

diff --git a/surfbar.php b/surfbar.php
index 2249305aaa..d659861935 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -54,7 +55,7 @@ require('inc/config-global.php');
 setContentType('text/html');
 
 // Is a frame active?
-if (isGetRequestElementSet('frame')) {
+if (isGetRequestParameterSet('frame')) {
 	// Then we need to set header_sent to 0
 	$GLOBALS['header_sent'] = '0';
 } // END - if
@@ -67,9 +68,9 @@ 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'))) {
+		if ((isFormSent()) && (isPostRequestParameterSet('id')) && (isPostRequestParameterSet('password'))) {
 			// Do the login procedure
-			$URL = doUserLogin(postRequestElement('id'), postRequestElement('password'), basename(__FILE__), basename(__FILE__) . '?code=');
+			$URL = doUserLogin(postRequestParameter('id'), postRequestParameter('password'), basename(__FILE__), basename(__FILE__) . '?code=');
 
 			// And redirect to the URL
 			redirectToUrl($URL);
@@ -78,9 +79,9 @@ if (!isMember()) {
 			loadIncludeOnce('inc/header.php');
 
 			// Is there a 'code' provided?
-			if (isGetRequestElementSet('code')) {
+			if (isGetRequestParameterSet('code')) {
 				// Then generate an error message
-				loadTemplate('admin_settings_saved', false, getMessageFromErrorCode(getRequestElement('code')));
+				loadTemplate('admin_settings_saved', false, getMessageFromErrorCode(getRequestParameter('code')));
 			} // END - if
 
 			// Display login form
@@ -94,7 +95,7 @@ if (!isMember()) {
 		}
 	} else {
 		// Redirect
-		redirectToUrl('index.php');
+		redirectToUrl('modules.php?module=index');
 	}
 } // END - if
 
@@ -105,13 +106,13 @@ SURFBAR_INIT();
 SURFBAR_HANDLE_SELF_MAINTENANCE();
 
 // Is there a check value?
-if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_array(getRequestElement('frame'), array('stop', 'stop2', 'stats', 'textlinks'))))) {
+if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in_array(getRequestParameter('frame'), array('stop', 'stop2', 'stats', 'textlinks'))))) {
 	// Reload-lock is full, surfbar stopped so...
 	// Load header
 	loadIncludeOnce('inc/header.php');
 
 	// Load template
-	if (((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'stop2')) || (!isGetRequestElementSet('frame'))) {
+	if (((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'stop2')) || (!isGetRequestParameterSet('frame'))) {
 		// Load template for "start" page
 		loadTemplate('surfbar_frame_start');
 
@@ -119,30 +120,23 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
 		loadTemplate('surfbar_start_banner');
 
 		// This makes the footer appear again
-		unsetGetRequestElement('frame');
-	} elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'stats')) {
+		unsetGetRequestParameter('frame');
+	} elseif ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'stats')) {
 		// Get total points amount
 		$points = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
 
 		// 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' => $points,
+			'reload' => (getConfig('surfbar_stats_reload') * 1000)
 		);
 
 		// Load template for "stats" page
 		loadTemplate('surfbar_frame_stats', false, $content);
-	} elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'textlinks')) {
+	} elseif ((isGetRequestParameterSet('frame')) && (getRequestParameter('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
@@ -157,14 +151,14 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
 		// Load template for stopped surfbar
 		loadTemplate('surfbar_stopped', false, $content);
 	}
-} elseif ((isGetRequestElementSet('check')) && (isGetRequestElementSet('id')) && (isGetRequestElementSet('salt'))) {
+} elseif ((isGetRequestParameterSet('check')) && (isGetRequestParameterSet('id')) && (isGetRequestParameterSet('salt'))) {
 	// Dummy next id get
-	SURFBAR_DETERMINE_NEXT_ID(getRequestElement('id'));
+	SURFBAR_DETERMINE_NEXT_ID(getRequestParameter('id'));
 
 	// Check reload lock and validation code
-	if ((!SURFBAR_CHECK_RELOAD_LOCK(getRequestElement('id'))) && (SURFBAR_CHECK_VALIDATION_CODE(getRequestElement('id'), getRequestElement('check'), getRequestElement('salt')))) {
+	if ((!SURFBAR_CHECK_RELOAD_LOCK(getRequestParameter('id'))) && (SURFBAR_CHECK_VALIDATION_CODE(getRequestParameter('id'), getRequestParameter('check'), getRequestParameter('salt')))) {
 		// Lock the URL (id) down
-		SURFBAR_LOCKDOWN_ID(getRequestElement('id'));
+		SURFBAR_LOCKDOWN_ID(getRequestParameter('id'));
 
 		// Code is valid so pay points here
 		SURFBAR_PAY_POINTS();
@@ -192,7 +186,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
 	$isFrameset = true;
 
 	// Frame "top" set?
-	if ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'top')) {
+	if ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'top')) {
 		// Determine next id
 		$nextId = SURFBAR_DETERMINE_NEXT_ID();
 
@@ -200,14 +194,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
 		if ($nextId > 0) {
 			// Then prepare other content
 			$content = array(
-				'id'          => $nextId,
-				'check'       => SURFBAR_GENERATE_VALIDATION_CODE($nextId),
-				'salt'        => SURFBAR_GET_SALT(),
-				'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),
+				'url_id'      => $nextId,
 				'xxx'         => str_repeat('X', strlen(SURFBAR_GET_RELOAD_TIME($nextId)))
 			);
 
@@ -217,9 +204,9 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
 			// Load new URL
 			SURFBAR_RELOAD_TO_STOP_PAGE('stop');
 		}
-	} elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'start')) {
+	} elseif ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'start')) {
 		// Starter frame found so let the footer display
-		unsetGetRequestElement('frame');
+		unsetGetRequestParameter('frame');
 	}
 
 	// Load header