From c512dca087b932692815cb5524401fbd262b2818 Mon Sep 17 00:00:00 2001
From: oliver <coderkun@users.noreply.github.com>
Date: Wed, 8 Apr 2015 12:34:13 +0200
Subject: [PATCH] add configuration value to restrict registration to an e?mail
 address (implements #4)

---
 configs/AppConfig.inc                       |   9 +++--
 controllers/UsersController.inc             |   7 ++++
 locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 25124 -> 25233 bytes
 locale/de_DE/LC_MESSAGES/The Legend of Z.po |  39 +++++++++++---------
 views/html/users/register.tpl               |   4 +-
 5 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/configs/AppConfig.inc b/configs/AppConfig.inc
index aa637e03..484932c4 100644
--- a/configs/AppConfig.inc
+++ b/configs/AppConfig.inc
@@ -143,10 +143,11 @@
 		 * @var array
 		 */
 		public static $misc = array(
-			'ranking_range'		=> 2,
-			'achievements_range'	=> 3,
-			'title_delimiter'	=> ' – ',
-			'lists_limit'		=> 10
+            'registration_host'     => '',
+            'ranking_range'         => 2,
+            'achievements_range'    => 3,
+            'title_delimiter'       => ' – ',
+            'lists_limit'           => 10
 		);
 		
 		
diff --git a/controllers/UsersController.inc b/controllers/UsersController.inc
index 39de6cfc..25db38bf 100644
--- a/controllers/UsersController.inc
+++ b/controllers/UsersController.inc
@@ -207,6 +207,7 @@
 			
 			$fields = array('username', 'prename', 'surname', 'email', 'password');
 			$validation = array();
+            $emailhost = \nre\configs\AppConfig::$misc['registration_host'];
 			
 			// Register a new user
 			if($this->request->getRequestMethod() == 'POST' && !is_null($this->request->getPostParam('register')))
@@ -220,6 +221,11 @@
 				$prename = $this->request->getPostParam('prename');
 				$surname = $this->request->getPostParam('surname');
 				$email = $this->request->getPostParam('email');
+                if(!empty($emailhost)) {
+                    if(substr_compare($email, $emailhost, max(0, strlen($email)-strlen($emailhost)), strlen($emailhost)) !== 0) {
+                        $validation = $this->Validation->addValidationResult($validation, 'email', 'host', 'invalid');
+                    }
+                }
 				if($this->Users->emailExists($email)) {
 					$validation = $this->Validation->addValidationResult($validation, 'email', 'exist', true);
 				}
@@ -264,6 +270,7 @@
 			$this->set('prename', $prename);
 			$this->set('surname', $surname);
 			$this->set('email', $email);
+            $this->set('emailhost', $emailhost);
 			$this->set('validation', $validation);
 			$this->set('validationSettings', $validationSettings);
 		}
diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo
index 2376872547aa449f41eb5488fbb41b1f015faa45..629a5b8e3e8eb752c679207111b49c52c81568fe 100644
GIT binary patch
delta 8231
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
TX$lUi#UNu-^ER9Kd=Lcy-~wJq

delta 8132
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

diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.po b/locale/de_DE/LC_MESSAGES/The Legend of Z.po
index f3ca15bb..87815d0f 100644
--- a/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
+++ b/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Legend of Z\n"
-"POT-Creation-Date: 2015-03-21 14:54+0100\n"
-"PO-Revision-Date: 2015-03-21 14:55+0100\n"
+"POT-Creation-Date: 2015-04-08 12:28+0100\n"
+"PO-Revision-Date: 2015-04-08 12:29+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.4\n"
+"X-Generator: Poedit 1.7.5\n"
 "X-Poedit-Basepath: ../../../\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Poedit-SearchPath-2: controllers\n"
 
 #: controllers/CharactersController.inc:402
