bug 1652 fixed: json_encode function is required for admin.php?fckb_t…

…ags=1 (used in the new tags widget) git-svn-id: http://piwigo.org/svn/trunk@6126 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · May 8, 2010 · eb0aec9 · eb0aec9
1 parent a34af69
commit eb0aec9
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 33 deletions.
diff --git a/include/common.inc.php b/include/common.inc.php
@@ -81,6 +81,7 @@ function sanitize_mysql_kv(&$v, $k)
   'array_intersect_key', //PHP 5 >= 5.1.0RC1
   'hash_hmac', //(hash) - enabled by default as of PHP 5.1.2
   'preg_last_error', // PHP 5 >= 5.2.0
+  'json_encode', // PHP 5 >= 5.2.0
   ) as $func)
 {
   if (!function_exists($func))

diff --git a/include/php_compat/json_encode.php b/include/php_compat/json_encode.php
@@ -0,0 +1,53 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2010 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+function json_encode($data) {
+  switch (gettype($data)) {
+    case 'boolean':
+      return ($data ? 'true' : 'false');
+    case 'null':
+    case 'NULL':
+      return 'null';
+    case 'integer':
+    case 'double':
+      return $data;
+    case 'string':
+      return '"'. str_replace(array("\\",'"',"/","\n","\r","\t"), array("\\\\",'\"',"\\/","\\n","\\r","\\t"), $data) .'"';
+    case 'object':
+    case 'array':
+      if ($data === array()) return '[]'; # empty array
+      if (range(0, count($data) - 1) !== array_keys($data) ) { # string keys, unordered, non-incremental keys, .. - whatever, make object
+        $out = "\n".'{';
+        foreach($data as $key => $value) {
+          $out .= json_encode((string) $key) . ':' . json_encode($value) . ',';
+        }
+        $out = substr($out, 0, -1) . "\n". '}';
+      }else{
+        # regular array
+        $out = "\n".'[' . join("\n".',', array_map('json_encode', $data)) ."\n".']';
+      }
+      return $out;
+  }
+}
+
+?>
diff --git a/include/ws_protocols/json_encoder.php b/include/ws_protocols/json_encoder.php
@@ -21,39 +21,6 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-
-#_____________________  PHP 5.2
-if (! function_exists('json_encode')) {
-  function json_encode($data) {
-    switch (gettype($data)) {
-      case 'boolean':
-        return ($data ? 'true' : 'false');
-      case 'null':
-      case 'NULL':
-        return 'null';
-      case 'integer':
-      case 'double':
-        return $data;
-      case 'string':
-        return '"'. str_replace(array("\\",'"',"/","\n","\r","\t"), array("\\\\",'\"',"\\/","\\n","\\r","\\t"), $data) .'"';
-      case 'object':
-      case 'array':
-        if ($data === array()) return '[]'; # empty array
-        if (range(0, count($data) - 1) !== array_keys($data) ) { # string keys, unordered, non-incremental keys, .. - whatever, make object
-          $out = "\n".'{';
-          foreach($data as $key => $value) {
-            $out .= json_encode((string) $key) . ':' . json_encode($value) . ',';
-          }
-          $out = substr($out, 0, -1) . "\n". '}';
-        }else{
-          # regular array
-          $out = "\n".'[' . join("\n".',', array_map('json_encode', $data)) ."\n".']';
-        }
-        return $out;
-    }
-  }
-}
-
 class PwgJsonEncoder extends PwgResponseEncoder
 {
   function encodeResponse($response)