From abad402c6ba1f315feab5972d2d1d87db1ad1bc9 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 21 Jul 2015 08:47:59 -0400
Subject: Allow pre-filling (but no automatic action) of the download filename
 on exec.php. Setup a link to download the status output.tgz in status.php

---
 usr/local/www/exec.php   | 2 +-
 usr/local/www/status.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/exec.php b/usr/local/www/exec.php
index ecf938a..e0220b7 100644
--- a/usr/local/www/exec.php
+++ b/usr/local/www/exec.php
@@ -288,7 +288,7 @@ if (!isBlank($_POST['txtPHPCommand'])) {
 		<tr>
 			<td align="right"><?=gettext("File to download"); ?>:</td>
 			<td>
-				<input name="dlPath" type="text" class="formfld file" id="dlPath" size="50" />
+				<input name="dlPath" type="text" class="formfld file" id="dlPath" size="50" value="<?php echo htmlspecialchars($_GET['dlPath']) ?>" />
 			</td>
 		</tr>
 		<tr>
diff --git a/usr/local/www/status.php b/usr/local/www/status.php
index b15edc3..5b3cb5d 100755
--- a/usr/local/www/status.php
+++ b/usr/local/www/status.php
@@ -256,7 +256,8 @@ pre {
 "(passwords, maybe also IP addresses) before posting " .
 "information from this page in public places (like mailing lists)"); ?>!</strong></span><br />
 <?=gettext("Passwords in config.xml have been automatically removed"); ?>.<br /><br />
-<?=gettext("When the page has finished loading, the output will be stored in {$output_file}. It may be downloaded via Diagnostics > Command Prompt or scp."); ?>
+<?=gettext("When the page has finished loading, the output will be stored in {$output_file}. It may be downloaded via scp or "); ?>
+<a href="/exec.php?dlPath=<?= $output_file ?>"><?=gettext("Diagnostics > Command Prompt")?></a>
 
 <div id="cmdspace" style="width:700px">
 <?php listCmds(); ?>
-- 
cgit v1.1