From 21bd539847f33c3889c4f58f14afd672f54a410a Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 9 Apr 2014 01:44:12 +0200 Subject: ported to owncloud internal appframework classes, confused with how to start the app and define deps --- controller/exportcontroller.php | 18 +++++++++++------- controller/feedcontroller.php | 16 +++++++++------- controller/foldercontroller.php | 16 +++++++++------- controller/itemcontroller.php | 16 +++++++++------- controller/pagecontroller.php | 10 +++++----- controller/usersettingscontroller.php | 15 +++++++++------ 6 files changed, 52 insertions(+), 39 deletions(-) (limited to 'controller') diff --git a/controller/exportcontroller.php b/controller/exportcontroller.php index 357c54d54..e16a5b513 100644 --- a/controller/exportcontroller.php +++ b/controller/exportcontroller.php @@ -25,12 +25,14 @@ namespace OCA\News\Controller; -use \OCA\AppFramework\Controller\Controller; -use \OCA\AppFramework\Core\API; -use \OCA\AppFramework\Http\Request; -use \OCA\AppFramework\Http\TextDownloadResponse; -use \OCA\AppFramework\Http\JSONResponse; +use \OCP\IRequest; +use \OCP\AppFramework\Controller; +use \OCP\AppFramework\Http; +use \OCP\AppFramework\Http\JSONResponse; +use \OCP\AppFramework\Http\Response; +use \OCA\News\Http\TextDownloadResponse; +use \OCA\News\Core\API; use \OCA\News\BusinessLayer\FeedBusinessLayer; use \OCA\News\BusinessLayer\FolderBusinessLayer; use \OCA\News\BusinessLayer\ItemBusinessLayer; @@ -42,17 +44,19 @@ class ExportController extends Controller { private $folderBusinessLayer; private $feedBusinessLayer; private $itemBusinessLayer; + private $api; - public function __construct(API $api, Request $request, + public function __construct(API $api, IRequest $request, FeedBusinessLayer $feedBusinessLayer, FolderBusinessLayer $folderBusinessLayer, ItemBusinessLayer $itemBusinessLayer, OPMLExporter $opmlExporter){ - parent::__construct($api, $request); + parent::__construct($api->getAppName(), $request); $this->feedBusinessLayer = $feedBusinessLayer; $this->folderBusinessLayer = $folderBusinessLayer; $this->opmlExporter = $opmlExporter; $this->itemBusinessLayer = $itemBusinessLayer; + $this->api = $api; } diff --git a/controller/feedcontroller.php b/controller/feedcontroller.php index b0b856b79..29f60b8ea 100644 --- a/controller/feedcontroller.php +++ b/controller/feedcontroller.php @@ -25,12 +25,12 @@ namespace OCA\News\Controller; -use \OCA\AppFramework\Controller\Controller; -use \OCA\AppFramework\Core\API; -use \OCA\AppFramework\Http\Request; -use \OCA\AppFramework\Http\JSONResponse; -use \OCA\AppFramework\Http\Http; +use \OCP\IRequest; +use \OCP\AppFramework\Controller; +use \OCP\AppFramework\Http; +use \OCP\AppFramework\Http\JSONResponse; +use \OCA\News\Core\API; use \OCA\News\BusinessLayer\ItemBusinessLayer; use \OCA\News\BusinessLayer\FeedBusinessLayer; use \OCA\News\BusinessLayer\FolderBusinessLayer; @@ -44,15 +44,17 @@ class FeedController extends Controller { private $feedBusinessLayer; private $folderBusinessLayer; private $itemBusinessLayer; + private $api; - public function __construct(API $api, Request $request, + public function __construct(API $api, IRequest $request, FolderBusinessLayer $folderBusinessLayer, FeedBusinessLayer $feedBusinessLayer, ItemBusinessLayer $itemBusinessLayer){ - parent::__construct($api, $request); + parent::__construct($api->getAppName(), $request); $this->feedBusinessLayer = $feedBusinessLayer; $this->folderBusinessLayer = $folderBusinessLayer; $this->itemBusinessLayer = $itemBusinessLayer; + $this->api = $api; } diff --git a/controller/foldercontroller.php b/controller/foldercontroller.php index 09d226920..4a133c6b2 100644 --- a/controller/foldercontroller.php +++ b/controller/foldercontroller.php @@ -25,12 +25,12 @@ namespace OCA\News\Controller; -use \OCA\AppFramework\Controller\Controller; -use \OCA\AppFramework\Core\API; -use \OCA\AppFramework\Http\Request; -use \OCA\AppFramework\Http\JSONResponse; -use \OCA\AppFramework\Http\Http; +use \OCP\IRequest; +use \OCP\AppFramework\Controller; +use \OCP\AppFramework\Http; +use \OCP\AppFramework\Http\JSONResponse; +use \OCA\News\Core\API; use \OCA\News\BusinessLayer\FolderBusinessLayer; use \OCA\News\BusinessLayer\FeedBusinessLayer; use \OCA\News\BusinessLayer\ItemBusinessLayer; @@ -43,15 +43,17 @@ class FolderController extends Controller { private $folderBusinessLayer; private $feedBusinessLayer; private $itemBusinessLayer; + private $api; - public function __construct(API $api, Request $request, + public function __construct(API $api, IRequest $request, FolderBusinessLayer $folderBusinessLayer, FeedBusinessLayer $feedBusinessLayer, ItemBusinessLayer $itemBusinessLayer){ - parent::__construct($api, $request); + parent::__construct($api->getAppName(), $request); $this->folderBusinessLayer = $folderBusinessLayer; $this->feedBusinessLayer = $feedBusinessLayer; $this->itemBusinessLayer = $itemBusinessLayer; + $this->api = $api; } diff --git a/controller/itemcontroller.php b/controller/itemcontroller.php index 637c5fd49..a813d92ca 100644 --- a/controller/itemcontroller.php +++ b/controller/itemcontroller.php @@ -25,12 +25,12 @@ namespace OCA\News\Controller; -use \OCA\AppFramework\Controller\Controller; -use \OCA\AppFramework\Core\API; -use \OCA\AppFramework\Http\Request; -use \OCA\AppFramework\Http\JSONResponse; -use \OCA\AppFramework\Http\Http; +use \OCP\IRequest; +use \OCP\AppFramework\Controller; +use \OCP\AppFramework\Http; +use \OCP\AppFramework\Http\JSONResponse; +use \OCA\News\Core\API; use \OCA\News\BusinessLayer\BusinessLayerException; use \OCA\News\BusinessLayer\ItemBusinessLayer; use \OCA\News\BusinessLayer\FeedBusinessLayer; @@ -40,13 +40,15 @@ class ItemController extends Controller { private $itemBusinessLayer; private $feedBusinessLayer; + private $api; - public function __construct(API $api, Request $request, + public function __construct(API $api, IRequest $request, FeedBusinessLayer $feedBusinessLayer, ItemBusinessLayer $itemBusinessLayer){ - parent::__construct($api, $request); + parent::__construct($api->getAppName(), $request); $this->itemBusinessLayer = $itemBusinessLayer; $this->feedBusinessLayer = $feedBusinessLayer; + $this->api = $api; } diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php index 6f82e0640..f0d6b78e3 100644 --- a/controller/pagecontroller.php +++ b/controller/pagecontroller.php @@ -25,16 +25,16 @@ namespace OCA\News\Controller; -use \OCA\AppFramework\Controller\Controller; -use \OCA\AppFramework\Core\API; -use \OCA\AppFramework\Http\Request; +use \OCP\IRequest; +use \OCP\AppFramework\Controller; +use \OCA\News\Core\API; class PageController extends Controller { - public function __construct(API $api, Request $request){ - parent::__construct($api, $request); + public function __construct(API $api, IRequest $request){ + parent::__construct($api->getAppName(), $request); } diff --git a/controller/usersettingscontroller.php b/controller/usersettingscontroller.php index a34d5397e..11799aca1 100644 --- a/controller/usersettingscontroller.php +++ b/controller/usersettingscontroller.php @@ -25,16 +25,19 @@ namespace OCA\News\Controller; -use \OCA\AppFramework\Controller\Controller; -use \OCA\AppFramework\Core\API; -use \OCA\AppFramework\Http\Request; -use \OCA\AppFramework\Http\JSONResponse; +use \OCP\IRequest; +use \OCP\AppFramework\Controller; +use \OCP\AppFramework\Http\JSONResponse; + +use \OCA\News\Core\API; class UserSettingsController extends Controller { + private $api; - public function __construct(API $api, Request $request){ - parent::__construct($api, $request); + public function __construct(API $api, IRequest $request){ + parent::__construct($api->getAppName(), $request); + $this->api = $api; } -- cgit v1.2.3