Changeset 9460 for modules/branches/2.8/queues

Timestamp:

04/07/10 13:16:23 (3 years ago)

Author:

p_lindheimer

Message:

Merged revisions 9418-9447,9449-9459 via svnmerge from
http://svn.freepbx.org/modules/branches/2.7

........

r9420 | p_lindheimer | 2010-03-27 14:49:12 -0700 (Sat, 27 Mar 2010) | 1 line

remove unused install.sql

........

r9421 | p_lindheimer | 2010-03-27 14:49:38 -0700 (Sat, 27 Mar 2010) | 1 line

Module Publish Script: cidlookup 2.7.0.2

........

r9442 | p_lindheimer | 2010-04-05 11:40:45 -0700 (Mon, 05 Apr 2010) | 1 line

don't put dynmember info in queues_additional.conf, it is meaningless and may break the app, please confirm this fixes the issue before closing and publishing re #4187

........

r9457 | p_lindheimer | 2010-04-07 10:03:38 -0700 (Wed, 07 Apr 2010) | 1 line

Auto Check-in of any outstanding patches

........

r9458 | p_lindheimer | 2010-04-07 10:04:08 -0700 (Wed, 07 Apr 2010) | 1 line

Module Publish Script: core 2.7.0.5

........

Files:

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

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

@@ -884 +884 @@
-    $results['queuewait']     = $config['queuewait'];
-    $results['use_queue_context'] = $config['use_queue_context'];
+
+    // TODO: why the str_replace?
+    //
+    if ($astman) {
+      $account=str_replace("'",'',$account);
+      //get dynamic members priority from astDB
+      $get=$astman->database_show('QPENALTY/'.$account.'/agents');
+      if($get){
+        foreach($get as $key => $value){
+          $key=explode('/',$key);
+          $mem[$key[4]]=$value;
+        }
+        foreach($mem as $mem => $pnlty){
+          $dynmem[]=$mem.','.$pnlty;
+        }
+        $results['dynmembers']=implode("\n",$dynmem);
+      } else {
+        $results['dynmembers']='';
+      }
+      $results['dynmemberonly'] = $astman->database_get('QPENALTY/'.$account,'dynmemberonly');
+    } else {
+      fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
+    }
-  }
-
@@ -902 +925 @@
-    }
-  }
-  // TODO: why the str_replace?
-  //
-  if ($astman) {
-    $account=str_replace("'",'',$account);
-    //get dynamic members priority from astDB
-    $get=$astman->database_show('QPENALTY/'.$account.'/agents');
-    if($get){
-      foreach($get as $key => $value){
-        $key=explode('/',$key);
-        $mem[$key[4]]=$value;
-      }
-      foreach($mem as $mem => $pnlty){
-        $dynmem[]=$mem.','.$pnlty;
-      }
-      $results['dynmembers']=implode("\n",$dynmem);
-    } else {
-      $results['dynmembers']='';
-     }
-    $results['dynmemberonly'] = $astman->database_get('QPENALTY/'.$account,'dynmemberonly');
-  } else {
-    fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
-  }
-  return $results;
-}

modules/branches/2.8/queues/module.xml

@@ -2 +2 @@
-  <rawname>queues</rawname>
-  <name>Queues</name>
-3
+4
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -11 +11 @@
-  </description>
-  <changelog>
+    *2.7.0.4* #4187
-    *2.7.0.3* #4165
-    *2.7.0.2* #4120 again fixed typo in variable name