Changeset 5592

Timestamp:

01/14/08 12:45:14 (9 months ago)

Author:

p_lindheimer

Message:

#2626 logout user in devicesanduser mode not logging out if no default user set

Files:

• modules/branches/2.4/core/agi-bin/user_login_out.agi (modified) (9 diffs)
• modules/branches/2.4/core/module.xml (modified) (1 diff)

modules/branches/2.4/core/agi-bin/user_login_out.agi

@@ -115 +115 @@
-                $default_user = get_default_user($this_device);
-
+                debug("current_user: $current_user, default_user: $default_user",8);
+
-                if ($current_user != $default_user) {
-                        remove_user($this_device);
@@ -136 +138 @@
-                $previous_devices = get_devices($user);
-                $new_devices = insert_device($previous_devices,$device);
-
+insert_user: 
-                set_user_devices($user, $new_devices);
-                set_hint($user, $new_devices);
@@ -160 +162 @@
-                        $current_devices = get_devices($current_user);
-                        $new_devices = remove_device($current_devices,$device);
-
+remove_user: 
-                        set_user_devices($current_user, $new_devices);
-                        set_hint($current_user, $new_devices);
@@ -167 +169 @@
-                                debug("Got Return code: $ret trying to remove: {$astspooldir}/voicemail/device/$device",5);
-                        }
+                        set_device_user($device, 'none');
-                }
-        }
@@ -241 +244 @@
-                $user = $agi->database_get('DEVICE',$device.'/user');
-                if ($user['result'] == 1 && trim($user['data']) != 'none') {
+                        debug("get_logged_in_user: got user: ".$user['data'],8);
-                        return trim($user['data']);
-                }
@@ -249 +253 @@
-        //
-        function get_default_user($device) {
-ua
+au
-                global $agi;
-
@@ -267 +271 @@
-                $devices = $agi->database_get('AMPUSER',$user.'/device');
-                if ($devices['result'] == 1) {
+                        debug("get_devices: got: ".$devices['data'], 8);
-                        return trim($devices['data']);
-                }
@@ -293 +298 @@
-                $user = $agi->database_get('DEVICE',$device.'/user');
-                if ($user['result'] == 1 && trim($user['data']) != 'none') {
+                        debug("get_user: got: ".$user['data'], 8);
-                        return trim($user['data']);
-                }
+                debug("get_user: no user found", 8);
-                return '';
-        }
@@ -304 +311 @@
-                global $agi;
-                if (empty($devices)) {
+                        debug("No more devices associated with $user, deletting /device key", 8);
-                        $agi->database_del('AMPUSER',$user.'/device');
-                } else {
+                        debug("set_user_devices: assigning $devices to $user /device key", 8);
-                        $agi->database_put('AMPUSER',$user.'/device',$devices);
-                }

modules/branches/2.4/core/module.xml

@@ -4 +4 @@
-        <category>Basic</category>
-        <name>Core</name>
-2
+3
-        <candisable>no</candisable>
-        <canuninstall>no</canuninstall>
-        <changelog>
+                *2.4.0beta2.3* #2626 logout user in devicesanduser mode not logging out if no default user set
-                *2.4.0beta2.2* revert #2919, #2607, #2578, #2620, #2560, #2621, #2560, add RETURN option to macro-vm, added DUNDi trunk type
-                *2.4.0beta2.1* #2576 fix macro-dial to hand dialparties returning with no numbers to dial