X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fsecurity_functions.php;h=536fa68aa8f25b6886581f1ae7dd1eee8b3b4d10;hb=d016e24dd4686f613a17733b96bc28fac936a4ac;hp=363bca731cd0feae1a4f11ed7a076d092c890b41;hpb=9ebbb5d10817b978a59bdb009b3f41b40fdb3c6c;p=mailer.git

diff --git a/inc/libs/security_functions.php b/inc/libs/security_functions.php
index 363bca731c..536fa68aa8 100644
--- a/inc/libs/security_functions.php
+++ b/inc/libs/security_functions.php
@@ -41,10 +41,17 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
  * Function to secure input strings
  *
  * @param	$str	The unsecured string
+ * @param	$strip	Strip tags
  * @return	$str	A (hopefully) secured string against XSS and other bad things
  */
-function secureString ($str) {
-	$str = trim(strip_tags($str));
+function secureString ($str, $strip=true) {
+	// Shall we strip HTML code?
+	if ($strip) $str = strip_tags($str);
+
+	// Trim string
+	$str = trim($str);
+
+	// Encode in entities
 	$str = htmlentities($str, ENT_QUOTES);
 	return $str;
 }
@@ -52,10 +59,6 @@ function secureString ($str) {
 // Run only once this security check/exchange
 if (defined('__SECURITY')) return;
 
-// Fatal messages goes here
-global $FATAL;
-$FATAL = array();
-
 // Runtime/GPC quoting is off now...
 @set_magic_quotes_runtime(false);
 @ini_set('magic_quotes_gpc', false); // This may not work on some systems
@@ -76,17 +79,11 @@ if (!isset($_POST)) {
 	$_POST = $GLOBALS['_POST'];
 }
 
-if (!isset($_COOKIE)) {
-	global $_COOKIE;
-	$_COOKIE = $GLOBALS['_COOKIE'];
-}
-
 // Include IP-Filter here
 //require("/usr/share/php/ipfilter.php");
 
 // Generate arrays which holds the relevante chars to replace
-global $SEC_CHARS, $URL_CHARS;
-$SEC_CHARS = array(
+$GLOBALS['security_chars'] = array(
 	// The chars we are looking for...
 	'from' => array("{", "}", "/", ".", "'", "$", "(", ")", '{--', '--}', "%", ";", "[", "]", ":", "--"),
 	// ... and we will replace to.
@@ -95,7 +92,7 @@ $SEC_CHARS = array(
 		"{CLOSE_ANCHOR2}",
 		"{SLASH}",
 		"{DOT}",
-		'{QUOT}',
+		"{QUOT}",
 		"{DOLLAR}",
 		"{OPEN_ANCHOR}",
 		"{CLOSE_ANCHOR}",
@@ -114,7 +111,7 @@ $SEC_CHARS = array(
 //
 // Note: Do not replace 'to' with 'from' and vise-versa! When you do this all booked URLs will be
 //       rejected because of the {SLASH}, {DOT} and all below listed items inside the URL.
-$URL_CHARS = array(
+$GLOBALS['url_chars'] = array(
 	// Search for these secured characters
 	'to'   => array("{SLASH}", "{DOT}", "{PER}", "{DBL_DOT}", "{COMMENT}"),
 	// Replace with these characters
@@ -129,9 +126,9 @@ if (is_array($_GET)) {
 			unset($_GET[$seckey]);
 		} else {
 			// Only variables are allowed (non-array) but we secure them all!
-			foreach ($SEC_CHARS['from'] as $key => $char) {
+			foreach ($GLOBALS['security_chars']['from'] as $key => $char) {
 				// Pass all through
-				$_GET[$seckey] = str_replace($char  , $SEC_CHARS['to'][$key], $_GET[$seckey]);
+				$_GET[$seckey] = str_replace($char  , $GLOBALS['security_chars']['to'][$key], $_GET[$seckey]);
 			}
 
 			// Strip all other out
@@ -145,32 +142,15 @@ if (basename($_SERVER['PHP_SELF']) != "install.php") {
 	foreach ($_POST as $seckey => $secvalue) {
 		if (!is_array($secvalue)) {
 			// Only variables are allowed (non-array) to be secured...
-			foreach ($SEC_CHARS['from'] as $key => $char) {
+			foreach ($GLOBALS['security_chars']['from'] as $key => $char) {
 				// Pass all through
-				$_POST[$seckey] = str_replace($char  , $SEC_CHARS['to'][$key], $_POST[$seckey]);
+				$_POST[$seckey] = str_replace($char  , $GLOBALS['security_chars']['to'][$key], $_POST[$seckey]);
 			}
 
 			// Strip all other out
 			$_POST[$seckey] = strip_tags($_POST[$seckey]);
 		}
 	}
-
-	// ... and finally cookies
-	foreach ($_COOKIE as $seckey => $secvalue) {
-		if (is_array($secvalue)) {
-			// Throw arrays away...
-			unset($_COOKIE[$seckey]);
-		} else {
-			// Only variables are allowed (non-array) but we secure them all!
-			foreach ($SEC_CHARS['from'] as $key => $char) {
-				// Pass all through
-				$_COOKIE[$seckey] = str_replace($char  , $SEC_CHARS['to'][$key], $_COOKIE[$seckey]);
-			}
-
-			// Strip all other out
-			$_COOKIE[$seckey] = strip_tags($_COOKIE[$seckey]);
-		}
-	}
 }
 
 // Activate caching or transparent compressing when it is not already done