* added missing setIndexedTagName for some upload api array results

[lhc/web/wiklou.git] / includes / api / ApiFormatJson.php

diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php
index 3563de3..1d7e3dc 100644 (file)
--- a/includes/api/ApiFormatJson.php
+++ b/includes/api/ApiFormatJson.php
@@ -1,12 +1,11 @@
 <?php
 
-
 /*
  * Created on Sep 19, 2006
  *
  * API for MediaWiki 1.8+
  *
- * Copyright (C) 2006 Yuri Astrakhan <FirstnameLastname@gmail.com>
+ * Copyright (C) 2006 Yuri Astrakhan <Firstname><Lastname>@gmail.com
  *
  * 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
@@ -26,27 +25,83 @@
 
 if (!defined('MEDIAWIKI')) {
        // Eclipse helper - will be ignored in production
-       require_once ("ApiFormatBase.php");
+       require_once ('ApiFormatBase.php');
 }
 
+/**
+ * @ingroup API
+ */
 class ApiFormatJson extends ApiFormatBase {
 
+       private $mIsRaw;
+
        public function __construct($main, $format) {
                parent :: __construct($main, $format);
+               $this->mIsRaw = ($format === 'rawfm');
+       }
+
+       public function getMimeType() {
+               return 'text/javascript';
+       }
+
+       public function getNeedsRawData() {
+               return $this->mIsRaw;
+       }
+       
+       public function getWantsHelp() {
+               // Help is always ugly in JSON
+               return false;
+       }
+
+       public function execute() {
+               $prefix = $suffix = "";
+
+               $params = $this->extractRequestParams();
+               $callback = $params['callback'];
+               if(!is_null($callback)) {
+                       $prefix = preg_replace("/[^][.\\'\\\"_A-Za-z0-9]/", "", $callback ) . "(";
+                       $suffix = ")";
+               }
+
+               // Some versions of PHP have a broken json_encode, see PHP bug 
+               // 46944. Test encoding an affected character (U+20000) to 
+               // avoid this.
+               $this->printText( $prefix . $this->getJsonEncode($this->getResultData(),   $this->getIsHtml() )  . $suffix);            
+       }       
+       /*
+        * static to support static calls to json output (instead of json_encode function) 
+        * @param array $results  the results array to output as a json string
+        * @parm isHTML if the output is html
+        */     
+       public static function getJsonEncode($value, $isHtml=false){
+               if (!function_exists('json_encode') || $isHtml || strtolower(json_encode("\xf0\xa0\x80\x80")) != '\ud840\udc00') {
+                       $json = new Services_JSON();
+                       return $json->encode($value, $isHtml) ;
+               } else {
+                       return json_encode($value);
+               }
+       }
+
+       public function getAllowedParams() {
+               return array (
+                       'callback' => null
+               );
        }
 
-       public function GetMimeType() {
-               return 'application/json';
+       public function getParamDescription() {
+               return array (
+                       'callback' => 'If specified, wraps the output into a given function call. For safety, all user-specific data will be restricted.',
+               );
        }
 
-       public function Execute() {
-               require_once ('ApiFormatJson_json.php');
-               $json = new Services_JSON();
-               $this->PrintText($json->encode($this->GetResult()->GetData(), true));
+       public function getDescription() {
+               if ($this->mIsRaw)
+                       return 'Output data with the debuging elements in JSON format' . parent :: getDescription();
+               else
+                       return 'Output data in JSON format' . parent :: getDescription();
        }
 
-       protected function GetDescription() {
-               return 'Output data in JSON format';
+       public function getVersion() {
+               return __CLASS__ . ': $Id$';
        }
 }
-?>
\ No newline at end of file