More cleanups and small improvements (e.g. usage of wrappers).

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

diff --git a/inc/libs/security_functions.php b/inc/libs/security_functions.php
index 2c0ca74bff50a8fc224c7e5f7f0abc2d2328b21b..e2568b5c3c4261fa292e690566ae995e4d56d255 100644 (file)
--- a/inc/libs/security_functions.php
+++ b/inc/libs/security_functions.php
@@ -163,17 +163,17 @@ if (isPhpVersionEqualNewer('5.0')) {
 } // END - if
 
 // Check if important arrays are found and define them if missing
-if (!isset($_SERVER)) {
+if ((!isset($_SERVER)) || (!is_array($_SERVER))) {
        global $_SERVER;
        $_SERVER = $GLOBALS['_SERVER'];
 } // END - if
 
-if (!isset($_GET)) {
+if ((!isset($_GET)) || (!is_array($_GET))) {
        global $_GET;
        $_GET = $GLOBALS['_GET'];
 } // END - if
 
-if (!isset($_POST)) {
+if ((!isset($_POST)) || (!is_array($_POST))) {
        global $_POST;
        $_POST = $GLOBALS['_POST'];
 } // END - if
@@ -226,10 +226,10 @@ $GLOBALS['url_chars'] = array(
 if (is_array($_GET)) {
        foreach ($_GET as $seckey => $secvalue) {
                if (is_array($secvalue)) {
-                       // Throw arrays away...
+                       // Throw arrays away ...
                        unset($_GET[$seckey]);
                } else {
-                       // Only variables are allowed (non-array) but we secure them all!
+                       // Only variables are allowed (non-array) but we secure them all.
                        $_GET[$seckey] = str_replace($GLOBALS['security_chars']['from'], $GLOBALS['security_chars']['to'], $_GET[$seckey]);
 
                        // Strip all other out