Changeset 12045

Timestamp:

04/23/11 12:47:46 (2 years ago)

Author:

p_lindheimer

Message:

closes #5095 adds ext_vqa, auto-detection for VQA app and DITECH_VQA_OUTBOUND/INBOUND Advanced settings set in inbound routes and outbound routes

Files:

• freepbx/branches/2.9/amp_conf/bin/retrieve_conf (modified) (2 diffs)
• freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/extensions.class.php (modified) (1 diff)
• freepbx/branches/2.9/libfreepbx.install.php (modified) (1 diff)
• modules/branches/2.9/core/functions.inc.php (modified) (2 diffs)
• modules/branches/2.9/core/module.xml (modified) (1 diff)

freepbx/branches/2.9/amp_conf/bin/retrieve_conf

@@ -494 +494 @@
-  $freepbx_conf->define_conf_setting('AST_FUNC_MASTER_CHANNEL',$set);
-}
+if (!$freepbx_conf->conf_setting_exists('AST_APP_VQA')) {
+  // AST_APP_VQA
+  //
+  $set['value'] = '';
+  $set['defaultval'] =& $set['value'];
+  $set['options'] = '';
+  $set['readonly'] = 1;
+  $set['hidden'] = 1;
+  $set['level'] = 10;
+  $set['module'] = '';
+  $set['category'] = 'Internal Use';
+  $set['emptyok'] = 1;
+  $set['name'] = 'Asterisk Application VQA';
+  $set['description'] = "Set to the application name if the application is present in this Asterisk install";
+  $set['type'] = CONF_TYPE_TEXT;
+  $freepbx_conf->define_conf_setting('AST_APP_VQA',$set);
+}
-// Since modules can be loaded in a current version, we check these each time
-// DEVICE_STATE exists in two flavors, DEVSTATE and DEVICE_STATE, the latter is the official one
@@ -510 +527 @@
-foreach ($func_arr as $func) {
-  $update_arr['AST_FUNC_'.$func] = $astman->func_exists($func) ? $func : '';
+}
+
+$app_arr = array('VQA');
+foreach ($app_arr as $app) {
+  $update_arr['AST_APP_'.$app] = $astman->app_exists($app) ? $app : '';
-}
-$freepbx_conf->set_conf_values($update_arr, true, true);

freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/extensions.class.php

@@ -1605 +1605 @@
-}
-
+class ext_vqa extends extension {
+  function output() {
+    return "VQA(".$this->data.")";
+  }
+}
+
-/* example usage
-$ext = new extensions;

freepbx/branches/2.9/libfreepbx.install.php

@@ -950 +950 @@
-  $freepbx_conf->define_conf_setting('CID_PREPEND_REPLACE',$set);
-
+  // DITECH_VQA_INBOUND
+  $set['value'] = '7';
+  $set['options'] = array(0,1,2,3,4,5,6,7);
+  $set['name'] = 'Ditech VQA Inbound Setting';
+  $set['description'] = "If Ditech's VQA, Voice Quality application is installed, this setting will be used for all inbound calls. For more information 'core show application VQA' at the Asterisk CLI will show the different settings.";
+  $set['emptyok'] = 0;
+  $set['readonly'] = 0;
+  $set['type'] = CONF_TYPE_SELECT;
+  $freepbx_conf->define_conf_setting('DITECH_VQA_INBOUND',$set);
+
+  // DITECH_VQA_OUTBOUND
+  $set['value'] = '7';
+  $set['options'] = array(0,1,2,3,4,5,6,7);
+  $set['name'] = 'Ditech VQA Outbound Setting';
+  $set['description'] = "If Ditech's VQA, Voice Quality application is installed, this setting will be used for all outbound calls. For more information 'core show application VQA' at the Asterisk CLI will show the different settings.";
+  $set['emptyok'] = 0;
+  $set['readonly'] = 0;
+  $set['type'] = CONF_TYPE_SELECT;
+  $freepbx_conf->define_conf_setting('DITECH_VQA_OUTBOUND',$set);
+
-
-  //

modules/branches/2.9/core/functions.inc.php

@@ -1271 +1271 @@
-          // always set CallerID name
-          $ext->add($context, $exten, '', new ext_execif('$[ "${CALLERID(name)}" = "" ] ','Set','CALLERID(name)=${CALLERID(num)}'));
+
+          // if VQA present and configured call it
+          if ($amp_conf['AST_APP_VQA'] && $amp_conf['DITECH_VQA_INBOUND']) {
+            $ext->add($context, $exten, '', new ext_vqa($amp_conf['DITECH_VQA_INBOUND'));
+          }
-
-          if (!empty($item['mohclass']) && trim($item['mohclass']) != 'default') {
@@ -1920 +1925 @@
-            $ext->add($context, $exten, '', new ext_gosubif('$[${LEN(${FROM_DID})}>0 & "${FROM_DID}"!="s"]','sub-diversion-header,s,1'));
-          }
+
+          // if VQA present and configured call it
+          if ($amp_conf['AST_APP_VQA'] && $amp_conf['DITECH_VQA_OUTBOUND']) {
+            $ext->add($context, $exten, '', new ext_vqa($amp_conf['DITECH_VQA_OUTBOUND'));
+          }
-
-          if ($route['emergency_route'] != '') {

modules/branches/2.9/core/module.xml

@@ -11 +11 @@
-  <canuninstall>no</canuninstall>
-  <changelog>
+    *2.9.0rc1.6* #5095
-    *2.9.0rc1.5* #5055
-    *2.9.0rc1.4* #5065, #5057