Changeset 1394

Timestamp:

06/25/09 14:52:10 (3 years ago)

Author:

benoitg

Message:

• Fix #559

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/lost_password.php (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
 # $Id$
+2009-06-25 Benoit Grégoire <benoitg@coeus.ca>
+        * Fix #559
+
 2009-06-23 Benoit Grégoire <benoitg@coeus.ca>
         * Commit another slightly modified patch contributed by Zap Sherbrooke:  Allow generating publicly accessible statistics for the various nodes.  Enabled node per node.  Note that a cron must be setup for those stats to actually be generated.

trunk/wifidog-auth/wifidog/lost_password.php

@@ -114 +114 @@
          * Get a list of users associated with either a username of an e-mail
          */
-        if ($username) {
+        if ($username && $email){
+            throw new Exception(_("Please specify EITHER your username or your email, not both"));
+        }
+        else if ($username) {
             $user = User::getUserByUsernameAndOrigin($username, $account_origin);
         }
-
-        if ($email) {
+        else if ($email) {
             $user = User::getUserByEmailAndOrigin($email, $account_origin);
+        }
+        else {
+            throw new Exception(_("You need to specify your username or your email"));
         }