From 1f14ba6aedb3b777f148372305331261938be3b6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Sun, 6 Oct 2013 23:16:40 +0200
Subject: [PATCH] move controller to OCP

---
 .../appframework/controller/controller.php    | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)
 rename lib/{private => public}/appframework/controller/controller.php (88%)

diff --git a/lib/private/appframework/controller/controller.php b/lib/public/appframework/controller/controller.php
similarity index 88%
rename from lib/private/appframework/controller/controller.php
rename to lib/public/appframework/controller/controller.php
index 0ea0a38cc09..a832f89df42 100644
--- a/lib/private/appframework/controller/controller.php
+++ b/lib/public/appframework/controller/controller.php
@@ -22,11 +22,13 @@
  */
 
 
-namespace OC\AppFramework\Controller;
+namespace OCP\AppFramework\Controller;
 
 use OC\AppFramework\Http\Request;
 use OC\AppFramework\Core\API;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\IAppContainer;
+use OCP\IRequest;
 
 
 /**
@@ -35,18 +37,21 @@ use OCP\AppFramework\Http\TemplateResponse;
 abstract class Controller {
 
 	/**
-	 * @var API instance of the api layer
+	 * @var \OCP\AppFramework\IAppContainer
 	 */
-	protected $api;
+	protected $app;
 
+	/**
+	 * @var \OCP\IRequest
+	 */
 	protected $request;
 
 	/**
-	 * @param API $api an api wrapper instance
-	 * @param Request $request an instance of the request
+	 * @param IAppContainer $app interface to the app
+	 * @param IRequest $request an instance of the request
 	 */
-	public function __construct(API $api, Request $request){
-		$this->api = $api;
+	public function __construct(IAppContainer $app, IRequest $request){
+		$this->app = $app;
 		$this->request = $request;
 	}
 
@@ -127,7 +132,7 @@ abstract class Controller {
 	 */
 	public function render($templateName, array $params=array(),
 							$renderAs='user', array $headers=array()){
-		$response = new TemplateResponse($this->api, $templateName);
+		$response = new TemplateResponse($this->app->getAppName(), $templateName);
 		$response->setParams($params);
 		$response->renderAs($renderAs);
 
-- 
2.39.5