Changeset 5993

Timestamp:

07/13/08 17:34:25 (4 months ago)

Author:

p_lindheimer

Message:

#2875, #2768 only add auto-blkvm once, add ringinuse on Ast 1.4

Files:

• modules/branches/2.5/queues/functions.inc.php (modified) (8 diffs)

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

@@ -34 +34 @@
-                }
-
-
+true
-                foreach ($results as $result) {
-                        $output .= "[".$result[0]."]\n";
@@ -51 +51 @@
-                        foreach ($results2 as $keyword => $data) {
-                                if ($ver12){
-
+
+
+
+
+
+
+
-                                }else{
-                                        switch($keyword){
@@ -102 +108 @@
-function queues_destinations() {
-        //get the list of all exisiting
-
+true
-        
-        //return an associative array with destination and description
@@ -150 +156 @@
-                        /* queue extensions */
-                        $ext->addInclude('from-internal-additional','ext-queues');
-
+true
-                        if (is_array($qlist)) {
-                                foreach($qlist as $item) {
@@ -175 +181 @@
-                                        $ext->add('ext-queues', $exten, '', new ext_setvar('__BLKVM_BASE', '${EXTEN}'));
-                                        $ext->add('ext-queues', $exten, '', new ext_setvar('DB(${BLKVM_OVERRIDE})', 'TRUE'));
-setvar('_DIAL_OPTIONS', '
+execif('$["${REGEX("(M[(]auto-blkvm[)])" ${DIAL_OPTIONS})}" != "1"]', 'Set', '_DIAL_OPTIONS=
-
-                                        // Inform all the children NOT to send calls to destinations or voicemail
@@ -301 +307 @@
-        array($account,'monitor-join','yes',0),
-        array($account,'eventwhencalled',($_REQUEST['eventwhencalled'])?$_REQUEST['eventwhencalled']:'no',0),
-
+
+
+
-
-        if ($_REQUEST['music'] != 'inherit') {
@@ -359 +367 @@
-
-//get the existing queue extensions
-
+
+
-        global $db;
-        $sql = "SELECT extension, descr FROM queues_config ORDER BY extension";
@@ -368 +377 @@
-
-        foreach($results as $result){
-
+$listall || 
-                        $extens[] = array($result[0],$result[1]);
-                }