Changeset 7627

Timestamp:

05/02/09 13:15:16 (1 year ago)

Author:

p_lindheimer

Message:

fixes #3618 generate announce-position in queues.conf for Asterisk 1.6 (yes or no only for now)

Files:

• modules/branches/2.5/queues/functions.inc.php (modified) (3 diffs)
• modules/branches/2.5/queues/module.xml (modified) (1 diff)

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

@@ -42 +42 @@
-                //
-                $ver12 = version_compare($ast_version, '1.4', 'lt');
+                $ver16 = version_compare($ast_version, '1.6', 'ge');
-                
-                // legacy but in case someone was using this we will leave it
@@ -100 +101 @@
-                                                case 'ringinuse': 
-                                                        break;
+                                                case 'announce-position':
+                                                        if ($ver16) {
+                                                                $output .= $keyword."=".$data."\n";
+                                                        }
+                                                        break;
-                                                case 'retry': 
-                                                        if ($data == 'none') {
@@ -404 +410 @@
-        array($account,'announce-frequency',($_REQUEST['announcefreq'])?$_REQUEST['announcefreq']:'0',0),
-        array($account,'announce-holdtime',($_REQUEST['announceholdtime'])?$_REQUEST['announceholdtime']:'no',0),
+        array($account,'announce-position',($_REQUEST['announceposition'])?$_REQUEST['announceposition']:'no',0),
-        array($account,'queue-youarenext',($_REQUEST['announceposition']=='no')?'silence/1':'queue-youarenext',0),  //if no, play no sound
-        array($account,'queue-thereare',($_REQUEST['announceposition']=='no')?'silence/1':'queue-thereare',0),  //if no, play no sound

modules/branches/2.5/queues/module.xml

@@ -9 +9 @@
-        </description>
-        <changelog>
+                *2.5.4.7* #3618
-                *2.5.4.6* localization updates
-                *2.5.4.5* #3400, #3380, various translations