r4347 dos2unix(): move to interface-lib.php

escapeString(): idem
transformRequestData(): new function to house the code previously in init.php

diff --git a/wwwroot/inc/database.php b/wwwroot/inc/database.php
index 36cf4f2462cad1c2c1cb1180e6a8c91c80594d85..8216450be0df211c8c0c0e5dbd1f72fc7eec80e6 100644 (file)
--- a/wwwroot/inc/database.php
+++ b/wwwroot/inc/database.php
@@ -183,17 +183,6 @@ $port_role_options = array
 
 $object_attribute_cache = array();
 
-function escapeString ($value, $do_db_escape = FALSE)
-{
-       $ret = htmlspecialchars ($value, ENT_QUOTES, 'UTF-8');
-       if ($do_db_escape)
-       {
-               global $dbxlink;
-               $ret = substr ($dbxlink->quote ($ret), 1, -1);
-       }
-       return $ret;
-}
-
 // Return detailed information about one rack row.
 function getRackRowInfo ($rackrow_id)
 {

diff --git a/wwwroot/inc/functions.php b/wwwroot/inc/functions.php
index eb554aab5b78660ae244a2db9fbb656937383b31..d884a89d3177deb17acb188962a14782723bcbd2 100644 (file)
--- a/wwwroot/inc/functions.php
+++ b/wwwroot/inc/functions.php
@@ -2471,11 +2471,6 @@ function cookOptgroups ($recordList, $object_type_id = 0, $existing_value = 0)
        return $ret;
 }
 
-function dos2unix ($text)
-{
-       return str_replace ("\r\n", "\n", $text);
-}
-
 function unix2dos ($text)
 {
        return str_replace ("\n", "\r\n", $text);

diff --git a/wwwroot/inc/init.php b/wwwroot/inc/init.php
index 7060718a441c33e96065411f846dd7ebe8239c5d..44256a9f649b8c45a09cc7532c8386e839ac78fa 100644 (file)
--- a/wwwroot/inc/init.php
+++ b/wwwroot/inc/init.php
@@ -71,28 +71,7 @@ $tmp = ob_get_clean();
 if ($tmp != '' and ! preg_match ("/^\n+$/D", $tmp))
        echo $tmp;
 connectDB();
-
-// Magic quotes feature is deprecated, but just in case the local system
-// still has it activated, reverse its effect.
-if (function_exists ('get_magic_quotes_gpc') and get_magic_quotes_gpc())
-       foreach ($_REQUEST as $key => $value)
-               if (gettype ($value) == 'string')
-                       $_REQUEST[$key] = stripslashes ($value);
-
-// Escape any globals before we ever try to use them, but keep a copy of originals.
-$sic = array();
-foreach ($_REQUEST as $key => $value)
-{
-       $sic[$key] = dos2unix ($value);
-       if (gettype ($value) == 'string')
-               $_REQUEST[$key] = escapeString (dos2unix ($value));
-}
-
-if (isset ($_SERVER['PHP_AUTH_USER']))
-       $_SERVER['PHP_AUTH_USER'] = escapeString ($_SERVER['PHP_AUTH_USER']);
-if (isset ($_SERVER['REMOTE_USER']))
-       $_SERVER['REMOTE_USER'] = escapeString ($_SERVER['REMOTE_USER']);
-
+transformRequestData();
 loadConfigDefaults();
 $tab['reports']['local'] = getConfigVar ('enterprise');
 

diff --git a/wwwroot/inc/interface-lib.php b/wwwroot/inc/interface-lib.php
index 1bb8022e9af9254b33678096873fd925edcee62e..065f5d1eb22bea6faa955dbc4cfe21de9e262671 100644 (file)
--- a/wwwroot/inc/interface-lib.php
+++ b/wwwroot/inc/interface-lib.php
@@ -391,4 +391,44 @@ function renderAccessDenied ($and_exit = TRUE)
                exit;
 }
 
+function dos2unix ($text)
+{
+       return str_replace ("\r\n", "\n", $text);
+}
+
+function escapeString ($value, $do_db_escape = FALSE)
+{
+       $ret = htmlspecialchars ($value, ENT_QUOTES, 'UTF-8');
+       if ($do_db_escape)
+       {
+               global $dbxlink;
+               $ret = substr ($dbxlink->quote ($ret), 1, -1);
+       }
+       return $ret;
+}
+
+function transformRequestData()
+{
+       global $sic;
+       // Magic quotes feature is deprecated, but just in case the local system
+       // still has it activated, reverse its effect.
+       if (function_exists ('get_magic_quotes_gpc') and get_magic_quotes_gpc())
+               foreach ($_REQUEST as $key => $value)
+                       if (gettype ($value) == 'string')
+                               $_REQUEST[$key] = stripslashes ($value);
+       // Escape any globals before we ever try to use them, but keep a copy of originals.
+       $sic = array();
+       foreach ($_REQUEST as $key => $value)
+       {
+               $sic[$key] = dos2unix ($value);
+               if (gettype ($value) == 'string')
+                       $_REQUEST[$key] = escapeString (dos2unix ($value));
+       }
+
+       if (isset ($_SERVER['PHP_AUTH_USER']))
+               $_SERVER['PHP_AUTH_USER'] = escapeString ($_SERVER['PHP_AUTH_USER']);
+       if (isset ($_SERVER['REMOTE_USER']))
+               $_SERVER['REMOTE_USER'] = escapeString ($_SERVER['REMOTE_USER']);
+}
+
 ?>