From: Jerome Bakker <jeabakker@coldtrick.com>
Date: Thu, 8 Nov 2012 09:57:45 +0000 (+0100)
Subject: fixes missing error message on manual login of an unvalidated user
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=cb8231ad16a9fbd9e4b5df9af8b8d79f563a2bbb;p=lorea%2Felgg.git

fixes missing error message on manual login of an unvalidated user
---

diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php
index f98f57faf..a453f36a4 100644
--- a/mod/uservalidationbyemail/start.php
+++ b/mod/uservalidationbyemail/start.php
@@ -238,8 +238,16 @@ function uservalidationbyemail_check_manual_login($event, $type, $user) {
 	$access_status = access_get_show_hidden_status();
 	access_show_hidden_entities(TRUE);
 
-	// @todo register_error()?
-	$return = ($user instanceof ElggUser && !$user->isEnabled() && !$user->validated) ? FALSE : NULL;
+	if(($user instanceof ElggUser) && !$user->isEnabled() && !$user->validated){
+		// send new validation email
+		uservalidationbyemail_request_validation($user->getGUID());
+		
+		// restore hidden entities settings
+		access_show_hidden_entities($access_status);
+		
+		// throw error so we get a nice error message
+		throw new LoginException(elgg_echo('uservalidationbyemail:login:fail'));
+	}
 
 	access_show_hidden_entities($access_status);