Changeset 1446 for branches/newtoken/wifidog/signup.php

Timestamp:

02/11/10 17:34:27 (2 years ago)

Author:

gbastien

Message:

* Merged recent changes in the trunk into this branch
* New token architecture not yet fully functional, nor tested, but ...

• can now edit token templates for different context of tokens (from the edit netork interface at the bottom of page)
• Users connected through a wifidog gateway can view their connection token information

Files:

• branches/newtoken/wifidog/signup.php (modified) (1 diff)

branches/newtoken/wifidog/signup.php

@@ -233 +233 @@
             // Make sure the user IDs match
             if(($created_user->getId() == $authenticated_user->getId())) {
-                $token = $created_user->generateConnectionToken($mac);
+                $node = Node::getObjectByGatewayId($gw_id);
+                $network = $node->getNetwork();
+                $token = Token::generateConnectionToken($mac, $network, $node, $created_user);
 
                 $redirURL = "http://" . $gw_address . ":" . $gw_port . "/wifidog/auth?token=" . $token;