No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/kolab_admin_json_output.php b/lib/kolab_admin_json_output.php
	index 9bc2c04..8dc26f1 100644
	--- a/lib/kolab_admin_json_output.php
	+++ b/lib/kolab_admin_json_output.php
	@@ -1,45 +1,45 @@
	<?php

	/**
	* View class generating JSON output
	*/
	class kolab_admin_json_output
	{

	/**
	*
	*/
	public function success($data)
	{
	if (!is_array($data))
	$data = array();

	- $this->send(array('status' => 'OK') + $data);
	+ $this->send(array('status' => 'OK', 'result' => $data));
	}


	/**
	*
	*/
	public function error($errdata, $code = 400)
	{
	if (is_string($errdata))
	$errdata = array('reason' => $errdata);

	$this->send(array('status' => 'ERROR', 'code' => $code) + $errdata);
	}


	/**
	*
	*/
	public function send($data)
	{
	header("Content-Type: application/json");
	echo json_encode($data);
	exit;
	}

	}

	-?>
	\ No newline at end of file
	+?>