Changeset 1455 for branches/newtoken/wifidog/ws/classes/WifidogWS/V1.php

Timestamp:

03/03/10 19:27:35 (2 years ago)

Author:

gbastien

Message:

* Modifs on the token architecture: some corrections to connection and token deletions and garbage collection because token are now reusable

Files:

• branches/newtoken/wifidog/ws/classes/WifidogWS/V1.php (modified) (5 diffs)

branches/newtoken/wifidog/ws/classes/WifidogWS/V1.php

@@ -103 +103 @@
                         'NumOnlineUsers' => 'NumOnlineUsers',
                         'CreationDate' => 'CreationDate',
-                        'Status' => 'Status',
+                        'Status' => 'DeploymentStatus',
                         'OpeningDate' => 'CreationDate', 
                                                                         'Connected_users' => 'OnlineUsers'),
@@ -150 +150 @@
         foreach($infields as $field) {
             if (isset(self::$_allowedFields[$objectClass][$field]))
-                $fields[] = self::$_allowedFields[$objectClass][$field];
+                $fields[$field] = self::$_allowedFields[$objectClass][$field];
             else
-                $fields[] = "$field.forbidden";
+                $fields[$field] = "$field.forbidden";
         }
         return $fields;
@@ -298 +298 @@
         $fields = $this->mapFields($objectClass, $fields);
         if (empty($fields)) {
-            $fields = array_keys(self::$_allowedFields[$objectClass]);
+            $fields = self::$_allowedFields[$objectClass];
         } 
         $allowedFields = self::$_allowedFields[$objectClass];
@@ -362 +362 @@
         } 
 
+        if (!isset($objectList)) {
+            throw new WSException("Object list for '{$objectClass}' is not supported.", WSException::GENERIC_EXCEPTION);
+        }
         $this->_outputArr = self::filterRet($objectList, $fields);
     }
@@ -389 +392 @@
                     }
                     $retFields = array();
-                    foreach ($fields as $field) {
+                    foreach ($fields as $fkey => $field) {
                         $forbiddenfield = explode(".", $field);
                         if (! (count($forbiddenfield) == 2)) {
                             $methodName = 'get'.$field;
                             if (method_exists($value, $methodName)) {
-                                
-                                $retFields[$field] = self::filterRet($value->$methodName());
+                                $retFields[is_string($fkey)?$fkey:$field] = self::filterRet($value->$methodName());
                             } else {
-                                $retFields[$field] = 'unknown';
+                                $retFields[is_string($fkey)?$fkey:$field] = 'unknown';
                             }
                         } else