Changeset 13401

Timestamp:

02/07/12 19:44:19 (1 year ago)

Author:

p_lindheimer

Message:

adds a hint for all devices for the all queue toggle, some testing done needs more but checking in to preserve code changes re #5456

Files:

• modules/branches/2.10/core/agi-bin/user_login_out.agi (modified) (9 diffs)
• modules/branches/2.10/queues/bin (added)
• modules/branches/2.10/queues/bin/generate_queue_hints.php (copied) (copied from freepbx/branches/2.10/amp_conf/bin/generate_hints.php) (3 diffs)
• modules/branches/2.10/queues/functions.inc/dialplan.php (modified) (2 diffs)

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

@@ -51 +51 @@
-  $fm_devstate  = get_var( "FMDEVSTATE" ) == "TRUE" ? true : false;
-  $que_devstate = get_var( "QUEDEVSTATE" ) == "TRUE" ? true : false;
+  $queue_toggle = get_var( "QUEUETOGGLE" );
-  $intercom_code = get_var( "INTERCOMCODE" );
-  $campon_toggle = get_var( "CAMPONTOGGLE" );
@@ -58 +59 @@
-  $DEVSTATE = version_compare($ast_version, "1.6", "ge") ? "DEVICE_STATE" : "DEVSTATE";
-
-  /*
-  $ampmgruser  = 'admin';
-  $ampmgrpass  = 'amp111';
-  */
-  $astman = new AGI_AsteriskManager( ); 
-  if (!$astman->connect("127.0.0.1", $ampmgruser , $ampmgrpass)) {
@@ -221 +218 @@
-    global $cf_devstate;
-    global $que_devstate;
+    global $queue_toggle;
-    global $DEVSTATE;
-
@@ -249 +247 @@
-      }
-      if ($que_devstate) {
-                        
+     
-        set_queue_states($user,$device,'off');
-
+
+
+
+
-      if ($dnd_devstate) {
-        debug("Setting device $device DND state to INVALID before deleting",5);
@@ -271 +272 @@
-  }
-
+  function set_queue_hint($user, $devices) {
+    global $astman;
+    global $ast_version14;
+    global $queue_toggle;
+    $dp_pre = ($ast_version14) ? 'dialplan ' : '';
+
+    debug("entering set_queue_hint user: $user and devices: $devices",6);
+    if (trim($devices) == '') {
+      // don't do anything in this case, handle elsewhere
+      return true;
+    }
+    $queues = get_user_queue_assignments($user);
+    if (!empty($queues)) {
+      $device_array = explode( '&', $devices);
+      foreach ($device_array as $device) {
+        $hlist = 'Custom:QUEUE' . $device . '*' . implode('&Custom:QUEUE' . $device . '*', $queues);
+        debug("Hint for device: $device user: $user hint to $hlist",1);
+        $response = $astman->send_request('Command',array('Command'=>$dp_pre."add extension {$queue_toggle}*{$device},hint,{$hlist} into ext-queues replace"));
+      }
+    }
+  }
+
+  function remove_queue_hint($device) {
+    global $astman;
+    global $ast_version14;
+    global $queue_toggle;
+    $dp_pre = ($ast_version14) ? 'dialplan ' : '';
+    debug("entering remove_queue_hint with device: $device",6);
+    if ($device != '') {
+      debug("removing $queue_toggle*$device@ext-queues hint",1);
+      $response = $astman->send_request('Command',array('Command'=>$dp_pre."remove extension {$queue_toggle}*{$device}@ext-queues hint"));
+    }
+  }
+
-  // Set the hint for a user based on the devices in their AMPUSER object
-  //
@@ -278 +313 @@
-    global $agi;
-    global $dnd_devstate;
+    global $que_devstate;
+    global $queue_toggle;
-    global $intercom_code;
-    global $campon_toggle;
@@ -292 +329 @@
-        $hint_val = 'ccss:'.implode('&ccss:',$dev_arr);
-        $response = $astman->send_request('Command',array('Command'=>$dp_pre."add extension {$campon_toggle}{$user},hint,{$hint_val} into ext-local replace"));
+      }
+      if ($que_devstate && $queue_toggle) {
+        set_queue_hint($user, $devices);
-      }
-      if ($dnd_devstate) {
@@ -491 +531 @@
-    debug("set_user_devices: user: $user,  devices: $devices", 8);
-    global $agi;
-empty($devices)
+trim($devices) == ''
-      debug("No more devices associated with $user, deletting /device key", 8);
-      $agi->database_del('AMPUSER',$user.'/device');
@@ -592 +632 @@
-    }
-  }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

modules/branches/2.10/queues/bin/generate_queue_hints.php

@@ -8 +8 @@
-}
-
-
-
-
-
-
-
-
+
-
-$var = $astman->database_show('AMPUSER');
@@ -23 +17 @@
-
-foreach (array_keys($user_hash) as $user) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-}
@@ -34 +47 @@
-// Set the hint for a user based on the devices in their AMPUSER object
-//
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-  }
+  $hlist = 'Custom:QUEUE' . $device . '*' . implode('&Custom:QUEUE' . $device . '*', $queues);
+  out("exten => $queue_toggle_code*$device,hint,$hlist");
-}
-
-// Get the actual technology dialstrings from the DEVICE objects (used
-// to create proper hints)
-//
-function get_dial_string($devices) {
-  debug("get_dial_string: devices: $devices",8);
-  global $astman;
-  global $ast_with_dahdi;
-
-  $device_array = explode( '&', $devices );
-  $dialstring = ''; 
-  foreach ($device_array as $adevice) {
-    $dds = $astman->database_get('DEVICE',$adevice.'/dial');
-    $dialstring .= $dds.'&';
-  }
-  if ($ast_with_dahdi) {
-    $dialstring = str_replace('ZAP/', 'DAHDI/', $dialstring);
-  }
-  return trim($dialstring," &");
-}
-
-// Get the list of current devices for this user
-//
-function get_devices($user) {
-  debug("get_devices: user: $user", 8);
-  global $astman;
-

modules/branches/2.10/queues/functions.inc/dialplan.php

@@ -54 +54 @@
-        queue_agent_del_toggle();
-        queue_agent_add_toggle();
+        $ext->addGlobal('QUEUETOGGLE',$que_code);
-      }
-      $qlist = queues_list(true);
@@ -293 +294 @@
-      if ($que_code != '') {
-        $ext->add($c, $que_code, '', new ext_goto('start','s','app-all-queue-toggle'));
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      // We need to have a hangup here, if call is ended by the caller during Playback it will end in the
-      // h context and do a proper hangup and clean the blkvm if set, see #4671