extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 15:18:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
Ralf Becker 2010-06-16 06:44:19 +00:00
parent 88ebb437c2
commit 557ef43872
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
phpgwapi/inc/class.egw_json.inc.php
View File

@ -4,7 +4,7 @@
* *
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package api$request['menuaction'], $parameters * @package api
* @subpackage ajax * @subpackage ajax
* @author Andreas Stoeckel <as@stylite.de> * @author Andreas Stoeckel <as@stylite.de>
* @version $Id$ * @version $Id$
@ -21,7 +21,6 @@ class egw_json_request
* *
* @param string menuaction to call * @param string menuaction to call
* @param string $input_data is the RAW input data as it was received from the client * @param string $input_data is the RAW input data as it was received from the client
* @returns NULL if parsing the request failed, or the result of the callback function if the request has been successfully decoded.
*/ */
public function parseRequest($menuaction, $input_data) public function parseRequest($menuaction, $input_data)
{ {
@ -48,15 +47,14 @@ class egw_json_request
//Check whether any parameters were supplied along with the request //Check whether any parameters were supplied along with the request
if (isset($request['parameters'])) if (isset($request['parameters']))
{
$parameters = $request['parameters']; $parameters = $request['parameters'];
/*$parameters = array_stripslashes($request['parameters']);*/ }
} }
//Call the supplied callback function along with the menuaction and the passed parameters //Call the supplied callback function along with the menuaction and the passed parameters
$this->handleRequest($menuaction, $parameters); $this->handleRequest($menuaction, $parameters);
} }
} }
return NULL;
} }
/** /**
@ -126,10 +124,6 @@ class egw_json_request
$parameters = translation::convert($parameters, 'utf-8'); $parameters = translation::convert($parameters, 'utf-8');
// error_log(print_r($parameters, true));
// _debug_array($parameters);
call_user_func_array(array($ajaxClass, $functionName), $parameters); call_user_func_array(array($ajaxClass, $functionName), $parameters);
} }
} }
@ -191,7 +185,8 @@ class egw_json_response
public function sendResult() public function sendResult()
{ {
$this->sendHeader(); $this->sendHeader();
echo($this->getJSON());
echo $this->getJSON();
} }
/** /**