Changeset 732

Timestamp:

09/10/05 15:11:08 (8 years ago)

Author:

aprilp

Message:

* signup.php: Fixed bug in detecting is the user is already part of the network.

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• wifidog/signup.php (modified) (3 diffs)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-09-10 Philippe April  <philippe@ilesansfil.org>
+        * signup.php: Fixed bug in detecting is the user is already part of the
+        network.
+
 2005-09-10 Francois Proulx <francois.proulx@gmail.com>
         * Automatically redirect user to login form when trying to access admin

trunk/wifidog-auth/wifidog/signup.php

@@ -81 +81 @@
         $smarty->assign('username', $username);
         $smarty->assign('email', $email);
-    $account_origin = Network::getObject($_REQUEST['auth_source'])->getId();
+    $network = Network::getObject($_REQUEST['auth_source']);
         try
         {
-                if (!isset($account_origin))
+                if (!isset($network))
                         throw new Exception(_("Sorry, this network does not exist !"));
 
@@ -91 +91 @@
                 validate_passwords($password, $password_again);
 
-                if (User :: getUserByUsernameAndOrigin($username, $account_origin))
+                if (User :: getUserByUsernameAndOrigin($username, $network))
                         throw new Exception(_("Sorry, a user account is already associated to this username. Pick another one."));
 
-                if (User :: getUserByEmailAndOrigin($email, $account_origin))
+                if (User :: getUserByEmailAndOrigin($email, $network))
                         throw new Exception(_("Sorry, a user account is already associated to this email address."));
 
-                $created_user = User :: createUser(get_guid(), $username, $account_origin, $email, $password);
+                $created_user = User :: createUser(get_guid(), $username, $network, $email, $password);
                 $created_user->sendValidationEmail();
                 
@@ -108 +108 @@
                 {
                         // Authenticate this new user automatically
-                $network = Network::getObject($account_origin);
                 $authenticated_user = $network->getAuthenticator()->login($username, $password, $errmsg);