From b1d8f81e328b00bd96e3e40ea7b5b559c8d0f403 Mon Sep 17 00:00:00 2001
From: Mark Crane <mcrane@pfsense.org>
Date: Tue, 23 Dec 2008 09:28:15 +0000
Subject: FreeSWITCH package 0.5.7 fix bugs with IVR.

---
 packages/freeswitch/freeswitch.inc | 24 ++++++++++++++----------
 packages/freeswitch/freeswitch.xml |  2 +-
 pkg_config.7.xml                   |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc
index 637513b1..0e013ad0 100644
--- a/packages/freeswitch/freeswitch.inc
+++ b/packages/freeswitch/freeswitch.inc
@@ -830,7 +830,7 @@ function sync_package_freeswitch_ivr()
 
 	    
 	    //add the IVR to the dialplan
-
+	    if (strlen($rowhelper['ivrid']) > 0) {
 	      $action = 'add'; //set default action to add
 	      $i = 0;
 	      if (count($a_dialplan_includes) > 0) {
@@ -928,8 +928,9 @@ function sync_package_freeswitch_ivr()
 	  		write_config();
 	   		  		
 	      sync_package_freeswitch_dialplan_includes();		
-	  		unset($dialplanincludeid);
+	      unset($dialplanincludeid);
 	  		
+	    } //end if strlen ivrid; add the IVR to the dialplan
 	    
 	    // Build the IVR javascript
 	    $recording_action_filename = get_recording_filename($rowhelper['recordingidaction']);
@@ -944,7 +945,9 @@ function sync_package_freeswitch_ivr()
 		    $cmd = "api global_getvar domain";
 		    $domain = trim(event_socket_request($fp, $cmd));
 	    }
-	      
+	    
+	    
+	    $tmp = ""; //make sure the variable starts with no value
 	    $tmp .= "\n";
 	    $tmp .= " var condition = true;\n";
 	    $tmp .= "\n";
@@ -1313,12 +1316,13 @@ function sync_package_freeswitch_ivr()
 	    unset($tmpactiondefault);
 	    unset($tmpantiactiondefault);    
 	    
-	    $ivrfilename = "ivr_".str_replace(array("{", "}"), "", $rowhelper['ivrid']).".js";   
-	  	$fout = fopen("/usr/local/freeswitch/scripts/".$ivrfilename,"w");
-	    fwrite($fout, $tmp);
-	    unset($ivrfilename);
-	    unset($tmpxml);
-	    fclose($fout);
+	    if (strlen($rowhelper['ivrid']) > 0) {
+		    $ivrfilename = "ivr_".str_replace(array("{", "}"), "", $rowhelper['ivrid']).".js";   
+		  	$fout = fopen("/usr/local/freeswitch/scripts/".$ivrfilename,"w");
+		    fwrite($fout, $tmp);
+		    unset($ivrfilename);
+		    fclose($fout);
+	    }
 	  
 	  } //end foreach 
   } //end if count    
@@ -2062,7 +2066,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.5.6";
+	$config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.5.7";
 	
 	       
 	conf_mount_ro();
diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml
index bb0d0737..6ccff27d 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.5.6</version>
+	<version>0.5.7</version>
 	<title>FreeSWITCH: Settings</title>
 	<include_file>/usr/local/pkg/freeswitch.inc</include_file>
 	<menu>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index e28d7039..d2bc0a0c 100644
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -66,7 +66,7 @@
       <pkginfolink>http://doc.pfsense.org/index.php/FreeSWITCH</pkginfolink>
       <config_file>http://www.pfsense.com/packages/config/freeswitch/freeswitch.xml</config_file>
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-      <version>0.5.6</version>
+      <version>0.5.7</version>
       <status>Beta</status>
       <required_version>1.2.1</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>
-- 
cgit v1.2.3