-#: controllers/UsersController.inc:322 views/ajax/characters/index.tpl:10
+#: controllers/UsersController.inc:329 views/ajax/characters/index.tpl:10
 #: views/ajax/users/index.tpl:10 views/html/characters/index.tpl:48
 #: views/html/characters/manage.tpl:35 views/html/characters/manage.tpl:50
 #: views/html/characters/manage.tpl:58 views/html/userroles/user.tpl:5
@@ -28,7 +28,7 @@ msgid "Admin"
 msgstr "Administrator"
 
 #: controllers/CharactersController.inc:408
-#: controllers/UsersController.inc:328 views/ajax/characters/index.tpl:12
+#: controllers/UsersController.inc:335 views/ajax/characters/index.tpl:12
 #: views/ajax/users/index.tpl:12 views/html/characters/index.tpl:49
 #: views/html/characters/manage.tpl:36 views/html/characters/manage.tpl:51
 #: views/html/characters/manage.tpl:59 views/html/userroles/user.tpl:7
@@ -38,7 +38,7 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #: controllers/CharactersController.inc:414
-#: controllers/UsersController.inc:334 views/ajax/characters/index.tpl:14
+#: controllers/UsersController.inc:341 views/ajax/characters/index.tpl:14
 #: views/ajax/users/index.tpl:14 views/html/characters/index.tpl:50
 #: views/html/characters/manage.tpl:37 views/html/characters/manage.tpl:53
 #: views/html/characters/manage.tpl:61 views/html/userroles/user.tpl:9
@@ -1450,7 +1450,7 @@ msgstr "Login"
 #: views/html/users/index.tpl:15 views/html/users/index.tpl:19
 #: views/html/users/index.tpl:20 views/html/users/login.tpl:12
 #: views/html/users/login.tpl:13 views/html/users/manage.tpl:14
-#: views/html/users/register.tpl:83 views/html/users/register.tpl:84
+#: views/html/users/register.tpl:85 views/html/users/register.tpl:86
 msgid "Username"
 msgstr "Benutzername"
 
@@ -1458,8 +1458,8 @@ msgstr "Benutzername"
 #: views/html/introduction/index.tpl:8 views/html/users/create.tpl:92
 #: views/html/users/create.tpl:93 views/html/users/edit.tpl:100
 #: views/html/users/edit.tpl:101 views/html/users/login.tpl:14
-#: views/html/users/login.tpl:15 views/html/users/register.tpl:91
-#: views/html/users/register.tpl:92
+#: views/html/users/login.tpl:15 views/html/users/register.tpl:93
+#: views/html/users/register.tpl:94
 msgid "Password"
 msgstr "Passwort"
 
@@ -2031,7 +2031,7 @@ msgstr "Der Nachname ist ungültig"
 
 #: views/html/users/create.tpl:54 views/html/users/create.tpl:58
 #: views/html/users/edit.tpl:58 views/html/users/edit.tpl:62
-#: views/html/users/register.tpl:54 views/html/users/register.tpl:58
+#: views/html/users/register.tpl:54 views/html/users/register.tpl:60
 msgid "E‑mail address invalid"
 msgstr "Die E‑Mail-Adresse ist ungültig"
 
@@ -2041,37 +2041,37 @@ msgid "E‑mail address already exists"
 msgstr "E‑Mail-Adresse existiert bereits"
 
 #: views/html/users/create.tpl:63 views/html/users/edit.tpl:67
-#: views/html/users/register.tpl:63
+#: views/html/users/register.tpl:65
 #, php-format
 msgid "Password is too short (min. %d chars)"
 msgstr "Das Passwort ist zu kurz (min. %d Zeichen)"
 
 #: views/html/users/create.tpl:65 views/html/users/edit.tpl:69
-#: views/html/users/register.tpl:65
+#: views/html/users/register.tpl:67
 #, php-format
 msgid "Password is too long (max. %d chars)"
 msgstr "Das Passwort ist zu lang (max. %d Zeichen)"
 
 #: views/html/users/create.tpl:67 views/html/users/edit.tpl:71
