X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Frequest-functions.php;h=2903a4418cb18058398be0b80c6d069682403296;hb=a00ad7dd8c36a5322e28f38d8d641efb90c00c92;hp=e3296109b45ebdc0bf09d700e9f7ccf9bc434968;hpb=5b2fa7f464317185154a3550edb5786d52b2cbf9;p=mailer.git

diff --git a/inc/request-functions.php b/inc/request-functions.php
index e3296109b4..2903a4418c 100644
--- a/inc/request-functions.php
+++ b/inc/request-functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -57,7 +57,7 @@ function getRequestElement ($element) {
 		$value = $GLOBALS['cache_request']['get'][$element];
 	} elseif (isGetRequestElementSet($element)) {
 		// Then get it directly
-		$value = SQL_ESCAPE($GLOBALS['raw_request']['get'][$element]);
+		$value = sqlEscapeString($GLOBALS['raw_request']['get'][$element]);
 
 		// Store it in cache
 		$GLOBALS['cache_request']['get'][$element] = $value;
@@ -107,8 +107,8 @@ function countRequestGet () {
 // Setter for element in $_GET
 function setGetRequestElement ($element, $value) {
 	// Escape both
-	$element = SQL_ESCAPE($element);
-	$value   = SQL_ESCAPE($value);
+	$element = sqlEscapeString($element);
+	$value   = sqlEscapeString($value);
 
 	// Set in $_GET
 	$GLOBALS['raw_request']['get'][$element] = $value;
@@ -135,11 +135,11 @@ function postRequestElement ($element, $subElement = NULL) {
 		// Is $subElement set?
 		if ((!is_null($subElement)) && (isPostRequestElementSet($element, $subElement))) {
 			// Then use this
-			$value = SQL_ESCAPE($value[$subElement]);
+			$value = sqlEscapeString($value[$subElement]);
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',subElement=' . $subElement . ' - SUB!');
-		} elseif (!is_array($value)) {
+		} elseif ((!is_array($value)) && (function_exists('sqlEscapeString'))) {
 			// Escape it here
-			$value = SQL_ESCAPE($value);
+			$value = sqlEscapeString($value);
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ' - REGULAR!');
 		}
 
@@ -218,26 +218,26 @@ function setPostRequestElement ($element, $value) {
 		$eval .= implode("']['", $element);
 
 		// Finish eval() command
-		$eval .= sprintf("'] = \"%s\";", SQL_ESCAPE($value));
+		$eval .= sprintf("'] = \"%s\";", sqlEscapeString($value));
 
 		// And run it
 		eval($eval);
 	} elseif (is_array($value)) {
 		// Escape element
-		$element = SQL_ESCAPE($element);
+		$element = sqlEscapeString($element);
 
 		// Value is an array so set it directly
 		$GLOBALS['raw_request']['post'][$element] = $value;
 	} else {
 		// Debug message
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',value=' . $value . ' - BEFORE!');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',value=' . $value . ' - BEFORE!');
 
 		// Escape both
-		$element = SQL_ESCAPE($element);
-		$value   = SQL_ESCAPE($value);
+		$element = sqlEscapeString($element);
+		$value   = sqlEscapeString($value);
 
 		// Debug message
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',value=' . $value . ' - AFTER!');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'element=' . $element . ',value=' . $value . ' - AFTER!');
 
 		// Set regular entry
 		$GLOBALS['raw_request']['post'][$element] = $value;
@@ -273,7 +273,7 @@ function addAllGetRequestParameters () {
 	// Now add all parameters
 	foreach (getRequestArray() as $key => $value) {
 		// Add it secured
-		$return .= SQL_ESCAPE($key) . '=' . SQL_ESCAPE($value) . '&';
+		$return .= sqlEscapeString($key) . '=' . sqlEscapeString($value) . '&';
 	} // END - foreach
 
 	// Remove trailing &