FreeSWITCH package change password fields from text to passwords, copy slim.swf to enable mp3 playback, fix a few links.

6 files changed, 16 insertions, 16 deletions

diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc
index ea6474bc..91425e84 100644
--- a/packages/freeswitch/freeswitch.inc
+++ b/packages/freeswitch/freeswitch.inc
@@ -1708,6 +1708,7 @@ function freeswitch_php_install_command()
 	exec("cp /tmp/freeswitch_time_conditions_edit.tmp /usr/local/www/freeswitch/freeswitch_time_conditions_edit.php");
 	unlink_if_exists("/tmp/freeswitch_time_conditions_edit.tmp");
 
+	exec("cp /usr/local/freeswitch/htdocs/slim.swf /usr/local/www/freeswitch/slim.swf");
 
   /* freeswitch settings defaults */
   	if (strlen($config['installedpackages']['freeswitchsettings']['config'][0]['numbering_plan']) == 0) {
@@ -2084,8 +2085,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.8.1";
-	
+	$config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.5.8.2";
 	       
 	conf_mount_ro();
 	config_unlock();
@@ -2134,8 +2134,8 @@ function freeswitch_deinstall_command()
 	unlink_if_exists("/usr/local/www/freeswitch/freeswitch_recordings_play.php");
 	unlink_if_exists("/usr/local/www/freeswitch/freeswitch_time_conditions.php");
 	unlink_if_exists("/usr/local/www/freeswitch/freeswitch_time_conditions_edit.php");
-	unlink_if_exists("/usr/local/www/freeswitch/freeswitch_status.php");
-
+	unlink_if_exists("/usr/local/www/freeswitch/freeswitch_status.php");	
+	unlink_if_exists("/usr/local/www/freeswitch/slim.swf");
 	
 	exec("rm -R /usr/local/freeswitch/");
 	exec("rm -R /usr/local/www/freeswitch/");
diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml
index b87171f3..e205b80b 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.8.1</version>
+	<version>0.5.8.2</version>
 	<title>FreeSWITCH: Settings</title>
 	<include_file>/usr/local/pkg/freeswitch.inc</include_file>
 	<menu>
@@ -346,7 +346,7 @@
 			<fielddescr>Event Socket Password</fielddescr>
 			<fieldname>event_socket_password</fieldname>
 			<description>Enter the event socket password here. default: ClueCon</description>
-			<type>input</type>
+			<type>password</type>
 		</field>	
 		<field>
 			<fielddescr>XML RPC HTTP Port</fielddescr>
@@ -370,13 +370,13 @@
 			<fielddescr>XML RPC Auth Password</fielddescr>
 			<fieldname>xml_rpc_auth_pass</fieldname>
 			<description>Enter the XML RPC Auth Password here. default: works</description>
-			<type>input</type>
+			<type>password</type>
 		</field>
 		<field>
 			<fielddescr>Admin PIN Number</fielddescr>
 			<fieldname>admin_pin</fieldname>
 			<description>Enter a admin pin number. Used to authenticate the admin from the phone.</description>
-			<type>input</type>
+			<type>password</type>
 		</field>
 		<field>
 			<fielddescr>SMTP Host</fielddescr>
@@ -430,7 +430,7 @@
 			<fielddescr>SMTP Password</fielddescr>
 			<fieldname>smtppassword</fieldname>
 			<description>Enter the SMTP authentication password.</description>
-			<type>input</type>
+			<type>password</type>
 		</field>
 		<field>
 			<fielddescr>SMTP From</fielddescr>
diff --git a/packages/freeswitch/freeswitch_extensions_edit.tmp b/packages/freeswitch/freeswitch_extensions_edit.tmp
index 6914ab7c..0d023d4e 100644
--- a/packages/freeswitch/freeswitch_extensions_edit.tmp
+++ b/packages/freeswitch/freeswitch_extensions_edit.tmp
@@ -143,7 +143,7 @@ function show_advanced_config() {
 	$tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php");
 	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_extensions.php");
+	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
@@ -193,7 +193,7 @@ function show_advanced_config() {
 		        <tr>
               <td width="25%" valign="top" class="vncellreq">Voicemail Password</td>
               <td width="75%" class="vtable"> 
-                <input name="vm-password" type="text" class="formfld" id="vm-password" size="40" value="<?=htmlspecialchars($pconfig['vm-password']);?>">
+                <input name="vm-password" type="password" class="formfld" id="vm-password" size="40" value="<?=htmlspecialchars($pconfig['vm-password']);?>">
                 <br><span class="vexpl">Enter the voicemail password here.<br></span>
               </td>
             </tr>
diff --git a/packages/freeswitch/freeswitch_gateways_edit.tmp b/packages/freeswitch/freeswitch_gateways_edit.tmp
index 22757257..c4bb0a87 100644
--- a/packages/freeswitch/freeswitch_gateways_edit.tmp
+++ b/packages/freeswitch/freeswitch_gateways_edit.tmp
@@ -258,7 +258,7 @@ function show_advanced_config() {
 	$tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php");
 	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_gateways.php");
+	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
@@ -301,7 +301,7 @@ function show_advanced_config() {
             <tr>
               <td width="22%" valign="top" class="vncellreq">Password</td>
               <td width="78%" class="vtable"> 
-                <input name="password" type="text" class="formfld" id="password" size="40" value="<?=htmlspecialchars($pconfig['password']);?>">
+                <input name="password" type="password" class="formfld" id="password" size="40" value="<?=htmlspecialchars($pconfig['password']);?>">
                 <br><span class="vexpl">Enter the password here.<br></span>
               </td>
             </tr>
diff --git a/packages/freeswitch/freeswitch_recordings_play.tmp b/packages/freeswitch/freeswitch_recordings_play.tmp
index 4135362d..8dfb90c2 100644
--- a/packages/freeswitch/freeswitch_recordings_play.tmp
+++ b/packages/freeswitch/freeswitch_recordings_play.tmp
@@ -55,8 +55,8 @@ $type = $_GET['type']; //moh //rec
         echo "<embed src=\"freeswitch_recordings.php?a=download&type=".$type."&filename=".$filename."\" autostart=true width=200 height=40 name=\"sound".$$filename."\" enablejavascript=\"true\">\n";
       }
       if ($file_ext == "mp3") {
-        echo "<object type=\"application/x-shockwave-flash\" width=\"400\" height=\"17\" data=\"slim.swf?song_url=".urlencode("/freeswitch/freeswitch_recordings.php?a=download&type=".$type."&filename=".$filename)."\">\n";
-        echo "<param name=\"movie\" value=\"slim.swf?song_url=".urlencode("/freeswitch/freeswitch_recordings.php?a=download&type=".$type."&filename=".$filename)."\" />\n";
+        echo "<object type=\"application/x-shockwave-flash\" width=\"400\" height=\"17\" data=\"slim.swf?autoplay=true&song_title=".urlencode($filename)."&song_url=".urlencode("/freeswitch/freeswitch_recordings.php?a=download&type=".$type."&filename=".$filename)."\">\n";
+        echo "<param name=\"movie\" value=\"slim.swf?autoplay=true&song_url=".urlencode("/freeswitch/freeswitch_recordings.php?a=download&type=".$type."&filename=".$filename)."\" />\n";
         echo "<param name=\"quality\" value=\"high\"/>\n";
         echo "<param name=\"bgcolor\" value=\"#E6E6E6\"/>\n";
         echo "</object>\n";
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 00ecc3e3..843a05e9 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.8.1</version>
+      <version>0.5.8.2</version>
       <status>Beta</status>
       <required_version>1.2.1</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>