Changeset 1453 for trunk/wifidog-auth/wifidog/classes/User.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/User.php (modified) (3 diffs)

trunk/wifidog-auth/wifidog/classes/User.php

@@ -516 +516 @@
 
     /** Is the user valid?  Valid means that the account is validated or hasn't exhausted it's validation period.
-     $errmsg: Returs the reason why the account is or isn't valid */
-    function isUserValid(& $errmsg = null) {
+     $errmsg: Returs the reason why the account is or isn't valid
+     $errno: Returns an error code identifying the error */
+    function isUserValid(& $errmsg = null, &$errno = 0) {
         global $account_status_to_text;
         $db = AbstractDb::getObject();
@@ -530 +531 @@
 
             if ($user_info['validation_grace_time_expired'] == 't') {
-                $errmsg = sprintf(_("Sorry, your %.0f minutes grace period to retrieve your email and validate your account has now expired. You will have to connect to the internet and validate your account from another location."), $user_info['validation_grace_time']/60);
+                $errmsg = sprintf(getErrorText(ERR_VALIDATION_EXPIRED), $user_info['validation_grace_time']/60);
+                $errno = ERR_VALIDATION_EXPIRED;
                 $retval = false;
             } else {
@@ -537 +539 @@
             }
         } else {
-            $errmsg = _("Sorry, your account is not valid: ") . $account_status_to_text[$account_status];
+            $errmsg = getErrorText(ERR_ACCOUNT_INVALID) . $account_status_to_text[$account_status];
+            $errno = ERR_ACCOUNT_INVALID;
             $retval = false;
         }