Reverted of changes in 1704, see ticket #160

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

diff --git a/inc/request-functions.php b/inc/request-functions.php
index c417c560c181513974a915614703557b19d87e87..b651b018e73b582b269ba2af5e1a439a8e3ab020 100644 (file)
--- a/inc/request-functions.php
+++ b/inc/request-functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -48,7 +49,7 @@ function initRequest () {
 }
 
 // Wrapper for elements in $_GET
-function getRequestElement ($element) {
+function getRequestParameter ($element) {
        // By default no element is there
        $value = null;
 
@@ -56,7 +57,7 @@ function getRequestElement ($element) {
        if (isset($GLOBALS['cache_request']['request_get'][$element])) {
                // Then use the cache
                $value = $GLOBALS['cache_request']['request_get'][$element];
-       } elseif (isGetRequestElementSet($element)) {
+       } elseif (isGetRequestParameterSet($element)) {
                // Then get it directly
                $value = SQL_ESCAPE($GLOBALS['raw_request']['get'][$element]);
 
@@ -69,7 +70,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 +79,7 @@ function isGetRequestElementSet ($element, $subElement = '') {
 }
 
 // Removes an element from $_GET
-function unsetGetRequestElement ($element) {
+function unsetGetRequestParameter ($element) {
        unset($GLOBALS['raw_request']['get'][$element]);
 }
 
@@ -105,7 +106,7 @@ function countRequestGet () {
 }
 
 // Setter for element in $_GET
-function setGetRequestElement ($element, $value) {
+function setGetRequestParameter ($element, $value) {
        // Escape both
        $element = SQL_ESCAPE($element);
        $value   = SQL_ESCAPE($value);
@@ -118,7 +119,7 @@ function setGetRequestElement ($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;
 
@@ -126,12 +127,12 @@ function postRequestElement ($element, $subElement=null) {
        if (isset($GLOBALS['cache_request']['request_post'][$element][$subElement])) {
                // Then use it
                $value = $GLOBALS['cache_request']['request_post'][$element][$subElement];
-       } elseif (isPostRequestElementSet($element)) {
+       } 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)) {
@@ -148,7 +149,7 @@ 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])) && (isset($GLOBALS['raw_request']['post'][$element])));
        } else {
@@ -157,7 +158,7 @@ function isPostRequestElementSet ($element, $subElement=null) {
 }
 
 // Removes an element from $_POST
-function unsetPostRequestElement ($element) {
+function unsetPostRequestParameter ($element) {
        unset($GLOBALS['raw_request']['post'][$element]);
 }
 
@@ -189,7 +190,7 @@ function countRequestPost () {
 }
 
 // Setter for element in $_POST
-function setPostRequestElement ($element, $value) {
+function setPostRequestParameter ($element, $value) {
        // Is $element or $value an array?
        if (is_array($element)) {
                // Set array
@@ -225,7 +226,12 @@ function setPostRequestElement ($element, $value) {
 // Checks wether a form was sent. If so, the $_POST['ok'] element must be set
 function isFormSent () {
        // Simply wrap it!
-       return isPostRequestElementSet('ok');
+       return isPostRequestParameterSet('ok');
+}
+
+// Checks if 'content_type' is set
+function isContentTypeSet () {
+       return isset($GLOBALS['content_type']);
 }
 
 // Setter for content type