From 69ff86ee53cf8bcf382b8a7211d0e41474d3485e Mon Sep 17 00:00:00 2001
From: Pellaeon Lin <nfsmwlin@gmail.com>
Date: Sat, 29 Aug 2015 19:17:10 +0800
Subject: [PATCH] Update# clean up code from johannesst's PR

---
 controller/registercontroller.php | 22 ++++++++--------------
 templates/domains.php             | 17 ++++++++---------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/controller/registercontroller.php b/controller/registercontroller.php
index 353f80b..24285dc 100644
--- a/controller/registercontroller.php
+++ b/controller/registercontroller.php
@@ -94,33 +94,27 @@ class RegisterController extends Controller {
 		}
 
 
-		// FEATURE: allow only from specific email domain
-
-		$allowed_domains= $this->config->getAppValue($this->appName, 'allowed_domains','');
-		if ( ($allowed_domains === null) || ($allowed_domains === '') || ( strlen($allowed_domains)===0)){
-}else{
-			$allowed_domains= explode (";",$allowed_domains);
-			$allowed=false;
-			$domains=array();
-			foreach ($allowed_domains as $domain ) {
-				$domains[]=$domain;//=$domain.print_unescaped("<br>").$domains;
+		// allow only from specific email domain
+		$allowed_domains = $this->config->getAppValue($this->appName, 'allowed_domains', '');
+		if ( $allowed_domains !== '' ) {
+			$allowed_domains = explode(';', $allowed_domains);
+			$allowed = false;
+			foreach ( $allowed_domains as $domain ) {
 				$maildomain=explode("@",$email)[1];
 				// valid domain, everythings fine
 				if ($maildomain === $domain) {
 					$allowed=true;
 					break;
 				}
-					
 			}
-			// $allowed still false->return error message
 			if ( $allowed === false ) {
 				return new TemplateResponse('registration', 'domains', ['domains' =>
 					$domains
 				], 'guest');
 			}
-		}//else var_dump($allowed_domains);
+		}
 
-	return sendVerificationEmail($email);
+		return sendVerificationEmail($email);
 	}
 
 	/**
diff --git a/templates/domains.php b/templates/domains.php
index 4c73dba..f628040 100644
--- a/templates/domains.php
+++ b/templates/domains.php
@@ -3,13 +3,12 @@
 ?>
 <ul class="error-wide">
 	<li class='error'><?php p($l->t('Registration is only allowed for following domains:')); ?>
-<?php 
-foreach ($_['domains'] as $domain ){
-	echo "<p class='hint'>";
-	p($domain);
-	echo "</p>";
-}
-
-?>
-</li>
+	<?php
+	foreach ($_['domains'] as $domain ){
+		echo "<p class='hint'>";
+		p($domain);
+		echo "</p>";
+	}
+	?>
+	</li>
 </ul>