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

diff --git a/inc/request-functions.php b/inc/request-functions.php
index 4f48971f94..62cdacc8c3 100644
--- a/inc/request-functions.php
+++ b/inc/request-functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -119,6 +119,7 @@ function setGetRequestElement ($element, $value) {
 
 // Wrapper for elements in $_POST
 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;
 
@@ -126,7 +127,7 @@ function postRequestElement ($element, $subElement = NULL) {
 	if (isset($GLOBALS['cache_request']['post'][$element][$subElement])) {
 		// Then use it
 		$value = $GLOBALS['cache_request']['post'][$element][$subElement];
-		//* DEBUG: */ print $element.'/'.$subElement.'='.$value.'<br />';
+		//* 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];
@@ -135,28 +136,38 @@ function postRequestElement ($element, $subElement = NULL) {
 		if ((!is_null($subElement)) && (isPostRequestElementSet($element, $subElement))) {
 			// Then use this
 			$value = SQL_ESCAPE($value[$subElement]);
-			//* DEBUG: */ print 'sub!<br />';
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',subElement=' . $subElement . ' - SUB!');
 		} elseif (!is_array($value)) {
 			// Escape it here
 			$value = SQL_ESCAPE($value);
-			//* DEBUG: */ print 'no-array!<br />';
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ' - REGULAR!');
 		}
 
 		// Set it in cache
-		//* DEBUG: */ print $element.'/'.$subElement.'='.$value.'<br />';
-		//* DEBUG: */ print('<pre>'.print_r($_POST,true).'</pre>');
+		//* 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 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])) && (('' . $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 {
+		// Yes, then check both together
 		return ((isset($GLOBALS['raw_request']['post'][$element][$subElement])) && (('' . $GLOBALS['raw_request']['post'][$element][$subElement] . '') != ''));
 	}
 }
@@ -229,29 +240,21 @@ function setPostRequestElement ($element, $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 isPostRequestElementSet($requestParameter);
 }
 
-// Checks if 'content_type' is set
-function isContentTypeSet () {
-	return isset($GLOBALS['content_type']);
-}
-
-// Setter for content type
-function setContentType ($contentType) {
-	$GLOBALS['content_type'] = (string) $contentType;
-}
-
-// Getter for content type
-function getContentType () {
-	return $GLOBALS['content_type'];
-}
-
 // Getter for request URI
 function getRequestUri () {
+	// Is it not set?
+	if (!isset($_SERVER['REQUEST_URI'])) {
+		// Return empty string
+		return '';
+	} // END - if
+
+	// Return it
 	return $_SERVER['REQUEST_URI'];
 }