X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Frequest-functions.php;h=ed1a0a78c2b7fcba37bd783f132553eea29d2d00;hb=bc2da429e6d78668152427b7b5310268453553d8;hp=0ae3de0a6a52c4d17edc49eb04507f38ddf6a8b6;hpb=2592ef433edd0c7cbde318e76792a521b6ec155e;p=mailer.git

diff --git a/inc/request-functions.php b/inc/request-functions.php
index 0ae3de0a6a..ed1a0a78c2 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                            *
@@ -17,7 +17,7 @@
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,12 +38,17 @@
 
 // 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']  = $_GET;
+	$GLOBALS['raw_request']['post'] = $_POST;
+}
+
 // Wrapper for elements in $_GET
-function REQUEST_GET ($element) {
+function getRequestElement ($element) {
 	// By default no element is there
 	$value = null;
 
@@ -51,7 +56,7 @@ function REQUEST_GET ($element) {
 	if (isset($GLOBALS['cache_request']['request_get'][$element])) {
 		// Then use the cache
 		$value = $GLOBALS['cache_request']['request_get'][$element];
-	} elseif (REQUEST_ISSET_GET($element)) {
+	} elseif (isGetRequestElementSet($element)) {
 		// Then get it directly
 		$value = SQL_ESCAPE($GLOBALS['raw_request']['get'][$element]);
 
@@ -64,7 +69,7 @@ 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])));
 	} else {
@@ -73,22 +78,22 @@ function REQUEST_ISSET_GET ($element, $subElement = '') {
 }
 
 // Removes an element from $_GET
-function REQUEST_UNSET_GET ($element) {
+function unsetGetRequestElement ($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 setRequestGetElement ($element, $value) {
 	// Escape both
 	$element = SQL_ESCAPE($element);
 	$value   = SQL_ESCAPE($value);
@@ -113,7 +118,7 @@ function REQUEST_SET_GET ($element, $value) {
 }
 
 // Wrapper for elements in $_POST
-function REQUEST_POST ($element, $subElement=-1) {
+function postRequestElement ($element, $subElement=null) {
 	// By default no element is there
 	$value = null;
 
@@ -121,12 +126,12 @@ function REQUEST_POST ($element, $subElement=-1) {
 	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)) {
+	} 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]);
 		} elseif (!is_array($value)) {
@@ -143,48 +148,48 @@ function REQUEST_POST ($element, $subElement=-1) {
 }
 
 // Checks if an element in $_POST exists
-function REQUEST_ISSET_POST ($element, $subElement=null) {
+function isPostRequestElementSet ($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 REQUEST_UNSET_POST ($element) {
+function unsetPostRequestElement ($element) {
 	unset($GLOBALS['raw_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
 }
 
 // Setter for element in $_POST
-function REQUEST_SET_POST ($element, $value) {
+function setRequestPostElement ($element, $value) {
 	// Is $element or $value an array?
 	if (is_array($element)) {
 		// Set array
@@ -214,20 +219,29 @@ function REQUEST_SET_POST ($element, $value) {
 	}
 
 	// Update cache
-	$GLOBALS['cache_request']['request_post'][$element] = $value;
+	$GLOBALS['cache_request']['request_post'][$element][null] = $value;
 }
 
 // Checks wether a form was sent. If so, the $_POST['ok'] element must be set
 function isFormSent () {
 	// Simply wrap it!
-	return REQUEST_ISSET_POST('ok');
+	return isPostRequestElementSet('ok');
 }
 
-// Initialize the request elements
-function initRequest () {
-	$GLOBALS['raw_request']['get']  = $_GET;
-	$GLOBALS['raw_request']['post'] = $_POST;
+// 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 () {
+	return $_SERVER['REQUEST_URI'];
 }
 
-//
+// [EOF]
 ?>