X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Frequest-functions.php;h=799d4e38dd120a16452d7442adbb2984618b50cb;hb=cd951a117b88c07a2dcbf3e97587b4c370973b85;hp=f67df00b8ae12eac7e554431917f01e5f4f9104b;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/request-functions.php b/inc/request-functions.php
index f67df00b8a..799d4e38dd 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,10 +14,9 @@
  * $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 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,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 getRequestElement ($element) {
+function getRequestParameter ($element) {
 	// By default no element is there
 	$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 (isGetRequestElementSet($element)) {
+		$value = $GLOBALS['cache_request']['get'][$element];
+	} elseif (isGetRequestParameterSet($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
@@ -69,7 +68,7 @@ function getRequestElement ($element) {
 }
 
 // Checks if an element in $_GET exists
-function isGetRequestElementSet ($element, $subElement = '') {
+function isGetRequestParameterSet ($element, $subElement = '') {
 	if (empty($subElement)) {
 		return ((isset($GLOBALS['raw_request']['get'][$element])) && (!empty($GLOBALS['raw_request']['get'][$element])));
 	} else {
@@ -78,7 +77,7 @@ function isGetRequestElementSet ($element, $subElement = '') {
 }
 
 // Removes an element from $_GET
-function unsetGetRequestElement ($element) {
+function unsetGetRequestParameter ($element) {
 	unset($GLOBALS['raw_request']['get'][$element]);
 }
 
@@ -105,7 +104,7 @@ function countRequestGet () {
 }
 
 // Setter for element in $_GET
-function setRequestGetElement ($element, $value) {
+function setGetRequestParameter ($element, $value) {
 	// Escape both
 	$element = SQL_ESCAPE($element);
 	$value   = SQL_ESCAPE($value);
@@ -114,24 +113,24 @@ function setRequestGetElement ($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 postRequestElement ($element, $subElement=null) {
+function postRequestParameter ($element, $subElement=null) {
 	// By default no element is there
 	$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 (isPostRequestElementSet($element)) {
+		$value = $GLOBALS['cache_request']['post'][$element][$subElement];
+	} elseif (isPostRequestParameterSet($element)) {
 		// Then use it
 		$value = $GLOBALS['raw_request']['post'][$element];
 
 		// Is $subElement set?
-		if ((!is_null($subElement)) && (isPostRequestElementSet($element, $subElement))) {
+		if ((!is_null($subElement)) && (isPostRequestParameterSet($element, $subElement))) {
 			// Then use this
 			$value = SQL_ESCAPE($value[$subElement]);
 		} elseif (!is_array($value)) {
@@ -140,7 +139,7 @@ function postRequestElement ($element, $subElement=null) {
 		}
 
 		// Set it in cache
-		$GLOBALS['cache_request']['request_post'][$element][$subElement] = $value;
+		$GLOBALS['cache_request']['post'][$element][$subElement] = $value;
 	} // END - if
 
 	// Return value
@@ -148,16 +147,16 @@ function postRequestElement ($element, $subElement=null) {
 }
 
 // Checks if an element in $_POST exists
-function isPostRequestElementSet ($element, $subElement=null) {
+function isPostRequestParameterSet ($element, $subElement=null) {
 	if (is_null($subElement)) {
-		return ((isset($GLOBALS['raw_request']['post'][$element])) && (!empty($GLOBALS['raw_request']['post'][$element])));
+		return ((isset($GLOBALS['raw_request']['post'][$element])) && (isset($GLOBALS['raw_request']['post'][$element])));
 	} else {
-		return ((isset($GLOBALS['raw_request']['post'][$element][$subElement])) && (!empty($GLOBALS['raw_request']['post'][$element][$subElement])));
+		return ((isset($GLOBALS['raw_request']['post'][$element][$subElement])) && (isset($GLOBALS['raw_request']['post'][$element][$subElement])));
 	}
 }
 
 // Removes an element from $_POST
-function unsetPostRequestElement ($element) {
+function unsetPostRequestParameter ($element) {
 	unset($GLOBALS['raw_request']['post'][$element]);
 }
 
@@ -167,7 +166,7 @@ function postRequestArray () {
 }
 
 // Setter for whole $_POST array
-function setPostRequestArray (array $postData) {
+function setPostRequestArray ($postData) {
 	$GLOBALS['raw_request']['post'] = $postData;
 }
 
@@ -189,7 +188,7 @@ function countRequestPost () {
 }
 
 // Setter for element in $_POST
-function setRequestPostElement ($element, $value) {
+function setPostRequestParameter ($element, $value) {
 	// Is $element or $value an array?
 	if (is_array($element)) {
 		// Set array
@@ -219,13 +218,18 @@ function setRequestPostElement ($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 () {
+function isFormSent ($requestParameter = 'ok') {
 	// Simply wrap it!
-	return isPostRequestElementSet('ok');
+	return isPostRequestParameterSet($requestParameter);
+}
+
+// Checks if 'content_type' is set
+function isContentTypeSet () {
+	return isset($GLOBALS['content_type']);
 }
 
 // Setter for content type