diff options
Diffstat (limited to 'config/freeswitch')
| -rw-r--r-- | config/freeswitch/freeswitch.inc | 8 | ||||
| -rw-r--r-- | config/freeswitch/freeswitch.xml | 2 | ||||
| -rw-r--r-- | config/freeswitch/freeswitch_extensions_edit.tmp | 9 | ||||
| -rw-r--r-- | config/freeswitch/freeswitch_gateways_edit.tmp | 15 |
4 files changed, 17 insertions, 17 deletions
diff --git a/config/freeswitch/freeswitch.inc b/config/freeswitch/freeswitch.inc index 3635229d..d4591a0f 100644 --- a/config/freeswitch/freeswitch.inc +++ b/config/freeswitch/freeswitch.inc @@ -604,9 +604,6 @@ function sync_package_freeswitch_extensions() } $tmpxml .= " <param name=\"vm-mailto\" value=\"" . $rowhelper['vm-mailto'] . "\"/>\n"; } - if (strlen($rowhelper['auth-user']) > 0) { - $tmpxml .= " <param name=\"auth-user\" value=\"" . $rowhelper['auth-user'] . "\"/>\n"; - } if (strlen($rowhelper['auth-acl']) > 0) { $tmpxml .= " <param name=\"auth-acl\" value=\"" . $rowhelper['auth-acl'] . "\"/>\n"; } @@ -666,6 +663,9 @@ function sync_package_freeswitch_gateways() if (strlen($rowhelper['username']) > 0) { $tmpxml .= " <param name=\"username\" value=\"" . $rowhelper['username'] . "\"/>\n"; } + if (strlen($rowhelper['auth-username']) > 0) { + $tmpxml .= " <param name=\"auth-username\" value=\"" . $rowhelper['auth-username'] . "\"/>\n"; + } if (strlen($rowhelper['password']) > 0) { $tmpxml .= " <param name=\"password\" value=\"" . $rowhelper['password'] . "\"/>\n"; } @@ -2725,7 +2725,7 @@ function freeswitch_php_install_command() global $config; //exec("/etc/./rc.conf_mount_rw"); - $freeswitch_package_version = "0.9.4.7"; + $freeswitch_package_version = "0.9.4.8"; $freeswitch_build_version = "1.0.4 pre 8"; $freeswitch_build_revision = "13784"; diff --git a/config/freeswitch/freeswitch.xml b/config/freeswitch/freeswitch.xml index ed167a0c..c52415dc 100644 --- a/config/freeswitch/freeswitch.xml +++ b/config/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.9.4.7</version> + <version>0.9.4.8</version> <title>FreeSWITCH: Settings</title> <include_file>/usr/local/pkg/freeswitch.inc</include_file> <menu> diff --git a/config/freeswitch/freeswitch_extensions_edit.tmp b/config/freeswitch/freeswitch_extensions_edit.tmp index 1d1cbf95..de98d447 100644 --- a/config/freeswitch/freeswitch_extensions_edit.tmp +++ b/config/freeswitch/freeswitch_extensions_edit.tmp @@ -58,7 +58,6 @@ if (isset($id) && $a_extensions[$id]) { $pconfig['vm-keep-local-after-email'] = $a_extensions[$id]['vm-keep-local-after-email']; $pconfig['user_context'] = $a_extensions[$id]['user_context']; $pconfig['callgroup'] = $a_extensions[$id]['callgroup']; - $pconfig['auth-user'] = $a_extensions[$id]['auth-user']; $pconfig['auth-acl'] = $a_extensions[$id]['auth-acl']; $pconfig['cidr'] = $a_extensions[$id]['cidr']; $pconfig['sip-force-contact'] = $a_extensions[$id]['sip-force-contact']; @@ -96,7 +95,6 @@ if ($_POST) { $ent['vm-keep-local-after-email'] = $_POST['vm-keep-local-after-email']; $ent['user_context'] = $_POST['user_context']; $ent['callgroup'] = $_POST['callgroup']; - $ent['auth-user'] = $_POST['auth-user']; $ent['auth-acl'] = $_POST['auth-acl']; $ent['cidr'] = $_POST['cidr']; $ent['sip-force-contact'] = $_POST['sip-force-contact']; @@ -303,13 +301,6 @@ display_top_tabs(build_menu()); <div id="showadvanced" style="display:none"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> - <td width="25%" valign="top" class="vncell">Auth-User</td> - <td width="75%" class="vtable"> - <input name="auth-user" type="text" class="formfld unknown" id="auth-user" size="40" value="<?=htmlspecialchars($pconfig['auth-user']);?>"> - <br> <span class="vexpl">Enter the auth user here.<br></span> - </td> - </tr> - <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']);?>"> diff --git a/config/freeswitch/freeswitch_gateways_edit.tmp b/config/freeswitch/freeswitch_gateways_edit.tmp index c51ad5fe..977e562e 100644 --- a/config/freeswitch/freeswitch_gateways_edit.tmp +++ b/config/freeswitch/freeswitch_gateways_edit.tmp @@ -47,7 +47,8 @@ if (isset($id) && $a_gateways[$id]) { $pconfig['gatewayid'] = $a_gateways[$id]['gatewayid']; $gatewayid = $a_gateways[$id]['gatewayid']; $pconfig['gateway'] = $a_gateways[$id]['gateway']; - $pconfig['username'] = $a_gateways[$id]['username']; + $pconfig['username'] = $a_gateways[$id]['username']; + $pconfig['auth-username'] = $a_gateways[$id]['auth-username']; $pconfig['password'] = $a_gateways[$id]['password']; $pconfig['realm'] = $a_gateways[$id]['realm']; $pconfig['from-user'] = $a_gateways[$id]['from-user']; @@ -94,6 +95,7 @@ if ($_POST) { } $ent['gateway'] = $_POST['gateway']; $ent['username'] = $_POST['username']; + $ent['auth-username'] = $_POST['auth-username']; $ent['password'] = $_POST['password']; $ent['realm'] = $_POST['realm']; $ent['from-user'] = $_POST['from-user']; @@ -492,10 +494,17 @@ display_top_tabs(build_menu()); <input type="button" onClick="show_advanced_config()" value="Advanced"></input></a> </td> </tr> - </table> + </table> </div> <div id="showadvanced" style="display:none"> - <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">Auth-username</td> + <td width="78%" class="vtable"> + <input name="auth-username" type="text" class="formfld" id="auth-username" size="40" value="<?=htmlspecialchars($pconfig['auth-username']);?>"> + <br> <span class="vexpl">Enter the auth-username here.<br></span> + </td> + </tr> <tr> <td width="22%" valign="top" class="vncell">Register-transport</td> <td width="78%" class="vtable"> |