aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2015-12-02 21:11:22 -0600
committerChris Buechler <cmb@pfsense.org>2015-12-02 21:11:22 -0600
commit9885b12aaba85ceb9af05aad3e8a672934b345f9 (patch)
treefcad9f49a9baeb0d0e2b2a4a2ac6c068354c936f
parent2ad51aa2f70f5dc0a347cb9c92918978f4f90248 (diff)
parent64385c0ea3fb0d9573c4913ae071207eca2d0d9b (diff)
downloadpfsense-packages-9885b12aaba85ceb9af05aad3e8a672934b345f9.tar.gz
pfsense-packages-9885b12aaba85ceb9af05aad3e8a672934b345f9.tar.bz2
pfsense-packages-9885b12aaba85ceb9af05aad3e8a672934b345f9.zip
Merge pull request #1201 from doktornotor/patch-6
-rw-r--r--config/tftp2/tftp.xml4
-rw-r--r--config/tftp2/tftp_files.php11
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
5 files changed, 5 insertions, 16 deletions
diff --git a/config/tftp2/tftp.xml b/config/tftp2/tftp.xml
index 33fb9c3d..f45a344a 100644
--- a/config/tftp2/tftp.xml
+++ b/config/tftp2/tftp.xml
@@ -43,7 +43,7 @@
]]>
</copyright>
<name>tftp Settings</name>
- <version>2.2.2</version>
+ <version>2.2.3</version>
<title>TFTP: Settings</title>
<include_file>/usr/local/pkg/tftp.inc</include_file>
<menu>
@@ -51,7 +51,7 @@
<tooltiptext>Add or Remove files for TFTP.</tooltiptext>
<section>Services</section>
<configfile>tftp.xml</configfile>
- <url>tftp_files.php</url>
+ <url>/tftp_files.php</url>
</menu>
<service>
<name>tftp</name>
diff --git a/config/tftp2/tftp_files.php b/config/tftp2/tftp_files.php
index 0352f4a0..e2e81ed4 100644
--- a/config/tftp2/tftp_files.php
+++ b/config/tftp2/tftp_files.php
@@ -133,17 +133,6 @@ if ($savemsg) {
?>
<div id="mainlevel">
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr><td class="tabnavtbl">
-<?php
-
- $tab_array = array();
- $tab_array[] = array(gettext("TFTP"), false, "tftp_files.php");
- display_top_tabs($tab_array);
-
-?>
-</td></tr>
-</table>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 6094bc85..b891b843 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -336,7 +336,7 @@
<pkginfolink/>
<port_category>ftp</port_category>
<config_file>https://packages.pfsense.org/packages/config/tftp2/tftp.xml</config_file>
- <version>2.2.2</version>
+ <version>2.2.3</version>
<status>RELEASE</status>
<required_version>2.2</required_version>
<configurationfile>tftp.xml</configurationfile>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 784ffbbd..716d3542 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -396,7 +396,7 @@
<pkginfolink/>
<config_file>https://packages.pfsense.org/packages/config/tftp2/tftp.xml</config_file>
<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
- <version>2.2.2</version>
+ <version>2.2.3</version>
<status>Stable</status>
<required_version>2.0</required_version>
<configurationfile>tftp.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index a3f17c9d..57629b71 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -383,7 +383,7 @@
<pkginfolink/>
<config_file>https://packages.pfsense.org/packages/config/tftp2/tftp.xml</config_file>
<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
- <version>2.2.2</version>
+ <version>2.2.3</version>
<status>Stable</status>
<required_version>2.0</required_version>
<configurationfile>tftp.xml</configurationfile>