From ebe363b50fd9357ba9d3c44c8e942f892363fcb3 Mon Sep 17 00:00:00 2001
From: Mark Crane <mcrane@pfsense.org>
Date: Tue, 9 Dec 2008 07:49:40 +0000
Subject: pfSense FreeSWITCH recording correct admin_pin

---
 packages/freeswitch/freeswitch.inc | 20 +++++++++++---------
 packages/freeswitch/freeswitch.xml |  2 +-
 pkg_config.7.xml                   |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc
index d9735e26..d9d6b998 100644
--- a/packages/freeswitch/freeswitch.inc
+++ b/packages/freeswitch/freeswitch.inc
@@ -160,8 +160,10 @@ function event_socket_request_cmd($cmd)
 
 function  recording_js() {
     
+    $admin_pin = $config['installedpackages']['freeswitchsettings']['config'][0]['admin_pin'];
+    
     $fout = fopen("/usr/local/freeswitch/scripts/recordings.js","w");
-    $tmp = "  var pin = \"".$rowhelper['admin_pin']."\";\n";
+    $tmp = "  var pin = \"".$admin_pin."\";\n";
     $tmp .= "  //var pin = \"\"; //don't require a pin\n";
     $tmp .= "    //if you choose not to require a pin then then you may want to add a dialplan condition for a specific caller id\n";
     $tmp .= "\n";
@@ -212,17 +214,17 @@ function  recording_js() {
     $tmp .= "  dtmf.digits = \"\";\n";
     $tmp .= "\n";
     $tmp .= "  if ( session.ready( ) ) {\n";
-    $tmp .= "  session.answer( );\n";
+    $tmp .= "      session.answer( );\n";
     $tmp .= "\n";
-    //$tmp .= "  session.execute(\"set\", \"tts_engine=flite\");\n";
-    //$tmp .= "  session.execute(\"set\", \"tts_voice=kal\");\n";
-    //$tmp .= "  session.execute(\"speak\", \"Please enter your pin number now.\");\n";
-    $tmp .= "  digitmaxlength = 6;\n";    
-    $tmp .= "  session.execute(\"set\", \"playback_terminators=#\");\n";
-    $tmp .= "  session.streamFile( \"/usr/local/freeswitch/recordings/please_enter_your_pin_number.wav\", mycb, \"dtmf\");\n";    
+
     $tmp .= "\n";
     $tmp .= "  if (pin.length > 0) {\n";
-    //$tmp .= "      session.streamFile( \"custom/pin.wav\", mycb, \"dtmf\");\n";
+    //$tmp .= "      session.execute(\"set\", \"tts_engine=flite\");\n";
+    //$tmp .= "      session.execute(\"set\", \"tts_voice=kal\");\n";
+    //$tmp .= "      session.execute(\"speak\", \"Please enter your pin number now.\");\n";
+    $tmp .= "      digitmaxlength = 6;\n";    
+    $tmp .= "      session.execute(\"set\", \"playback_terminators=#\");\n";
+    $tmp .= "      session.streamFile( \"/usr/local/freeswitch/recordings/please_enter_your_pin_number.wav\", mycb, \"dtmf\");\n";    
     $tmp .= "      session.collectInput( mycb, dtmf, timeoutpin );\n";
     $tmp .= "  }\n";
     $tmp .= "\n";
diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml
index 761c3b8b..8841602f 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.4</version>
+	<version>0.3.5</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 c811a043..c1435f5d 100644
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -46,7 +46,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.4</version>
+      <version>0.3.5</version>
       <status>Beta</status>
       <required_version>1.2.1</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>
-- 
cgit v1.2.3