diff options
| author | mcrane <mctch@yahoo.com> | 2009-05-12 04:57:08 -0600 |
|---|---|---|
| committer | mcrane <mctch@yahoo.com> | 2009-05-12 04:59:11 -0600 |
| commit | 85264c180bf6d4860727e53c33b5e9d59539fff4 (patch) | |
| tree | 851ce03c0211804cc2b243af75d69b84806bb287 | |
| parent | c486e2d192b9a4fcf509daf14841befe7d43bafb (diff) | |
| download | pfsense-packages-85264c180bf6d4860727e53c33b5e9d59539fff4.tar.gz pfsense-packages-85264c180bf6d4860727e53c33b5e9d59539fff4.tar.bz2 pfsense-packages-85264c180bf6d4860727e53c33b5e9d59539fff4.zip | |
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.
31 files changed, 452 insertions, 333 deletions
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 @@ -75,10 +75,6 @@ <url>/packages/freeswitch/freeswitch_extensions.php</url> </tab> <tab> - <text>External</text> - <url>/pkg_edit.php?xml=freeswitch_external.xml&id=0</url> - </tab> - <tab> <text>Features</text> <url>/packages/freeswitch/freeswitch_features.php</url> </tab> @@ -87,8 +83,8 @@ <url>/packages/freeswitch/freeswitch_gateways.php</url> </tab> <tab> - <text>Internal</text> - <url>/pkg_edit.php?xml=freeswitch_internal.xml&id=0</url> + <text>Profiles</text> + <url>/packages/freeswitch/freeswitch_profiles.php</url> </tab> <tab> <text>Public</text> 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 @@ -71,10 +71,6 @@ <url>/packages/freeswitch/freeswitch_extensions.php</url> </tab> <tab> - <text>External</text> - <url>/pkg_edit.php?xml=freeswitch_external.xml&id=0</url> - </tab> - <tab> <text>Features</text> <url>/packages/freeswitch/freeswitch_features.php</url> </tab> @@ -83,8 +79,8 @@ <url>/packages/freeswitch/freeswitch_gateways.php</url> </tab> <tab> - <text>Internal</text> - <url>/pkg_edit.php?xml=freeswitch_internal.xml&id=0</url> + <text>Profiles</text> + <url>/packages/freeswitch/freeswitch_profiles.php</url> </tab> <tab> <text>Public</text> 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 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd"> -<packagegui> - <copyright> - <![CDATA[ -/* $Id$ */ -/* ========================================================================== */ -/* - - freeswitch_external.xml - Copyright (C) 2008 Mark J Crane - All rights reserved. - - FreeSWITCH (TM) - http://www.freeswitch.org/ - - part of pfSense (http://www.pfSense.com) - Copyright (C) 2007 to whom it may belong - All rights reserved. - - Based on m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>. - 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. - */ -/* ========================================================================== */ - ]]> - </copyright> - <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>freeswitchexternal</name> - <version>0.1</version> - <title>FreeSWITCH: External</title> - <aftersaveredirect>pkg_edit.php?xml=freeswitch_external.xml&id=0</aftersaveredirect> - <include_file>/usr/local/pkg/freeswitch.inc</include_file> - <tabs> - <tab> - <text>Settings</text> - <url>/pkg_edit.php?xml=freeswitch.xml&id=0</url> - </tab> - <tab> - <text>Dialplan</text> - <url>/packages/freeswitch/freeswitch_dialplan_includes.php</url> - </tab> - <tab> - <text>Extensions</text> - <url>/packages/freeswitch/freeswitch_extensions.php</url> - </tab> - <tab> - <text>External</text> - <url>/pkg_edit.php?xml=freeswitch_external.xml&id=0</url> - <active/> - </tab> - <tab> - <text>Features</text> - <url>/packages/freeswitch/freeswitch_features.php</url> - </tab> - <tab> - <text>Gateways</text> - <url>/packages/freeswitch/freeswitch_gateways.php</url> - </tab> - <tab> - <text>Internal</text> - <url>/pkg_edit.php?xml=freeswitch_internal.xml&id=0</url> - </tab> - <tab> - <text>Public</text> - <url>/packages/freeswitch/freeswitch_public_includes.php</url> - </tab> - <tab> - <text>Status</text> - <url>/packages/freeswitch/freeswitch_status.php</url> - </tab> - <tab> - <text>Vars</text> - <url>/pkg_edit.php?xml=freeswitch_vars.xml&id=0</url> - </tab> - </tabs> - <configpath>installedpackages->package->$packagename->configuration->freeswitchexternal</configpath> - <fields> - <field> - <fielddescr><b>External</b> <br /> <br />SIP external profile for outbound registrations.</fielddescr> - <fieldname>external_xml</fieldname> - <description><br />Path: /usr/local/freeswitch/conf/sip_profiles/external.xml <br /><br /></description> - <type>textarea</type> - <encoding>base64</encoding> - <wrap>off</wrap> - <size>30</size> - <cols>70</cols> - <rows>33</rows> - </field> - </fields> - <custom_php_command_before_form> - </custom_php_command_before_form> - <custom_php_after_head_command> - sync_package_freeswitch_external(); - </custom_php_after_head_command> - <custom_php_after_form_command> - </custom_php_after_form_command> - <custom_php_validation_command> - </custom_php_validation_command> - <custom_php_resync_config_command> - sync_package_freeswitch_external(); - </custom_php_resync_config_command> -</packagegui>
\ 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 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd"> -<packagegui> - <copyright> - <![CDATA[ -/* $Id$ */ -/* ========================================================================== */ -/* - - freeswitch_internal.xml - Copyright (C) 2008 Mark J Crane - All rights reserved. - - FreeSWITCH (TM) - http://www.freeswitch.org/ - - part of pfSense (http://www.pfSense.com) - Copyright (C) 2007 to whom it may belong - All rights reserved. - - Based on m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net> - 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. - */ -/* ========================================================================== */ - ]]> - </copyright> - <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>freeswitchinternal</name> - <version>0.1</version> - <title>FreeSWITCH: Internal</title> - <aftersaveredirect>pkg_edit.php?xml=freeswitch_internal.xml&id=0</aftersaveredirect> - <include_file>/usr/local/pkg/freeswitch.inc</include_file> - <tabs> - <tab> - <text>Settings</text> - <url>/pkg_edit.php?xml=freeswitch.xml&id=0</url> - </tab> - <tab> - <text>Dialplan</text> - <url>/packages/freeswitch/freeswitch_dialplan_includes.php</url> - </tab> - <tab> - <text>Extensions</text> - <url>/packages/freeswitch/freeswitch_extensions.php</url> - </tab> - <tab> - <text>External</text> - <url>/pkg_edit.php?xml=freeswitch_external.xml&id=0</url> - </tab> - <tab> - <text>Features</text> - <url>/packages/freeswitch/freeswitch_features.php</url> - </tab> - <tab> - <text>Gateways</text> - <url>/packages/freeswitch/freeswitch_gateways.php</url> - </tab> - <tab> - <text>Internal</text> - <url>/pkg_edit.php?xml=freeswitch_internal.xml&id=0</url> - <active/> - </tab> - <tab> - <text>Public</text> - <url>/packages/freeswitch/freeswitch_public_includes.php</url> - </tab> - <tab> - <text>Status</text> - <url>/packages/freeswitch/freeswitch_status.php</url> - </tab> - <tab> - <text>Vars</text> - <url>/pkg_edit.php?xml=freeswitch_vars.xml&id=0</url> - </tab> - </tabs> - <configpath>installedpackages->package->$packagename->configuration->freeswitchinternal</configpath> - <fields> - <field> - <fielddescr><b>Internal</b> <br /> <br />SIP internal profile. </fielddescr> - <fieldname>internal_xml</fieldname> - <description><br />Path: /usr/local/freeswitch/conf/sip_profiles/internal.xml <br /><br /></description> - <type>textarea</type> - <encoding>base64</encoding> - <wrap>off</wrap> - <size>30</size> - <cols>70</cols> - <rows>33</rows> - </field> - </fields> - <custom_php_command_before_form> - </custom_php_command_before_form> - <custom_php_after_head_command> - sync_package_freeswitch_internal(); - </custom_php_after_head_command> - <custom_php_after_form_command> - </custom_php_after_form_command> - <custom_php_validation_command> - </custom_php_validation_command> - <custom_php_resync_config_command> - sync_package_freeswitch_internal(); - </custom_php_resync_config_command> -</packagegui>
\ 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 @@ -81,10 +81,6 @@ <url>/packages/freeswitch/freeswitch_extensions.php</url> </tab> <tab> - <text>External</text> - <url>/pkg_edit.php?xml=freeswitch_external.xml&id=0</url> - </tab> - <tab> <text>Features</text> <url>/packages/freeswitch/freeswitch_features.php</url> </tab> @@ -93,8 +89,8 @@ <url>/packages/freeswitch/freeswitch_gateways.php</url> </tab> <tab> - <text>Internal</text> - <url>/pkg_edit.php?xml=freeswitch_internal.xml&id=0</url> + <text>Profiles</text> + <url>/packages/freeswitch/freeswitch_profiles.php</url> </tab> <tab> <text>Public</text> 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 @@ +<?php +/* $Id$ */ +/* + freeswitch_extensions.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_extensions = &$config['installedpackages']['freeswitchprofiles']['config']; + +$fd = fopen("/usr/local/freeswitch/conf/sip_profiles/".$_GET['f'], "r"); +$content = fread($fd, filesize("/usr/local/freeswitch/conf/sip_profiles/".$_GET['f'])); +fclose($fd); + +include("head.inc"); + +?> + + +<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> + +<script language="Javascript"> +function sf() { document.forms[0].savetopath.focus(); } +</script> +<script language="Javascript" type="text/javascript" src="/edit_area/edit_area_full.js"></script> +<script language="Javascript" type="text/javascript"> + // initialisation + editAreaLoader.init({ + id: "code" // id of the textarea to transform + ,start_highlight: false + ,allow_toggle: false + ,language: "en" + ,syntax: "html" + ,toolbar: "search, go_to_line,|, fullscreen, |, undo, redo, |, select_font, |, syntax_selection, |, change_smooth_selection, highlight, reset_highlight, |, help" + ,syntax_selection_allow: "css,html,js,php,xml,c,cpp,sql" + ,show_line_colors: true + }); +</script> + +<?php include("fbegin.inc"); ?> +<p class="pgtitle">FreeSWITCH: Edit Profile</p> + +<div id="mainlevel"> +<table width="100%" border="0" cellpadding="0" cellspacing="0"> +<tr><td class="tabnavtbl"> +<?php + + $tab_array = array(); + $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("Features"), false, "/packages/freeswitch/freeswitch_features.php"); + $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.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); + +?> +</td></tr> +</table> + + +<table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="tabcont" > + +<form action="freeswitch_profiles.php" method="post" name="iform" id="iform"> +<?php + +?> + <table width="98%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td><p><span class="vexpl"><span class="red"><strong>Edit Profile<br> + </strong></span> + Use this to configure your SIP profiles. + </p> + </td> + <td align='right' valign='middle'>Filename: <input type="text" name="f" value="<?php echo $_GET['f']; ?>" /><input type="submit" value="save" /></td> + </tr> + </table> + <br /> + <br /> + + <textarea style="width:98%" id="code" name="code" rows="30" cols="<?php echo $cols; ?>" name="content"><?php echo htmlentities($content); ?></textarea> + <br /> + <br /> + + <table width="98%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td>/usr/local/freeswitch/conf/sip_profiles/<?php echo $_GET['f']; ?></td> + <td align='right'> + <input type="hidden" name="a" value="save" /> + <input type="submit" value="save" /> + </td> + </tr> + </table> + +</form> + +<br> +<br> + +<br> +<br> +<br> +<br> +<br> +<br> +<br> +<br> + +</td> +</tr> +</table> + +</div> + + + +<?php include("fend.inc"); ?> +</body> +</html> 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 @@ +<?php +/* $Id$ */ +/* + freeswitch_profiles.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_extensions = &$config['installedpackages']['freeswitchextensions']['config']; + +function ListFiles($dir) { + + if($dh = opendir($dir)) { + + $files = Array(); + $inner_files = Array(); + + while($file = readdir($dh)) { + if($file != "." && $file != ".." && $file[0] != '.') { + if(is_dir($dir . "/" . $file)) { + //$inner_files = ListFiles($dir . "/" . $file); //recursive + if(is_array($inner_files)) $files = array_merge($files, $inner_files); + } else { + array_push($files, $file); + //array_push($files, $dir . "/" . $file); + } + } + } + + closedir($dh); + return $files; + } +} + + +if ($_POST['a'] == "save") { + conf_mount_rw(); + $content = ereg_replace("\r","",$_POST['code']); + $fd = fopen("/usr/local/freeswitch/conf/sip_profiles/".$_POST['f'], "w"); + fwrite($fd, $content); + fclose($fd); + $savemsg = "Saved text to " . $_POST['f']; + conf_mount_ro(); +} + + +if ($_GET['a'] == "del") { + if ($_GET['type'] == 'profile') { + //if ($a_profiles[$_GET['id']]) { + //unset($a_extensions[$_GET['id']]); + //write_config(); + + exec("rm /usr/local/freeswitch/conf/sip_profiles/".$_GET['f']); + header("Location: freeswitch_profiles.php"); + exit; + //} + } +} + +include("head.inc"); + +?> + + +<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> +<?php include("fbegin.inc"); ?> +<p class="pgtitle">FreeSWITCH: Profiles</p> + +<div id="mainlevel"> +<table width="100%" border="0" cellpadding="0" cellspacing="0"> +<tr><td class="tabnavtbl"> +<?php + + $tab_array = array(); + $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("Features"), false, "/packages/freeswitch/freeswitch_features.php"); + $tab_array[] = array(gettext("Gateways"), false, "/packages/freeswitch/freeswitch_gateways.php"); + $tab_array[] = array(gettext("Profiles"), true, "/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); + +?> +</td></tr> +</table> + + +<table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="tabcont" > + +<form action="freeswitch_profiles.php" method="post" name="iform" id="iform"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td><p><span class="vexpl"><span class="red"><strong>Profiles<br> + </strong></span> + Use this to configure your SIP profiles. + </p></td> + </tr> + </table> + <br /> + + + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td width="25%" class="listhdrr">Name</td> + <td width="70%" class="listhdr">Description</td> + <td width="5%" class="list"> + </td> + </tr> + + + <?php + + + + foreach (ListFiles('/usr/local/freeswitch/conf/sip_profiles') as $key=>$file){ + ?> + <tr> + <td class="listr" ondblclick="document.location='freeswitch_profile_edit.php?f=<?=$file;?>';" valign="middle"> + <?=$file;?> + </td> + <td class="listbg" ondblclick="document.location='freeswitch_profile_edit.php?f=<?=$file;?>';"> + <?php + + switch ($file) { + case "internal.xml": + echo "<font color='#FFFFFF'>"; + 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 "</font>"; + echo " "; + break; + case "internal-ipv6.xml": + echo "<font color='#FFFFFF'>The Internal IPV6 profile binds to the IP version 6 address and is similar to the Internal profile.</font> "; + break; + case "external.xml": + echo "<font color='#FFFFFF'>"; + 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 "</font> "; + break; + case "lan.xml": + echo "<font color='#FFFFFF'>The LAN profile is the same as the Internal profile except that it is bound to the LAN IP.</font> "; + break; + default: + echo "<font color='#FFFFFF'>default</font> "; + } + ?> + </td> + <td valign="middle" nowrap class="list" valign="top"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td valign="middle"><a href="freeswitch_profile_edit.php?type=profile&f=<?=$file;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td> + <td><a href="freeswitch_profiles.php?type=profile&a=del&f=<?=$file;?>" onclick="return confirm('Do you really want to delete this?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> + <?php + $i++; + } + + ?> + + <tr> + <td class="list" colspan="4"></td> + <td class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17"></td> + <td valign="middle"></td> + </tr> + </table> + </td> + </tr> + + + <tr> + <td class="list" colspan="4"></td> + <td class="list"></td> + </tr> + </table> + +</form> + +<br> +<br> +/usr/local/freeswitch/conf/sip_profiles +<br> +<br> +<br> +<br> +<br> +<br> +<br> +<br> + +</td> +</tr> +</table> + +</div> + + + +<?php include("fend.inc"); ?> +</body> +</html> 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 @@ -69,10 +69,6 @@ <url>/packages/freeswitch/freeswitch_extensions.php</url> </tab> <tab> - <text>External</text> - <url>/pkg_edit.php?xml=freeswitch_external.xml&id=0</url> - </tab> - <tab> <text>Features</text> <url>/packages/freeswitch/freeswitch_features.php</url> </tab> @@ -81,8 +77,8 @@ <url>/packages/freeswitch/freeswitch_gateways.php</url> </tab> <tab> - <text>Internal</text> - <url>/pkg_edit.php?xml=freeswitch_internal.xml&id=0</url> + <text>Profiles</text> + <url>/packages/freeswitch/freeswitch_profiles.php</url> </tab> <tab> <text>Public</text> 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 @@ -70,10 +70,6 @@ <url>/packages/freeswitch/freeswitch_extensions.php</url> </tab> <tab> - <text>External</text> - <url>/pkg_edit.php?xml=freeswitch_external.xml&id=0</url> - </tab> - <tab> <text>Features</text> <url>/packages/freeswitch/freeswitch_features.php</url> </tab> @@ -82,8 +78,8 @@ <url>/packages/freeswitch/freeswitch_gateways.php</url> </tab> <tab> - <text>Internal</text> - <url>/pkg_edit.php?xml=freeswitch_internal.xml&id=0</url> + <text>Profiles</text> + <url>/packages/freeswitch/freeswitch_profiles.php</url> </tab> <tab> <text>Public</text> diff --git a/config/freeswitch/mod_fax.so.1 b/config/freeswitch/mod_fax.so.1 Binary files differdeleted file mode 100755 index 68bd05d0..00000000 --- a/config/freeswitch/mod_fax.so.1 +++ /dev/null diff --git a/config/freeswitch/mod_shout.so.1 b/config/freeswitch/mod_shout.so.1 Binary files differdeleted file mode 100755 index 26d9b94b..00000000 --- a/config/freeswitch/mod_shout.so.1 +++ /dev/null |