Changeset 566 for trunk/wifidog-auth/wifidog/classes/Node.php

Timestamp:

04/25/05 09:16:07 (8 years ago)

Author:

benoitg

Message:

2005-04-25 Benoit Gr�goire <bock@…>

• Integration merge, should work, but there will be display problems everywhere. Expect further commits today.
• Almost 100% complete Network abstraction
• Much better object encapsulation. Deprecated methods not removed yet.
• Add MainUI class. Used to display the interface. Inner workings still need work.

Files:

• trunk/wifidog-auth/wifidog/classes/Node.php (modified) (4 diffs)

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

@@ -57 +57 @@
                 else
                 {
-                        $object = getCurrentRealNode();
+                        $object = self::getCurrentRealNode();
                 }
                 return $object;
@@ -74 +74 @@
          * @param        * @return a Node object, or null if it can't be found.
          */
-        public function getCurrentRealNode()
+        public static function getCurrentRealNode()
         {
                 global $db;
@@ -484 +484 @@
         }
 
+/** The list of users online at this node
+ * @return An array of User object, or en empty array */
         function getOnlineUsers()
         {
                 global $db;
-
-                $db->ExecSql("SELECT users.user_id, users.username, users.account_origin FROM users,connections WHERE connections.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND connections.node_id='{$this->id}'", $users, false);
+                $retval=array();
+                $db->ExecSql("SELECT users.user_id FROM users,connections WHERE connections.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND connections.node_id='{$this->id}'", $users, false);
+                if($users!=null)
+                {
+                        foreach ($users as $user_row)
+                        {
+                                $retval[]=getObject($user_row['user_id']);
+                        }
+                }
                 return $users;
         }
@@ -548 +557 @@
         }
 
+/** Warning, the semantics of this function will change */
         public static function getAllOnlineUsers()
         {