Changeset 607 for branches/1.3

Timestamp:

07/05/2009 08:03:56 AM (4 years ago)

Author:

moo

Message:

merged 418,r419,r424,r425,r429,r431 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• admin/common.php (modified) (1 diff)
• admin/edit.php (modified) (1 diff)
• coverager/common.php (modified) (1 diff)

branches/1.3/admin/common.php

@@ -75 +75 @@
 }
 
+function stripaddslashes_array($value, $mqs = false)
+{
+    if (is_array($value)) {
+        foreach($value as $k => $v) {
+            $value[$k] = stripaddslashes_array($v, $mqs);
+        }
+    }
+    else if(is_string($value)) {
+        $value = $mqs ? str_replace('\'\'', '\'', $value) : stripslashes($value);
+    }
+    return $value;
+}
+
 error_reporting(E_ALL);
 ini_set('display_errors', 'On');
 define('REQUEST_TIME', time());
+
+if (get_magic_quotes_gpc()) {
+    $mqs = (bool) ini_get('magic_quotes_sybase');
+    $_GET = stripaddslashes_array($_GET, $mqs);
+    $_POST = stripaddslashes_array($_POST, $mqs);
+    $_REQUEST = stripaddslashes_array($_REQUEST, $mqs);
+}
+ini_set('magic_quotes_runtime', '0');
 
 $charset = "UTF-8";

branches/1.3/admin/edit.php

@@ -12 +12 @@
 
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-    xcache_set($name, $_POST['value']);
+    eval('$value = ' . $_POST['value']);
+    xcache_set($name, $value);
     header("Location: xcache.php?type=" . XC_TYPE_VAR);
     exit;
 }
-$value = xcache_get($name);
+$value = var_export(xcache_get($name), true);
 
 $xcache_version = XCACHE_VERSION;

branches/1.3/coverager/common.php

@@ -75 +75 @@
 }
 
+function stripaddslashes_array($value, $mqs = false)
+{
+    if (is_array($value)) {
+        foreach($value as $k => $v) {
+            $value[$k] = stripaddslashes_array($v, $mqs);
+        }
+    }
+    else if(is_string($value)) {
+        $value = $mqs ? str_replace('\'\'', '\'', $value) : stripslashes($value);
+    }
+    return $value;
+}
+
 error_reporting(E_ALL);
 ini_set('display_errors', 'On');
 define('REQUEST_TIME', time());
+
+if (get_magic_quotes_gpc()) {
+    $mqs = (bool) ini_get('magic_quotes_sybase');
+    $_GET = stripaddslashes_array($_GET, $mqs);
+    $_POST = stripaddslashes_array($_POST, $mqs);
+    $_REQUEST = stripaddslashes_array($_REQUEST, $mqs);
+}
+ini_set('magic_quotes_runtime', '0');
 
 $charset = "UTF-8";