1 files changed, 89 insertions, 96 deletions

diff --git a/core/DataTable/Renderer/Json.php b/core/DataTable/Renderer/Json.php
index 87fb8035f6..286299acd6 100644
--- a/core/DataTable/Renderer/Json.php
+++ b/core/DataTable/Renderer/Json.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * Piwik - Open source web analytics
- * 
+ *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- * 
+ *
  * @category Piwik
  * @package Piwik
  */
@@ -12,109 +12,102 @@
 /**
  * JSON export.
  * Works with recursive DataTable (when a row can be associated with a subDataTable).
- * 
+ *
  * @package Piwik
  * @subpackage Piwik_DataTable
  */
 class Piwik_DataTable_Renderer_Json extends Piwik_DataTable_Renderer
 {
-	/**
-	 * Computes the dataTable output and returns the string/binary
-	 *
-	 * @return string
-	 */
-	public function render()
-	{
-		$this->renderHeader();
-		return $this->renderTable($this->table);
-	}
+    /**
+     * Computes the dataTable output and returns the string/binary
+     *
+     * @return string
+     */
+    public function render()
+    {
+        $this->renderHeader();
+        return $this->renderTable($this->table);
+    }
 
-	/**
-	 * Computes the exception output and returns the string/binary
-	 *
-	 * @return string
-	 */
-	function renderException()
-	{
-		$this->renderHeader();
-		
-		$exceptionMessage = $this->getExceptionMessage();
-		$exceptionMessage = str_replace(array("\r\n","\n"), "", $exceptionMessage);
-		$exceptionMessage = '{"result":"error", "message":"'.$exceptionMessage.'"}';
-		
-		return $this->jsonpWrap($exceptionMessage);
-	}
+    /**
+     * Computes the exception output and returns the string/binary
+     *
+     * @return string
+     */
+    function renderException()
+    {
+        $this->renderHeader();
 
-	/**
-	 * Computes the output for the given data table
-	 *
-	 * @param Piwik_DataTable  $table
-	 * @return string
-	 */
-	protected function renderTable($table)
-	{
-		if (is_array($table))
-		{
-			$array = $table;
-			if (self::shouldWrapArrayBeforeRendering($array, $wrapSingleValues = true))
-			{
-				$array = array($array);
-			}
-		}
-		else
-		{
-			$renderer = new Piwik_DataTable_Renderer_Php();
-			$renderer->setTable($table);
-			$renderer->setRenderSubTables($this->isRenderSubtables());
-			$renderer->setSerialize(false);
-			$renderer->setHideIdSubDatableFromResponse($this->hideIdSubDatatable);
-			$array = $renderer->flatRender();
-		}
-		
-		if(!is_array($array))
-		{
-			$array = array('value' => $array);
-		}
+        $exceptionMessage = $this->getExceptionMessage();
+        $exceptionMessage = str_replace(array("\r\n", "\n"), "", $exceptionMessage);
+        $exceptionMessage = '{"result":"error", "message":"' . $exceptionMessage . '"}';
 
-		// decode all entities
-		$callback = create_function('&$value,$key', 'if(is_string($value)){$value = html_entity_decode($value, ENT_QUOTES, "UTF-8");}');
-		array_walk_recursive($array, $callback);
-		
-		$str = Piwik_Common::json_encode($array);
-		
-		return $this->jsonpWrap($str);
-	}
+        return $this->jsonpWrap($exceptionMessage);
+    }
 
-	/**
-	 * @param $str
-	 * @return string
-	 */
-	protected function jsonpWrap($str)
-	{		
-		if(($jsonCallback = Piwik_Common::getRequestVar('callback', false)) === false)
-			$jsonCallback = Piwik_Common::getRequestVar('jsoncallback', false);
-		if($jsonCallback !== false) 
-		{
-			if(preg_match('/^[0-9a-zA-Z_]*$/D', $jsonCallback) > 0)
-			{
-				$str = $jsonCallback . "(" . $str . ")";
-			}
-		}
-		
-		return $str;
-	}
+    /**
+     * Computes the output for the given data table
+     *
+     * @param Piwik_DataTable $table
+     * @return string
+     */
+    protected function renderTable($table)
+    {
+        if (is_array($table)) {
+            $array = $table;
+            if (self::shouldWrapArrayBeforeRendering($array, $wrapSingleValues = true)) {
+                $array = array($array);
+            }
+        } else {
+            $renderer = new Piwik_DataTable_Renderer_Php();
+            $renderer->setTable($table);
+            $renderer->setRenderSubTables($this->isRenderSubtables());
+            $renderer->setSerialize(false);
+            $renderer->setHideIdSubDatableFromResponse($this->hideIdSubDatatable);
+            $array = $renderer->flatRender();
+        }
 
-	/**
-	 * Sends the http header for json file
-	 */
-	protected function renderHeader()
-	{
-		self::sendHeaderJSON();
-		Piwik::overrideCacheControlHeaders();
-	}
+        if (!is_array($array)) {
+            $array = array('value' => $array);
+        }
 
-	public static function sendHeaderJSON()
-	{
-		@header('Content-Type: application/json; charset=utf-8');
-	}
+        // decode all entities
+        $callback = create_function('&$value,$key', 'if(is_string($value)){$value = html_entity_decode($value, ENT_QUOTES, "UTF-8");}');
+        array_walk_recursive($array, $callback);
+
+        $str = Piwik_Common::json_encode($array);
+
+        return $this->jsonpWrap($str);
+    }
+
+    /**
+     * @param $str
+     * @return string
+     */
+    protected function jsonpWrap($str)
+    {
+        if (($jsonCallback = Piwik_Common::getRequestVar('callback', false)) === false)
+            $jsonCallback = Piwik_Common::getRequestVar('jsoncallback', false);
+        if ($jsonCallback !== false) {
+            if (preg_match('/^[0-9a-zA-Z_]*$/D', $jsonCallback) > 0) {
+                $str = $jsonCallback . "(" . $str . ")";
+            }
+        }
+
+        return $str;
+    }
+
+    /**
+     * Sends the http header for json file
+     */
+    protected function renderHeader()
+    {
+        self::sendHeaderJSON();
+        Piwik::overrideCacheControlHeaders();
+    }
+
+    public static function sendHeaderJSON()
+    {
+        @header('Content-Type: application/json; charset=utf-8');
+    }
 }