From b46ef8f445d6999a655b2474df8f13f3c86e221c Mon Sep 17 00:00:00 2001
From: Mark Crane <mcrane@pfsense.org>
Date: Wed, 10 Dec 2008 08:12:30 +0000
Subject: FreeSWITCH package IVR allow dialing an extension

---
 packages/freeswitch/freeswitch.inc | 14 ++++++++------
 packages/freeswitch/freeswitch.xml |  2 +-
 pkg_config.7.xml                   |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc
index 3b707c2f..8fde49fb 100644
--- a/packages/freeswitch/freeswitch.inc
+++ b/packages/freeswitch/freeswitch.inc
@@ -868,8 +868,8 @@ function sync_package_freeswitch_ivr()
 	          $ent['tag'] = 'action'; //condition, action, antiaction
 	          $ent['fieldtype'] = 'javascript';
 	          $ent['fielddata'] = 'ivr_'.$ivrid.'.js';
-	      		$a_dialplan_include_details[] = $ent;
-	      		unset($ent);
+	          $a_dialplan_include_details[] = $ent;
+	          unset($ent);
 	      		
 	      	  unset($ivrid);
 	      		 		
@@ -1071,7 +1071,8 @@ function sync_package_freeswitch_ivr()
 	
 	    $tmp .= $tmpaction;
 	    $tmp .= "             else {\n";
-	    $tmp .= $tmpactiondefault;
+	    $tmp .= "	                  session.execute(\"transfer\", dtmf.digits+\" XML default\");\n";
+	    //$tmp .= $tmpactiondefault;
 	    $tmp .= "             }\n";
 	    $tmp .= "\n";
 	    unset($tmpaction);  
@@ -1106,7 +1107,7 @@ function sync_package_freeswitch_ivr()
 	    $tmp .= "         //pickup the remaining digits\n";
 	    $tmp .= "         //http://wiki.freeswitch.org/wiki/Session_getDigits\n";
 	    $tmp .= "         //getDigits(length, terminators, timeout, digit_timeout, abs_timeout)\n";
-	    $tmp .= "         dtmf.digits +=  session.getDigits(2, \"#\", 3000);\n";
+	    $tmp .= "         dtmf.digits +=  session.getDigits(3, \"#\", 3000);\n";
 	    $tmp .= "\n";
 	    $tmp .= "         console_log( \"info\", \"IVR Digit Pressed: \" + dtmf.digits + \"\\n\" );\n";
 	    $tmp .= "\n";
@@ -1191,7 +1192,8 @@ function sync_package_freeswitch_ivr()
 	    
 	    $tmp .= $tmpantiaction;
 	    $tmp .= "             else {\n";
-	    $tmp .= $tmpantiactiondefault;
+	    $tmp .= "	                  session.execute(\"transfer\", dtmf.digits+\" XML default\");\n";	    
+	    //$tmp .= $tmpantiactiondefault;
 	    $tmp .= "             }\n";
 	    $tmp .= "\n";
 	    unset($tmpantiaction);
@@ -1814,7 +1816,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.7";
+	$config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.3.8";
 	
 	       
 	conf_mount_ro();
diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml
index 2483d06e..624a199a 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.7</version>
+	<version>0.3.8</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 c4a62114..5e195d8a 100644
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -47,7 +47,7 @@
       <category>Services</category>
       <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.3.7</version>
+      <version>0.3.8</version>
       <status>Beta</status>
       <required_version>1.2.1</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>
-- 
cgit v1.2.3