Changeset 14085

Timestamp:

05/23/12 09:34:42 (1 year ago)

Author:

p_lindheimer

Message:

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

........

r14084 | p_lindheimer | 2012-05-23 06:22:38 -0700 (Wed, 23 May 2012) | 1 line

fixes #5844 typo should be 'Callers:' but added additional logic to track better and potentially insulate against future changes in asterisk

........

Files:

• modules/branches/2.9 (modified) (2 props)
• modules/branches/2.9/queues/agi-bin/queue_devstate.agi (modified) (4 diffs)

modules/branches/2.9/queues/agi-bin/queue_devstate.agi

@@ -76 +76 @@
-    // Lets try and process our results here.
-    $inqueue='false';
+    $callers_list = false;
-    foreach ($response1 as $item) {
-      $item1=trim($item);
+      if ($callers_list) {
+        if (preg_match('/^\d+\./',$item1)) {
+          debug("skipping caller $item1 in queue $inqueue", 6);
+          continue;
+        } else {
+          debug("Finished processing callers for $inqueue");
+          $callers_list = false;
+          $inqueue='false';
+        }
+      }
-      if ($inqueue == 'false') {
-        if (preg_match('/^(\d+)/',$item1)) {
@@ -86 +97 @@
-            $logged_agents_array[$inqueue][]='';
-            $static_agents_array[$inqueue][]='';
+            debug("initiating queue: $inqueue");
-          }
-        }
@@ -99 +111 @@
-        case '':
-          break;
+
-        case '\n':
-          break;
@@ -108 +121 @@
-
-        case 'No Callers':
-        case 'Callers':
-          debug("Finished processing members for $inqueue");
-          $inqueue='false';
-          break;
+
+        case 'Callers':
+        case 'Callers:':
+          debug("Getting ready to skip callers in $inqueue");
+          $callers_list = true;
+          break;
+
-        case 'ADD':
-          $logged_agents_array[$inqueue][]=$loggedagent;