aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2015-12-17 08:10:00 -0500
committerjim-p <jimp@pfsense.org>2015-12-17 08:10:00 -0500
commite4ddd3cbcafc391661c7b694ff058747eddbb8ef (patch)
tree80eead74fc9cb3fe0b2cea3c411fbb674c58ddea /config
parent2cbebcfe988509eed9382228335ceb07c4e1ce37 (diff)
parentc25e3c31d2a30b38eb18bc90c491b18fca513e1d (diff)
downloadpfsense-packages-e4ddd3cbcafc391661c7b694ff058747eddbb8ef.tar.gz
pfsense-packages-e4ddd3cbcafc391661c7b694ff058747eddbb8ef.tar.bz2
pfsense-packages-e4ddd3cbcafc391661c7b694ff058747eddbb8ef.zip
Merge pull request #1214 from doktornotor/patch-2
Diffstat (limited to 'config')
-rw-r--r--config/tftp2/tftp.inc3
-rw-r--r--config/tftp2/tftp.xml6
-rw-r--r--config/tftp2/tftp_files.php3
3 files changed, 7 insertions, 5 deletions
diff --git a/config/tftp2/tftp.inc b/config/tftp2/tftp.inc
index 75ddaac8..baf753c9 100644
--- a/config/tftp2/tftp.inc
+++ b/config/tftp2/tftp.inc
@@ -28,6 +28,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+require_once("filter.inc");
+require_once("util.inc");
+
function tftp_byte_convert($bytes) {
if ($bytes <= 0) {
return '0 Byte';
diff --git a/config/tftp2/tftp.xml b/config/tftp2/tftp.xml
index f45a344a..350999dd 100644
--- a/config/tftp2/tftp.xml
+++ b/config/tftp2/tftp.xml
@@ -42,13 +42,12 @@
/* ====================================================================================== */
]]>
</copyright>
- <name>tftp Settings</name>
- <version>2.2.3</version>
+ <name>tftpsettings</name>
+ <version>2.2.4</version>
<title>TFTP: Settings</title>
<include_file>/usr/local/pkg/tftp.inc</include_file>
<menu>
<name>TFTP</name>
- <tooltiptext>Add or Remove files for TFTP.</tooltiptext>
<section>Services</section>
<configfile>tftp.xml</configfile>
<url>/tftp_files.php</url>
@@ -58,7 +57,6 @@
<executable>inetd</executable>
<description>TFTP Daemon</description>
</service>
- <configpath>installedpackages->$packagename</configpath>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<item>https://packages.pfsense.org/packages/config/tftp2/tftp.inc</item>
diff --git a/config/tftp2/tftp_files.php b/config/tftp2/tftp_files.php
index e2e81ed4..4cb34024 100644
--- a/config/tftp2/tftp_files.php
+++ b/config/tftp2/tftp_files.php
@@ -28,6 +28,7 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+require_once("config.inc");
require_once("guiconfig.inc");
require_once("util.inc");
require_once("/usr/local/pkg/tftp.inc");
@@ -117,13 +118,13 @@ if ($_GET['act'] == "del") {
}
}
+$pgtitle = "TFTP: Settings/Files";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle">TFTP: Settings/Files</p>
<?php
$savemsg = $_GET["savemsg"];