Changeset 5196

Timestamp:

11/03/07 11:33:45 (4 years ago)

Author:

p_lindheimer

Message:

fix to r5186 (#2411, #2402): when editing device into a fixed device, reset user. When changing a device from a fixed to adhoc, reset user

Files:

• modules/branches/2.3/core/functions.inc.php (modified) (2 diffs)

modules/branches/2.3/core/functions.inc.php

@@ -794 +794 @@
-  //add details to astdb
-  if ($astman) {
+    // if adding or editting a fixed device, user property should always be set
+    if ($devicetype == 'fixed' || !$editmode) {
+      $astman->database_put("DEVICE",$id."/user",$user);
+    }
+    // If changing from a fixed to an adhoc, the user property should be intialized
+    // to the new default, not remain as the previous fixed user
+    if ($editmode) {
+      $previous_type = $astman->database_get("DEVICE",$id."/type");
+      if ($previous_type == 'fixed' && $devicetype == 'adhoc') {
+        $astman->database_put("DEVICE",$id."/user",$user);
+      }
+    }
-    $astman->database_put("DEVICE",$id."/dial",$dial);
-    $astman->database_put("DEVICE",$id."/type",$devicetype);
-    if (!$editmode) {
-      $astman->database_put("DEVICE",$id."/user",$user);
-    }
-    $astman->database_put("DEVICE",$id."/default_user",$user);
-    if(!empty($emergency_cid))
@@ -878 +887 @@
-      }
-    }
-    $astman->database_del("DEVICE",$account."/dial");
-    $astman->database_del("DEVICE",$account."/type");
-    if (! $editmode) {
+      $astman->database_del("DEVICE",$account."/dial");
+      $astman->database_del("DEVICE",$account."/type");
-      $astman->database_del("DEVICE",$account."/user");
-}
-$astman->database_del("DEVICE",$account."/default_user
-$astman->database_del("DEVICE",$account."/emergency_cid");
+ $astman->database_del("DEVICE",$account."/default_user");
+ $astman->database_del("DEVICE",$account."/emergency_cid
+}
-
-    //delete from devices table