summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2015-07-21 08:47:59 -0400
committerjim-p <jimp@pfsense.org>2015-07-21 08:47:59 -0400
commitabad402c6ba1f315feab5972d2d1d87db1ad1bc9 (patch)
tree9c770f8de076ee859d5ce8afd6f269d5275185dc
parent34cd534810b1e4ff85550ef9a1deddc5c0411c67 (diff)
downloadpfsense-abad402c6ba1f315feab5972d2d1d87db1ad1bc9.zip
pfsense-abad402c6ba1f315feab5972d2d1d87db1ad1bc9.tar.gz
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
-rw-r--r--usr/local/www/exec.php2
-rwxr-xr-xusr/local/www/status.php3
2 files changed, 3 insertions, 2 deletions
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(); ?>
OpenPOWER on IntegriCloud