DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #193 from owncloud/use_json_instad_of_raw

Browse Source 
use json instead of raw error msg output
This commit is contained in:
VicDeo 2014-02-05 00:03:52 -08:00
commit ccc5af2709
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ajax/otpoll.php
View File

@ -39,7 +39,7 @@ try{
} catch (\Exception $e){ } catch (\Exception $e){
Helper::warnLog('Error. Session no longer exists. ' . $e->getMessage()); Helper::warnLog('Error. Session no longer exists. ' . $e->getMessage());
$ex = new BadRequestException(); $ex = new BadRequestException();
$ex->setBody("{err:'bad request: [" . $request->getRawRequest() . "]'}"); $ex->setBody($request->getRawRequest());
throw $ex; throw $ex;
} }
if (!$file->isPublicShare()){ if (!$file->isPublicShare()){
@ -101,7 +101,7 @@ try{
break; break;
default: default:
$ex = new BadRequestException(); $ex = new BadRequestException();
$ex->setBody("{err:'bad request: [" . $request->getRawRequest() . "]'}"); $ex->setBody($request->getRawRequest());
throw $ex; throw $ex;
break; break;
} }
@ -109,8 +109,8 @@ try{
\OCP\JSON::success($response); \OCP\JSON::success($response);
} catch (BadRequestException $e){ } catch (BadRequestException $e){
header('HTTP/1.1 400: BAD REQUEST'); header('HTTP/1.1 400: BAD REQUEST');
print(""); \OCP\JSON::error( array(
print($e->getBody()); 'err' => 'bad request:[' . $e->getBody() . ']',
print(""); ));
} }
exit(); exit();