FreeSWITCH package remove icons from extensions input boxes until 1.2.x is retired icons overlap the text, replace settings xml with php file which provides better flexibility.

5 files changed, 422 insertions, 27 deletions

diff --git a/config/freeswitch_dev/freeswitch.inc b/config/freeswitch_dev/freeswitch.inc
index 4cc48d65..a9bf9481 100644
--- a/config/freeswitch_dev/freeswitch.inc
+++ b/config/freeswitch_dev/freeswitch.inc
@@ -42,8 +42,8 @@ function build_menu() {
 	
 	$tab_array = array();
 	$menu_selected = false;
-	if ($_SERVER["SCRIPT_NAME"] == "/pkg_edit.php?xml=freeswitch.xml&id=0") { $menu_selected = true; }
-	$tab_array[] = array(gettext("Settings"), $menu_selected, "/pkg_edit.php?xml=freeswitch.xml&id=0");
+	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/freeswitch_settings.php") { $menu_selected = true; }
+	$tab_array[] = array(gettext("Settings"), $menu_selected, "/packages/freeswitch/freeswitch_settings.php");
 	unset($menu_selected);
 
 	$menu_selected = false;
@@ -2969,7 +2969,7 @@ function freeswitch_php_install_command()
 	global $config;
 	//exec("/etc/./rc.conf_mount_rw");
 
-	$freeswitch_package_version = "0.9.5";
+	$freeswitch_package_version = "0.9.5.1";
 	$freeswitch_build_version = "1.0.4 pre 8";
 	$freeswitch_build_revision = "13784";
 
@@ -3114,7 +3114,7 @@ function freeswitch_php_install_command()
 	exec("cd /tmp/;fetch ".$download_path."freeswitch_dialplan_includes_edit.tmp");	
 	exec("cp /tmp/freeswitch_dialplan_includes_edit.tmp /usr/local/www/packages/freeswitch/freeswitch_dialplan_includes_edit.php");
 	unlink_if_exists("/tmp/freeswitch_dialplan_includes_edit.tmp");
-
+	
 	exec("cd /tmp/;fetch ".$download_path."freeswitch_extensions.tmp");
 	exec("cp /tmp/freeswitch_extensions.tmp /usr/local/www/packages/freeswitch/freeswitch_extensions.php");
 	unlink_if_exists("/tmp/freeswitch_extensions.tmp");
@@ -3223,6 +3223,10 @@ function freeswitch_php_install_command()
 	exec("cp /tmp/freeswitch_recordings_play.tmp /usr/local/www/packages/freeswitch/freeswitch_recordings_play.php");
 	unlink_if_exists("/tmp/freeswitch_recordings_play.tmp");
 
+	exec("cd /tmp/;fetch ".$download_path."freeswitch_settings.tmp");
+	exec("cp /tmp/freeswitch_settings.tmp /usr/local/www/packages/freeswitch/freeswitch_settings.php");
+	unlink_if_exists("/tmp/freeswitch_settings.tmp");
+	
 	exec("cd /tmp/;fetch ".$download_path."freeswitch_status.tmp");
 	exec("cp /tmp/freeswitch_status.tmp /usr/local/www/packages/freeswitch/freeswitch_status.php");
 	unlink_if_exists("/tmp/freeswitch_status.tmp");
diff --git a/config/freeswitch_dev/freeswitch.xml b/config/freeswitch_dev/freeswitch.xml
index 0bd1d2f8..632f9b1e 100644
--- a/config/freeswitch_dev/freeswitch.xml
+++ b/config/freeswitch_dev/freeswitch.xml
@@ -43,16 +43,16 @@
 		<description>FreeSWITCH is an open source telephony platform designed to facilitate the creation of voice and chat driven products scaling from a soft-phone up to a soft-switch.  It can be used as a simple switching engine, a PBX, a media gateway or a media server to host IVR applications using simple scripts or XML to control the callflow.</description>
 		<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
-	<name>FreeSWITCH Settings</name>
-	<version>0.9.5</version>
-	<title>FreeSWITCH: Settings</title>
+	<name>Settings</name>
+	<version>0.9.5.1</version>
+	<title>Settings</title>
 	<include_file>/usr/local/pkg/freeswitch.inc</include_file>
 	<menu>
 		<name>FreeSWITCH</name>
 		<tooltiptext>Modify FreeSWITCH settings.</tooltiptext>
 		<section>Services</section>
 		<configfile>freeswitch.xml</configfile>
-		<url>/pkg_edit.php?xml=freeswitch.xml&amp;id=0</url>
+		<url>/packages/freeswitch/freeswitch_settings.php</url>
 	</menu>
 	<service>
 		<name>freeswitch</name>
@@ -63,7 +63,7 @@
 	<tabs>
 		<tab>
 			<text>Settings</text>
-			<url>/pkg_edit.php?xml=freeswitch.xml&amp;id=0</url>
+			<url>/packages/freeswitch/freeswitch_settings.php</url>
 			<active/>
 		</tab>
 		<tab>
diff --git a/config/freeswitch_dev/freeswitch_extensions_edit.tmp b/config/freeswitch_dev/freeswitch_extensions_edit.tmp
index de98d447..6d30f582 100644
--- a/config/freeswitch_dev/freeswitch_extensions_edit.tmp
+++ b/config/freeswitch_dev/freeswitch_extensions_edit.tmp
@@ -169,56 +169,56 @@ display_top_tabs(build_menu());
             <tr>
               <td width="25%" valign="top" class="vncellreq">Extension</td>
               <td width="75%" class="vtable">
-                <input name="extension" type="text" class="formfld unknown" id="extension" size="40" value="<?=htmlspecialchars($pconfig['extension']);?>">
+                <input name="extension" type="text" class="formfld" id="extension" size="40" value="<?=htmlspecialchars($pconfig['extension']);?>">
                 <br><span class="vexpl">Enter the extension here. The default configuration 3 or 4 digit extensions.<br></span>
               </td>
             </tr>
 		        <tr>
               <td width="25%" valign="top" class="vncellreq">Password</td>
               <td width="75%" class="vtable">
-                <input name="password" type="password" class="formfld pwd" 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>
 		        <tr>
               <td width="25%" valign="top" class="vncellreq">Mailbox</td>
               <td width="75%" class="vtable">
-                <input name="mailbox" type="text" class="formfld unknown" id="mailbox" size="40" value="<?=htmlspecialchars($pconfig['mailbox']);?>">
+                <input name="mailbox" type="text" class="formfld" id="mailbox" size="40" value="<?=htmlspecialchars($pconfig['mailbox']);?>">
                 <br><span class="vexpl">Enter the mailbox here. Example: extension 1001 then mailbox 1001<br></span>
               </td>
             </tr>
 		        <tr>
               <td width="25%" valign="top" class="vncellreq">Voicemail Password</td>
               <td width="75%" class="vtable">
-                <input name="vm-password" type="password" class="formfld pwd" 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>
 		        <tr>
               <td width="25%" valign="top" class="vncellreq">Account Code</td>
               <td width="75%" class="vtable">
-                <input name="accountcode" type="text" class="formfld unknown" id="accountcode" size="40" value="<?=htmlspecialchars($pconfig['accountcode']);?>">
+                <input name="accountcode" type="text" class="formfld" id="accountcode" size="40" value="<?=htmlspecialchars($pconfig['accountcode']);?>">
                 <br><span class="vexpl">Enter the account code here. Example: extension 1001 then accountcode 1001<br></span>
               </td>
             </tr>
 		        <tr>
               <td width="25%" valign="top" class="vncellreq" nowrap>Effective Caller ID Name</td>
               <td width="75%" class="vtable">
-                <input name="effective_caller_id_name" type="text" class="formfld unknown" id="effective_caller_id_name" size="40" value="<?=htmlspecialchars($pconfig['effective_caller_id_name']);?>">
+                <input name="effective_caller_id_name" type="text" class="formfld" id="effective_caller_id_name" size="40" value="<?=htmlspecialchars($pconfig['effective_caller_id_name']);?>">
                 <br><span class="vexpl">Enter the effective caller id name here.<br></span>
               </td>
             </tr>		
 		    <tr>
               <td width="25%" valign="top" class="vncellreq" nowrap>Effective Caller ID Number</td>
               <td width="75%" class="vtable">
-                <input name="effective_caller_id_number" type="text" class="formfld unknown" id="effective_caller_id_number" size="40" value="<?=htmlspecialchars($pconfig['effective_caller_id_number']);?>">
+                <input name="effective_caller_id_number" type="text" class="formfld" id="effective_caller_id_number" size="40" value="<?=htmlspecialchars($pconfig['effective_caller_id_number']);?>">
                 <br><span class="vexpl">Enter the effective caller id number here.<br></span>
               </td>
             </tr>
 			<tr>
               <td width="25%" valign="top" class="vncellreq" nowrap>Voicemail Mail To</td>
               <td width="75%" class="vtable">
-                <input name="vm-mailto" type="text" class="formfld unknown" id="vm-mailto" size="40" value="<?=htmlspecialchars($pconfig['vm-mailto']);?>">
+                <input name="vm-mailto" type="text" class="formfld" id="vm-mailto" size="40" value="<?=htmlspecialchars($pconfig['vm-mailto']);?>">
                 <br><span class="vexpl">Optional: Enter the email address to send voicemail to.<br></span>
               </td>
             </tr>
@@ -226,7 +226,7 @@ display_top_tabs(build_menu());
               <td width="25%" valign="top" class="vncellreq" nowrap>Voicemail Attach File</td>
               <td width="75%" class="vtable">
                 <?php
-                echo "              <select name='vm-attach-file' class='formfld unknown'>\n";
+                echo "              <select name='vm-attach-file' class='formfld'>\n";
                 echo "                <option></option>\n";
                 switch (htmlspecialchars($pconfig['vm-attach-file'])) {
                 case "true":
@@ -251,7 +251,7 @@ display_top_tabs(build_menu());
               <td width="25%" valign="top" class="vncellreq" nowrap>VM Keep Local After Email</td>
               <td width="75%" class="vtable">
                 <?php
-                echo "              <select name='vm-keep-local-after-email' class='formfld unknown'>\n";
+                echo "              <select name='vm-keep-local-after-email' class='formfld'>\n";
                 echo "                <option></option>\n";
                 switch (htmlspecialchars($pconfig['vm-keep-local-after-email'])) {
                 case "true":
@@ -275,14 +275,14 @@ display_top_tabs(build_menu());
             <tr>
               <td width="25%" valign="top" class="vncellreq">User Context</td>
               <td width="75%" class="vtable">
-                <input name="user_context" type="text" class="formfld unknown" id="user_context" size="40" value="<?=htmlspecialchars($pconfig['user_context']);?>">
+                <input name="user_context" type="text" class="formfld" id="user_context" size="40" value="<?=htmlspecialchars($pconfig['user_context']);?>">
                 <br><span class="vexpl">Enter the user context here. Example: default<br></span>
               </td>
             </tr>
             <tr>
               <td width="25%" valign="top" class="vncellreq">Call Group</td>
               <td width="75%" class="vtable">
-                <input name="callgroup" type="text" class="formfld unknown" id="callgroup" size="40" value="<?=htmlspecialchars($pconfig['callgroup']);?>">
+                <input name="callgroup" type="text" class="formfld" id="callgroup" size="40" value="<?=htmlspecialchars($pconfig['callgroup']);?>">
                 <br><span class="vexpl">Enter the user call group here. Example: sales, support<br></span>
               </td>
             </tr>
@@ -303,28 +303,28 @@ display_top_tabs(build_menu());
 				<tr>
 					<td width="25%" valign="top" class="vncell">Auth-ACL</td>
 					<td width="75%" class="vtable">
-						<input name="auth-acl" type="text" class="formfld unknown" id="auth-acl" size="40" value="<?=htmlspecialchars($pconfig['auth-acl']);?>">
+						<input name="auth-acl" type="text" class="formfld" id="auth-acl" size="40" value="<?=htmlspecialchars($pconfig['auth-acl']);?>">
 						<br> <span class="vexpl">Enter the auth acl here.<br></span>
 					</td>
 				</tr>
 				<tr>
                 <td valign="top" class="vncell">CIDR</td>
 					<td class="vtable">
-						<input name="cidr" type="text" class="formfld unknown" id="cidr" size="40" value="<?=htmlspecialchars($pconfig['cidr']);?>">
+						<input name="cidr" type="text" class="formfld" id="cidr" size="40" value="<?=htmlspecialchars($pconfig['cidr']);?>">
 						<br> <span class="vexpl">Enter the cidr here.<br></span>
 					</td>
 				</tr>
 				<tr>
 					<td width="25%" valign="top" class="vncell" nowrap>Outbound Caller ID Name</td>
 					<td width="75%" class="vtable">
-						<input name="outbound_caller_id_name" type="text" class="formfld unknown" id="outbound_caller_id_name" size="40" value="<?=htmlspecialchars($pconfig['outbound_caller_id_name']);?>">
+						<input name="outbound_caller_id_name" type="text" class="formfld" id="outbound_caller_id_name" size="40" value="<?=htmlspecialchars($pconfig['outbound_caller_id_name']);?>">
 						<br><span class="vexpl">Enter the outbound caller id name here.<br></span>
 					</td>
 				</tr>
 				<tr>
 					<td width="25%" valign="top" class="vncell" nowrap>Outbound Caller ID Number</td>
 					<td width="75%" class="vtable">
-						<input name="outbound_caller_id_number" type="text" class="formfld unknown" id="outbound_caller_id_number" size="40" value="<?=htmlspecialchars($pconfig['outbound_caller_id_number']);?>">
+						<input name="outbound_caller_id_number" type="text" class="formfld" id="outbound_caller_id_number" size="40" value="<?=htmlspecialchars($pconfig['outbound_caller_id_number']);?>">
 						<br><span class="vexpl">Enter the outbound caller id number here.<br></span>
 					</td>
 				</tr>
@@ -383,7 +383,7 @@ display_top_tabs(build_menu());
             <tr>
               <td width="25%" valign="top" class="vncellreq">Extension Description</td>
               <td width="75%" class="vtable">
-                <input name="description" type="text" class="formfld unknown" id="description" size="40" value="<?=htmlspecialchars($pconfig['description']);?>">
+                <input name="description" type="text" class="formfld" id="description" size="40" value="<?=htmlspecialchars($pconfig['description']);?>">
                 <br><span class="vexpl">Enter the description of the extension here.<br></span>
               </td>
             </tr>
diff --git a/config/freeswitch_dev/freeswitch_settings.tmp b/config/freeswitch_dev/freeswitch_settings.tmp
new file mode 100644
index 00000000..462078a5
--- /dev/null
+++ b/config/freeswitch_dev/freeswitch_settings.tmp
@@ -0,0 +1,391 @@
+<?php
+/* $Id$ */
+/*
+	freeswitch_settings.php
+	Copyright (C) 2008 Mark J Crane
+	All rights reserved.
+
+	FreeSWITCH (TM)
+	http://www.freeswitch.org/
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require("guiconfig.inc");
+require("/usr/local/pkg/freeswitch.inc");
+
+
+$a_settings = &$config['installedpackages']['freeswitchsettings']['config'];
+
+//$id = $_GET['id'];
+//if (isset($_POST['id'])) {
+//	$id = $_POST['id'];
+//}
+$id = 0;
+
+if (isset($id) && $a_settings[$id]) {
+
+	$pconfig['numbering_plan'] = $a_settings[$id]['numbering_plan'];
+	$pconfig['default_gateway'] = $a_settings[$id]['default_gateway'];
+	$pconfig['default_area_code'] = $a_settings[$id]['default_area_code'];
+	$pconfig['event_socket_port'] = $a_settings[$id]['event_socket_port'];
+	$pconfig['event_socket_password'] = $a_settings[$id]['event_socket_password'];
+	$pconfig['xml_rpc_http_port'] = $a_settings[$id]['xml_rpc_http_port'];
+	$pconfig['xml_rpc_auth_realm'] = $a_settings[$id]['xml_rpc_auth_realm'];
+	$pconfig['xml_rpc_auth_user'] = $a_settings[$id]['xml_rpc_auth_user'];
+	$pconfig['xml_rpc_auth_pass'] = $a_settings[$id]['xml_rpc_auth_pass'];
+	$pconfig['admin_pin'] = $a_settings[$id]['admin_pin'];
+	$pconfig['smtphost'] = $a_settings[$id]['smtphost'];
+	$pconfig['smtpsecure'] = $a_settings[$id]['smtpsecure'];
+	$pconfig['smtpauth'] = $a_settings[$id]['smtpauth'];	
+	$pconfig['smtpusername'] = $a_settings[$id]['smtpusername'];
+	$pconfig['smtppassword'] = $a_settings[$id]['smtppassword'];
+	$pconfig['smtpfrom'] = $a_settings[$id]['smtpfrom'];
+	$pconfig['smtpfromname'] = $a_settings[$id]['smtpfromname'];
+	$pconfig['mod_shout_decoder'] = $a_settings[$id]['mod_shout_decoder'];
+	$pconfig['mod_shout_volume'] = $a_settings[$id]['mod_shout_volume'];
+	
+}
+
+if ($_POST) {
+
+	unset($input_errors);
+	$pconfig = $_POST;
+
+
+	if (!$input_errors) {
+	
+		$ent = array();
+		$ent['numbering_plan'] = $_POST['numbering_plan'];
+		$ent['default_gateway'] = $_POST['default_gateway'];
+		$ent['default_area_code'] = $_POST['default_area_code'];
+		$ent['event_socket_port'] = $_POST['event_socket_port'];
+		$ent['event_socket_password'] = $_POST['event_socket_password'];
+		$ent['xml_rpc_http_port'] = $_POST['xml_rpc_http_port'];
+		$ent['xml_rpc_auth_realm'] = $_POST['xml_rpc_auth_realm'];
+		$ent['xml_rpc_auth_user'] = $_POST['xml_rpc_auth_user'];
+		$ent['xml_rpc_auth_pass'] = $_POST['xml_rpc_auth_pass'];
+		$ent['admin_pin'] = $_POST['admin_pin'];
+		$ent['smtphost'] = $_POST['smtphost'];
+		$ent['smtpsecure'] = $_POST['smtpsecure'];
+		$ent['smtpauth'] = $_POST['smtpauth'];
+		$ent['smtpusername'] = $_POST['smtpusername'];
+		$ent['smtppassword'] = $_POST['smtppassword'];
+		$ent['smtpfrom'] = $_POST['smtpfrom'];
+		$ent['smtpfromname'] = $_POST['smtpfromname'];
+		$ent['mod_shout_decoder'] = $_POST['mod_shout_decoder'];
+		$ent['mod_shout_volume'] = $_POST['mod_shout_volume'];
+
+		
+		if (isset($id) && $a_settings[$id]) {
+		  	//update
+      		$a_settings[$id] = $ent;
+		}
+		else {
+		  	//add	
+			$a_settings[] = $ent;
+		}
+		
+		write_config();
+		sync_package_freeswitch_settings();
+		
+		//header("Location: freeswitch_extensions.php");
+		//exit;
+	}
+}
+
+include("head.inc");
+
+?>
+
+<script type="text/javascript" language="JavaScript">
+
+function show_advanced_config() {
+	document.getElementById("showadvancedbox").innerHTML='';
+	aodiv = document.getElementById('showadvanced');
+	aodiv.style.display = "block";
+}
+
+</script>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<p class="pgtitle">FreeSWITCH: Settings</p>
+<?php if ($input_errors) print_input_errors($input_errors); ?>
+
+
+<div id="mainlevel">
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr><td class="tabnavtbl">
+<?php
+
+display_top_tabs(build_menu());
+ 	
+?>
+</td></tr>
+</table>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+   <tr>
+     <td class="tabcont" >
+
+	<!--
+  	<table width="100%" border="0" cellpadding="6" cellspacing="0">
+      <tr>
+        <td><p><span class="vexpl"><span class="red"><strong>Settings<br />
+            </strong></span>
+            /usr/local/freeswitch/conf/directory/default/
+            </p></td>
+      </tr>
+    </table>
+	-->
+    <br />
+
+        <form action="freeswitch_settings.php" method="post" name="iform" id="iform">
+            <table width="100%" border="0" cellpadding="6" cellspacing="0">
+
+            <tr>
+              <td width="25%" valign="top" class="vncell">Numbering Plan</td>
+              <td width="75%" class="vtable">
+                <input name="numbering_plan" type="text" class="formfld" id="numbering_plan" size="40" value="<?=htmlspecialchars($pconfig['numbering_plan']);?>">
+                <br /><span class="vexpl">Enter the numbering plan here. example: US<br /></span>
+              </td>
+            </tr>
+            <tr>
+              <td width="25%" valign="top" class="vncell">Default Gateway</td>
+              <td width="75%" class="vtable">
+                <input name="default_gateway" type="text" class="formfld" id="default_gateway" size="40" value="<?=htmlspecialchars($pconfig['default_gateway']);?>">
+                <br /><span class="vexpl">Enter the default gateway name here.<br /></span>
+              </td>
+            </tr>
+            <tr>
+              <td width="25%" valign="top" class="vncell">Default Area Code</td>
+              <td width="75%" class="vtable">
+                <input name="default_area_code" type="text" class="formfld" id="default_area_code" size="40" value="<?=htmlspecialchars($pconfig['default_area_code']);?>">
+                <br /><span class="vexpl">Enter the area code here. example: 208<br /></span>
+              </td>
+            </tr>
+            <tr>
+              <td width="25%" valign="top" class="vncell">Event Socket Port</td>
+              <td width="75%" class="vtable">
+                <input name="event_socket_port" type="text" class="formfld" id="event_socket_port" size="40" value="<?=htmlspecialchars($pconfig['event_socket_port']);?>">
+                <br /><span class="vexpl">Enter the event socket port here. default: 8021<br /></span>
+              </td>
+            </tr>
+            <tr>
+              <td width="25%" valign="top" class="vncell">Event Socket Password</td>
+              <td width="75%" class="vtable">
+                <input name="event_socket_password" type="password" class="formfld" id="event_socket_password" size="40" value="<?=htmlspecialchars($pconfig['event_socket_password']);?>">
+                <br /><span class="vexpl">Enter the event socket password here. default: ClueCon<br /></span>
+              </td>
+            </tr>
+            <tr>
+              <td width="25%" valign="top" class="vncell">XML RPC HTTP Port</td>
+              <td width="75%" class="vtable">
+                <input name="xml_rpc_http_port" type="text" class="formfld" id="xml_rpc_http_port" size="40" value="<?=htmlspecialchars($pconfig['xml_rpc_http_port']);?>">
+                <br /><span class="vexpl">Enter the XML RPC HTTP Port here. default: 8787<br /></span>
+              </td>
+            </tr>
+            <tr>
+              <td width="25%" valign="top" class="vncell">XML RPC Auth Realm</td>
+              <td width="75%" class="vtable">
+                <input name="xml_rpc_auth_realm" type="text" class="formfld" id="xml_rpc_auth_realm" size="40" value="<?=htmlspecialchars($pconfig['xml_rpc_auth_realm']);?>">
+                <br /><span class="vexpl">Enter the XML RPC Auth Realm here. default: freeswitch<br /></span>
+              </td>
+            </tr>
+            <tr>
+              <td width="25%" valign="top" class="vncell">XML RPC Auth User</td>
+              <td width="75%" class="vtable">
+                <input name="xml_rpc_auth_user" type="text" class="formfld" id="xml_rpc_auth_user" size="40" value="<?=htmlspecialchars($pconfig['xml_rpc_auth_user']);?>">
+                <br /><span class="vexpl">Enter the XML RPC Auth User here. default: freeswitch<br /></span>
+              </td>
+            </tr>
+            <tr>
+              <td width="25%" valign="top" class="vncell">XML RPC Auth Password</td>
+              <td width="75%" class="vtable">
+                <input name="xml_rpc_auth_pass" type="password" class="formfld" id="xml_rpc_auth_pass" size="40" value="<?=htmlspecialchars($pconfig['xml_rpc_auth_pass']);?>">
+                <br /><span class="vexpl">Enter the XML RPC Auth Password here. default: works<br /></span>
+              </td>
+            </tr>
+            <tr>
+              <td width="25%" valign="top" class="vncell">Admin PIN Number</td>
+              <td width="75%" class="vtable">
+                <input name="admin_pin" type="password" class="formfld" id="admin_pin" size="40" value="<?=htmlspecialchars($pconfig['admin_pin']);?>">
+                <br /><span class="vexpl">Enter a admin pin number. Used to authenticate the admin from the phone.<br /></span>
+              </td>
+            </tr>
+            <tr>
+              <td width="25%" valign="top" class="vncell">SMTP Host</td>
+              <td width="75%" class="vtable">
+                <input name="smtphost" type="text" class="formfld2" id="smtphost" size="40" value="<?=htmlspecialchars($pconfig['smtphost']);?>">
+                <br /><span class="vexpl">Enter the SMTP host address. example: smtp.gmail.com:465<br /></span>
+              </td>
+            </tr>
+            <tr>
+              <td width="22%" valign="top" class="vncell">SMTP Secure</td>
+              <td width="78%" class="vtable">
+                <?php
+                echo "              <select name='smtpsecure' class='formfld'>\n";
+                echo "                <option></option>\n";
+                switch (htmlspecialchars($pconfig['smtpsecure'])) {
+                case "none":
+                    echo "              <option value='none' selected='yes'>none</option>\n";
+                    echo "              <option value='tls'>tls</option>\n";
+                    echo "              <option value='ssl'>ssl</option>\n";
+                    break;
+                case "tls":
+					echo "              <option value='none'>none</option>\n";
+					echo "              <option value='tls' selected='yes'>tls</option>\n";
+                    echo "              <option value='ssl'>ssl</option>\n";
+                    break;
+                case "ssl":
+					echo "              <option value='none'>none</option>\n";
+					echo "              <option value='tls'>tls</option>\n";
+                    echo "              <option value='ssl' selected='yes'>ssl</option>\n";
+                    break;
+                default:
+					echo "              <option value='' selected='yes'>none</option>\n";
+                    echo "              <option value='tls'>tls</option>\n";
+                    echo "              <option value='ssl'>ssl</option>\n";
+                }
+                echo "              </select><br />\n";
+				echo "Select the SMTP security. None, TLS, SSL<br />";
+                ?>
+              </td>
+            </tr>
+            <tr>
+              <td width="22%" valign="top" class="vncell">SMTP Auth</td>
+              <td width="78%" class="vtable">
+                <?php
+                echo "              <select name='smtpauth' class='formfld'>\n";
+                echo "                <option></option>\n";
+                switch (htmlspecialchars($pconfig['smtpauth'])) {
+                case "true":
+                    echo "              <option value='true' selected='yes'>true</option>\n";
+                    echo "              <option value='false'>false</option>\n";
+                    break;
+                case "false":
+                    echo "              <option value='true'>true</option>\n";
+                    echo "              <option value='false' selected='yes'>false</option>\n";
+
+                    break;
+                default:
+                    echo "              <option value='true' selected='yes'>true</option>\n";
+                    echo "              <option value='false'>false</option>\n";
+                }
+                echo "              </select><br />\n";
+				echo "Use SMTP Authentication true or false.<br />";
+                ?>
+              </td>
+            </tr>
+			
+            <tr>
+              <td width="25%" valign="top" class="vncell">SMTP Username</td>
+              <td width="75%" class="vtable">
+                <input name="smtpusername" type="text" class="formfld" id="smtpusername" size="40" value="<?=htmlspecialchars($pconfig['smtpusername']);?>">
+                <br /><span class="vexpl">Enter the SMTP authentication username.<br /></span>
+              </td>
+            </tr>
+            <tr>
+              <td width="25%" valign="top" class="vncell">SMTP Password</td>
+              <td width="75%" class="vtable">
+                <input name="smtppassword" type="password" class="formfld" id="smtppassword" size="40" value="<?=htmlspecialchars($pconfig['smtppassword']);?>">
+                <br /><span class="vexpl">Enter the SMTP authentication password.<br /></span>
+              </td>
+            </tr>
+            <tr>
+              <td width="25%" valign="top" class="vncell">SMTP From</td>
+              <td width="75%" class="vtable">
+                <input name="smtpfrom" type="text" class="formfld" id="smtpfrom" size="40" value="<?=htmlspecialchars($pconfig['smtpfrom']);?>">
+                <br /><span class="vexpl">Enter the SMTP From email address.<br /></span>
+              </td>
+            </tr>
+            <tr>
+              <td width="25%" valign="top" class="vncell">SMTP From Name</td>
+              <td width="75%" class="vtable">
+                <input name="smtpfromname" type="text" class="formfld" id="smtpfromname" size="40" value="<?=htmlspecialchars($pconfig['smtpfromname']);?>">
+                <br /><span class="vexpl">Enter the SMTP From Name.<br /></span>
+              </td>
+            </tr>
+            <tr>
+              <td width="25%" valign="top" class="vncell">Mod Shout Decoder</td>
+              <td width="75%" class="vtable">
+                <input name="mod_shout_decoder" type="text" class="formfld" id="mod_shout_decoder" size="40" value="<?=htmlspecialchars($pconfig['mod_shout_decoder']);?>">
+                <br /><span class="vexpl">Enter the Decoder. default: i386<br /></span>
+              </td>
+            </tr>
+            </table>
+			<!--
+  			<div id="showadvancedbox">
+				<table width="100%" border="0" cellpadding="6" cellspacing="0">
+				<tr>
+					<td width="25%" valign="top" class="vncell">Show Advanced</td>
+					<td width="75%" class="vtable">
+						<input type="button" onClick="show_advanced_config()" value="Advanced"></input></a>
+					</td>
+				</tr>
+				</table>				
+  			</div>
+  			<div id="showadvanced" style="display:none">
+				<table width="100%" border="0" cellpadding="6" cellspacing="0">
+				<tr>
+					<td width="25%" valign="top" class="vncell">zzz</td>
+					<td width="75%" class="vtable">
+						<input name="zzz" type="text" class="formfld" id="zzz" size="40" value="<?=htmlspecialchars($pconfig['zzz']);?>">
+						<br /> <span class="vexpl">zzz<br /></span>
+					</td>
+				</tr>
+				</table>
+  			</div>
+			-->
+			<br /><br />
+            <table width="100%" border="0" cellpadding="6" cellspacing="0">
+            <tr>
+              <td width="25%" valign="top">&nbsp;</td>
+              <td>
+                <input name="Submit" type="submit" class="formbtn" value="Save"> <input class="formbtn" type="button" value="Cancel" onclick="history.back()">
+                <?php
+				$id = 0;
+				if (isset($id) && $a_settings[$id]) {
+                  echo "<input name=\"id\" type=\"hidden\" value=\"".$id."\">\n";
+                }
+				?>
+              </td>
+            </tr>
+            </table>
+        </form>
+
+      <br />
+      <br />
+      <br />
+      <br />
+      <br />
+      <br />
+
+     </td>
+   </tr>
+</table>
+
+</div>
+
+<?php include("fend.inc"); ?>
+</body>
+</html>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 4f6231f1..dd42a454 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -126,7 +126,7 @@
       <pkginfolink>http://doc.pfsense.org/index.php/FreeSWITCH</pkginfolink>
       <config_file>http://www.pfsense.com/packages/config/freeswitch_dev/freeswitch.xml</config_file>
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-      <version>0.9.5</version>
+      <version>0.9.5.1</version>
       <status>Beta</status>
       <required_version>1.2.3</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>