Changeset 523 for trunk/lib/Utilities.inc.php

Timestamp:

May 24, 2015 3:01:42 PM (9 years ago)

Author:

anonymous

Message:

First set of changes towards 2.2.0. Improved functinoality with integration in wordpress; bugs fixed.

File:

• trunk/lib/Utilities.inc.php (modified) (6 diffs)

trunk/lib/Utilities.inc.php

@@ -609 +609 @@
 /**
  * Tests the existence of a file anywhere in the include path.
+ * Replaced by stream_resolve_include_path() in PHP 5 >= 5.3.2
  *
  * @param   string  $file   File in include path.
@@ -897 +898 @@
 {
     // Translate the human string date into SQL-safe date format.
-    if (empty($date) || mb_strpos($date, '0000-00-00') !== false || strtotime($date) === -1 || strtotime($date) === false) {
+    if (empty($date) || mb_strpos($date, '0000-00-00') !== false || strtotime($date) === -1 || strtotime($date) === false || strtotime($date) === null) {
         // Return a string of zero time, formatted the same as $format.
         return strtr($format, array(
@@ -920 +921 @@
  * @return mixed        $var, minus any magic quotes.
  */
-function dispelMagicQuotes($var)
+function dispelMagicQuotes($var, $always=false)
 {
     static $magic_quotes_gpc;
@@ -928 +929 @@
     }
 
-    if ($magic_quotes_gpc) {
+    if ($always || $magic_quotes_gpc) {
         if (!is_array($var)) {
             $var = stripslashes($var);
@@ -934 +935 @@
             foreach ($var as $key=>$val) {
                 if (is_array($val)) {
-                    $var[$key] = dispelMagicQuotes($val);
+                    $var[$key] = dispelMagicQuotes($val, $always);
                 } else {
                     $var[$key] = stripslashes($val);
@@ -956 +957 @@
 function getFormData($var=null, $default=null)
 {
+    $app =& App::getInstance();
+
     if ('POST' == getenv('REQUEST_METHOD') && is_null($var)) {
-        return dispelMagicQuotes($_POST);
+        return dispelMagicQuotes($_POST, $app->getParam('always_dispel_magicquotes'));
     } else if ('GET' == getenv('REQUEST_METHOD') && is_null($var)) {
-        return dispelMagicQuotes($_GET);
+        return dispelMagicQuotes($_GET, $app->getParam('always_dispel_magicquotes'));
     }
     if (isset($_POST[$var])) {
-        return dispelMagicQuotes($_POST[$var]);
+        return dispelMagicQuotes($_POST[$var], $app->getParam('always_dispel_magicquotes'));
     } else if (isset($_GET[$var])) {
-        return dispelMagicQuotes($_GET[$var]);
+        return dispelMagicQuotes($_GET[$var], $app->getParam('always_dispel_magicquotes'));
     } else {
         return $default;
     }
 }
+
 function getPost($var=null, $default=null)
 {
+    $app =& App::getInstance();
+
     if (is_null($var)) {
-        return dispelMagicQuotes($_POST);
+        return dispelMagicQuotes($_POST, $app->getParam('always_dispel_magicquotes'));
     }
     if (isset($_POST[$var])) {
-        return dispelMagicQuotes($_POST[$var]);
+        return dispelMagicQuotes($_POST[$var], $app->getParam('always_dispel_magicquotes'));
     } else {
         return $default;
     }
 }
+
 function getGet($var=null, $default=null)
 {
+    $app =& App::getInstance();
     if (is_null($var)) {
-        return dispelMagicQuotes($_GET);
+        return dispelMagicQuotes($_GET, $app->getParam('always_dispel_magicquotes'));
     }
     if (isset($_GET[$var])) {
-        return dispelMagicQuotes($_GET[$var]);
+        return dispelMagicQuotes($_GET[$var], $app->getParam('always_dispel_magicquotes'));
     } else {
         return $default;