aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorMark Crane <mcrane@pfsense.org>2008-12-09 20:58:41 +0000
committerMark Crane <mcrane@pfsense.org>2008-12-09 20:58:41 +0000
commitae3cb2e7e86039457b748b1d0d454085803abea1 (patch)
tree0110a7e2a4d4d98babeb171a2cd5c9235d40e2d3 /packages
parent0b30f78c5fd3ae81e1353264d684b11030990dd4 (diff)
downloadpfsense-packages-ae3cb2e7e86039457b748b1d0d454085803abea1.tar.gz
pfsense-packages-ae3cb2e7e86039457b748b1d0d454085803abea1.tar.bz2
pfsense-packages-ae3cb2e7e86039457b748b1d0d454085803abea1.zip
FreeSWITCH IVR missing $, and strip { } from ivr .js
Diffstat (limited to 'packages')
-rw-r--r--packages/freeswitch/freeswitch.inc12
-rw-r--r--packages/freeswitch/freeswitch.xml2
2 files changed, 9 insertions, 5 deletions
diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc
index c0b9ee29..39da15af 100644
--- a/packages/freeswitch/freeswitch.inc
+++ b/packages/freeswitch/freeswitch.inc
@@ -851,14 +851,18 @@ function sync_package_freeswitch_ivr() {
$ent['fielddata'] = '^'.$rowhelper['ivrextension'].'$';
$a_dialplan_include_details[] = $ent;
unset($ent);
-
+
+ $ivrid = str_replace(array("{", "}"), "", $rowhelper['ivrid']);
+
$ent = array();
$ent['dialplanincludeid'] = $dialplanincludeid;
$ent['tag'] = 'action'; //condition, action, antiaction
$ent['fieldtype'] = 'javascript';
- $ent['fielddata'] = 'ivr_'.$rowhelper['ivrid'].'.js';
+ $ent['fielddata'] = 'ivr_'.$ivrid.'.js';
$a_dialplan_include_details[] = $ent;
unset($ent);
+
+ unset($ivrid);
}
if ($action == 'update') {
@@ -1117,7 +1121,7 @@ function sync_package_freeswitch_ivr() {
$x = 0;
if (count($a_ivr_options) > 0) {
- foreach(a_ivr_options as $row) {
+ foreach($a_ivr_options as $row) {
/*
$row['ivrid']
@@ -1796,7 +1800,7 @@ function freeswitch_php_install_command()
}
$config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_version'] = "1.0.1 revision 10638.";
- $config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.3.1";
+ $config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.3.6";
conf_mount_ro();
diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml
index 8841602f..6bce2980 100644
--- a/packages/freeswitch/freeswitch.xml
+++ b/packages/freeswitch/freeswitch.xml
@@ -44,7 +44,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>FreeSWITCH Settings</name>
- <version>0.3.5</version>
+ <version>0.3.6</version>
<title>FreeSWITCH: Settings</title>
<include_file>/usr/local/pkg/freeswitch.inc</include_file>
<menu>