Changeset 6247

Timestamp:

08/01/08 20:33:25 (2 months ago)

Author:

p_lindheimer

Message:

closes #2073 prepend optional queue hold time to CID so agent can see how long the person was holding

Files:

• modules/branches/2.5/core/agi-bin/dialparties.agi (modified) (1 diff)
• modules/branches/2.5/core/module.xml (modified) (1 diff)
• modules/branches/2.5/queues/functions.inc.php (modified) (4 diffs)
• modules/branches/2.5/queues/install.php (modified) (1 diff)
• modules/branches/2.5/queues/module.xml (modified) (2 diffs)
• modules/branches/2.5/queues/page.queues.php (modified) (4 diffs)

modules/branches/2.5/core/agi-bin/dialparties.agi

@@ -67 +67 @@
-$cidname = $AGI->request['agi_calleridname'];
-debug("Caller ID name is '$cidname' number is '$cidnum'", 1);
+
+$queue_wait = get_var( $AGI, "QUEUEWAIT" );
+if ($queue_wait != '') {
+        $saved_cidname = get_var( $AGI, "SAVEDCIDNAME" );
+        $elapsed = round((time() - $queue_wait)/60,0);
+        if ($saved_cidname == '') {
+                $AGI->set_variable('__SAVEDCIDNAME',$cidname);
+                $AGI->set_variable('CALLERID(name)',"M$elapsed:$cidname");
+        } else {
+                $AGI->set_variable('CALLERID(name)',"M$elapsed:$saved_cidname");
+        }
+}
-
-// From this point forward, Set KEEPCID in the channel so subsequent calls, CF, etc. retain the incoming

modules/branches/2.5/core/module.xml

@@ -4 +4 @@
-        <category>Basic</category>
-        <name>Core</name>
-1
+2
-        <candisable>no</candisable>
-        <canuninstall>no</canuninstall>
-        <changelog>
+                *2.5.0alpha1.2* #2976, #2778, #2413, #2974, #2962, #2894, #2073
-                *2.5.0alpha1.1* #2930, #2938, #2922, #2939, #1568, #2949, #2779, #2953, #1911, #2807
-                *2.5.0alpha1.0* #2853, #2925, #2391, #2785, #2923, #2671, #2585, #2908, #2909, #2510, #2976, #2845, #1715, #2760, #2926, #2927, #2838, also added misc icons, links between users/devices

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

@@ -213 +213 @@
-                                        // line to clear this flag so that subsequent transfers can occur.
-                                        //
+                                        if ($q['queuewait']) {
+                                                $ext->add('ext-queues', $exten, '', new ext_execif('$["${QUEUEWAIT}" = ""]', 'Set', '__QUEUEWAIT=${EPOCH}'));
+                                        }
-                                        $ext->add('ext-queues', $exten, '', new ext_setvar('__BLKVM_OVERRIDE', 'BLKVM/${EXTEN}/${CHANNEL}'));
-                                        $ext->add('ext-queues', $exten, '', new ext_setvar('__BLKVM_BASE', '${EXTEN}'));
@@ -317 +320 @@
-}
-
-
+,$queuewait='no'
-        global $db;
-
@@ -382 +385 @@
-        $dest          = isset($goto) ? $goto:'';
-        $cwignore      = isset($cwignore) ? $cwignore:'0';
+        $queuewait     = isset($queuewait) ? $queuewait:'0';
-        $qregex        = isset($qregex) ? addslashes($qregex):'';
-
-        // Assumes it has just been deleted
-
-
+, queuewait
+, '$queuewait'
-        $results = sql($sql);
-        return true;
@@ -588 +592 @@
-                $results['cwignore']      = $config['cwignore'];
-                $results['qregex']        = $config['qregex'];
+                $results['queuewait']     = $config['queuewait'];
-        }
-

modules/branches/2.5/queues/install.php

@@ -425 +425 @@
-}
-
+outn(_("checking for queuewait field.."));
+$sql = "SELECT `queuewait` FROM queues_config";
+$check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+if(DB::IsError($check)) {
+        // add new field
+        $sql = "ALTER TABLE queues_config ADD `queuewait` TINYINT( 1 ) DEFAULT 0";
+        $result = $db->query($sql);
+        if(DB::IsError($result)) {
+                die_freepbx($result->getDebugInfo());
+        }
+        out(_("OK"));
+} else {
+        out(_("already exists"));
+}
+
-?>

modules/branches/2.5/queues/module.xml

@@ -2 +2 @@
-        <rawname>queues</rawname>
-        <name>Queues</name>
-1
+2
-        <type>setup</type>
-        <category>Inbound Call Control</category>
@@ -9 +9 @@
-        </description>
-        <changelog>
+                *2.5.2* #2073 add a Queue hold time CID prepend to report how long the caller has been holding
-                *2.5.1* #2068 recordings_id, don't list IVRs with compound messages
-                *2.5.0.1* #2875, #2768

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

@@ -27 +27 @@
-$maxwait = isset($_REQUEST['maxwait'])?$_REQUEST['maxwait']:'';
-$cwignore = isset($_REQUEST['cwignore'])?$_REQUEST['cwignore']:'0';
+$queuewait = isset($_REQUEST['queuewait'])?$_REQUEST['queuewait']:'0';
-$rtone = isset($_REQUEST['rtone'])?$_REQUEST['rtone']:'0';
-$qregex = isset($_REQUEST['qregex'])?$_REQUEST['qregex']:'';
@@ -98 +99 @@
-                                        $conflict_url = framework_display_extension_usage_alert($usage_arr);
-                                } else {
-
+,$queuewait
-                                        needreload();
-                                        redirect_standard();
@@ -110 +111 @@
-                        case "edit":  //just delete and re-add
-                                queues_del($account);
-
+,$queuewait
-                                needreload();
-                                redirect_standard('extdisplay');
@@ -207 +208 @@
-
-        <tr>
+                <td><a href="#" class="info"><?php echo _("Wait Time Prefix:")?><span><?php echo _("When set to Yes, the CID Name will be prefixed with the total wait time in the queue so the answering agent is aware how long they have waited. It will be rounded to the nearest minute, in the form of Mnn: where nn is the number of minutes")?></span></a></td>
+                <td>
+                        <select name="queuewait" tabindex="<?php echo ++$tabindex;?>">
+                        <?php
+                                $default = (isset($queuewait) ? $queuewait : 'no');
+                                $items = array('1'=>_("Yes"),'0'=>_("No"));
+                                foreach ($items as $item=>$val) {
+                                        echo '<option value="'.$item.'" '. ($default == $item ? 'SELECTED' : '').'>'.$val;
+                                }
+                        ?>
+                        </select>
+                </td>
+        </tr>
+
+        <tr>
-                <td><a href="#" class="info"><?php echo _("Alert Info")?><span><?php echo _('ALERT_INFO can be used for distinctive ring with SIP devices.')?></span></a>:</td>
-                <td><input type="text" name="alertinfo" size="30" value="<?php echo (isset($alertinfo)?$alertinfo:'') ?>" tabindex="<?php echo ++$tabindex;?>"></td>