X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Frequest-functions.php;h=d7817ba0c921108d059409c33ac75941c3a28cd2;hb=8202991f32bfb2056e94a11746c0b5308fe4a273;hp=32eb4eea6c5f58f9a454c53ade7d477f2cd3077c;hpb=1a906c15d14b40fcf983dc82ed40455ead19589d;p=mailer.git
diff --git a/inc/request-functions.php b/inc/request-functions.php
index 32eb4eea6c..d7817ba0c9 100644
--- a/inc/request-functions.php
+++ b/inc/request-functions.php
@@ -14,11 +14,10 @@
* $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 *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -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 getRequestParameter ($element) {
+function getRequestElement ($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];
- } elseif (isGetRequestParameterSet($element)) {
+ $value = $GLOBALS['cache_request']['get'][$element];
+ } elseif (isGetRequestElementSet($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,16 +68,16 @@ function getRequestParameter ($element) {
}
// Checks if an element in $_GET exists
-function isGetRequestParameterSet ($element, $subElement = '') {
+function isGetRequestElementSet ($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] . '') != ''));
}
}
// Removes an element from $_GET
-function unsetGetRequestParameter ($element) {
+function unsetGetRequestElement ($element) {
unset($GLOBALS['raw_request']['get'][$element]);
}
@@ -105,7 +104,7 @@ function countRequestGet () {
}
// Setter for element in $_GET
-function setGetRequestParameter ($element, $value) {
+function setGetRequestElement ($element, $value) {
// Escape both
$element = SQL_ESCAPE($element);
$value = SQL_ESCAPE($value);
@@ -114,33 +113,38 @@ 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) {
+function postRequestElement ($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];
- } elseif (isPostRequestParameterSet($element)) {
+ $value = $GLOBALS['cache_request']['post'][$element][$subElement];
+ //* DEBUG: */ print $element.'/'.$subElement.'='.$value.'
';
+ } elseif (isPostRequestElementSet($element)) {
// Then use it
$value = $GLOBALS['raw_request']['post'][$element];
// Is $subElement set?
- if ((!is_null($subElement)) && (isPostRequestParameterSet($element, $subElement))) {
+ if ((!is_null($subElement)) && (isPostRequestElementSet($element, $subElement))) {
// Then use this
$value = SQL_ESCAPE($value[$subElement]);
+ //* DEBUG: */ print 'sub!
';
} elseif (!is_array($value)) {
// Escape it here
$value = SQL_ESCAPE($value);
+ //* DEBUG: */ print 'no-array!
';
}
// Set it in cache
- $GLOBALS['cache_request']['request_post'][$element][$subElement] = $value;
+ //* DEBUG: */ print $element.'/'.$subElement.'='.$value.'
';
+ //* DEBUG: */ print('
'.print_r($_POST,true).''); + $GLOBALS['cache_request']['post'][$element][$subElement] = $value; } // END - if // Return value @@ -148,16 +152,16 @@ function postRequestParameter ($element, $subElement=null) { } // Checks if an element in $_POST exists -function isPostRequestParameterSet ($element, $subElement=null) { +function isPostRequestElementSet ($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] . '') != '')); } } // Removes an element from $_POST -function unsetPostRequestParameter ($element) { +function unsetPostRequestElement ($element) { unset($GLOBALS['raw_request']['post'][$element]); } @@ -189,7 +193,7 @@ function countRequestPost () { } // Setter for element in $_POST -function setPostRequestParameter ($element, $value) { +function setPostRequestElement ($element, $value) { // Is $element or $value an array? if (is_array($element)) { // Set array @@ -219,13 +223,13 @@ 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 -function isFormSent () { +function isFormSent ($requestParameter = 'ok') { // Simply wrap it! - return isPostRequestParameterSet('ok'); + return isPostRequestElementSet($requestParameter); } // Checks if 'content_type' is set @@ -248,5 +252,23 @@ function getRequestUri () { return $_SERVER['REQUEST_URI']; } +// Add all GET parameters to a string (without leading sign) +function addAllGetRequestParameters () { + // Init variable + $return = ''; + + // Now add all parameters + foreach (getRequestArray() as $key => $value) { + // Add it secured + $return .= SQL_ESCAPE($key) . '=' . SQL_ESCAPE($value) . '&'; + } // END - foreach + + // Remove trailing & + $return = substr($return, 0, -5); + + // Return it + return $return; +} + // [EOF] ?>