Changeset 13439 for modules/branches

Timestamp:

02/13/12 22:41:59 (1 year ago)

Author:

p_lindheimer

Message:

closes #5576 adds ability to not append original annoucmenets. know issue in js when timeout retries set to 0 not hiding elements as does invalid repsonse. This was broken before, needs someone to look at it

Files:

• modules/branches/2.10/ivr/assets/js/ivr.js (modified) (4 diffs)
• modules/branches/2.10/ivr/functions.inc.php (modified) (11 diffs)
• modules/branches/2.10/ivr/install.php (modified) (3 diffs)
• modules/branches/2.10/ivr/module.xml (modified) (2 diffs)

modules/branches/2.10/ivr/assets/js/ivr.js

@@ -83 +83 @@
-//always disable hidden elements so that they dont trigger validation
-function invalid_elements() {
-
+#invalid_append_announce, 
-  var invalid_element_tr = invalid_elements.parent().parent();
-  switch ($('#invalid_loops').val()) {
@@ -94 +94 @@
-      invalid_element_tr.show();
-      $('#invalid_retry_recording').parent().parent().hide();
+      $('#invalid_append_announce').parent().parent().hide();
-      break;
-    default:
@@ -104 +105 @@
-//always disable hidden elements so that they dont trigger validation
-function timeout_elements() {
-
+#timeout_append_announce, 
-  var timeout_element_tr = timeout_elements.parent().parent();
-  switch ($('#timeout_loops').val()) {
@@ -114 +115 @@
-      timeout_elements.removeAttr('disabled')
-      timeout_element_tr.show();
-
+
+
-    default:
-      timeout_elements.removeAttr('disabled')

modules/branches/2.10/ivr/functions.inc.php

@@ -83 +83 @@
-        $ext->add($c, 's', '', new ext_answer(''));
-        $ext->add($c, 's', '', new ext_wait('1'));
+
+        $ivr_announcement = recordings_get_file($ivr['announcement']);
+        $ext->add($c, 's', '', new ext_set('IVR_MSG', $ivr_announcement));
+
-        $ext->add($c, 's', 'start', new ext_digittimeout(3));
-        //$ext->add($ivr_id, 's', '', new ext_responsetimeout($ivr['timeout_time']));
-
-background(recordings_get_file($ivr['announcement'])
+execif('$["${IVR_MSG}" != ""]','Background','${IVR_MSG}'
-        $ext->add($c, 's', '', new ext_waitexten($ivr['timeout_time']));
-        
@@ -127 +131 @@
-            switch ($ivr['invalid_retry_recording']) {
-              case 'default':
-ext->add($c, 'i', '', new ext_playback('no-valid-responce-pls-try-again'))
+invalid_annoucement = 'no-valid-responce-pls-try-again'
-                break;
-              case '':
+                $invalid_annoucement = '';
-                break;
-              default:
-ext->add($c, 'i', '', new ext_playback(recordings_get_file($ivr['invalid_retry_recording']))
+invalid_annoucement = recordings_get_file($ivr['invalid_retry_recording']
-                break;
-            }
-
+            if ($ivr['invalid_append_announce'] || $invalid_annoucement == '') {
+              $invalid_annoucement .= '&' . $ivr_announcement;
+            }
+            $ext->add($c, 'i', '', new ext_set('IVR_MSG', trim($invalid_annoucement, '&')));
-            $ext->add($c, 'i', '', new ext_goto('s,start'));
-          }
@@ -154 +163 @@
-          }
-          $ext->add($c, 'i', $label, new ext_goto($ivr['invalid_destination']));
+        } else {
+          // If no invalid destination provided we need to do something
+          $ext->add($c, 'i', '', new ext_playback('sorry-youre-having-problems'));
+          $ext->add($c, 'i', '', new ext_goto('1','hang'));
-        }
-
@@ -164 +177 @@
-            switch ($ivr['timeout_retry_recording']) {
-              case 'default':
-ext->add($c, 't', '', new ext_playback('no-valid-responce-pls-try-again'))
+timeout_annoucement = 'no-valid-responce-pls-try-again'
-                break;
-              case '':
+                $timeout_annoucement = '';
-                break;
-              default:
-
-
+
-                break;
-            }
-
+            if ($ivr['timeout_append_announce'] || $timeout_annoucement == '') {
+              $timeout_annoucement .= '&' . $ivr_announcement;
+            }
+            $ext->add($c, 't', '', new ext_set('IVR_MSG', trim($timeout_annoucement, '&')));
-            $ext->add($c, 't', '', new ext_goto('s,start'));
-          }
@@ -192 +209 @@
-          }
-          $ext->add($c, 't', $label, new ext_goto($ivr['timeout_destination']));
+        } else {
+          // If no invalid destination provided we need to do something
+          $ext->add($c, 't', '', new ext_playback('sorry-youre-having-problems'));
+          $ext->add($c, 't', '', new ext_goto('1','hang'));
-        }
-        
@@ -199 +220 @@
-          $ext->add($c, 'return', '', new ext_setvar('_IVR_CONTEXT', '${CONTEXT}'));
-          $ext->add($c, 'return', '', new ext_setvar('_IVR_CONTEXT_${CONTEXT}', '${IVR_CONTEXT_${CONTEXT}}'));
+          $ext->add($c, 'return', '', new ext_set('IVR_MSG', $ivr_announcement));
-          $ext->add($c, 'return', '', new ext_goto('s,start'));
-        }
@@ -383 +405 @@
-    new gui_selectbox('invalid_retry_recording', $currentcomponent->getoptlist('recordings'), 
-    $ivr['invalid_retry_recording'], _('Invalid Retry Recording'), _('Prompt to be played when an invalid/unmatched response is received, before prompting the caller to try again'), false));
+
+  $currentcomponent->addguielem($section, 
+    new gui_checkbox('invalid_append_announce', $ivr['invalid_append_announce'], _('Append Original Annoucement'), _('After playing the Invalid Retry Recording the system will replay the main IVR Annoucement')));
+
-  $currentcomponent->addguielem($section, 
-    new gui_selectbox('invalid_recording', $currentcomponent->getoptlist('recordings'), 
@@ -397 +423 @@
-    new gui_selectbox('timeout_retry_recording', $currentcomponent->getoptlist('recordings'), 
-    $ivr['timeout_retry_recording'], _('Timeout Retry Recording'), _('Prompt to be played when an invalid/unmatched response is received, before prompting the caller to try again'), false));
+
+  $currentcomponent->addguielem($section, 
+    new gui_checkbox('timeout_append_announce', $ivr['timeout_append_announce'], _('Append Original Annoucement'), _('After playing the Timeout Retry Recording the system will replay the main IVR Annoucement')));
+
-  $currentcomponent->addguielem($section, 
-    new gui_selectbox('timeout_recording', $currentcomponent->getoptlist('recordings'), 
@@ -448 +478 @@
-            'invalid_destination', 'invalid_recording',
-            'retvm', 'timeout_time', 'timeout_recording',
-
+
+
-    foreach($get_var as $var){
-      $vars[$var] = isset($_REQUEST[$var])  ? $_REQUEST[$var]   : '';
-    }
+    $vars['timeout_append_announce'] = empty($vars['timeout_append_announce']) ? '0' : '1';
+    $vars['invalid_append_announce'] = empty($vars['invalid_append_announce']) ? '0' : '1';
-
-    $action   = isset($_REQUEST['action'])  ? $_REQUEST['action'] : '';
@@ -488 +521 @@
-        invalid_destination, invalid_recording,
-        retvm, timeout_time, timeout_recording,
-
-
+
+
+
-    $foo = $db->query($sql, $vals);
-    if($db->IsError($foo)) {
@@ -500 +534 @@
-        invalid_destination,  invalid_recording,
-        retvm, timeout_time, timeout_recording,
-
-
+
+
+
-        
-    $foo = $db->query($sql, $vals);

modules/branches/2.10/ivr/install.php

@@ -23 +23 @@
-    `timeout_retry_recording` varchar(25) default NULL,
-    `timeout_destination` varchar(50) default NULL,
-
+
+
+
-  );
-} else {
@@ -43 +45 @@
-    `timeout_destination` varchar(50) default NULL,
-    `timeout_loops` varchar(10) default NULL,
+    `timeout_append_announce` tinyint(1) NOT NULL default '1',
+    `invalid_append_announce` tinyint(1) NOT NULL default '1',
-    PRIMARY KEY  (`id`))"
-  );
@@ -423 +427 @@
-} 
-
+// Add timeout/invalid_append_announce if not there
+//
+outn(_("Checking for timeout_append_announce.."));
+$sql = "SELECT timeout_append_announce FROM ivr_details";
+$check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+if($db->IsError($check)) {
+  //  Add timeout_append_announce field
+  //
+  $sql = "ALTER TABLE ivr_details ADD timeout_append_announce tinyint(1) NOT NULL DEFAULT '1'";
+  $result = $db->query($sql);
+  if($db->IsError($result)) {
+    out(_("fatal error"));
+    die_freepbx($result->getDebugInfo());
+  } else {
+    out(_("added"));
+  }
+} else {
+  out(_("not needed"));
+}
+
+outn(_("Checking for invalid_append_announce.."));
+$sql = "SELECT invalid_append_announce FROM ivr_details";
+$check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+if($db->IsError($check)) {
+  //  Add invalid_append_announce field
+  //
+  $sql = "ALTER TABLE ivr_details ADD invalid_append_announce tinyint(1) NOT NULL DEFAULT '1'";
+  $result = $db->query($sql);
+  if($db->IsError($result)) {
+    out(_("fatal error"));
+    die_freepbx($result->getDebugInfo());
+  } else {
+    out(_("added"));
+  }
+} else {
+  out(_("not needed"));
+}
+
-?>

modules/branches/2.10/ivr/module.xml

@@ -3 +3 @@
-  <repo>standard</repo>
-  <name>IVR</name>
-3
+4
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -11 +11 @@
-  </description>
-  <changelog>
+    *2.10.0.4* #5576
-    *2.10.0.3* #5515
-    *2.10.0.2* misc bug fixes