diff options
| -rw-r--r-- | packages/freeswitch/freeswitch.inc | 2 | ||||
| -rw-r--r-- | packages/freeswitch/freeswitch.xml | 2 | ||||
| -rw-r--r-- | packages/freeswitch/freeswitch_extensions_edit.tmp | 85 | ||||
| -rw-r--r-- | pkg_config.7.xml | 2 |
4 files changed, 46 insertions, 45 deletions
diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc index cca8e0c1..ea6474bc 100644 --- a/packages/freeswitch/freeswitch.inc +++ b/packages/freeswitch/freeswitch.inc @@ -2084,7 +2084,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"; + $config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.5.8.1"; conf_mount_ro(); diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml index ba3b2d39..b87171f3 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</version> + <version>0.5.8.1</version> <title>FreeSWITCH: Settings</title> <include_file>/usr/local/pkg/freeswitch.inc</include_file> <menu> diff --git a/packages/freeswitch/freeswitch_extensions_edit.tmp b/packages/freeswitch/freeswitch_extensions_edit.tmp index ae931c49..6914ab7c 100644 --- a/packages/freeswitch/freeswitch_extensions_edit.tmp +++ b/packages/freeswitch/freeswitch_extensions_edit.tmp @@ -170,78 +170,78 @@ function show_advanced_config() { <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> - <td width="22%" valign="top" class="vncellreq">Extension</td> - <td width="78%" class="vtable"> + <td width="25%" valign="top" class="vncellreq">Extension</td> + <td width="75%" class="vtable"> <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 expects extension numbers between 1001 -1019. To use additional numbers for the extensions by adjusting the dialplan. In the in the dialplan under name="Local_Extension" adjust the regular expression="^(10[01][0-9])$".<br></span> </td> </tr> <tr> - <td width="22%" valign="top" class="vncellreq">Password</td> - <td width="78%" class="vtable"> + <td width="25%" valign="top" class="vncellreq">Password</td> + <td width="75%" class="vtable"> <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="22%" valign="top" class="vncellreq">Mailbox</td> - <td width="78%" class="vtable"> + <td width="25%" valign="top" class="vncellreq">Mailbox</td> + <td width="75%" class="vtable"> <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="22%" valign="top" class="vncellreq">Voicemail Password</td> - <td width="78%" class="vtable"> + <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']);?>"> <br><span class="vexpl">Enter the voicemail password here.<br></span> </td> </tr> <tr> - <td width="22%" valign="top" class="vncellreq">Account Code</td> - <td width="78%" class="vtable"> + <td width="25%" valign="top" class="vncellreq">Account Code</td> + <td width="75%" class="vtable"> <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="22%" valign="top" class="vncellreq" nowrap>Effective Caller ID Name</td> - <td width="78%" class="vtable"> + <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" 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="22%" valign="top" class="vncellreq" nowrap>Effective Caller ID Number</td> - <td width="78%" class="vtable"> + <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" 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="22%" valign="top" class="vncellreq" nowrap>Outbound Caller ID Name</td> - <td width="78%" class="vtable"> + <td width="25%" valign="top" class="vncellreq" nowrap>Outbound Caller ID Name</td> + <td width="75%" class="vtable"> <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="22%" valign="top" class="vncellreq" nowrap>Outbound Caller ID Number</td> - <td width="78%" class="vtable"> + <td width="25%" valign="top" class="vncellreq" nowrap>Outbound Caller ID Number</td> + <td width="75%" class="vtable"> <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> <tr> - <td width="22%" valign="top" class="vncellreq" nowrap>Voicemail Mail To</td> - <td width="78%" class="vtable"> + <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" 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> <tr> - <td width="22%" valign="top" class="vncellreq" nowrap>Voicemail Attach File</td> - <td width="78%" class="vtable"> + <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'>\n"; echo " <option></option>\n"; @@ -265,25 +265,26 @@ function show_advanced_config() { </td> </tr> <tr> - <td width="22%" valign="top" class="vncellreq">User Context</td> - <td width="78%" class="vtable"> + <td width="25%" valign="top" class="vncellreq">User Context</td> + <td width="75%" class="vtable"> <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="22%" valign="top" class="vncellreq">Call Group</td> - <td width="78%" class="vtable"> + <td width="25%" valign="top" class="vncellreq">Call Group</td> + <td width="75%" class="vtable"> <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<br></span> </td> - </tr> - + </tr> + </table> + <div id="showadvancedbox"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> - <td width="22%" valign="top" class="vncell">Show Advanced</td> - <td width="78%" class="vtable"> + <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> @@ -292,33 +293,33 @@ function show_advanced_config() { <div id="showadvanced" style="display:none"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> - <td width="22%" valign="top" class="vncell">Auth-ACL</td> - <td width="78%" class="vtable"> + <td width="25%" valign="top" class="vncell">Auth-ACL</td> + <td width="75%" class="vtable"> <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 width="22%" valign="top" class="vncell">CIDR</td> - <td width="78%" class="vtable"> + <td valign="top" class="vncell">CIDR</td> + <td class="vtable"> <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> </table> </div> - + + <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> - <td width="22%" valign="top" class="vncellreq">Extension Description</td> - <td width="78%" class="vtable"> + <td width="25%" valign="top" class="vncellreq">Extension Description</td> + <td width="75%" class="vtable"> <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> <tr> - <td width="22%" valign="top"> </td> - <td width="78%"> + <td valign="top"> </td> + <td> <input name="Submit" type="submit" class="formbtn" value="Save"> <input class="formbtn" type="button" value="Cancel" onclick="history.back()"> <?php if (isset($id) && $a_extensions[$id]): ?> <input name="id" type="hidden" value="<?=$id;?>"> diff --git a/pkg_config.7.xml b/pkg_config.7.xml index d6e299a9..00ecc3e3 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</version> + <version>0.5.8.1</version> <status>Beta</status> <required_version>1.2.1</required_version> <maintainer>markjcrane@gmail.com</maintainer> |