X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=surfbar.php;h=2d0a5e301bab2e0bc98654179da63c7f77d3519c;hp=8ad2c2af012473fd73719298e06bc00aa866b8fb;hb=2379934be6a196a54f4155bb8e24c49b20736969;hpb=b60d6755eb34f6a302b30eeb363ed0853e8d987d

diff --git a/surfbar.php b/surfbar.php
index 8ad2c2af01..2d0a5e301b 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -53,7 +53,7 @@ require('inc/config-global.php');
 setContentType('text/html');
 
 // Is a frame active?
-if (isGetRequestParameterSet('frame')) {
+if (isGetRequestElementSet('frame')) {
 	// Then we need to set header_sent to 0
 	$GLOBALS['header_sent'] = '0';
 } // END - if
@@ -66,9 +66,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()) && (isPostRequestParameterSet('id')) && (isPostRequestParameterSet('password'))) {
+		if ((isFormSent()) && (isPostRequestElementSet('id')) && (isPostRequestElementSet('password'))) {
 			// Do the login procedure
-			$url = doUserLogin(postRequestParameter('id'), postRequestParameter('password'), basename(__FILE__), basename(__FILE__) . '?code=');
+			$url = doUserLogin(postRequestElement('id'), postRequestElement('password'), basename(__FILE__), basename(__FILE__) . '?code=');
 
 			// And redirect to the URL
 			redirectToUrl($url);
@@ -77,9 +77,9 @@ if (!isMember()) {
 			loadIncludeOnce('inc/header.php');
 
 			// Is there a 'code' provided?
-			if (isGetRequestParameterSet('code')) {
+			if (isGetRequestElementSet('code')) {
 				// Then generate an error message
-				displayMessage(getMessageFromErrorCode(getRequestParameter('code')));
+				displayMessage(getMessageFromErrorCode(getRequestElement('code')));
 			} // END - if
 
 			// Display login form
@@ -104,13 +104,13 @@ SURFBAR_INIT();
 SURFBAR_HANDLE_SELF_MAINTENANCE();
 
 // Is there a check value?
-if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in_array(getRequestParameter('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 (((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'stop2')) || (!isGetRequestParameterSet('frame'))) {
+	if (((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'stop2')) || (!isGetRequestElementSet('frame'))) {
 		// Load template for "start" page
 		loadTemplate('surfbar_frame_start');
 
@@ -118,8 +118,8 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
 		loadTemplate('surfbar_start_banner');
 
 		// This makes the footer appear again
-		unsetGetRequestParameter('frame');
-	} elseif ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'stats')) {
+		unsetGetRequestElement('frame');
+	} elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'stats')) {
 		// Prepare content
 		$content = array(
 			'points' => getTotalPoints(getMemberId()),
@@ -128,7 +128,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
 
 		// Load template for "stats" page
 		loadTemplate('surfbar_frame_stats', false, $content);
-	} elseif ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'textlinks')) {
+	} elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'textlinks')) {
 		// Prepare content
 		$content = array(
 			'reload' => (getConfig('surfbar_stats_reload') * 1000)
@@ -146,14 +146,14 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
 		// Load template for stopped surfbar
 		loadTemplate('surfbar_stopped', false, $content);
 	}
-} elseif ((isGetRequestParameterSet('check')) && (isGetRequestParameterSet('id')) && (isGetRequestParameterSet('salt'))) {
+} elseif ((isGetRequestElementSet('check')) && (isGetRequestElementSet('id')) && (isGetRequestElementSet('salt'))) {
 	// Dummy next id get
-	SURFBAR_DETERMINE_NEXT_ID(getRequestParameter('id'));
+	SURFBAR_DETERMINE_NEXT_ID(getRequestElement('id'));
 
 	// Check reload lock and validation code
-	if ((!SURFBAR_CHECK_RELOAD_LOCK(getRequestParameter('id'))) && (SURFBAR_CHECK_VALIDATION_CODE(getRequestParameter('id'), getRequestParameter('check'), getRequestParameter('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(getRequestParameter('id'));
+		SURFBAR_LOCKDOWN_ID(getRequestElement('id'));
 
 		// Code is valid so pay points here
 		SURFBAR_PAY_POINTS();
@@ -178,7 +178,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
 	$content = '';
 
 	// Frame "top" set?
-	if ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'top')) {
+	if ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'top')) {
 		// Determine next id
 		$nextId = SURFBAR_DETERMINE_NEXT_ID();
 		//* DEBUG: */ die('nextId='.$nextId);
@@ -197,9 +197,9 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
 			// Load new URL
 			SURFBAR_RELOAD_TO_STOP_PAGE('stop');
 		}
-	} elseif ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'start')) {
+	} elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'start')) {
 		// Starter frame found so let the footer display
-		unsetGetRequestParameter('frame');
+		unsetGetRequestElement('frame');
 	}
 
 	// Load header