From 4031687e260e29bdb107fc03235486b9a4e6cebc Mon Sep 17 00:00:00 2001
From: Pellaeon Lin <nfsmwlin@gmail.com>
Date: Thu, 28 Aug 2014 15:03:40 +0000
Subject: [PATCH] Rename controller, no userID needed

---
 appinfo/application.php       | 11 ++++-----
 controller/pagecontroller.php | 45 +++++++++++++++++++----------------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/appinfo/application.php b/appinfo/application.php
index ca91e8f..eba3c94 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -14,7 +14,7 @@ namespace OCA\Registration\AppInfo;
 
 use \OCP\AppFramework\App;
 
-use \OCA\Registration\Controller\PageController;
+use \OCA\Registration\Controller\RegistrationController;
 
 
 class Application extends App {
@@ -28,11 +28,10 @@ class Application extends App {
 		/**
 		 * Controllers
 		 */
-		$container->registerService('PageController', function($c) {
-			return new PageController(
+		$container->registerService('RegistrationController', function($c) {
+			return new RegistrationController(
 				$c->query('AppName'), 
-				$c->query('Request'),
-				$c->query('UserId')
+				$c->query('Request')
 			);
 		});
 
@@ -47,4 +46,4 @@ class Application extends App {
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php
index 07906a7..7945342 100644
--- a/controller/pagecontroller.php
+++ b/controller/pagecontroller.php
@@ -16,33 +16,36 @@ use \OCP\IRequest;
 use \OCP\AppFramework\Http\TemplateResponse;
 use \OCP\AppFramework\Controller;
 
-class PageController extends Controller {
+class RegistrationController extends Controller {
 
-    private $userId;
-
-    public function __construct($appName, IRequest $request, $userId){
-        parent::__construct($appName, $request);
-        $this->userId = $userId;
-    }
+	public function __construct($appName, IRequest $request, $userId){
+		parent::__construct($appName, $request);
+		$this->userId = $userId;
+	}
 
 
-    /**
-     * @NoAdminRequired
+	/**
+	 * @NoAdminRequired
 	 * @PublicPage
-     */
-    public function index() {
-        $params = array('user' => $this->userId);
-        return new TemplateResponse('registration', 'main', $params);  // templates/main.php
-    }
+	 */
+	public function displayRegisterPage($errormsg, $entered) {
+		OC_Template::printGuestPage('core/registration', 'register',
+			array('errormsg' => $errormsg,
+			'entered' => $entered));
+	}
+	public function index() {
+		$params = array('user' => $this->userId);
+		return new TemplateResponse('registration', 'main', $params);  // templates/main.php
+	}
 
 
-    /**
-     * Simply method that posts back the payload of the request
-     * @NoAdminRequired
-     */
-    public function doEcho($echo) {
-        return array('echo' => $echo);
-    }
+	/**
+	 * Simply method that posts back the payload of the request
+	 * @NoAdminRequired
+	 */
+	public function doEcho($echo) {
+		return array('echo' => $echo);
+	}
 
 
 }