From 8c6da61f469274aaae7dbbbb1b9c123c49b95196 Mon Sep 17 00:00:00 2001
From: Neraste <neraste.herr10@gmail.com>
Date: Sat, 21 Oct 2017 12:53:53 +0200
Subject: [PATCH] Disable all new registred users

---
 controller/registercontroller.php              | 12 +++++++++++-
 service/mailservice.php                        |  4 ++--
 service/registrationservice.php                |  3 +++
 templates/email.newuser.disabled_html.php      |  2 ++
 templates/email.newuser.disabled_plaintext.php |  2 ++
 5 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 templates/email.newuser.disabled_html.php
 create mode 100644 templates/email.newuser.disabled_plaintext.php

diff --git a/controller/registercontroller.php b/controller/registercontroller.php
index 2112e3a..7c16c54 100644
--- a/controller/registercontroller.php
+++ b/controller/registercontroller.php
@@ -149,7 +149,17 @@ class RegisterController extends Controller {
 				], 'guest');
 		}
 
-		return $this->registrationService->loginUser($user->getUID(), $username, $password, false);
+		if ($user->isEnabled()) {
+			// log the user
+			return $this->registrationService->loginUser($user->getUID(), $username, $password, false);
+		} else {
+			// warn the user their account needs admin validation
+			return new TemplateResponse(
+				'registration',
+				'message',
+				array('msg' => "Your account has been successfully created, but it still needs approval from an administrator."),
+				'guest');
+		}
 	}
 
 	private function renderError($error, $hint="") {
diff --git a/service/mailservice.php b/service/mailservice.php
index 25448ac..47acb75 100644
--- a/service/mailservice.php
+++ b/service/mailservice.php
@@ -135,9 +135,9 @@ class MailService {
 			'user' => $username,
 			'sitename' => $this->defaults->getName()
 		];
-		$html_template = new TemplateResponse('registration', 'email.newuser_html', $template_var, 'blank');
+		$html_template = new TemplateResponse('registration', 'email.newuser.disabled_html', $template_var, 'blank');
 		$html_part = $html_template->render();
-		$plaintext_template = new TemplateResponse('registration', 'email.newuser_plaintext', $template_var, 'blank');
+		$plaintext_template = new TemplateResponse('registration', 'email.newuser.disabled_plaintext', $template_var, 'blank');
 		$plaintext_part = $plaintext_template->render();
 		$subject = $this->l10n->t('A new user "%s" has created an account on %s', [$username, $this->defaults->getName()]);
 
diff --git a/service/registrationservice.php b/service/registrationservice.php
index bf4c67f..37a004f 100644
--- a/service/registrationservice.php
+++ b/service/registrationservice.php
@@ -293,6 +293,9 @@ class RegistrationService {
 			}
 		}
 
+		// Disable user unconditionaly
+		$user->setEnabled(false);
+
 		// Delete pending registration if no client secret is stored
 		if($registration->getClientSecret() === null) {
 			$res = $this->registrationMapper->delete($registration);
diff --git a/templates/email.newuser.disabled_html.php b/templates/email.newuser.disabled_html.php
new file mode 100644
index 0000000..ef23ba2
--- /dev/null
+++ b/templates/email.newuser.disabled_html.php
@@ -0,0 +1,2 @@
+<?php
+echo $l->t('A new user "%s" has created an account on %s and awaits admin validation', [$_['user'], $_['sitename']]);
diff --git a/templates/email.newuser.disabled_plaintext.php b/templates/email.newuser.disabled_plaintext.php
new file mode 100644
index 0000000..ef23ba2
--- /dev/null
+++ b/templates/email.newuser.disabled_plaintext.php
@@ -0,0 +1,2 @@
+<?php
+echo $l->t('A new user "%s" has created an account on %s and awaits admin validation', [$_['user'], $_['sitename']]);