From ae3cb2e7e86039457b748b1d0d454085803abea1 Mon Sep 17 00:00:00 2001
From: Mark Crane <mcrane@pfsense.org>
Date: Tue, 9 Dec 2008 20:58:41 +0000
Subject: FreeSWITCH IVR missing $, and strip { } from ivr .js

---
 packages/freeswitch/freeswitch.inc | 12 ++++++++----
 packages/freeswitch/freeswitch.xml |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'packages/freeswitch')

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>
-- 
cgit v1.2.3