Changeset 11371 for modules/branches/2.8/queues

Timestamp:

02/13/11 19:56:05 (2 years ago)

Author:

p_lindheimer

Message:

Merged revisions 11370 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.9

........

r11370 | p_lindheimer | 2011-02-13 16:52:10 -0800 (Sun, 13 Feb 2011) | 1 line

fixes #4408, fixes #4540, fixes #4745 adds extension option 'Queue State Detection' that can be configured to 'Ignore State' which will make the queue code always ignore state information for the given user/extension

........
publishing deferred until feedback is provided by some testers that this
addresses the reported issues and does not break anything.

Files:

• modules/branches/2.8 (modified) (1 prop)
• modules/branches/2.8/queues/functions.inc.php (modified) (9 diffs)

modules/branches/2.8/queues/functions.inc.php

@@ -45 +45 @@
-    $ver16 = version_compare($ast_version, '1.6', 'ge');
-    $ast_ge_14_25 = version_compare($ast_version,'1.4.25','ge');
+    $ast_ge_18 = version_compare($ast_version,'1.8','ge');
-    
-    // legacy but in case someone was using this we will leave it
@@ -142 +143 @@
-      // Now pull out all the memebers, one line for each
-      //
-
+st_ge_18 || $a
-        foreach ($members as $member) {
-          preg_match("/^Local\/([\d]+)\@*/",$member,$matches);
@@ -148 +149 @@
-            $name = $users[$matches[1]];
-            str_replace(',','\,',$name);
-
+
+
+
+
+
+
+
-          } else {
-            $output .= "member=".$member."\n";
@@ -159 +166 @@
-            $name = $users[$matches[1]];
-            str_replace(',','\,',$name);
-
+
+
+
+
+
+
-          } else {
-            $output .= "member=".$member."\n";
@@ -297 +309 @@
-      $ast_ge_16 = version_compare($version,'1.6','ge');
-      $ast_ge_14_25 = version_compare($version,'1.4.25','ge');
+      $ast_ge_18 = version_compare($version,'1.8','ge');
-
-      $has_extension_state = $ast_ge_16;
@@ -566 +579 @@
-
-
-
-
+
+
+
-        $ext->add($context, $exten, '', new ext_execif('$[${DB_EXISTS(AMPUSER/${CALLBACKNUM}/cidname)} = 0]', 'AddQueueMember', '${ARG1},Local/${CALLBACKNUM}@from-queue/n,${DB(QPENALTY/${ARG1}/agents/${CALLBACKNUM})}'));
-      } else if ($ast_ge_14_25) {
-        $ext->add($context, $exten, '', new ext_set('THISDEVICE', '${IF($[${LEN(${THISDEVICE})}=0]?${DB(DEVICE/${CUT(DB(AMPUSER/${CALLBACKNUM}/device),&,1)}/dial)}:${THISDEVICE})}'));
-
+
+
-        $ext->add($context, $exten, '', new ext_execif('$[${LEN(${THISDEVICE})}=0]', 'AddQueueMember', '${ARG1},Local/${CALLBACKNUM}@from-queue/n,${DB(QPENALTY/${ARG1}/agents/${CALLBACKNUM})}'));
-      } else {
@@ -1050 +1065 @@
-
-  $ast_ge_14_25 = version_compare($version,'1.4.25','ge');
+  $ast_ge_18 = version_compare($version,'1.8','ge');
-  $id = "macro-toggle-add-agent"; // The context to be included
-
@@ -1059 +1075 @@
-  //TODO: check if it's not a user for some reason and abort?
-  $ext->add($id, $c, '', new ext_gotoif('$["${DB(QPENALTY/${QUEUENO}/dynmemberonly)}" = "yes" & ${DB_EXISTS(QPENALTY/${QUEUENO}/agents/${CALLBACKNUM})} != 1]', 'invalid'));
-
-
+
+
+
+
-  } else if ($ast_ge_14_25) {
-
+
+
-  } else {
-    $ext->add($id, $c, '', new ext_addqueuemember('${QUEUENO}','Local/${CALLBACKNUM}@from-queue/n,${DB(QPENALTY/${QUEUENO}/agents/${CALLBACKNUM})}'));
@@ -1089 +1108 @@
-  $ext->add($id, $c, '', new ext_macroexit());
-}
+
+/************************************************************************************************************
+ * Hook Exentions/Users to allow an extension to indicate if the Queue should ignore it's state information
+ * when it is acting as a Queue Member (Agent).
+ */
+function queues_get_qnostate($exten) {
+  global $astman;
+
+  // Retrieve the qnostate configuraiton from this user from ASTDB
+  if ($astman) {
+    $qnostate = $astman->database_get("AMPUSER",$exten."/queues/qnostate");
+  } else {
+    fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
+  }
+  // If it's blank, set it to 'usestate'
+  //
+  return ($qnostate == 'ignorestate' ? $qnostate : 'usestate');
+}
+
+function queues_set_qnostate($exten,$qnostate) {
+  global $astman;
+  
+  // Update the settings in ASTDB
+  if ($astman) {
+    $astman->database_put("AMPUSER",$exten."/queues/qnostate",$qnostate);
+  } else {
+    fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
+  }
+}
+
+function queues_applyhooks() {
+  global $currentcomponent;
+
+  $currentcomponent->addoptlistitem('qnostate', 'usestate', _('Use State'));
+  $currentcomponent->addoptlistitem('qnostate', 'ignorestate',_('Ignore State'));
+  $currentcomponent->setoptlistopts('qnostate', 'sort', false);
+
+  // Add the 'process' function - this gets called when the page is loaded, to hook into 
+  // displaying stuff on the page.
+  $currentcomponent->addguifunc('queues_configpageload');
+
+}
+
+function queues_configpageinit($pagename) {
+  global $currentcomponent;
+
+  $action = isset($_REQUEST['action'])?$_REQUEST['action']:null;
+  $extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null;
+  $extension = isset($_REQUEST['extension'])?$_REQUEST['extension']:null;
+  $tech_hardware = isset($_REQUEST['tech_hardware'])?$_REQUEST['tech_hardware']:null;
+
+  // We only want to hook 'users' or 'extensions' pages.
+  if ($pagename != 'users' && $pagename != 'extensions') 
+    return true;
+  // On a 'new' user, 'tech_hardware' is set, and there's no extension. Hook into the page.
+  if ($tech_hardware != null || $pagename == 'users') {
+    queues_applyhooks();
+    $currentcomponent->addprocessfunc('queues_configprocess', 8);
+  } elseif ($action=="add") {
+    // We don't need to display anything on an 'add', but we do need to handle returned data.
+    $currentcomponent->addprocessfunc('queues_configprocess', 8);
+  } elseif ($extdisplay != '') {
+    // We're now viewing an extension, so we need to display _and_ process.
+    queues_applyhooks();
+    $currentcomponent->addprocessfunc('queues_configprocess', 8);
+  }
+}
+
+// This is called before the page is actually displayed, so we can use addguielem().
+function queues_configpageload() {
+  global $currentcomponent;
+
+  // Init vars from $_REQUEST[]
+  $action = isset($_REQUEST['action'])?$_REQUEST['action']:null;
+  $extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null;
+  
+  // Don't display this stuff it it's on a 'This xtn has been deleted' page.
+  if ($action != 'del') {
+
+    $qnostate = queues_get_qnostate($extdisplay);
+
+    $section = _('Extension Options');
+    $currentcomponent->addguielem($section, new gui_selectbox('qnostate', $currentcomponent->getoptlist('qnostate'), $qnostate, _('Queue State Detection'), _("If this extension is part of a Queue then the Queue will attempt to use the user's extension state or device state information when determining if this queue member should be called. In some uncommon situations such as a Follow-Me with no physical device, or some virtual extension scenarios, the state information will indicate that this member is not available when they are. Setting this to 'Ignore State' will make the Queue ignore all state information thus always trying to contact this member. Certain side affects can occur when this route is taken due to the nature of how Queues handle Local channels, such as subseqeuent transfers will continue to show the member as busy until the original call is terminated. In most cases, this SHOULD BE set to 'Use State'."), false));
+  }
+}
+
+function queues_configprocess() {
+  //create vars from the request
+  $action = isset($_REQUEST['action'])?$_REQUEST['action']:null;
+  $ext = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null;
+  $extn = isset($_REQUEST['extension'])?$_REQUEST['extension']:null;
+  $qnostate = isset($_REQUEST['qnostate'])?$_REQUEST['qnostate']:null;
+
+  if ($ext==='') { 
+    $extdisplay = $extn; 
+  } else {
+    $extdisplay = $ext;
+  } 
+  if ($action == "add" || $action == "edit") {
+    if (!isset($GLOBALS['abort']) || $GLOBALS['abort'] !== true) {
+      queues_set_qnostate($extdisplay, $qnostate);
+    }
+  } // if 'del' then core will remove the entire tree
+}
-?>