mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reduce duplicate code

This commit is contained in:
Thomas Müller 2015-08-03 18:06:07 +02:00
parent bacf1603ff
commit 3358db320b
3 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/private/ocs.php
View File

@ -28,6 +28,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
* *
*/ */
use OCP\API;
/** /**
* Class to handle open collaboration services API requests * Class to handle open collaboration services API requests
@ -64,8 +65,7 @@ class OC_OCS {
} }
} }
if ($data === false) { if ($data === false) {
echo self::generateXml('', 'fail', 400, 'Bad request. Please provide a valid '.$key); throw new \OC\OCS\Exception(new OC_OCS_Result(null, 400, 'Bad request. Please provide a valid '.$key));
exit();
} else { } else {
// NOTE: Is the raw type necessary? It might be a little risky without sanitization // NOTE: Is the raw type necessary? It might be a little risky without sanitization
if ($type == 'raw') return $data; if ($type == 'raw') return $data;
@ -78,23 +78,12 @@ class OC_OCS {
} }
public static function notFound() { public static function notFound() {
if($_SERVER['REQUEST_METHOD'] == 'GET') { $format = OC_API::requestedFormat();
$method='get';
}elseif($_SERVER['REQUEST_METHOD'] == 'PUT') {
$method='put';
}elseif($_SERVER['REQUEST_METHOD'] == 'POST') {
$method='post';
}else{
echo('internal server error: method not supported');
exit();
}
$format = self::readData($method, 'format', 'text', '');
$txt='Invalid query, please check the syntax. API specifications are here:' $txt='Invalid query, please check the syntax. API specifications are here:'
.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n"; .' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
$txt.=OC_OCS::getDebugOutput(); $txt.=OC_OCS::getDebugOutput();
echo(OC_OCS::generateXml($format, 'failed', 999, $txt));
OC_API::respond(new OC_OCS_Result(null, API::RESPOND_UNKNOWN_ERROR, $txt), $format);
} }
/** /**

40
lib/private/ocs/exception.php Normal file
View File

@ -0,0 +1,40 @@
<?php
/**
* @author Bart Visscher <bartv@thisnet.nl>
* @author Björn Schießle <schiessle@owncloud.com>
* @author Christopher Schäpers <kondou@ts.unde.re>
* @author Lukas Reschke <lukas@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Robin McCorkell <rmccorkell@karoshi.org.uk>
* @author Tom Needham <tom@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OC\OCS;
class Exception extends \Exception {
public function __construct(\OC_OCS_Result $result) {
$this->result = $result;
}
public function getResult() {
return $this->result;
}
}

2
ocs/v1.php
View File

@ -56,5 +56,7 @@ try {
} catch (MethodNotAllowedException $e) { } catch (MethodNotAllowedException $e) {
OC_API::setContentType(); OC_API::setContentType();
OC_Response::setStatus(405); OC_Response::setStatus(405);
} catch (\OC\OCS\Exception $ex) {
OC_API::respond($ex->getResult(), OC_API::requestedFormat());
} }