From 04c7bb5b3d5af9ffd5ed349e5f53c14b658147f7 Mon Sep 17 00:00:00 2001
From: Pellaeon Lin <nfsmwlin@gmail.com>
Date: Sat, 31 Jan 2015 00:33:46 +0800
Subject: [PATCH] Set registered after account creation

---
 controller/registercontroller.php | 10 ++++++++++
 db/pendingregist.php              |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/controller/registercontroller.php b/controller/registercontroller.php
index a455fd6..d82087a 100644
--- a/controller/registercontroller.php
+++ b/controller/registercontroller.php
@@ -78,6 +78,7 @@ class RegisterController extends Controller {
 		// FEATURE: allow only from specific email domain
 
 		$token = $this->pendingreg->save($email);
+		//TODO: check for error
 		$link = $this->urlgenerator->linkToRoute('registration.register.verifyToken', array('token' => $token));
 		$link = $this->urlgenerator->getAbsoluteURL($link);
 		$from = Util::getDefaultEmailAddress('register');
@@ -146,6 +147,15 @@ class RegisterController extends Controller {
 					))
 				), 'error');
 			}
+			$res = $this->pendingreg->setRegistered($token);
+			if ( \OCP\DB::isError($res) ) {
+				return new TemplateResponse('', 'error', array(
+					'errors' => array(array(
+						'error' => $this->l10n->t('Invalid verification URL. No registration request with this verification URL is found.'),
+						'hint' => ''
+					))
+				), 'error');
+
 			return new TemplateResponse('registration', 'message', array('msg' =>
 				str_replace('{link}',
 					$this->urlgenerator->getAbsoluteURL('/'),
diff --git a/db/pendingregist.php b/db/pendingregist.php
index a484d5e..814566e 100644
--- a/db/pendingregist.php
+++ b/db/pendingregist.php
@@ -30,4 +30,9 @@ class PendingRegist {
 		return $query->execute(array($token))->fetchOne();
 	}
 
+	public function setRegistered($token) {
+		$query = $this->db->prepareQuery('UPDATE SET `registered`=true FROM `*PREFIX*registration` WHERE `token` = ? ');
+		return $query->execute(array($token));
+	}
+
 }