Changeset 1453 for trunk/wifidog-auth/wifidog/classes/Authenticators/AuthenticatorLocalUser.php

Timestamp:

02/25/10 15:56:33 (2 years ago)

Author:

gbastien

Message:

• Added possibility to have a deployed geolocated node not show on map (quick fix) (#706)
• When producing anonymised data export, two files are produced, one for the geolocated nodes and one for the connections (#705)
• Additions and bug fixes to web service: can now logout and auth returns both error code and message
• Starting work on #707 as needed

Files:

• trunk/wifidog-auth/wifidog/classes/Authenticators/AuthenticatorLocalUser.php (modified) (4 diffs)

trunk/wifidog-auth/wifidog/classes/Authenticators/AuthenticatorLocalUser.php

@@ -101 +101 @@
      * @param string $password Clear text password.
      * @param string $errmsg   Reference of error message
+     * @param int $errno       Reference to error code
      *
      * @return object The actual User object if login was successfull, false
      *                otherwise.
      */
-    public function login($username, $password, &$errmsg = null)
+    public function login($username, $password, &$errmsg = null, &$errno = 0)
     {
         //echo "DEBUG:  login($username, $password, $errmsg)<br/>";
@@ -115 +116 @@
         $username = $db->escapeString($username);
         if (empty($username)) {
-            $errmsg .= sprintf(_("Fatal error:  Username cannot be empty"));
+            $errmsg .= sprintf(getErrorText(ERR_NO_USERNAME));
+            $errno = ERR_NO_USERNAME;
             $retval = false;
         }
@@ -131 +133 @@
                 $user = User::getObject($user_info['user_id']);
 
-                if ($user->isUserValid($errmsg)) {
+                if ($user->isUserValid($errmsg, $errno)) {
                     $retval = &$user;
                     $errmsg = _("Login successfull");
@@ -147 +149 @@
 
                 if ($user_info == null) {
-                    $errmsg = _('Unknown username or email');
+                    $errmsg = getErrorText(ERR_UNKNOWN_USERNAME);
+                    $errno = ERR_UNKNOWN_USERNAME;
                 } else {
-                    $errmsg = _('Incorrect password (Maybe you have CAPS LOCK on?)');
+                    $errmsg = getErrorText(ERR_WRONG_PASSWORD);
+                    $errno = ERR_WRONG_PASSWORD;
                 }