X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Frequest-functions.php;h=e0051a169edc6da09958b57ae5ac2276f48452b9;hp=5f9f1e263bb2b36378af1ddf877dc7d161a2c130;hb=e937b6540b932d537f72e827de76dd5be4aefe48;hpb=1355d2c0b29510dbd407f9cde9f41a5ac02d01fa

diff --git a/inc/request-functions.php b/inc/request-functions.php
index 5f9f1e263b..e0051a169e 100644
--- a/inc/request-functions.php
+++ b/inc/request-functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 02/28/2009 *
- * ===============                              Last change: 02/28/2009 *
+ * Mailer v0.2.1-FINAL                                Start: 02/28/2009 *
+ * ===================                          Last change: 02/28/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : request-functions.php                            *
@@ -14,11 +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 - 2008 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * 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 *
@@ -38,25 +37,30 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+	die();
 } // END - if
 
+// Initialize the request elements
+function initRequest () {
+	$GLOBALS['raw_request']['get']  = (array) $_GET;
+	$GLOBALS['raw_request']['post'] = (array) $_POST;
+}
+
 // Wrapper for elements in $_GET
-function REQUEST_GET ($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 (REQUEST_ISSET_GET($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
@@ -64,31 +68,32 @@ function REQUEST_GET ($element) {
 }
 
 // Checks if an element in $_GET exists
-function REQUEST_ISSET_GET ($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 REQUEST_UNSET_GET ($element) {
+function unsetGetRequestElement ($element) {
+	unset($GLOBALS['cache_request']['get'][$element]);
 	unset($GLOBALS['raw_request']['get'][$element]);
 }
 
 // Getter for whole $_GET array
-function REQUEST_GET_ARRAY () {
+function getRequestArray () {
 	return $GLOBALS['raw_request']['get'];
 }
 
 // Counts entries in $_GET or returns false if not an array
-function REQUEST_GET_COUNT () {
+function countRequestGet () {
 	// By default this is not an array
 	$count = false;
 
 	// Get the array
-	$GET = REQUEST_GET_ARRAY();
+	$GET = getRequestArray();
 
 	// Is it an array?
 	if (is_array($GET)) {
@@ -100,7 +105,7 @@ function REQUEST_GET_COUNT () {
 }
 
 // Setter for element in $_GET
-function REQUEST_SET_GET ($element, $value) {
+function setGetRequestElement ($element, $value) {
 	// Escape both
 	$element = SQL_ESCAPE($element);
 	$value   = SQL_ESCAPE($value);
@@ -109,82 +114,100 @@ function REQUEST_SET_GET ($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 REQUEST_POST ($element, $subElement=-1) {
+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 (REQUEST_ISSET_POST($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 (($subElement != -1) && (REQUEST_ISSET_POST($element, $subElement))) {
+		if ((!is_null($subElement)) && (isPostRequestElementSet($element, $subElement))) {
 			// Then use this
 			$value = SQL_ESCAPE($value[$subElement]);
-		} else {
+			//* 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] = SQL_ESCAPE($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 REQUEST_ISSET_POST ($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_int($subElement))));
+
+	// Is a sub element set?
 	if (is_null($subElement)) {
-		return ((isset($GLOBALS['raw_request']['post'][$element])) && (!empty($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])) && (!empty($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 REQUEST_UNSET_POST ($element) {
+function unsetPostRequestElement ($element) {
 	unset($GLOBALS['raw_request']['post'][$element]);
+	unset($GLOBALS['cache_request']['post'][$element]);
 }
 
 // Getter for whole $_POST array
-function REQUEST_POST_ARRAY () {
+function postRequestArray () {
 	return $GLOBALS['raw_request']['post'];
 }
 
 // Setter for whole $_POST array
-function REQUEST_SET_POST_ARRAY (array $POST) {
-	$GLOBALS['raw_request']['post'] = $POST;
+function setPostRequestArray ($postData) {
+	$GLOBALS['raw_request']['post'] = $postData;
 }
 
 // Counts entries in $_POST or returns false if not an array
-function REQUEST_POST_COUNT () {
+function countRequestPost () {
 	// By default this is not an array
 	$count = false;
 
 	// Get the array
-	$POST = REQUEST_POST_ARRAY();
+	$postData = postRequestArray();
 
 	// Is it an array?
-	if (is_array($POST)) {
+	if (is_array($postData)) {
 		// Then count it
-		$count = count($POST);
+		$count = count($postData);
 	} // END - if
 
 	// Return value
+	return $count;
 }
 
 // Setter for element in $_POST
-function REQUEST_SET_POST ($element, $value) {
+function setPostRequestElement ($element, $value) {
 	// Is $element or $value an array?
 	if (is_array($element)) {
 		// Set array
@@ -214,20 +237,44 @@ function REQUEST_SET_POST ($element, $value) {
 	}
 
 	// Update cache
-	$GLOBALS['cache_request']['request_post'][$element] = $value;
+	$GLOBALS['cache_request']['post'][$element][null] = $value;
 }
 
-// Checks wether a form was sent. If so, the $_POST['ok'] element must be set
-function isFormSent () {
+// Checks whether a form was sent. If so, the $_POST['ok'] element must be set
+function isFormSent ($requestParameter = 'ok') {
 	// Simply wrap it!
-	return REQUEST_ISSET_POST('ok');
+	return isPostRequestElementSet($requestParameter);
 }
 
-// Initialize the request elements
-function initRequest () {
-	$GLOBALS['raw_request']['get']  = $_GET;
-	$GLOBALS['raw_request']['post'] = $_POST;
+// 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'];
+}
+
+// Add all GET parameters to a string (without leading sign)
+function addAllGetRequestParameters () {
+	// Init variable
+	$return = '';
+
+	// Now add all parameters
+	foreach (getRequestArray() as $key => $value) {
+		// Add it secured
+		$return .= SQL_ESCAPE($key) . '=' . SQL_ESCAPE($value) . '&amp;';
+	} // END - foreach
+
+	// Remove trailing &amp;
+	$return = substr($return, 0, -5);
+
+	// Return it
+	return $return;
 }
 
-//
+// [EOF]
 ?>