X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Frequest-functions.php;h=62cdacc8c3f6e065f9e550750270a5ee04e2040f;hp=6237299a4a975e7d33e70274de3e65375c625945;hb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;hpb=18e32f1a8971b18bace4f051094acf27800bd7d9

diff --git a/inc/request-functions.php b/inc/request-functions.php
index 6237299a4a..62cdacc8c3 100644
--- a/inc/request-functions.php
+++ b/inc/request-functions.php
@@ -14,12 +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 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 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 *
@@ -44,25 +42,25 @@ if (!defined('__SECURITY')) {
 
 // Initialize the request elements
 function initRequest () {
-	$GLOBALS['raw_request']['get']  = $_GET;
-	$GLOBALS['raw_request']['post'] = $_POST;
+	$GLOBALS['raw_request']['get']  = (array) $_GET;
+	$GLOBALS['raw_request']['post'] = (array) $_POST;
 }
 
 // Wrapper for elements in $_GET
-function getRequestParameter ($element) {
+function getRequestElement ($element) {
 	// By default no element is there
-	$value = null;
+	$value = NULL;
 
 	// Is the element cached or there?
-	if (isset($GLOBALS['cache_request']['request_get'][$element])) {
+	if (isset($GLOBALS['cache_request']['get'][$element])) {
 		// Then use the cache
-		$value = $GLOBALS['cache_request']['request_get'][$element];
-	} elseif (isGetRequestParameterSet($element)) {
+		$value = $GLOBALS['cache_request']['get'][$element];
+	} elseif (isGetRequestElementSet($element)) {
 		// Then get it directly
 		$value = SQL_ESCAPE($GLOBALS['raw_request']['get'][$element]);
 
 		// Store it in cache
-		$GLOBALS['cache_request']['request_get'][$element] = $value;
+		$GLOBALS['cache_request']['get'][$element] = $value;
 	} // END - if
 
 	// Return value
@@ -70,16 +68,17 @@ function getRequestParameter ($element) {
 }
 
 // Checks if an element in $_GET exists
-function isGetRequestParameterSet ($element, $subElement = '') {
+function isGetRequestElementSet ($element, $subElement = '') {
 	if (empty($subElement)) {
-		return ((isset($GLOBALS['raw_request']['get'][$element])) && (!empty($GLOBALS['raw_request']['get'][$element])));
+		return ((isset($GLOBALS['raw_request']['get'][$element])) && ('' . ($GLOBALS['raw_request']['get'][$element] . '') != ''));
 	} else {
-		return ((isset($GLOBALS['raw_request']['get'][$element][$subElement])) && (!empty($GLOBALS['raw_request']['get'][$element][$subElement])));
+		return ((isset($GLOBALS['raw_request']['get'][$element][$subElement])) && ('' . ($GLOBALS['raw_request']['get'][$element][$subElement] . '') != ''));
 	}
 }
 
 // Removes an element from $_GET
-function unsetGetRequestParameter ($element) {
+function unsetGetRequestElement ($element) {
+	unset($GLOBALS['cache_request']['get'][$element]);
 	unset($GLOBALS['raw_request']['get'][$element]);
 }
 
@@ -106,7 +105,7 @@ function countRequestGet () {
 }
 
 // Setter for element in $_GET
-function setGetRequestParameter ($element, $value) {
+function setGetRequestElement ($element, $value) {
 	// Escape both
 	$element = SQL_ESCAPE($element);
 	$value   = SQL_ESCAPE($value);
@@ -115,51 +114,68 @@ function setGetRequestParameter ($element, $value) {
 	$GLOBALS['raw_request']['get'][$element] = $value;
 
 	// Update cache
-	$GLOBALS['cache_request']['request_get'][$element] = $value;
+	$GLOBALS['cache_request']['get'][$element] = $value;
 }
 
 // Wrapper for elements in $_POST
-function postRequestParameter ($element, $subElement=null) {
+function postRequestElement ($element, $subElement = NULL) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element[' . gettype($element) . ']=' . $element . ',subElement[' . gettype($subElement) . ']=' . $subElement . ' - ENTERED!');
 	// By default no element is there
-	$value = null;
+	$value = NULL;
 
 	// Is the element in cache?
-	if (isset($GLOBALS['cache_request']['request_post'][$element][$subElement])) {
+	if (isset($GLOBALS['cache_request']['post'][$element][$subElement])) {
 		// Then use it
-		$value = $GLOBALS['cache_request']['request_post'][$element][$subElement];
-	} elseif (isPostRequestParameterSet($element)) {
+		$value = $GLOBALS['cache_request']['post'][$element][$subElement];
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element[' . gettype($element) . ']=' . $element . ',subElement[' . gettype($subElement) . ']=' . $subElement . ',value[' . gettype($value) . ']=' . $value . ' - CACHE!');
+	} elseif (isPostRequestElementSet($element)) {
 		// Then use it
 		$value = $GLOBALS['raw_request']['post'][$element];
 
 		// Is $subElement set?
-		if ((!is_null($subElement)) && (isPostRequestParameterSet($element, $subElement))) {
+		if ((!is_null($subElement)) && (isPostRequestElementSet($element, $subElement))) {
 			// Then use this
 			$value = SQL_ESCAPE($value[$subElement]);
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',subElement=' . $subElement . ' - SUB!');
 		} elseif (!is_array($value)) {
 			// Escape it here
 			$value = SQL_ESCAPE($value);
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ' - REGULAR!');
 		}
 
 		// Set it in cache
-		$GLOBALS['cache_request']['request_post'][$element][$subElement] = $value;
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',subElement=' . $subElement . ',value=' . $value.' - ADDED!');
+		$GLOBALS['cache_request']['post'][$element][$subElement] = $value;
 	} // END - if
 
 	// Return value
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element[' . gettype($element) . ']=' . $element . ',subElement[' . gettype($subElement) . ']=' . $subElement . ',value[' . gettype($value) . ']=' . $value . ' - EXIT!');
 	return $value;
 }
 
 // Checks if an element in $_POST exists
-function isPostRequestParameterSet ($element, $subElement=null) {
+function isPostRequestElementSet ($element, $subElement = NULL) {
+	/*
+	 * Always check that $element is a string and that $subElement is NULL or
+	 * a string as numerical indexes are not wanted in POST data (in this
+	 * project).
+	 */
+	assert(is_string($element) && ((is_null($subElement)) || (is_string($subElement))));
+
+	// Is a sub element set?
 	if (is_null($subElement)) {
-		return ((isset($GLOBALS['raw_request']['post'][$element])) && (isset($GLOBALS['raw_request']['post'][$element])));
+		// No, then only check $element
+		return ((isset($GLOBALS['raw_request']['post'][$element])) && ((is_array($GLOBALS['raw_request']['post'][$element])) || (('' . $GLOBALS['raw_request']['post'][$element] . '') != '')));
 	} else {
-		return ((isset($GLOBALS['raw_request']['post'][$element][$subElement])) && (isset($GLOBALS['raw_request']['post'][$element][$subElement])));
+		// Yes, then check both together
+		return ((isset($GLOBALS['raw_request']['post'][$element][$subElement])) && (('' . $GLOBALS['raw_request']['post'][$element][$subElement] . '') != ''));
 	}
 }
 
 // Removes an element from $_POST
-function unsetPostRequestParameter ($element) {
+function unsetPostRequestElement ($element) {
 	unset($GLOBALS['raw_request']['post'][$element]);
+	unset($GLOBALS['cache_request']['post'][$element]);
 }
 
 // Getter for whole $_POST array
@@ -187,10 +203,11 @@ function countRequestPost () {
 	} // END - if
 
 	// Return value
+	return $count;
 }
 
 // Setter for element in $_POST
-function setPostRequestParameter ($element, $value) {
+function setPostRequestElement ($element, $value) {
 	// Is $element or $value an array?
 	if (is_array($element)) {
 		// Set array
@@ -220,33 +237,43 @@ function setPostRequestParameter ($element, $value) {
 	}
 
 	// Update cache
-	$GLOBALS['cache_request']['request_post'][$element][null] = $value;
+	$GLOBALS['cache_request']['post'][$element][null] = $value;
 }
 
-// Checks wether a form was sent. If so, the $_POST['ok'] element must be set
+// Checks whether a form was sent. If so, the $_POST['ok'] element must be set
 function isFormSent ($requestParameter = 'ok') {
 	// Simply wrap it!
-	return isPostRequestParameterSet($requestParameter);
+	return isPostRequestElementSet($requestParameter);
 }
 
-// Checks if 'content_type' is set
-function isContentTypeSet () {
-	return isset($GLOBALS['content_type']);
-}
+// Getter for request URI
+function getRequestUri () {
+	// Is it not set?
+	if (!isset($_SERVER['REQUEST_URI'])) {
+		// Return empty string
+		return '';
+	} // END - if
 
-// Setter for content type
-function setContentType ($contentType) {
-	$GLOBALS['content_type'] = (string) $contentType;
+	// Return it
+	return $_SERVER['REQUEST_URI'];
 }
 
-// Getter for content type
-function getContentType () {
-	return $GLOBALS['content_type'];
-}
+// Add all GET parameters to a string (without leading sign)
+function addAllGetRequestParameters () {
+	// Init variable
+	$return = '';
 
-// Getter for request URI
-function getRequestUri () {
-	return $_SERVER['REQUEST_URI'];
+	// Now add all parameters
+	foreach (getRequestArray() as $key => $value) {
+		// Add it secured
+		$return .= SQL_ESCAPE($key) . '=' . SQL_ESCAPE($value) . '&';
+	} // END - foreach
+
+	// Remove trailing &
+	$return = substr($return, 0, -5);
+
+	// Return it
+	return $return;
 }
 
 // [EOF]