Changeset 807

Timestamp:

10/25/05 11:20:51 (8 years ago)

Author:

fproulx

Message:

2005-10-25 Francois Proulx <francois.proulx@…>

• AuthenticatorRadius? : Fixed legacy variable misuse

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• wifidog/classes/AuthenticatorRadius.php (modified) (7 diffs)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-10-25 Francois Proulx <francois.proulx@gmail.com>
+        * AuthenticatorRadius : Fixed legacy variable misuse
+        
 2005-10-24 Benoit Grégoire  <bock@step.polymtl.ca>
         * AuthenticatorRadius:  Fix bug reported by kouete, by inspection.  Fix not actually tested. 

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

@@ -1 +1 @@
 <?php
+
 /********************************************************************\
  * This program is free software; you can redistribute it and/or    *
@@ -155 +156 @@
                                 // RADIUS authentication succeeded !
                                 // Now checking for local copy of this user
-                                $user_info=null;
+                                $user_info = null;
                                 $sql = "SELECT user_id, pass FROM users WHERE (username='$username') AND account_origin='".$this->getNetwork()->getId()."'";
                                 $db->ExecSqlUniqueRes($sql, $user_info, false);
@@ -165 +166 @@
                                         {
                                                 $retval = & $user;
-                                                User::setCurrentUser($user);
+                                                User :: setCurrentUser($user);
                                                 $errmsg = _("Login successfull");
                                         }
@@ -183 +184 @@
                                         // Validate the user right away !
                                         $user->setAccountStatus(ACCOUNT_STATUS_ALLOWED);
-                                        User::setCurrentUser($user);
+                                        User :: setCurrentUser($user);
                                         $errmsg = _("Login successfull");
                                 }
@@ -202 +203 @@
         {
                 global $db;
+                $info = null;
                 $conn_id = $db->EscapeString($conn_id);
-                $info=null;
                 $db->ExecSqlUniqueRes("SELECT NOW(), *, CASE WHEN ((NOW() - reg_date) > networks.validation_grace_time) THEN true ELSE false END AS validation_grace_time_expired FROM connections JOIN users ON (users.user_id=connections.user_id) JOIN networks ON (users.account_origin = networks.network_id) WHERE connections.conn_id=$conn_id", $info, false);
-                
+
                 // RADIUS accounting start
                 $radius_acct = new Auth_RADIUS_Acct_Start;
@@ -248 +249 @@
                 parent :: acctUpdate($conn_id, $incoming, $outgoing);
                 global $db;
+                $info = null;
                 $conn_id = $db->EscapeString($conn_id);
-                $info=null;
                 $db->ExecSqlUniqueRes("SELECT NOW(), *, CASE WHEN ((NOW() - reg_date) > networks.validation_grace_time) THEN true ELSE false END AS validation_grace_time_expired FROM connections JOIN users ON (users.user_id=connections.user_id) JOIN networks ON (users.account_origin = networks.network_id) WHERE connections.conn_id=$conn_id", $info, false);
-                
+
                 // RADIUS accounting ping
                 // Session is completely based on Database time
@@ -295 +296 @@
         function acctStop($conn_id, & $errmsg = null)
         {
-                parent :: acctStop($info['conn_id']);
+                parent :: acctStop($conn_id);
                 global $db;
-                                $conn_id = $db->EscapeString($conn_id);
-                
+                $info = null;
+                $conn_id = $db->EscapeString($conn_id);
                 $db->ExecSqlUniqueRes("SELECT NOW(), *, CASE WHEN ((NOW() - reg_date) > networks.validation_grace_time) THEN true ELSE false END AS validation_grace_time_expired FROM connections JOIN users ON (users.user_id=connections.user_id) JOIN networks ON (users.account_origin = networks.network_id) WHERE connections.conn_id=$conn_id", $info, false);