-#: views/html/users/register.tpl:67
+#: views/html/users/register.tpl:69
 msgid "Password invalid"
 msgstr "Das Passwort ist ungültig"
 
 #: views/html/users/create.tpl:86 views/html/users/create.tpl:87
 #: views/html/users/edit.tpl:94 views/html/users/edit.tpl:95
-#: views/html/users/register.tpl:85 views/html/users/register.tpl:86
+#: views/html/users/register.tpl:87 views/html/users/register.tpl:88
 msgid "Prename"
 msgstr "Vorname"
 
 #: views/html/users/create.tpl:88 views/html/users/create.tpl:89
 #: views/html/users/edit.tpl:96 views/html/users/edit.tpl:97
-#: views/html/users/register.tpl:87 views/html/users/register.tpl:88
+#: views/html/users/register.tpl:89 views/html/users/register.tpl:90
 msgid "Surname"
 msgstr "Nachname"
 
 #: views/html/users/create.tpl:90 views/html/users/create.tpl:91
 #: views/html/users/edit.tpl:98 views/html/users/edit.tpl:99
-#: views/html/users/register.tpl:89 views/html/users/register.tpl:90
+#: views/html/users/register.tpl:91 views/html/users/register.tpl:92
 #: views/html/users/user.tpl:24
 msgid "E‑mail address"
 msgstr "E‑Mail-Adresse"
@@ -2109,7 +2109,12 @@ msgstr "Benutzer verwalten"
 msgid "Registration"
 msgstr "Registrierung"
 
-#: views/html/users/register.tpl:94
+#: views/html/users/register.tpl:58
+#, php-format
+msgid "E‑Mail address has to end with @%s"
+msgstr "Die E‑Mail-Adresse muss auf @%s enden"
+
+#: views/html/users/register.tpl:96
 msgid "Register"
 msgstr "Registrieren"
 
diff --git a/views/html/users/register.tpl b/views/html/users/register.tpl
index 48fe6f47..78ab8b36 100644
--- a/views/html/users/register.tpl
+++ b/views/html/users/register.tpl
@@ -55,6 +55,8 @@
 							break;
 							case 'exist': echo _('E‑mail address already exists');
 							break;
+                            case 'host': printf(_('E‑Mail address has to end with @%s'), $emailhost);
+                            break;
 							default: echo _('E‑mail address invalid');
 						}
 					break;
@@ -87,7 +89,7 @@
 		<label for="surname"><?=_('Surname')?>:</label>
 		<input name="surname" type="text" placeholder="<?=_('Surname')?>" title="<?=_('Surname')?>" required="required" maxlength="<?=$validationSettings['surname']['maxlength']?>" value="<?=$surname?>" <?=(array_key_exists('surname', $validation)) ? 'class="invalid"' : null?> /><br />
 		<label for="email"><?=_('E‑mail address')?>:</label>
-		<input name="email" type="email" placeholder="<?=_('E‑mail address')?>" title="<?=_('E‑mail address')?>" required="required" value="<?=$email?>" <?=(array_key_exists('email', $validation)) ? 'class="invalid"' : null?> /><br />
+		<input name="email" type="email" placeholder="<?=(!empty($emailhost)) ? '…@'.$emailhost : _('E‑mail address')?>" title="<?=_('E‑mail address')?>" required="required" value="<?=$email?>" <?=(array_key_exists('email', $validation)) ? 'class="invalid"' : null?> /><br />
 		<label for="password"><?=_('Password')?>:</label>
 		<input name="password" type="password" placeholder="<?=_('Password')?>" title="<?=_('Password')?>" required="required" maxlength="<?=$validationSettings['password']['maxlength']?>" <?=(array_key_exists('password', $validation)) ? 'class="invalid"' : null?> /><br />
 	</fieldset>