Changeset 8832

Timestamp:

02/16/10 13:43:19 (3 years ago)

Author:

p_lindheimer

Message:

changes to support CF devstate in deviceanduser mode re #4047

Files:

• modules/branches/2.7/core/agi-bin/user_login_out.agi (modified) (6 diffs)
• modules/branches/2.7/core/module.xml (modified) (2 diffs)

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

@@ -48 +48 @@
-  $ast_version  = get_var("ASTVERSION");
-  $dnd_devstate = get_var( "DNDDEVSTATE" ) == "TRUE" ? true : false;
+  $cf_devstate = get_var( "CFDEVSTATE" ) == "TRUE" ? true : false;
-  $fm_devstate  = get_var( "FMDEVSTATE" ) == "TRUE" ? true : false;
-  $que_devstate = get_var( "QUEDEVSTATE" ) == "TRUE" ? true : false;
@@ -162 +163 @@
-    global $fm_devstate;
-    global $dnd_devstate;
+    global $cf_devstate;
-    global $que_devstate;
-    global $DEVSTATE;
@@ -193 +195 @@
-      $agi->set_variable($DEVSTATE.'(Custom:DEVDND'.$device.')',get_dnd_state($user));
-    }
+    if ($cf_devstate) {
+      debug("insert_user: Setting CF DEVSTATES for device $device",5);
+      $agi->set_variable($DEVSTATE.'(Custom:DEVCF'.$device.')',get_cf_state($user));
+    }
-
-    $vmcontext = get_voicemail_context($user);
@@ -212 +218 @@
-    global $fm_devstate;
-    global $dnd_devstate;
+    global $cf_devstate;
-    global $que_devstate;
-    global $DEVSTATE;
@@ -246 +253 @@
-      if ($dnd_devstate) {
-        debug("Setting device $device DND state to INVALID before deleting",5);
-
+
+
+
+
+
-      }
-      // I thought they should then be deleted, but they still end up there probably because setting them to invalid re-creates them
@@ -444 +455 @@
-    }
-    debug("get_dnd_state: user $user got state ".$dnd_state['data']." returning $ret",8);
+    return $ret;
+  }
+
+  function get_cf_state($user) {
+    global $agi;
+
+    $cf_state = $agi->database_get('CF',$user);
+    if ($cf_state['result'] != 1) {
+      $ret = 'NOT_INUSE';
+    } else {
+      if (trim($cf_state['data']) == '') {
+        $ret = 'NOT_INUSE';
+      } else {
+        $ret = 'INUSE';
+      }
+    }
+    debug("get_cf_state: user $user got state ".$cf_state['data']." returning $ret",8);
-    return $ret;
-  }

modules/branches/2.7/core/module.xml

@@ -4 +4 @@
-  <category>Basic</category>
-  <name>Core</name>
-4
+5
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -10 +10 @@
-  <canuninstall>no</canuninstall>
-  <changelog>
+    *2.7.0beta1.5* #4047 changes to support CF devstate in deviceanduser mode
-    *2.7.0beta1.4* #4041
-    *2.7.0beta1.3* #4037