From 85264c180bf6d4860727e53c33b5e9d59539fff4 Mon Sep 17 00:00:00 2001 From: mcrane Date: Tue, 12 May 2009 04:57:08 -0600 Subject: FreeSWITCH package add profile management, improve backup restore so sip profiles and music on hold are restored correctly, remove files that are not not used. --- config/freeswitch/freeswitch.inc | 35 ++- config/freeswitch/freeswitch.xml | 8 +- config/freeswitch/freeswitch_dialplan.xml | 8 +- config/freeswitch/freeswitch_dialplan_includes.tmp | 3 +- .../freeswitch_dialplan_includes_details_edit.tmp | 3 +- .../freeswitch_dialplan_includes_edit.tmp | 3 +- config/freeswitch/freeswitch_extensions.tmp | 3 +- config/freeswitch/freeswitch_extensions_edit.tmp | 3 +- config/freeswitch/freeswitch_external.xml | 128 ----------- config/freeswitch/freeswitch_features.tmp | 5 +- config/freeswitch/freeswitch_gateways.tmp | 3 +- config/freeswitch/freeswitch_gateways_edit.tmp | 3 +- config/freeswitch/freeswitch_internal.xml | 128 ----------- config/freeswitch/freeswitch_ivr.tmp | 3 +- config/freeswitch/freeswitch_ivr_edit.tmp | 3 +- config/freeswitch/freeswitch_ivr_options_edit.tmp | 3 +- config/freeswitch/freeswitch_modules.xml | 8 +- config/freeswitch/freeswitch_profile_edit.tmp | 151 +++++++++++++ config/freeswitch/freeswitch_profiles.tmp | 243 +++++++++++++++++++++ config/freeswitch/freeswitch_public.xml | 8 +- config/freeswitch/freeswitch_public_includes.tmp | 3 +- .../freeswitch_public_includes_details_edit.tmp | 3 +- .../freeswitch/freeswitch_public_includes_edit.tmp | 3 +- config/freeswitch/freeswitch_recordings.tmp | 3 +- config/freeswitch/freeswitch_recordings_edit.tmp | 3 +- config/freeswitch/freeswitch_status.tmp | 4 +- config/freeswitch/freeswitch_time_conditions.tmp | 3 +- .../freeswitch/freeswitch_time_conditions_edit.tmp | 3 +- config/freeswitch/freeswitch_vars.xml | 8 +- config/freeswitch/mod_fax.so.1 | Bin 80741 -> 0 bytes config/freeswitch/mod_shout.so.1 | Bin 2147544 -> 0 bytes 31 files changed, 452 insertions(+), 333 deletions(-) delete mode 100644 config/freeswitch/freeswitch_external.xml delete mode 100644 config/freeswitch/freeswitch_internal.xml create mode 100644 config/freeswitch/freeswitch_profile_edit.tmp create mode 100644 config/freeswitch/freeswitch_profiles.tmp delete mode 100755 config/freeswitch/mod_fax.so.1 delete mode 100755 config/freeswitch/mod_shout.so.1 (limited to 'config') diff --git a/config/freeswitch/freeswitch.inc b/config/freeswitch/freeswitch.inc index 4a6546eb..dcaf23fb 100644 --- a/config/freeswitch/freeswitch.inc +++ b/config/freeswitch/freeswitch.inc @@ -1710,7 +1710,7 @@ function sync_package_freeswitch() function freeswitch_php_install_command() { global $config; - $freeswitch_package_version = "0.8.5.4"; + $freeswitch_package_version = "0.8.6"; $freeswitch_build_version = "1.0.4 pre 6"; $freeswitch_build_revision = "13238"; @@ -1743,7 +1743,7 @@ function freeswitch_php_install_command() //make a backup copy of the default config - exec("cp -R /usr/local/freeswitch/conf /usr/local/freeswitch/conf.rev".$freeswitch_build_revision.".orig"); + exec("cp -R /usr/local/freeswitch/conf /usr/local/freeswitch/conf.orig"); //remove some default config files that are not needed unlink_if_exists("/usr/local/freeswitch/conf/dialplan/default/01_example.com.xml"); @@ -1783,12 +1783,19 @@ function freeswitch_php_install_command() //exec("cd /usr/local/pkg/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch.inc"); //exec("cd /usr/local/pkg/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch.xml"); exec("cd /usr/local/pkg/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch_dialplan.xml"); - exec("cd /usr/local/pkg/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch_external.xml"); - exec("cd /usr/local/pkg/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch_internal.xml"); + //exec("cd /usr/local/pkg/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch_external.xml"); + //exec("cd /usr/local/pkg/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch_internal.xml"); exec("cd /usr/local/pkg/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch_modules.xml"); exec("cd /usr/local/pkg/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch_public.xml"); exec("cd /usr/local/pkg/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch_vars.xml"); + //misc files + if (!is_dir('/usr/local/www/edit_area/')) { + exec("cd /usr/local/pkg/;fetch http://www.pfsense.com/packages/config/freeswitch/edit_area.tgz"); + system('cd /usr/local/www; tar xvpfz /tmp/edit_area.tgz edit_area'); + unlink_if_exists("/tmp/edit_area.tgz"); + } + //rename PHP files from .tmp to .php exec("cd /tmp/;fetch http://www.pfsense.com/packages/config/freeswitch/class.smtp.tmp"); @@ -1854,7 +1861,15 @@ function freeswitch_php_install_command() exec("cd /tmp/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch_ivr_options_edit.tmp"); exec("cp /tmp/freeswitch_ivr_options_edit.tmp /usr/local/www/packages/freeswitch/freeswitch_ivr_options_edit.php"); unlink_if_exists("/tmp/freeswitch_ivr_options_edit.tmp"); - + + exec("cd /tmp/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch_profiles.php.tmp"); + exec("cp /tmp/freeswitch_profiles.tmp /usr/local/www/packages/freeswitch/freeswitch_profiles.php"); + unlink_if_exists("/tmp/freeswitch_profiles.tmp"); + + exec("cd /tmp/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch_profile_edit.tmp"); + exec("cp /tmp/freeswitch_profile_edit.tmp /usr/local/www/packages/freeswitch/freeswitch_profile_edit.php"); + unlink_if_exists("/tmp/freeswitch_profile_edit.tmp"); + exec("cd /tmp/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch_public_includes.tmp"); exec("cp /tmp/freeswitch_public_includes.tmp /usr/local/www/packages/freeswitch/freeswitch_public_includes.php"); unlink_if_exists("/tmp/freeswitch_public_includes.tmp"); @@ -2282,7 +2297,9 @@ function freeswitch_php_install_command() // if backup file exists restore it $filename = 'freeswitch.bak.tgz'; if (!is_dir('/root/backup/')) { - exec("mkdir /root/backup/"); + exec("rm -R /usr/local/freeswitch/conf/sip_profiles/"); + exec("rm -R /usr/local/freeswitch/sounds/music/"); + exec("mkdir /root/backup/"); } //extract a specific directory to /usr/local/freeswitch @@ -2297,7 +2314,9 @@ function freeswitch_php_install_command() system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/storage/'); system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/sounds/custom/8000/'); system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/sounds/music/8000/'); - system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/conf/ssl'); + system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/conf/ssl/'); + system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/conf/sip_profiles/'); + //Optional //system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/conf/'); @@ -2332,7 +2351,7 @@ function freeswitch_php_install_command() pclose($handle); if (pkg_is_service_running('freeswitch')) { - sync_package_freeswitch_ivr(); + sync_package_freeswitch_ivr(); } diff --git a/config/freeswitch/freeswitch.xml b/config/freeswitch/freeswitch.xml index 28450fe1..2caa7a56 100644 --- a/config/freeswitch/freeswitch.xml +++ b/config/freeswitch/freeswitch.xml @@ -74,10 +74,6 @@ Extensions /packages/freeswitch/freeswitch_extensions.php - - External - /pkg_edit.php?xml=freeswitch_external.xml&id=0 - Features /packages/freeswitch/freeswitch_features.php @@ -87,8 +83,8 @@ /packages/freeswitch/freeswitch_gateways.php - Internal - /pkg_edit.php?xml=freeswitch_internal.xml&id=0 + Profiles + /packages/freeswitch/freeswitch_profiles.php Public diff --git a/config/freeswitch/freeswitch_dialplan.xml b/config/freeswitch/freeswitch_dialplan.xml index 06adf1d3..ef62f844 100644 --- a/config/freeswitch/freeswitch_dialplan.xml +++ b/config/freeswitch/freeswitch_dialplan.xml @@ -70,10 +70,6 @@ Extensions /packages/freeswitch/freeswitch_extensions.php - - External - /pkg_edit.php?xml=freeswitch_external.xml&id=0 - Features /packages/freeswitch/freeswitch_features.php @@ -83,8 +79,8 @@ /packages/freeswitch/freeswitch_gateways.php - Internal - /pkg_edit.php?xml=freeswitch_internal.xml&id=0 + Profiles + /packages/freeswitch/freeswitch_profiles.php Public diff --git a/config/freeswitch/freeswitch_dialplan_includes.tmp b/config/freeswitch/freeswitch_dialplan_includes.tmp index a38489a2..7519d052 100644 --- a/config/freeswitch/freeswitch_dialplan_includes.tmp +++ b/config/freeswitch/freeswitch_dialplan_includes.tmp @@ -116,10 +116,9 @@ include("head.inc"); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), true, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), false, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_dialplan_includes_details_edit.tmp b/config/freeswitch/freeswitch_dialplan_includes_details_edit.tmp index 5ab04236..e100ff40 100644 --- a/config/freeswitch/freeswitch_dialplan_includes_details_edit.tmp +++ b/config/freeswitch/freeswitch_dialplan_includes_details_edit.tmp @@ -134,10 +134,9 @@ include("head.inc"); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), true, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), false, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_dialplan_includes_edit.tmp b/config/freeswitch/freeswitch_dialplan_includes_edit.tmp index 4e5e6d21..491dba21 100644 --- a/config/freeswitch/freeswitch_dialplan_includes_edit.tmp +++ b/config/freeswitch/freeswitch_dialplan_includes_edit.tmp @@ -185,10 +185,9 @@ include("head.inc"); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), true, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), false, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_extensions.tmp b/config/freeswitch/freeswitch_extensions.tmp index ea0aec84..a45f1a9c 100644 --- a/config/freeswitch/freeswitch_extensions.tmp +++ b/config/freeswitch/freeswitch_extensions.tmp @@ -65,10 +65,9 @@ include("head.inc"); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), true, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), false, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_extensions_edit.tmp b/config/freeswitch/freeswitch_extensions_edit.tmp index feb6bf98..66cacfd9 100644 --- a/config/freeswitch/freeswitch_extensions_edit.tmp +++ b/config/freeswitch/freeswitch_extensions_edit.tmp @@ -136,10 +136,9 @@ function show_advanced_config() { $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), true, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), false, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_external.xml b/config/freeswitch/freeswitch_external.xml deleted file mode 100644 index f7ef2d70..00000000 --- a/config/freeswitch/freeswitch_external.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - . - All rights reserved. - */ -/* ========================================================================== */ -/* - 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. - */ -/* ========================================================================== */ - ]]> - - 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. - Describe your package requirements here - Currently there are no FAQ items provided. - freeswitchexternal - 0.1 - FreeSWITCH: External - pkg_edit.php?xml=freeswitch_external.xml&id=0 - /usr/local/pkg/freeswitch.inc - - - Settings - /pkg_edit.php?xml=freeswitch.xml&id=0 - - - Dialplan - /packages/freeswitch/freeswitch_dialplan_includes.php - - - Extensions - /packages/freeswitch/freeswitch_extensions.php - - - External - /pkg_edit.php?xml=freeswitch_external.xml&id=0 - - - - Features - /packages/freeswitch/freeswitch_features.php - - - Gateways - /packages/freeswitch/freeswitch_gateways.php - - - Internal - /pkg_edit.php?xml=freeswitch_internal.xml&id=0 - - - Public - /packages/freeswitch/freeswitch_public_includes.php - - - Status - /packages/freeswitch/freeswitch_status.php - - - Vars - /pkg_edit.php?xml=freeswitch_vars.xml&id=0 - - - installedpackages->package->$packagename->configuration->freeswitchexternal - - - <b>External</b> <br /> <br />SIP external profile for outbound registrations. - external_xml - <br />Path: /usr/local/freeswitch/conf/sip_profiles/external.xml <br /><br /> - textarea - base64 - off - 30 - 70 - 33 - - - - - - sync_package_freeswitch_external(); - - - - - - - sync_package_freeswitch_external(); - - \ No newline at end of file diff --git a/config/freeswitch/freeswitch_features.tmp b/config/freeswitch/freeswitch_features.tmp index 612e04dd..4a55c15a 100644 --- a/config/freeswitch/freeswitch_features.tmp +++ b/config/freeswitch/freeswitch_features.tmp @@ -65,11 +65,10 @@ include("head.inc"); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), true, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); - $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); + $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); display_top_tabs($tab_array); diff --git a/config/freeswitch/freeswitch_gateways.tmp b/config/freeswitch/freeswitch_gateways.tmp index f2036415..05ccbf8f 100644 --- a/config/freeswitch/freeswitch_gateways.tmp +++ b/config/freeswitch/freeswitch_gateways.tmp @@ -65,10 +65,9 @@ include("head.inc"); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), false, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), true, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_gateways_edit.tmp b/config/freeswitch/freeswitch_gateways_edit.tmp index d2f52051..f5a54881 100644 --- a/config/freeswitch/freeswitch_gateways_edit.tmp +++ b/config/freeswitch/freeswitch_gateways_edit.tmp @@ -278,10 +278,9 @@ function show_advanced_config() { $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), false, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), true, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_internal.xml b/config/freeswitch/freeswitch_internal.xml deleted file mode 100644 index 57a3d85f..00000000 --- a/config/freeswitch/freeswitch_internal.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - All rights reserved. - -/* ========================================================================== */ -/* - 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. - */ -/* ========================================================================== */ - ]]> - - 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. - Describe your package requirements here - Currently there are no FAQ items provided. - freeswitchinternal - 0.1 - FreeSWITCH: Internal - pkg_edit.php?xml=freeswitch_internal.xml&id=0 - /usr/local/pkg/freeswitch.inc - - - Settings - /pkg_edit.php?xml=freeswitch.xml&id=0 - - - Dialplan - /packages/freeswitch/freeswitch_dialplan_includes.php - - - Extensions - /packages/freeswitch/freeswitch_extensions.php - - - External - /pkg_edit.php?xml=freeswitch_external.xml&id=0 - - - Features - /packages/freeswitch/freeswitch_features.php - - - Gateways - /packages/freeswitch/freeswitch_gateways.php - - - Internal - /pkg_edit.php?xml=freeswitch_internal.xml&id=0 - - - - Public - /packages/freeswitch/freeswitch_public_includes.php - - - Status - /packages/freeswitch/freeswitch_status.php - - - Vars - /pkg_edit.php?xml=freeswitch_vars.xml&id=0 - - - installedpackages->package->$packagename->configuration->freeswitchinternal - - - <b>Internal</b> <br /> <br />SIP internal profile. - internal_xml - <br />Path: /usr/local/freeswitch/conf/sip_profiles/internal.xml <br /><br /> - textarea - base64 - off - 30 - 70 - 33 - - - - - - sync_package_freeswitch_internal(); - - - - - - - sync_package_freeswitch_internal(); - - \ No newline at end of file diff --git a/config/freeswitch/freeswitch_ivr.tmp b/config/freeswitch/freeswitch_ivr.tmp index 20134727..e6dd6a0f 100644 --- a/config/freeswitch/freeswitch_ivr.tmp +++ b/config/freeswitch/freeswitch_ivr.tmp @@ -66,10 +66,9 @@ include("head.inc"); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), true, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_ivr_edit.tmp b/config/freeswitch/freeswitch_ivr_edit.tmp index 47ea0a4b..e4e8abbf 100644 --- a/config/freeswitch/freeswitch_ivr_edit.tmp +++ b/config/freeswitch/freeswitch_ivr_edit.tmp @@ -212,10 +212,9 @@ include("head.inc"); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), true, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_ivr_options_edit.tmp b/config/freeswitch/freeswitch_ivr_options_edit.tmp index 9c13bccb..3d649a3a 100644 --- a/config/freeswitch/freeswitch_ivr_options_edit.tmp +++ b/config/freeswitch/freeswitch_ivr_options_edit.tmp @@ -120,10 +120,9 @@ include("head.inc"); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), true, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_modules.xml b/config/freeswitch/freeswitch_modules.xml index 81afa910..1f14c25e 100644 --- a/config/freeswitch/freeswitch_modules.xml +++ b/config/freeswitch/freeswitch_modules.xml @@ -80,10 +80,6 @@ Extensions /packages/freeswitch/freeswitch_extensions.php - - External - /pkg_edit.php?xml=freeswitch_external.xml&id=0 - Features /packages/freeswitch/freeswitch_features.php @@ -93,8 +89,8 @@ /packages/freeswitch/freeswitch_gateways.php - Internal - /pkg_edit.php?xml=freeswitch_internal.xml&id=0 + Profiles + /packages/freeswitch/freeswitch_profiles.php Public diff --git a/config/freeswitch/freeswitch_profile_edit.tmp b/config/freeswitch/freeswitch_profile_edit.tmp new file mode 100644 index 00000000..b1461dd3 --- /dev/null +++ b/config/freeswitch/freeswitch_profile_edit.tmp @@ -0,0 +1,151 @@ + + + + + + + + + + +

FreeSWITCH: Edit Profile

+ +
+ + +
+ +
+ + + + + + +
+ +
+ + + + + + +

Edit Profile
+ + Use this to configure your SIP profiles. +

+ 		Filename:
+
+
+ + +
+
+ + + + + + +
/usr/local/freeswitch/conf/sip_profiles/ + + +
+ +
+ +
+
+ +
+
+
+
+
+
+
+
+ +
+ +
+ + + + + + diff --git a/config/freeswitch/freeswitch_profiles.tmp b/config/freeswitch/freeswitch_profiles.tmp new file mode 100644 index 00000000..da57b249 --- /dev/null +++ b/config/freeswitch/freeswitch_profiles.tmp @@ -0,0 +1,243 @@ + + + + + +

FreeSWITCH: Profiles

+ +
+ + +
+ +
+ + + + + + +
+ +
+ + + + +

Profiles
+ + Use this to configure your SIP profiles. +

+
+ + + + + + + + + + + $file){ + ?> + + + + + + + + + + + + + + + + + +
NameDescription +
+   + + "; + echo "The Internal profile by default requires registration which is most often used for extensions. "; + echo "By default the Internal profile binds to the WAN IP which is accessible to the internal network. "; + echo "A rule can be set from PFSense -> Firewall -> Rules -> WAN to the the WAN IP for port 5060 which "; + echo "enables phones register from outside the network."; + echo ""; + echo ""; + echo " "; + break; + case "internal-ipv6.xml": + echo "The Internal IPV6 profile binds to the IP version 6 address and is similar to the Internal profile. "; + break; + case "external.xml": + echo ""; + echo "The External profile handles outbound registrations to a SIP provider or other SIP Server. The SIP provider sends calls to you, and you "; + echo "send calls to your provider, through the external profile. The external profile allows anonymous calling, which is "; + echo "required as your provider will never authenticate with you to send you a call. Calls can be sent using a SIP URL \"my.domain.com:5080\" "; + echo " "; + break; + case "lan.xml": + echo "The LAN profile is the same as the Internal profile except that it is bound to the LAN IP. "; + break; + default: + echo "default "; + } + ?> + + + + + + +
+
+ + + + + +
+
+ +
+ +
+
+/usr/local/freeswitch/conf/sip_profiles +
+
+
+
+
+
+
+
+ +
+ +
+ + + + + + diff --git a/config/freeswitch/freeswitch_public.xml b/config/freeswitch/freeswitch_public.xml index 0e97b9d8..5db5aa1b 100644 --- a/config/freeswitch/freeswitch_public.xml +++ b/config/freeswitch/freeswitch_public.xml @@ -68,10 +68,6 @@ Extensions /packages/freeswitch/freeswitch_extensions.php - - External - /pkg_edit.php?xml=freeswitch_external.xml&id=0 - Features /packages/freeswitch/freeswitch_features.php @@ -81,8 +77,8 @@ /packages/freeswitch/freeswitch_gateways.php - Internal - /pkg_edit.php?xml=freeswitch_internal.xml&id=0 + Profiles + /packages/freeswitch/freeswitch_profiles.php Public diff --git a/config/freeswitch/freeswitch_public_includes.tmp b/config/freeswitch/freeswitch_public_includes.tmp index 5157ebbd..09c6c8bb 100644 --- a/config/freeswitch/freeswitch_public_includes.tmp +++ b/config/freeswitch/freeswitch_public_includes.tmp @@ -118,10 +118,9 @@ include("head.inc"); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), false, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), true, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_public_includes_details_edit.tmp b/config/freeswitch/freeswitch_public_includes_details_edit.tmp index 580c5d49..2b5068cb 100644 --- a/config/freeswitch/freeswitch_public_includes_details_edit.tmp +++ b/config/freeswitch/freeswitch_public_includes_details_edit.tmp @@ -134,10 +134,9 @@ include("head.inc"); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), false, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), true, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_public_includes_edit.tmp b/config/freeswitch/freeswitch_public_includes_edit.tmp index 08e4c911..d045290e 100644 --- a/config/freeswitch/freeswitch_public_includes_edit.tmp +++ b/config/freeswitch/freeswitch_public_includes_edit.tmp @@ -187,10 +187,9 @@ include("head.inc"); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), false, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), true, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_recordings.tmp b/config/freeswitch/freeswitch_recordings.tmp index 1366c514..a5081993 100644 --- a/config/freeswitch/freeswitch_recordings.tmp +++ b/config/freeswitch/freeswitch_recordings.tmp @@ -163,10 +163,9 @@ function EvalSound(soundobj) { $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), true, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_recordings_edit.tmp b/config/freeswitch/freeswitch_recordings_edit.tmp index c8a36966..4d7f565d 100644 --- a/config/freeswitch/freeswitch_recordings_edit.tmp +++ b/config/freeswitch/freeswitch_recordings_edit.tmp @@ -112,10 +112,9 @@ include("head.inc"); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), true, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_status.tmp b/config/freeswitch/freeswitch_status.tmp index 0fa3f6f8..67107d3e 100644 --- a/config/freeswitch/freeswitch_status.tmp +++ b/config/freeswitch/freeswitch_status.tmp @@ -79,6 +79,7 @@ if ($_GET['a'] == "other") { system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/sounds/custom/8000/'); system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/sounds/music/8000/'); system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/conf/ssl'); + system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/conf/sip_profiles/'); //Optional //system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/conf/'); @@ -131,10 +132,9 @@ if ($savemsg) { $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), false, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), true, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_time_conditions.tmp b/config/freeswitch/freeswitch_time_conditions.tmp index 0205a686..69da11a0 100644 --- a/config/freeswitch/freeswitch_time_conditions.tmp +++ b/config/freeswitch/freeswitch_time_conditions.tmp @@ -67,10 +67,9 @@ include("head.inc"); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), false, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_time_conditions_edit.tmp b/config/freeswitch/freeswitch_time_conditions_edit.tmp index 5a90d25c..bd9bb261 100644 --- a/config/freeswitch/freeswitch_time_conditions_edit.tmp +++ b/config/freeswitch/freeswitch_time_conditions_edit.tmp @@ -119,10 +119,9 @@ include("head.inc"); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/packages/freeswitch/freeswitch_dialplan_includes.php"); $tab_array[] = array(gettext("Extensions"), false, "/packages/freeswitch/freeswitch_extensions.php"); - $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Features"), false, "/packages/freeswitch/freeswitch_features.php"); $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); - $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("Profiles"), false, "/packages/freeswitch/freeswitch_profiles.php"); $tab_array[] = array(gettext("Public"), false, "/packages/freeswitch/freeswitch_public_includes.php"); $tab_array[] = array(gettext("Status"), false, "/packages/freeswitch/freeswitch_status.php"); $tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&id=0"); diff --git a/config/freeswitch/freeswitch_vars.xml b/config/freeswitch/freeswitch_vars.xml index af5aa9db..da90b3bc 100644 --- a/config/freeswitch/freeswitch_vars.xml +++ b/config/freeswitch/freeswitch_vars.xml @@ -69,10 +69,6 @@ Extensions /packages/freeswitch/freeswitch_extensions.php - - External - /pkg_edit.php?xml=freeswitch_external.xml&id=0 - Features /packages/freeswitch/freeswitch_features.php @@ -82,8 +78,8 @@ /packages/freeswitch/freeswitch_gateways.php - Internal - /pkg_edit.php?xml=freeswitch_internal.xml&id=0 + Profiles + /packages/freeswitch/freeswitch_profiles.php Public diff --git a/config/freeswitch/mod_fax.so.1 b/config/freeswitch/mod_fax.so.1 deleted file mode 100755 index 68bd05d0..00000000 Binary files a/config/freeswitch/mod_fax.so.1 and /dev/null differ diff --git a/config/freeswitch/mod_shout.so.1 b/config/freeswitch/mod_shout.so.1 deleted file mode 100755 index 26d9b94b..00000000 Binary files a/config/freeswitch/mod_shout.so.1 and /dev/null differ -- cgit v1.2.3