move external api stuff to appframework

4 files changed, 2 insertions, 97 deletions

diff --git a/external/apiresult.php b/external/apiresult.php
deleted file mode 100644
index 64702b125..000000000
--- a/external/apiresult.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
-* ownCloud - News
-*
-* @author Alessandro Cosentino
-* @author Bernhard Posselt
-* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
-* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library 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 along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-namespace OCA\News\External;
-
-class APIResult {
-
-	const OK = 100;
-	const SERVER_ERROR = 996;
-	const UNAUTHORISED = 997;
-	const NOT_FOUND = 998;
-	const UNKNOWN_ERROR = 999;
-
-	private $data;
-	private $statusCode;
-
-	public function __construct($data, $statusCode=APIResult::OK) {
-		$this->data = $data;
-		$this->statusCode = $statusCode;
-	}
-
-
-	public function getData() {
-		return $this->data;
-	}
-
-
-	public function getStatusCode() {
-		return $this->statusCode;
-	}
-
-
-}
diff --git a/external/external.php b/external/external.php
deleted file mode 100644
index ea9657c90..000000000
--- a/external/external.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
-* ownCloud - News
-*
-* @author Alessandro Cosentino
-* @author Bernhard Posselt
-* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
-* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library 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 along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-namespace OCA\News\External;
-
-class External {
-
-
-	/**
-	 * Simple main function for API calls
-	 */
-	public static function main($controllerName, $methodName, $urlParams,
-	                            \Pimple $container) {
-		$container['urlParams'] = $urlParams;
-		$response = $container[$controllerName]->$methodName();
-		return new \OC_OCS_Result($response->getData(), $response->getStatusCode());
-	}
-
-
-}
\ No newline at end of file
diff --git a/external/feedapi.php b/external/feedapi.php
index 6b888b52d..0087886a2 100644
--- a/external/feedapi.php
+++ b/external/feedapi.php
@@ -26,6 +26,7 @@
 namespace OCA\News\External;
 
 use \OCA\AppFramework\Core\API;
+use \OCA\AppFramework\External\APIResult;
 use \OCA\AppFramework\Controller\Controller;
 use \OCA\AppFramework\Http\Request;
 
diff --git a/external/folderapi.php b/external/folderapi.php
index 629b1cff5..6b8aa9c47 100644
--- a/external/folderapi.php
+++ b/external/folderapi.php
@@ -26,6 +26,7 @@
 namespace OCA\News\External;
 
 use \OCA\AppFramework\Core\API;
+use \OCA\AppFramework\External\APIResult;
 use \OCA\AppFramework\Controller\Controller;
 use \OCA\AppFramework\Http\Request;