Changeset 1445 for branches/newtoken/wifidog/login/index.php

Timestamp:

02/04/10 16:20:28 (2 years ago)

Author:

gbastien

Message:

* First draft: nothing has changed so far, just the way tokens are generated from a template. Integration of the code by richard Jackson (#684). Not thoroughly tested though.

Files:

• branches/newtoken/wifidog/login/index.php (modified) (4 diffs)

branches/newtoken/wifidog/login/index.php

@@ -77 +77 @@
 require_once('classes/User.php');
 require_once('classes/Network.php');
+require_once('classes/Token.php');
+require_once('classes/TokenTemplate.php');
 require_once('classes/Authenticator.php');
 require_once('classes/MainUI.php');
@@ -181 +183 @@
  */
 
+$templates = array();
+if ($network != null) {
+    
+}
+
 /*
  * If this is a splash-only node, skip the login interface and log-in using
@@ -189 +196 @@
         // Login from a gateway, redirect to the gateway to activate the token
         $user = $network->getSplashOnlyUser();
-        $token = $user->generateConnectionToken($mac);
+        //$token = $user->generateConnectionToken($mac);
+        $token = Token::generateConnectionToken($mac, $network, $user);
         User::setCurrentUser($user);
         header("Location: http://" . $gw_address . ":" . $gw_port . "/wifidog/auth?token=" . $token);
@@ -213 +221 @@
         if (!empty($gw_address) && !empty($gw_port)) {
             // Login from a gateway, redirect to the gateway to activate the token
-            $token = $user->generateConnectionToken($mac);
+            // $token = $user->generateConnectionToken($mac);
+            $token = Token::generateConnectionToken($mac, $network, $user);
             if(!$token)
             {