A lot has been rewritten, ext-teams added, ext-forced continued:

[mailer.git] / inc / request-functions.php

diff --git a/inc/request-functions.php b/inc/request-functions.php
index b0ef0773b1b2657efc86a5d8149295649810ce0c..b82c12a7ef810354de2ee467316fbd487511a8e3 100644 (file)
--- a/inc/request-functions.php
+++ b/inc/request-functions.php
@@ -42,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 getRequestParameter ($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];
+               $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
@@ -70,9 +70,9 @@ function getRequestParameter ($element) {
 // Checks if an element in $_GET exists
 function isGetRequestParameterSet ($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] . '') != ''));
        }
 }
 
@@ -113,18 +113,18 @@ function setGetRequestParameter ($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 postRequestParameter ($element, $subElement=null) {
        // 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];
+               $value = $GLOBALS['cache_request']['post'][$element][$subElement];
        } elseif (isPostRequestParameterSet($element)) {
                // Then use it
                $value = $GLOBALS['raw_request']['post'][$element];
@@ -139,7 +139,7 @@ function postRequestParameter ($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
@@ -149,9 +149,9 @@ function postRequestParameter ($element, $subElement=null) {
 // Checks if an element in $_POST exists
 function isPostRequestParameterSet ($element, $subElement=null) {
        if (is_null($subElement)) {
-               return ((isset($GLOBALS['raw_request']['post'][$element])) && (isset($GLOBALS['raw_request']['post'][$element])));
+               return ((isset($GLOBALS['raw_request']['post'][$element])) && (('' . $GLOBALS['raw_request']['post'][$element] . '') != ''));
        } else {
-               return ((isset($GLOBALS['raw_request']['post'][$element][$subElement])) && (isset($GLOBALS['raw_request']['post'][$element][$subElement])));
+               return ((isset($GLOBALS['raw_request']['post'][$element][$subElement])) && (('' . $GLOBALS['raw_request']['post'][$element][$subElement] . '') != ''));
        }
 }
 
@@ -218,7 +218,7 @@ function setPostRequestParameter ($element, $value) {
        }
 
        // Update cache
-       $GLOBALS['cache_request']['request_post'][$element][null] = $value;
+       $GLOBALS['cache_request']['post'][$element][null] = $value;
 }
 
 // Checks wether a form was sent. If so, the $_POST['ok'] element must be set