X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Frequest-functions.php;h=c50fa5558c209e13fa26a795163c1473ff6f02b7;hb=da7b89a86040b778274dd89201e2a339232276fb;hp=740f7bd52eea4aeedb9fbe6e1b3f2521930b276f;hpb=b8c86fa12322603c24a88ea2b0fd3dbeba612752;p=mailer.git

diff --git a/inc/request-functions.php b/inc/request-functions.php
index 740f7bd52e..c50fa5558c 100644
--- a/inc/request-functions.php
+++ b/inc/request-functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Spezialle Funktionen fuer die Anfragebehandlung  *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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                  *
@@ -33,7 +38,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 } // END - if
 
@@ -59,11 +64,11 @@ function REQUEST_GET ($element) {
 }
 
 // Checks if an element in $_GET exists
-function REQUEST_ISSET_GET ($element, $extra="") {
-	if (empty($extra)) {
-		return (isset($_GET[$element]));
+function REQUEST_ISSET_GET ($element, $subElement = '') {
+	if (empty($subElement)) {
+		return ((isset($_GET[$element])) && (!empty($_GET[$element])));
 	} else {
-		return (isset($_GET[$element][$extra]));
+		return ((isset($_GET[$element][$subElement])) && (!empty($_GET[$element][$subElement])));
 	}
 }
 
@@ -100,7 +105,7 @@ function REQUEST_SET_GET ($element, $value) {
 }
 
 // Wrapper for elements in $_POST
-function REQUEST_POST ($element) {
+function REQUEST_POST ($element, $subElement=null) {
 	// By default no element is there
 	$value = null;
 
@@ -108,6 +113,12 @@ function REQUEST_POST ($element) {
 	if (REQUEST_ISSET_POST($element)) {
 		// Then use it
 		$value = $_POST[$element];
+
+		// Is $subElement set?
+		if ((!is_null($subElement)) && (REQUEST_ISSET_POST($element, $subElement))) {
+			// Then use this
+			$value = $value[$subElement];
+		} // END - if
 	} // END - if
 
 	// Return value
@@ -115,11 +126,11 @@ function REQUEST_POST ($element) {
 }
 
 // Checks if an element in $_POST exists
-function REQUEST_ISSET_POST ($element, $extra="") {
-	if (empty($extra)) {
-		return (isset($_POST[$element]));
+function REQUEST_ISSET_POST ($element, $subElement=null) {
+	if (is_null($subElement)) {
+		return ((isset($_POST[$element])) && (!empty($_POST[$element])));
 	} else {
-		return (isset($_POST[$element][$extra]));
+		return ((isset($_POST[$element][$subElement])) && (!empty($_POST[$element][$subElement])));
 	}
 }
 
@@ -152,18 +163,22 @@ function REQUEST_POST_COUNT () {
 
 // Setter for element in $_POST
 function REQUEST_SET_POST ($element, $value) {
+	// Is $element or $value an array?
 	if (is_array($element)) {
 		// Set array
 		$eval = "\$_POST['";
 
 		// Add all entries
-		$eval .= implode("', '", $element);
+		$eval .= implode("']['", $element);
 
 		// Finish eval() command
 		$eval .= sprintf("'] = \"%s\";", SQL_ESCAPE($value));
 
 		// And run it
 		eval($eval);
+	} elseif (is_array($value)) {
+		// Value is an array so set it directly
+		$_POST[SQL_ESCAPE($element)] = $value;
 	} else {
 		// Set regular entry
 		$_POST[SQL_ESCAPE($element)] = SQL_ESCAPE($value);
@@ -171,7 +186,7 @@ function REQUEST_SET_POST ($element, $value) {
 }
 
 // Checks wether a form was sent. If so, the $_POST['ok'] element must be set
-function IS_FORM_SENT () {
+function isFormSent () {
 	// Simply wrap it!
 	return REQUEST_ISSET_POST('ok');
 }