[Fusionforge-commits] r7595 - trunk/gforge/www/account

Roland Mas lolando at libremir.placard.fr.eu.org
Tue May 5 13:29:54 CEST 2009


Author: lolando
Date: 2009-05-05 13:29:54 +0200 (Tue, 05 May 2009)
New Revision: 7595

Modified:
   trunk/gforge/www/account/verify.php
Log:
Accept email address for account validation too.

Modified: trunk/gforge/www/account/verify.php
===================================================================
--- trunk/gforge/www/account/verify.php	2009-05-05 11:29:45 UTC (rev 7594)
+++ trunk/gforge/www/account/verify.php	2009-05-05 11:29:54 UTC (rev 7595)
@@ -41,6 +41,9 @@
 	}
 
 	$u = user_get_object_by_name($loginname);
+	if (!$u && $GLOBALS['sys_require_unique_email']) {
+		$u = user_get_object_by_email ($loginname);
+	}
 	if (!$u || !is_object($u)) {
 		exit_error('Error','Could Not Get User');
 	} elseif ($u->isError()) {
@@ -91,7 +94,13 @@
 
 <form action="<?php echo util_make_url('/account/verify.php'); ?>" method="post">
 
-<p><?php echo _('Login name:'); ?>
+<p><?php 
+if ($GLOBALS['sys_require_unique_email']) {
+	echo _('Login name or email address:');
+} else {
+	echo _('Login name:'); 
+}
+?>
 <br /><input type="text" name="loginname" /></p>
 <p><?php echo _('Password:'); ?>
 <br /><input type="password" name="passwd" /></p>




More information about the Fusionforge-commits mailing list