diff options
28 files changed, 556 insertions, 100 deletions
diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc index dd210c16..e7da6cd1 100644 --- a/packages/freeswitch/freeswitch.inc +++ b/packages/freeswitch/freeswitch.inc @@ -664,16 +664,17 @@ function sync_package_freeswitch_public() if(strlen($config['installedpackages']['freeswitchpublic']['config'][0]['public_xml']) == 0) { /* dialplan_public_xml not found in the pfsense config.xml get the default public.xml and save to config.xml. */ - $filename = "/usr/local/freeswitch/conf/dialplan/public/00_inbound_did.xml"; + $filename = "/usr/local/freeswitch/conf/dialplan/public.xml"; $fout = fopen($filename,"r"); $tmpxml = fread($fout, filesize($filename)); + $tmpxml = str_replace("<anti-action application=\"export\" data=\"domain_name=\${sip_req_host}\"/>", "<!--<anti-action application=\"export\" data=\"domain_name=\${sip_req_host}\"/>-->", $tmpxml); $config['installedpackages']['freeswitchpublic']['config'][0]['public_xml'] = base64_encode($tmpxml); unset($filename, $tmpxml); fclose($fout); } else { /* found dialplan_public_xml in the pfsense config.xml save it to public.xml. */ - $fout = fopen("/usr/local/freeswitch/conf/dialplan/public/00_inbound_did.xml","w"); + $fout = fopen("/usr/local/freeswitch/conf/dialplan/public.xml","w"); $tmpxml = $config['installedpackages']['freeswitchpublic']['config'][0]['public_xml']; fwrite($fout, base64_decode($tmpxml)); fclose($fout); @@ -1589,7 +1590,12 @@ function freeswitch_php_install_command() exec("tar zxvf /tmp/freeswitch.tgz -C /usr/local/"); unlink_if_exists("/tmp/freeswitch.tgz"); + + //remove some default config files that are not needed + unlink_if_exists("/usr/local/freeswitch/conf/dialplan/default/01_example.com.xml"); + unlink_if_exists("/usr/local/freeswitch/conf/dialplan/public/00_inbound_did.xml"); + //copy audio files exec("cp /tmp/please_enter_your_pin_number.wav /usr/local/freeswitch/recordings/please_enter_your_pin_number.wav"); unlink_if_exists("/tmp/please_enter_your_pin_number.wav"); @@ -1598,7 +1604,8 @@ function freeswitch_php_install_command() exec("cp /tmp/your_pin_number_is_incorect_goodbye.wav /usr/local/freeswitch/recordings/your_pin_number_is_incorect_goodbye.wav"); unlink_if_exists("/tmp/your_pin_number_is_incorect_goodbye.wav"); - + + //rename PHP files from .tmp to .php exec("cp /tmp/class.smtp.tmp /usr/local/www/freeswitch/class.smtp.php"); unlink_if_exists("/tmp/class.smtp.tmp"); @@ -1619,6 +1626,12 @@ function freeswitch_php_install_command() exec("cp /tmp/freeswitch_dialplan_includes_edit.tmp /usr/local/www/freeswitch/freeswitch_dialplan_includes_edit.php"); unlink_if_exists("/tmp/freeswitch_dialplan_includes_edit.tmp"); + + exec("cp /tmp/freeswitch_extensions.tmp /usr/local/www/freeswitch/freeswitch_extensions.php"); + unlink_if_exists("/tmp/freeswitch_extensions.tmp"); + + exec("cp /tmp/freeswitch_extensions_edit.tmp /usr/local/www/freeswitch/freeswitch_extensions_edit.php"); + unlink_if_exists("/tmp/freeswitch_extensions_edit.tmp"); exec("cp /tmp/freeswitch_gateways.tmp /usr/local/www/freeswitch/freeswitch_gateways.php"); unlink_if_exists("/tmp/freeswitch_gateways.tmp"); @@ -2028,7 +2041,7 @@ function freeswitch_php_install_command() } $config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_version'] = "1.0.1 revision 10638."; - $config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.5.2"; + $config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.5.3"; conf_mount_ro(); @@ -2060,6 +2073,8 @@ function freeswitch_deinstall_command() unlink_if_exists("/usr/local/www/freeswitch/freeswitch_dialplan_includes_edit.php"); unlink_if_exists("/usr/local/www/freeswitch/freeswitch_dialplan_includes.php"); unlink_if_exists("/usr/local/www/freeswitch/freeswitch_dialplan_includes_details_edit.php"); + unlink_if_exists("/usr/local/www/freeswitch/freeswitch_extensions.php"); + unlink_if_exists("/usr/local/www/freeswitch/freeswitch_extensions_edit.php"); unlink_if_exists("/usr/local/www/freeswitch/freeswitch_ivr.php"); unlink_if_exists("/usr/local/www/freeswitch/freeswitch_ivr_edit.php"); unlink_if_exists("/usr/local/www/freeswitch/freeswitch_ivr_options_edit.php"); diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml index 5d1cf541..a97212a3 100644 --- a/packages/freeswitch/freeswitch.xml +++ b/packages/freeswitch/freeswitch.xml @@ -44,7 +44,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>FreeSWITCH Settings</name> - <version>0.5.2</version> + <version>0.5.3</version> <title>FreeSWITCH: Settings</title> <include_file>/usr/local/pkg/freeswitch.inc</include_file> <menu> @@ -72,7 +72,7 @@ </tab> <tab> <text>Extensions</text> - <url>/pkg.php?xml=freeswitch_extensions.xml</url> + <url>/freeswitch/freeswitch_extensions.php</url> </tab> <tab> <text>External</text> @@ -188,11 +188,16 @@ <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_dialplan_includes_details_edit.tmp</item> </additional_files_needed> <additional_files_needed> - <prefix>/usr/local/pkg/</prefix> + <prefix>/tmp/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_extensions.xml</item> + <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_extensions.tmp</item> </additional_files_needed> <additional_files_needed> + <prefix>/tmp/</prefix> + <chmod>0755</chmod> + <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_extensions_edit.tmp</item> + </additional_files_needed> + <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_external.xml</item> diff --git a/packages/freeswitch/freeswitch_dialplan.xml b/packages/freeswitch/freeswitch_dialplan.xml index a4c8b929..3ce35570 100644 --- a/packages/freeswitch/freeswitch_dialplan.xml +++ b/packages/freeswitch/freeswitch_dialplan.xml @@ -68,7 +68,7 @@ </tab> <tab> <text>Extensions</text> - <url>/pkg.php?xml=freeswitch_extensions.xml</url> + <url>/freeswitch/freeswitch_extensions.php</url> </tab> <tab> <text>External</text> diff --git a/packages/freeswitch/freeswitch_dialplan_includes.tmp b/packages/freeswitch/freeswitch_dialplan_includes.tmp index e0b86654..483e9e21 100644 --- a/packages/freeswitch/freeswitch_dialplan_includes.tmp +++ b/packages/freeswitch/freeswitch_dialplan_includes.tmp @@ -115,7 +115,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), true, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); diff --git a/packages/freeswitch/freeswitch_dialplan_includes_details_edit.tmp b/packages/freeswitch/freeswitch_dialplan_includes_details_edit.tmp index 73ac7259..aa9748f5 100644 --- a/packages/freeswitch/freeswitch_dialplan_includes_details_edit.tmp +++ b/packages/freeswitch/freeswitch_dialplan_includes_details_edit.tmp @@ -133,7 +133,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), true, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); diff --git a/packages/freeswitch/freeswitch_dialplan_includes_edit.tmp b/packages/freeswitch/freeswitch_dialplan_includes_edit.tmp index 7b5c8235..e838a277 100644 --- a/packages/freeswitch/freeswitch_dialplan_includes_edit.tmp +++ b/packages/freeswitch/freeswitch_dialplan_includes_edit.tmp @@ -185,7 +185,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), true, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); diff --git a/packages/freeswitch/freeswitch_extensions.tmp b/packages/freeswitch/freeswitch_extensions.tmp new file mode 100644 index 00000000..b7a6896a --- /dev/null +++ b/packages/freeswitch/freeswitch_extensions.tmp @@ -0,0 +1,209 @@ +<?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']['freeswitchextensions']['config']; + + +if ($_GET['act'] == "del") { + if ($_GET['type'] == 'extensions') { + if ($a_extensions[$_GET['id']]) { + unset($a_extensions[$_GET['id']]); + write_config(); + header("Location: freeswitch_extensions.php"); + exit; + } + } +} + +include("head.inc"); + +?> + + +<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> +<?php include("fbegin.inc"); ?> +<p class="pgtitle">FreeSWITCH: Extensions</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, "/freeswitch/freeswitch_dialplan_includes.php"); + $tab_array[] = array(gettext("Extensions"), true, "/freeswitch/freeswitch_extensions.php"); + $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); + $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); + $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php"); + $tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&id=0"); + $tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php"); + $tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php"); + $tab_array[] = array(gettext("Status"), false, "/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_extensions.php" method="post" name="iform" id="iform"> +<?php + +if ($config_change == 1) { + write_config(); + $config_change = 0; +} + +//if ($savemsg) print_info_box($savemsg); +//if (file_exists($d_hostsdirty_path)): echo"<p>"; +//print_info_box_np("The FreeSWITCH extensions have been changed.<br>You must apply the changes in order for them to take effect."); +//echo"<br />"; +//endif; + +?> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td><p><span class="vexpl"><span class="red"><strong>Extensions<br> + </strong></span> + Use this to configure your SIP extensions. + </p></td> + </tr> + </table> + <br /> + + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td width="20%" class="listhdrr">Extension</td> + <td width="25%" class="listhdrr">Mail To</td> + <td width="25%" class="listhdrr">Context</td> + <td width="25%" class="listhdr">Description</td> + <td width="10%" class="list"> + + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td width="17"></td> + <td valign="middle"><a href="freeswitch_extensions_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + </tr> + </table> + + </td> + </tr> + + + <?php + + $i = 0; + if (count($a_extensions) > 0) { + + foreach ($a_extensions as $ent) { + + ?> + <tr> + <td class="listr" ondblclick="document.location='freeswitch_extensions_edit.php?id=<?=$i;?>';"> + <?=$ent['extension'];?> + </td> + <td class="listr" ondblclick="document.location='freeswitch_extensions_edit.php?id=<?=$i;?>';"> + <?=$ent['vm-mailto'];?> + </td> + <td class="listr" ondblclick="document.location='freeswitch_extensions_edit.php?id=<?=$i;?>';"> + <?=$ent['user_context'];?> + </td> + <td class="listbg" ondblclick="document.location='freeswitch_extensions_edit.php?id=<?=$i;?>';"> + <font color="#FFFFFF"><?=htmlspecialchars($ent['description']);?> + </td> + <td valign="middle" nowrap class="list"> + <table border="0" cellspacing="0" cellpadding="1"> + <tr> + <td valign="middle"><a href="freeswitch_extensions_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td> + <td><a href="freeswitch_extensions.php?type=extensions&act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this recording?')"><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"><a href="freeswitch_extensions_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> + </tr> + </table> + </td> + </tr> + + + <tr> + <td class="list" colspan="4"></td> + <td class="list"></td> + </tr> + </table> + +</form> + + +/usr/local/freeswitch/conf/directory/default/ +<br> +<br> +<br> +<br> +<br> +<br> +<br> +<br> + +</td> +</tr> +</table> + +</div> + + +<?php include("fend.inc"); ?> +</body> +</html> diff --git a/packages/freeswitch/freeswitch_extensions.xml b/packages/freeswitch/freeswitch_extensions.xml index 487cf09f..61277e97 100644 --- a/packages/freeswitch/freeswitch_extensions.xml +++ b/packages/freeswitch/freeswitch_extensions.xml @@ -66,7 +66,7 @@ </tab> <tab> <text>Extensions</text> - <url>/pkg.php?xml=freeswitch_extensions.xml</url> + <url>/freeswitch/freeswitch_extensions.php</url> <active/> </tab> <tab> diff --git a/packages/freeswitch/freeswitch_extensions_edit.tmp b/packages/freeswitch/freeswitch_extensions_edit.tmp new file mode 100644 index 00000000..c5619d19 --- /dev/null +++ b/packages/freeswitch/freeswitch_extensions_edit.tmp @@ -0,0 +1,292 @@ +<?php +/* $Id$ */ +/* + + freeswitch_extensions_edit.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']; + +$id = $_GET['id']; +if (isset($_POST['id'])) { + $id = $_POST['id']; +} + +if (isset($id) && $a_extensions[$id]) { + + $pconfig['extension'] = $a_extensions[$id]['extension']; + $pconfig['password'] = $a_extensions[$id]['password']; + $pconfig['mailbox'] = $a_extensions[$id]['mailbox']; + $pconfig['vm-password'] = $a_extensions[$id]['vm-password']; + $pconfig['accountcode'] = $a_extensions[$id]['accountcode']; + $pconfig['effective_caller_id_name'] = $a_extensions[$id]['effective_caller_id_name']; + $pconfig['effective_caller_id_number'] = $a_extensions[$id]['effective_caller_id_number']; + $pconfig['effective_caller_id_number'] = $a_extensions[$id]['effective_caller_id_number']; + $pconfig['outbound_caller_id_name'] = $a_extensions[$id]['outbound_caller_id_name']; + $pconfig['outbound_caller_id_number'] = $a_extensions[$id]['outbound_caller_id_number']; + $pconfig['vm-mailto'] = $a_extensions[$id]['vm-mailto']; + $pconfig['vm-attach-file'] = $a_extensions[$id]['vm-attach-file']; + $pconfig['user_context'] = $a_extensions[$id]['user_context']; + $pconfig['description'] = $a_extensions[$id]['description']; + +} + +if ($_POST) { + + unset($input_errors); + $pconfig = $_POST; + + + if (!$input_errors) { + + $ent = array(); + $ent['extension'] = $_POST['extension']; + $ent['password'] = $_POST['password']; + $ent['mailbox'] = $_POST['mailbox']; + $ent['vm-password'] = $_POST['vm-password']; + $ent['accountcode'] = $_POST['accountcode']; + $ent['effective_caller_id_name'] = $_POST['effective_caller_id_name']; + $ent['effective_caller_id_number'] = $_POST['effective_caller_id_number']; + $ent['outbound_caller_id_name'] = $_POST['outbound_caller_id_name']; + $ent['outbound_caller_id_number'] = $_POST['outbound_caller_id_number']; + $ent['vm-mailto'] = $_POST['vm-mailto']; + $ent['vm-attach-file'] = $_POST['vm-attach-file']; + $ent['user_context'] = $_POST['user_context']; + $ent['description'] = $_POST['description']; + + if (isset($id) && $a_extensions[$id]) { + //update + $a_extensions[$id] = $ent; + } + else { + //add + $a_extensions[] = $ent; + } + + write_config(); + sync_package_freeswitch_extensions(); + + header("Location: freeswitch_extensions.php"); + exit; + } +} + +include("head.inc"); + +?> + + +<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> +<?php include("fbegin.inc"); ?> +<p class="pgtitle">FreeSWITCH: Extensions: Edit</p> +<?php if ($input_errors) print_input_errors($input_errors); ?> + + +<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, "/freeswitch/freeswitch_dialplan_includes.php"); + $tab_array[] = array(gettext("Extensions"), true, "/freeswitch/freeswitch_extensions.php"); + $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); + $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); + $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); + $tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php"); + $tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&id=0"); + $tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php"); + $tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_extensions.php"); + $tab_array[] = array(gettext("Status"), false, "/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" > + + + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td><p><span class="vexpl"><span class="red"><strong>Extension Setup<br> + </strong></span> + /usr/local/freeswitch/conf/directory/default/ + </p></td> + </tr> + </table> + <br /> + + <form action="freeswitch_extensions_edit.php" method="post" name="iform" id="iform"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + + <tr> + <td width="22%" valign="top" class="vncellreq">Extension</td> + <td width="78%" class="vtable"> + <input name="extension" type="text" class="formfld" id="extension" size="40" value="<?=htmlspecialchars($pconfig['extension']);?>"> + <br><span class="vexpl">Enter the extension here. The default configuration expects extension numbers between 1001 -1019. To use additional numbers for the extensions by adjusting the dialplan. In the in the dialplan under name="Local_Extension" adjust the regular expression="^(10[01][0-9])$".<br></span> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq">Password</td> + <td width="78%" class="vtable"> + <input name="password" type="password" class="formfld" id="password" size="40" value="<?=htmlspecialchars($pconfig['password']);?>"> + <br><span class="vexpl">Enter the password here.<br></span> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq">Mailbox</td> + <td width="78%" class="vtable"> + <input name="mailbox" type="text" class="formfld" id="mailbox" size="40" value="<?=htmlspecialchars($pconfig['mailbox']);?>"> + <br><span class="vexpl">Enter the mailbox here. Example: extension 1001 then mailbox 1001<br></span> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq">Voicemail Password</td> + <td width="78%" class="vtable"> + <input name="vm-password" type="text" class="formfld" id="vm-password" size="40" value="<?=htmlspecialchars($pconfig['vm-password']);?>"> + <br><span class="vexpl">Enter the voicemail password here.<br></span> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq">Account Code</td> + <td width="78%" class="vtable"> + <input name="accountcode" type="text" class="formfld" id="accountcode" size="40" value="<?=htmlspecialchars($pconfig['accountcode']);?>"> + <br><span class="vexpl">Enter the account code here. Example: extension 1001 then accountcode 1001<br></span> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq" nowrap>Effective Caller ID Name</td> + <td width="78%" class="vtable"> + <input name="effective_caller_id_name" type="text" class="formfld" id="effective_caller_id_name" size="40" value="<?=htmlspecialchars($pconfig['effective_caller_id_name']);?>"> + <br><span class="vexpl">Enter the effective caller id name here.<br></span> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq" nowrap>Effective Caller ID Number</td> + <td width="78%" class="vtable"> + <input name="effective_caller_id_number" type="text" class="formfld" id="effective_caller_id_number" size="40" value="<?=htmlspecialchars($pconfig['effective_caller_id_number']);?>"> + <br><span class="vexpl">Enter the effective caller id number here.<br></span> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq" nowrap>Outbound Caller ID Name</td> + <td width="78%" class="vtable"> + <input name="outbound_caller_id_name" type="text" class="formfld" id="outbound_caller_id_name" size="40" value="<?=htmlspecialchars($pconfig['outbound_caller_id_name']);?>"> + <br><span class="vexpl">Enter the outbound caller id name here.<br></span> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq" nowrap>Outbound Caller ID Number</td> + <td width="78%" class="vtable"> + <input name="outbound_caller_id_number" type="text" class="formfld" id="outbound_caller_id_number" size="40" value="<?=htmlspecialchars($pconfig['outbound_caller_id_number']);?>"> + <br><span class="vexpl">Enter the outbound caller id number here.<br></span> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq" nowrap>Voicemail Mail To</td> + <td width="78%" class="vtable"> + <input name="vm-mailto" type="text" class="formfld" id="vm-mailto" size="40" value="<?=htmlspecialchars($pconfig['vm-mailto']);?>"> + <br><span class="vexpl">Optional: Enter the email address to send voicemail to.<br></span> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq" nowrap>Voicemail Attach File</td> + <td width="78%" class="vtable"> + <?php + echo " <select name='vm-attach-file' class='formfld'>\n"; + echo " <option></option>\n"; + switch (htmlspecialchars($pconfig['vm-attach-file'])) { + case "true": + echo " <option value='true' selected='yes'>true</option>\n"; + echo " <option value='false'>false</option>\n"; + break; + case "false": + echo " <option value='true'>true</option>\n"; + echo " <option value='false' selected='yes'>false</option>\n"; + + break; + default: + echo " <option value='true' selected='yes'>true</option>\n"; + echo " <option value='false'>false</option>\n"; + } + echo " </select>\n"; + ?> + Choose whether to attach the file to the email. + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq">User Context</td> + <td width="78%" class="vtable"> + <input name="user_context" type="text" class="formfld" id="user_context" size="40" value="<?=htmlspecialchars($pconfig['user_context']);?>"> + <br><span class="vexpl">Enter the user context here. Example: default<br></span> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq">Extension Description</td> + <td width="78%" class="vtable"> + <input name="description" type="text" class="formfld" id="description" size="40" value="<?=htmlspecialchars($pconfig['description']);?>"> + <br><span class="vexpl">Enter the description of the extension here.<br></span> + </td> + </tr> + <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <input name="Submit" type="submit" class="formbtn" value="Save"> <input class="formbtn" type="button" value="Cancel" onclick="history.back()"> + <?php if (isset($id) && $a_extensions[$id]): ?> + <input name="id" type="hidden" value="<?=$id;?>"> + <?php endif; ?> + </td> + </tr> + </table> + </form> + + <br> + <br> + <br> + <br> + <br> + <br> + + </td> + </tr> +</table> + +</div> + +<?php include("fend.inc"); ?> +</body> +</html> diff --git a/packages/freeswitch/freeswitch_external.xml b/packages/freeswitch/freeswitch_external.xml index 4b9fd5bd..62fa9dd3 100644 --- a/packages/freeswitch/freeswitch_external.xml +++ b/packages/freeswitch/freeswitch_external.xml @@ -67,7 +67,7 @@ </tab> <tab> <text>Extensions</text> - <url>/pkg.php?xml=freeswitch_extensions.xml</url> + <url>/freeswitch/freeswitch_extensions.php</url> </tab> <tab> <text>External</text> diff --git a/packages/freeswitch/freeswitch_gateways.tmp b/packages/freeswitch/freeswitch_gateways.tmp index a9202242..b24c5307 100644 --- a/packages/freeswitch/freeswitch_gateways.tmp +++ b/packages/freeswitch/freeswitch_gateways.tmp @@ -64,7 +64,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), true, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); diff --git a/packages/freeswitch/freeswitch_gateways_edit.tmp b/packages/freeswitch/freeswitch_gateways_edit.tmp index 611d9441..22757257 100644 --- a/packages/freeswitch/freeswitch_gateways_edit.tmp +++ b/packages/freeswitch/freeswitch_gateways_edit.tmp @@ -251,7 +251,7 @@ function show_advanced_config() { $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), true, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); diff --git a/packages/freeswitch/freeswitch_internal.xml b/packages/freeswitch/freeswitch_internal.xml index f97e4d8c..4ae5848f 100644 --- a/packages/freeswitch/freeswitch_internal.xml +++ b/packages/freeswitch/freeswitch_internal.xml @@ -67,7 +67,7 @@ </tab> <tab> <text>Extensions</text> - <url>/pkg.php?xml=freeswitch_extensions.xml</url> + <url>/freeswitch/freeswitch_extensions.php</url> </tab> <tab> <text>External</text> diff --git a/packages/freeswitch/freeswitch_ivr.tmp b/packages/freeswitch/freeswitch_ivr.tmp index d953a576..51b7d01a 100644 --- a/packages/freeswitch/freeswitch_ivr.tmp +++ b/packages/freeswitch/freeswitch_ivr.tmp @@ -65,7 +65,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); diff --git a/packages/freeswitch/freeswitch_ivr_edit.tmp b/packages/freeswitch/freeswitch_ivr_edit.tmp index 09c29e51..ed7a69ba 100644 --- a/packages/freeswitch/freeswitch_ivr_edit.tmp +++ b/packages/freeswitch/freeswitch_ivr_edit.tmp @@ -211,7 +211,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); diff --git a/packages/freeswitch/freeswitch_ivr_options_edit.tmp b/packages/freeswitch/freeswitch_ivr_options_edit.tmp index 3811b923..78975a7f 100644 --- a/packages/freeswitch/freeswitch_ivr_options_edit.tmp +++ b/packages/freeswitch/freeswitch_ivr_options_edit.tmp @@ -119,7 +119,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); diff --git a/packages/freeswitch/freeswitch_modules.xml b/packages/freeswitch/freeswitch_modules.xml index 76f51b14..38b0ac9b 100644 --- a/packages/freeswitch/freeswitch_modules.xml +++ b/packages/freeswitch/freeswitch_modules.xml @@ -78,7 +78,7 @@ </tab> <tab> <text>Extensions</text> - <url>/pkg.php?xml=freeswitch_extensions.xml</url> + <url>/freeswitch/freeswitch_extensions.php</url> </tab> <tab> <text>External</text> @@ -118,72 +118,7 @@ <url>/pkg_edit.php?xml=freeswitch_vars.xml&id=0</url> </tab> </tabs> - <configpath>installedpackages->package->$packagename->configuration->freeswitchmodules</configpath> - <additional_files_needed> - <prefix>/tmp/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch.tgz</item> - </additional_files_needed> - <additional_files_needed> - <prefix>/tmp/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_status.tmp</item> - </additional_files_needed> - <additional_files_needed> - <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_dialplan.xml</item> - </additional_files_needed> - <additional_files_needed> - <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_extensions.xml</item> - </additional_files_needed> - <additional_files_needed> - <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_external.xml</item> - </additional_files_needed> - <additional_files_needed> - <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_gateways.xml</item> - </additional_files_needed> - <additional_files_needed> - <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_internal.xml</item> - </additional_files_needed> - <additional_files_needed> - <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_modules.xml</item> - </additional_files_needed> - <additional_files_needed> - <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_public.xml</item> - </additional_files_needed> - <additional_files_needed> - <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_vars.xml</item> - </additional_files_needed> - <additional_files_needed> - <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/freeswitch/freeswitch.inc</item> - </additional_files_needed> - <additional_files_needed> - <prefix>/usr/local/lib/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/freeswitch/libtinfo.so.5.6</item> - </additional_files_needed> - <additional_files_needed> - <prefix>/usr/local/lib/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/freeswitch/libncurses.so.5.6</item> - </additional_files_needed> + <configpath>installedpackages->package->$packagename->configuration->freeswitchmodules</configpath> <fields> <field> <fielddescr><b>Loggers</b></fielddescr> diff --git a/packages/freeswitch/freeswitch_public.xml b/packages/freeswitch/freeswitch_public.xml index afd7590f..fab77635 100644 --- a/packages/freeswitch/freeswitch_public.xml +++ b/packages/freeswitch/freeswitch_public.xml @@ -66,7 +66,7 @@ </tab> <tab> <text>Extensions</text> - <url>/pkg.php?xml=freeswitch_extensions.xml</url> + <url>/freeswitch/freeswitch_extensions.php</url> </tab> <tab> <text>External</text> @@ -111,7 +111,7 @@ <field> <fielddescr><b>Public</b> <br /> <br />Directs inbound calls to extensions, IVRs, external numbers, and scripts. </fielddescr> <fieldname>public_xml</fieldname> - <description><br />Path: /usr/local/freeswitch/conf/dialplan/public/00_inbound_did.xml <br /><br /></description> + <description><br />Path: /usr/local/freeswitch/conf/dialplan/public.xml <br /><br /></description> <type>textarea</type> <encoding>base64</encoding> <wrap>off</wrap> diff --git a/packages/freeswitch/freeswitch_public_includes.tmp b/packages/freeswitch/freeswitch_public_includes.tmp index 4dc6e540..ef956d4e 100644 --- a/packages/freeswitch/freeswitch_public_includes.tmp +++ b/packages/freeswitch/freeswitch_public_includes.tmp @@ -117,7 +117,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); @@ -168,7 +168,7 @@ include("head.inc"); </strong></span></span> </td> <td align='right'> - <input type='button' value='deprecated xml' alt='deprecated' onclick="document.location.href='/pkg_edit.php?xml=freeswitch_public.xml&id=0';"> + <input type='button' value='public.xml' alt='' onclick="document.location.href='/pkg_edit.php?xml=freeswitch_public.xml&id=0';"> </td> </tr> <tr> diff --git a/packages/freeswitch/freeswitch_public_includes_details_edit.tmp b/packages/freeswitch/freeswitch_public_includes_details_edit.tmp index 254ff38f..dbabb3bf 100644 --- a/packages/freeswitch/freeswitch_public_includes_details_edit.tmp +++ b/packages/freeswitch/freeswitch_public_includes_details_edit.tmp @@ -134,7 +134,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); diff --git a/packages/freeswitch/freeswitch_public_includes_edit.tmp b/packages/freeswitch/freeswitch_public_includes_edit.tmp index 21a16c7f..94454fd3 100644 --- a/packages/freeswitch/freeswitch_public_includes_edit.tmp +++ b/packages/freeswitch/freeswitch_public_includes_edit.tmp @@ -187,7 +187,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); diff --git a/packages/freeswitch/freeswitch_recordings.tmp b/packages/freeswitch/freeswitch_recordings.tmp index 702e0c47..18759fb6 100644 --- a/packages/freeswitch/freeswitch_recordings.tmp +++ b/packages/freeswitch/freeswitch_recordings.tmp @@ -97,7 +97,7 @@ function EvalSound(soundobj) { $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); diff --git a/packages/freeswitch/freeswitch_recordings_edit.tmp b/packages/freeswitch/freeswitch_recordings_edit.tmp index 18c5705a..8ef58ff1 100644 --- a/packages/freeswitch/freeswitch_recordings_edit.tmp +++ b/packages/freeswitch/freeswitch_recordings_edit.tmp @@ -111,7 +111,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); diff --git a/packages/freeswitch/freeswitch_status.tmp b/packages/freeswitch/freeswitch_status.tmp index 66d21104..07128835 100644 --- a/packages/freeswitch/freeswitch_status.tmp +++ b/packages/freeswitch/freeswitch_status.tmp @@ -117,7 +117,7 @@ if ($savemsg) { $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); diff --git a/packages/freeswitch/freeswitch_time_conditions.tmp b/packages/freeswitch/freeswitch_time_conditions.tmp index daf6cf48..929cf463 100644 --- a/packages/freeswitch/freeswitch_time_conditions.tmp +++ b/packages/freeswitch/freeswitch_time_conditions.tmp @@ -66,7 +66,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); diff --git a/packages/freeswitch/freeswitch_time_conditions_edit.tmp b/packages/freeswitch/freeswitch_time_conditions_edit.tmp index b6e32392..36fdf772 100644 --- a/packages/freeswitch/freeswitch_time_conditions_edit.tmp +++ b/packages/freeswitch/freeswitch_time_conditions_edit.tmp @@ -130,7 +130,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&id=0"); $tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php"); - $tab_array[] = array(gettext("Extensions"), false, "/pkg.php?xml=freeswitch_extensions.xml"); + $tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php"); $tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&id=0"); $tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php"); $tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&id=0"); diff --git a/packages/freeswitch/freeswitch_vars.xml b/packages/freeswitch/freeswitch_vars.xml index 3efd6241..ac4246b9 100644 --- a/packages/freeswitch/freeswitch_vars.xml +++ b/packages/freeswitch/freeswitch_vars.xml @@ -67,7 +67,7 @@ </tab> <tab> <text>Extensions</text> - <url>/pkg.php?xml=freeswitch_extensions.xml</url> + <url>/freeswitch/freeswitch_extensions.php</url> </tab> <tab> <text>External</text> diff --git a/pkg_config.7.xml b/pkg_config.7.xml index d2231021..dc61f208 100644 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -66,7 +66,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,11930.0.html</pkginfolink> <config_file>http://www.pfsense.com/packages/config/freeswitch/freeswitch.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> - <version>0.5.2</version> + <version>0.5.3</version> <status>Beta</status> <required_version>1.2.1</required_version> <maintainer>markjcrane@gmail.com</maintainer> |