X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Frequest-functions.php;h=bf045e11feb4ab76c248045395363b71abc972ba;hp=482c69b5f1075c7c536f785091b86ba047d5d861;hb=3a60615e36f60612523966daf585ebe308a4f5cc;hpb=508228c85fba8448d00865b1639cb8cd7a69e457

diff --git a/inc/request-functions.php b/inc/request-functions.php
index 482c69b5f1..bf045e11fe 100644
--- a/inc/request-functions.php
+++ b/inc/request-functions.php
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Spezialle Funktionen fuer die Anfragebehandlung  *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
+ * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
@@ -38,7 +38,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 } // END - if
 
@@ -48,15 +48,15 @@ function REQUEST_GET ($element) {
 	$value = null;
 
 	// Is the element cached or there?
-	if (isset($GLOBALS['cache_array']['request_get'][$element])) {
+	if (isset($GLOBALS['cache_request']['request_get'][$element])) {
 		// Then use the cache
-		$value = $GLOBALS['cache_array']['request_get'][$element];
+		$value = $GLOBALS['cache_request']['request_get'][$element];
 	} elseif (REQUEST_ISSET_GET($element)) {
 		// Then get it directly
-		$value = SQL_ESCAPE($_GET[$element]);
+		$value = SQL_ESCAPE($GLOBALS['raw_request']['get'][$element]);
 
 		// Store it in cache
-		$GLOBALS['cache_array']['request_get'][$element] = $value;
+		$GLOBALS['cache_request']['request_get'][$element] = $value;
 	} // END - if
 
 	// Return value
@@ -64,22 +64,22 @@ function REQUEST_GET ($element) {
 }
 
 // Checks if an element in $_GET exists
-function REQUEST_ISSET_GET ($element, $subElement="") {
+function REQUEST_ISSET_GET ($element, $subElement = '') {
 	if (empty($subElement)) {
-		return (isset($_GET[$element]));
+		return ((isset($GLOBALS['raw_request']['get'][$element])) && (!empty($GLOBALS['raw_request']['get'][$element])));
 	} else {
-		return (isset($_GET[$element][$subElement]));
+		return ((isset($GLOBALS['raw_request']['get'][$element][$subElement])) && (!empty($GLOBALS['raw_request']['get'][$element][$subElement])));
 	}
 }
 
 // Removes an element from $_GET
 function REQUEST_UNSET_GET ($element) {
-	unset($_GET[$element]);
+	unset($GLOBALS['raw_request']['get'][$element]);
 }
 
 // Getter for whole $_GET array
 function REQUEST_GET_ARRAY () {
-	return $_GET;
+	return $GLOBALS['raw_request']['get'];
 }
 
 // Counts entries in $_GET or returns false if not an array
@@ -101,7 +101,15 @@ function REQUEST_GET_COUNT () {
 
 // Setter for element in $_GET
 function REQUEST_SET_GET ($element, $value) {
-	$_GET[SQL_ESCAPE($element)] = SQL_ESCAPE($value);
+	// Escape both
+	$element = SQL_ESCAPE($element);
+	$value   = SQL_ESCAPE($value);
+
+	// Set in $_GET
+	$GLOBALS['raw_request']['get'][$element] = $value;
+
+	// Update cache
+	$GLOBALS['cache_request']['request_get'][$element] = $value;
 }
 
 // Wrapper for elements in $_POST
@@ -109,16 +117,25 @@ function REQUEST_POST ($element, $subElement=null) {
 	// By default no element is there
 	$value = null;
 
-	// Is the element there?
-	if (REQUEST_ISSET_POST($element)) {
+	// Is the element in cache?
+	if (isset($GLOBALS['cache_request']['request_post'][$element][$subElement])) {
+		// Then use it
+		$value = $GLOBALS['cache_request']['request_post'][$element][$subElement];
+	} elseif (REQUEST_ISSET_POST($element)) {
 		// Then use it
-		$value = $_POST[$element];
+		$value = $GLOBALS['raw_request']['post'][$element];
 
 		// Is $subElement set?
 		if ((!is_null($subElement)) && (REQUEST_ISSET_POST($element, $subElement))) {
 			// Then use this
-			$value = $value[$subElement];
-		} // END - if
+			$value = SQL_ESCAPE($value[$subElement]);
+		} elseif (!is_array($value)) {
+			// Escape it here
+			$value = SQL_ESCAPE($value);
+		}
+
+		// Set it in cache
+		$GLOBALS['cache_request']['request_post'][$element][$subElement] = $value;
 	} // END - if
 
 	// Return value
@@ -128,20 +145,25 @@ function REQUEST_POST ($element, $subElement=null) {
 // Checks if an element in $_POST exists
 function REQUEST_ISSET_POST ($element, $subElement=null) {
 	if (is_null($subElement)) {
-		return (isset($_POST[$element]));
+		return ((isset($GLOBALS['raw_request']['post'][$element])) && (!empty($GLOBALS['raw_request']['post'][$element])));
 	} else {
-		return (isset($_POST[$element][$subElement]));
+		return ((isset($GLOBALS['raw_request']['post'][$element][$subElement])) && (!empty($GLOBALS['raw_request']['post'][$element][$subElement])));
 	}
 }
 
 // Removes an element from $_POST
 function REQUEST_UNSET_POST ($element) {
-	unset($_POST[$element]);
+	unset($GLOBALS['raw_request']['post'][$element]);
 }
 
 // Getter for whole $_POST array
 function REQUEST_POST_ARRAY () {
-	return $_POST;
+	return $GLOBALS['raw_request']['post'];
+}
+
+// Setter for whole $_POST array
+function REQUEST_SET_POST_ARRAY (array $POST) {
+	$GLOBALS['raw_request']['post'] = $POST;
 }
 
 // Counts entries in $_POST or returns false if not an array
@@ -163,12 +185,13 @@ function REQUEST_POST_COUNT () {
 
 // Setter for element in $_POST
 function REQUEST_SET_POST ($element, $value) {
+	// Is $element or $value an array?
 	if (is_array($element)) {
 		// Set array
-		$eval = "\$_POST['";
+		$eval = "\$GLOBALS['raw_request']['post']['";
 
 		// Add all entries
-		$eval .= implode("', '", $element);
+		$eval .= implode("']['", $element);
 
 		// Finish eval() command
 		$eval .= sprintf("'] = \"%s\";", SQL_ESCAPE($value));
@@ -176,19 +199,35 @@ function REQUEST_SET_POST ($element, $value) {
 		// And run it
 		eval($eval);
 	} elseif (is_array($value)) {
+		// Escape element
+		$element = SQL_ESCAPE($element);
+
 		// Value is an array so set it directly
-		$_POST[SQL_ESCAPE($element)] = $value;
+		$GLOBALS['raw_request']['post'][$element] = $value;
 	} else {
+		// Escape both
+		$element = SQL_ESCAPE($element);
+		$value   = SQL_ESCAPE($value);
+
 		// Set regular entry
-		$_POST[SQL_ESCAPE($element)] = SQL_ESCAPE($value);
+		$GLOBALS['raw_request']['post'][$element] = $value;
 	}
+
+	// Update cache
+	$GLOBALS['cache_request']['request_post'][$element] = $value;
 }
 
 // Checks wether a form was sent. If so, the $_POST['ok'] element must be set
-function IS_FORM_SENT () {
+function isFormSent () {
 	// Simply wrap it!
 	return REQUEST_ISSET_POST('ok');
 }
 
+// Initialize the request elements
+function initRequest () {
+	$GLOBALS['raw_request']['get']  = $_GET;
+	$GLOBALS['raw_request']['post'] = $_POST;
+}
+
 //
 ?>