More globals rewritten, see #100

[mailer.git] / inc / libs / security_functions.php

diff --git a/inc/libs/security_functions.php b/inc/libs/security_functions.php
index 1f08065de4695decd07ae7f2413e15ded8c5bbf0..536fa68aa8f25b6886581f1ae7dd1eee8b3b4d10 100644 (file)
--- a/inc/libs/security_functions.php
+++ b/inc/libs/security_functions.php
@@ -83,8 +83,7 @@ if (!isset($_POST)) {
 //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.
@@ -112,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
@@ -127,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
@@ -143,9 +142,9 @@ 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