Changeset 6170

Timestamp:

07/24/08 18:21:08 (4 months ago)

Author:

p_lindheimer

Message:

closes #2068 use recording_ids, adds queues_ivr_usage for #2948, don't list IVR's with compound recordings and don't list compound recordigns for announcement message

Files:

• modules/branches/2.5/queues/functions.inc.php (modified) (12 diffs)
• modules/branches/2.5/queues/install.php (modified) (2 diffs)
• modules/branches/2.5/queues/module.xml (modified) (3 diffs)
• modules/branches/2.5/queues/page.queues.php (modified) (10 diffs)

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

@@ -144 +144 @@
-        } else {
-                return false;
+        }
+}
+
+function queues_recordings_usage($recording_id) {
+        global $active_modules;
+
+        $results = sql("SELECT `extension`, `descr` FROM `queues_config` WHERE `agentannounce_id` = '$recording_id' OR `joinannounce_id` = '$recording_id'","getAll",DB_FETCHMODE_ASSOC);
+        if (empty($results)) {
+                return array();
+        } else {
+                //$type = isset($active_modules['queues']['type'])?$active_modules['queues']['type']:'setup';
+                foreach ($results as $result) {
+                        $usage_arr[] = array(
+                          'url_query' => 'config.php?display=queues&extdisplay='.urlencode($result['extension']),
+                                'description' => "Queue: ".$result['descr'],
+                        );
+                }
+                return $usage_arr;
+        }
+}
+
+function queues_ivr_usage($ivr_id) {
+        global $active_modules;
+
+        $results = sql("SELECT `extension`, `descr` FROM `queues_config` WHERE `ivr_id` = '$ivr_id'","getAll",DB_FETCHMODE_ASSOC);
+        if (empty($results)) {
+                return array();
+        } else {
+                foreach ($results as $result) {
+                        $usage_arr[] = array(
+                          'url_query' => 'config.php?display=queues&extdisplay='.urlencode($result['extension']),
+                                'description' => "Queue: ".$result['descr'],
+                        );
+                }
+                return $usage_arr;
-        }
-}
@@ -208 +243 @@
-
-                                        $ext->add('ext-queues', $exten, '', new ext_setvar('MONITOR_FILENAME','/var/spool/asterisk/monitor/q${EXTEN}-${STRFTIME(${EPOCH},,%Y%m%d-%H%M%S)}-${UNIQUEID}'));
-
-
+
+
+
-                                                $ext->add('ext-queues', $exten, '', new ext_playback($joinannounce));
-                                        }
@@ -223 +259 @@
-                                                $ext->add('ext-queues', $exten, '', new ext_setvar('_CWIGNORE', 'TRUE'));
-                                        }
-
+
+
+
+
+
+
-                                        $ext->add('ext-queues', $exten, '', new ext_queue($exten,$options,'',$agentannounce,$q['maxwait']));
- 
@@ -276 +317 @@
-}
-
-,$members,$joinannounce
+_id,$members,$joinannounce_id
-        global $db;
-
@@ -285 +326 @@
-
-        //add to extensions table
-) || $agentannounce == 'None'
-
+_id)
+_id
-        }
-
@@ -333 +374 @@
-        $grppre        = isset($prefix) ? addslashes($prefix):'';
-        $alertinfo     = isset($alertinfo) ? addslashes($alertinfo):'';
-$joinannounce  = strtolower($joinannounce) != 'none' ? $joinannounce:''
+//$joinannounce_id  = $joinannounce_id
-        $ringing       = isset($_REQUEST['rtone']) ? $_REQUEST['rtone']:'';
-$agentannounce = strtolower($agentannounce) != 'none' ? $agentannounce:''
+//$agentannounce_id = $agentannounce_id
-        $maxwait       = isset($maxwait) ? $maxwait:'';
-        $password      = isset($password) ? $password:'';
@@ -344 +385 @@
-
-        // Assumes it has just been deleted
-, ringing, agentannounce
-', '$ringing', '$agentannounce
+_id, ringing, agentannounce_id
+_id', '$ringing', '$agentannounce_id
-        $results = sql($sql);
-        return true;
@@ -445 +486 @@
-
-        $compound_recordings = array();
-, ivr_id FROM queues_config WHERE (ivr_id != 'none' AND ivr_id != '') OR agentannounce
+_id, ivr_id FROM queues_config WHERE (ivr_id != 'none' AND ivr_id != '') OR agentannounce_id
-        $results = sql($sql, "getAll",DB_FETCHMODE_ASSOC);
-
@@ -459 +500 @@
-
-        foreach ($results as $result) {
-
+
+
-                        $compound_recordings[] = array(
-                                                        'extension' => $result['extension'],
@@ -467 +509 @@
-                }
-                if ($result['ivr_id'] != 'none' && $result['ivr_id'] != '' && $check_ivr) {
-
+
+
+
-                                $compound_recordings[] = array(
-                                                                'extension' => $result['extension'],
@@ -526 +570 @@
-                // We need to strip off all but the first sound file of any compound sound files
-                //
-arr        = explode("&", $config['agentannounce
-'] = $agentannounce
+id_arr        = explode("&", $config['agentannounce_id
+_id'] = $agentannounce_id
-        } else {
-                $sql = "SELECT * FROM queues_config WHERE extension = $account";
@@ -534 +578 @@
-                $results['prefix']        = $config['grppre'];
-                $results['alertinfo']     = $config['alertinfo'];
-'] = $config['agentannounce
+_id'] = $config['agentannounce_id
-                $results['maxwait']       = $config['maxwait'];
-                $results['name']          = $config['descr'];
-']  = $config['joinannounce
+_id']  = $config['joinannounce_id
-                $results['password']      = $config['password'];
-                $results['goto']          = $config['dest'];

modules/branches/2.5/queues/install.php

@@ -301 +301 @@
-        }
-
-
-
-
-        // Version 2.5 upgrade
-        outn(_("checking for qregex field.."));
@@ -320 +317 @@
-        }
-
+// Version 2.5 migrate to recording ids
+// Note: we purposely did not chnage the inital creation of the
+//       recording ids as it is safer with all the complex
+//       migration code to simply stick with what works and
+//       then convert it here even if new.
+//
+outn(_("Checking if recordings need migration.."));
+$sql = "SELECT agentannounce_id FROM queues_config";
+$check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+if(DB::IsError($check)) {
+        //  Add recording_id field
+        //
+        out("migrating");
+        outn(_("adding agentannounce_id field.."));
+  $sql = "ALTER TABLE queues_config ADD agentannounce_id INTEGER";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) {
+                out(_("fatal error"));
+                die_freepbx($result->getDebugInfo()); 
+        } else {
+                out(_("ok"));
+        }
+        outn(_("adding joinannounce_id field.."));
+  $sql = "ALTER TABLE queues_config ADD joinannounce_id INTEGER";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) {
+                out(_("fatal error"));
+                die_freepbx($result->getDebugInfo()); 
+        } else {
+                out(_("ok"));
+        }
+
+        // Get all the valudes and replace them with recording_id
+        //
+        outn(_("migrate agentannounce to ids.."));
+  $sql = "SELECT `extension`, `agentannounce` FROM `queues_config`";
+        $results = $db->getAll($sql, DB_FETCHMODE_ASSOC);
+        if(DB::IsError($results)) {
+                out(_("fatal error"));
+                die_freepbx($results->getDebugInfo());  
+        }
+        $migrate_arr = array();
+        $count = 0;
+        foreach ($results as $row) {
+                if (trim($row['agentannounce']) != '') {
+                        $rec_id = recordings_get_or_create_id($row['agentannounce'], 'queues');
+                        $migrate_arr[] = array($rec_id, $row['extension']);
+                        $count++;
+                }
+        }
+        if ($count) {
+                $compiled = $db->prepare('UPDATE `queues_config` SET `agentannounce_id` = ? WHERE `extension` = ?');
+                $result = $db->executeMultiple($compiled,$migrate_arr);
+                if(DB::IsError($result)) {
+                        out(_("fatal error"));
+                        die_freepbx($result->getDebugInfo());   
+                }
+        }
+        out(sprintf(_("migrated %s entries"),$count));
+
+        outn(_("migrate joinannounce to ids.."));
+  $sql = "SELECT `extension`, `joinannounce` FROM `queues_config`";
+        $results = $db->getAll($sql, DB_FETCHMODE_ASSOC);
+        if(DB::IsError($results)) {
+                out(_("fatal error"));
+                die_freepbx($results->getDebugInfo());  
+        }
+        $migrate_arr = array();
+        $count = 0;
+        foreach ($results as $row) {
+                if (trim($row['joinannounce']) != '') {
+                        $rec_id = recordings_get_or_create_id($row['joinannounce'], 'queues');
+                        $migrate_arr[] = array($rec_id, $row['extension']);
+                        $count++;
+                }
+        }
+        if ($count) {
+                $compiled = $db->prepare('UPDATE `queues_config` SET `joinannounce_id` = ? WHERE `extension` = ?');
+                $result = $db->executeMultiple($compiled,$migrate_arr);
+                if(DB::IsError($result)) {
+                        out(_("fatal error"));
+                        die_freepbx($result->getDebugInfo());   
+                }
+        }
+        out(sprintf(_("migrated %s entries"),$count));
+
+        // Now remove the old recording field replaced by new id field
+        //
+        outn(_("dropping agentannounce field.."));
+  $sql = "ALTER TABLE `queues_config` DROP `agentannounce`";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) { 
+                out(_("no agentannounce field???"));
+        } else {
+                out(_("ok"));
+        }
+        outn(_("dropping joinannounce field.."));
+  $sql = "ALTER TABLE `queues_config` DROP `joinannounce`";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) { 
+                out(_("no joinannounce field???"));
+        } else {
+                out(_("ok"));
+        }
+} else {
+        out("already migrated");
+}
+
-?>

modules/branches/2.5/queues/module.xml

@@ -2 +2 @@
-        <rawname>queues</rawname>
-        <name>Queues</name>
-0.
+
-        <type>setup</type>
-        <category>Inbound Call Control</category>
@@ -9 +9 @@
-        </description>
-        <changelog>
+                *2.5.1* #2068 recordings_id, don't list IVRs with compound messages
-                *2.5.0.1* #2875, #2768
-                *2.5.0.0* #2976 Add Optional Regex to filter user agent numbers that they can input
@@ -48 +49 @@
-        <depends>
-                <version>2.5.0alpha1</version>
+                <module>recordings ge 3.3.8</module>
-        </depends>
-        <menuitems>

modules/branches/2.5/queues/page.queues.php

@@ -21 +21 @@
-isset($_REQUEST['name'])?$name = $_REQUEST['name']:$name='';
-isset($_REQUEST['password'])?$password = $_REQUEST['password']:$password='';
-'])?$agentannounce = $_REQUEST['agentannounce']:$agentannounce
+_id'])?$agentannounce_id = $_REQUEST['agentannounce_id']:$agentannounce_id
-isset($_REQUEST['prefix'])?$prefix = $_REQUEST['prefix']:$prefix='';
-isset($_REQUEST['alertinfo'])?$alertinfo = $_REQUEST['alertinfo']:$alertinfo='';
-'])?$joinannounce = $_REQUEST['joinannounce']:$joinannounce
+_id'])?$joinannounce_id = $_REQUEST['joinannounce_id']:$joinannounce_id
-$maxwait = isset($_REQUEST['maxwait'])?$_REQUEST['maxwait']:'';
-$cwignore = isset($_REQUEST['cwignore'])?$_REQUEST['cwignore']:'0';
@@ -98 +98 @@
-                                        $conflict_url = framework_display_extension_usage_alert($usage_arr);
-                                } else {
-,$members,$joinannounce
+_id,$members,$joinannounce_id
-                                        needreload();
-                                        redirect_standard();
@@ -110 +110 @@
-                        case "edit":  //just delete and re-add
-                                queues_del($account);
-,$members,$joinannounce
+_id,$members,$joinannounce_id
-                                needreload();
-                                redirect_standard('extdisplay');
@@ -244 +244 @@
-                <td><a href="#" class="info"><?php echo _("Agent Announcement:")?><span><?php echo _("Announcement played to the Agent prior to bridging in the caller <br><br> Example: \"the Following call is from the Sales Queue\" or \"This call is from the Technical Support Queue\".<br><br>To add additional recordings please use the \"System Recordings\" MENU to the left. Compound recordings composed of 2 or more sound files are not displayed as options since this feature can not accept such recordings.")?></span></a></td>
-                <td>
-
+_id
-                        <?php
-                                $tresults = recordings_list(false);
-) ? $agentannounce : 'None
-
-None
+_id) ? $agentannounce_id : '
+
+
-                                if (isset($tresults[0])) {
-                                        foreach ($tresults as $tresult) {
-2].'" '.($tresult[2] == $default ? 'SELECTED' : '').'>'.$tresult[1]."</option>\n";
+'id'].'"'.($tresult['id'] == $default ? ' SELECTED' : '').'>'.$tresult['displayname']."</option>\n"
-                                        }
-                                }
@@ -264 +264 @@
-                <td>
-                        <?php
-) ? $agentannounce
+_id) ? $agentannounce_id
-                        ?>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        <tr>
-                <td><a href="#" class="info"><?php echo _("Music on Hold Class:")?><span><?php echo _("Music (or Commercial) played to the caller while they wait in line for an available agent. Choose \"inherit\" if you want the MoH class to be what is currently selected, such as by the inbound route.<br><br>  This music is defined in the \"Music on Hold\" Menu to the left.")?></span></a></td>
@@ -559 +590 @@
-                        
-                        //query for exisiting aa_N contexts
+                        //
+                        // If a previous bogus IVR was listed, we will leave it in with an error but will no longer show such IVRs as valid options.
-                        $unique_aas = ivr_list();               
-                        
@@ -571 +604 @@
-                                        if (strpos($unique_aa['announcement'],"&") === false) {
-                                                echo '<option value="'.$menu_id.'" '.($default == $menu_id ? 'SELECTED' : '').'>'.($menu_name ? $menu_name : _("Menu ID ").$menu_id)."</option>\n";
-
+
+
-                                                $compound_recordings = true;
-                                                echo '<option style="color:red" value="'.$menu_id.'" '.($default == $menu_id ? 'SELECTED' : '').'>'.($menu_name ? $menu_name : _("Menu ID ").$menu_id)." (**)</option>\n";
-                                                if ($menu_id == $default) {
+                                                        echo '<option style="color:red" value="'.$menu_id.'" '.($default == $menu_id ? 'SELECTED' : '').'>'.($menu_name ? $menu_name : _("Menu ID ").$menu_id)." (**)</option>\n";
-                                                        $is_error = true;
-                                                }
@@ -583 +617 @@
-                        </select>
-                        <?php
-compound_recordings
+is_error
-                        ?>
-                                <small><a style="color:red"  href="#" class="info"><?php echo ($is_error ? _("(**) ERRORS") : _("(**) Warning Potential Errors"))?>
@@ -589 +623 @@
-                                                <?php 
-                                                        if ($is_error) {
-
-
-
+
-                                                        }
-                                                ?>
@@ -619 +651 @@
-<?php } else {
-        echo "<input type=\"hidden\" name=\"announcemenu\" value=\"none\">";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        // implementation of module hook
-        // object was initialized in config.php