From 4af8252d66de5a9bd37a333192ee6faada5eea74 Mon Sep 17 00:00:00 2001 From: mcrane Date: Wed, 15 Jul 2009 13:41:18 -0600 Subject: FreeSWITCH package remove auth-user from extensions add auth-username to gateways. --- config/freeswitch/freeswitch.inc | 8 ++++---- config/freeswitch/freeswitch.xml | 2 +- config/freeswitch/freeswitch_extensions_edit.tmp | 9 --------- config/freeswitch/freeswitch_gateways_edit.tmp | 15 ++++++++++++--- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'config/freeswitch') 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 .= " \n"; } - if (strlen($rowhelper['auth-user']) > 0) { - $tmpxml .= " \n"; - } if (strlen($rowhelper['auth-acl']) > 0) { $tmpxml .= " \n"; } @@ -666,6 +663,9 @@ function sync_package_freeswitch_gateways() if (strlen($rowhelper['username']) > 0) { $tmpxml .= " \n"; } + if (strlen($rowhelper['auth-username']) > 0) { + $tmpxml .= " \n"; + } if (strlen($rowhelper['password']) > 0) { $tmpxml .= " \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 @@ Describe your package requirements here Currently there are no FAQ items provided. FreeSWITCH Settings - 0.9.4.7 + 0.9.4.8 FreeSWITCH: Settings /usr/local/pkg/freeswitch.inc 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']; @@ -302,13 +300,6 @@ display_top_tabs(build_menu());