summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Beaver <sbeaver@netgate.com>2018-09-17 16:05:20 -0400
committerSteve Beaver <sbeaver@netgate.com>2018-09-18 14:27:10 -0400
commitb1aa39323e02d93ae8fa0b0de2f8afe3ed325534 (patch)
tree38b50201735b48bbc4c5ceacf38fecce9a21dff8
parent30213bb09a6be9769352700e9bdf32f8be6f9b61 (diff)
downloadpfsense-b1aa39323e02d93ae8fa0b0de2f8afe3ed325534.zip
pfsense-b1aa39323e02d93ae8fa0b0de2f8afe3ed325534.tar.gz
Fixed #8901
(cherry picked from commit d33560e8dcba496a553f33c50113877778c3274b)
-rw-r--r--src/usr/local/www/services_acb.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/usr/local/www/services_acb.php b/src/usr/local/www/services_acb.php
index fc33f8a..b8732e3 100644
--- a/src/usr/local/www/services_acb.php
+++ b/src/usr/local/www/services_acb.php
@@ -28,8 +28,13 @@ $exp_sep = '||';
// $legacy is used to determine whether to work with the old "Gold" ACB system, or the
// current system
$legacy = false;
+
if (isset($_REQUEST['legacy'])) {
$legacy = true;
+} else {
+ if (isset($_REQUEST['userkey'] )) {
+ $userkey = $_REQUEST['userkey'];
+ }
}
// Encryption password
@@ -530,9 +535,9 @@ if (!$legacy) {
<td><?= $cv['localtime']; ?></td>
<td><?= $cv['reason']; ?></td>
<td>
- <a class="fa fa-undo" title="<?=gettext('Restore this revision')?>" href="services_acb.php?hostname=<?=urlencode($hostname)?>&newver=<?=urlencode($cv['time'])?><?=($legacy ? "&legacy=true":"")?>" onclick="return confirm('<?=gettext("Are you sure you want to restore {$cv['localtime']}?")?>')"></a>
- <a class="fa fa-download" title="<?=gettext('Show info')?>" href="services_acb.php?download=<?=urlencode($cv['time'])?>&hostname=<?=urlencode($hostname)?>&reason=<?=urlencode($cv['reason'])?><?=($legacy ? "&legacy=true":"")?> "></a>
- <a class="fa fa-trash" title="<?=gettext('Delete config')?>" href="services_acb.php?hostname=<?=urlencode($hostname)?>&rmver=<?=urlencode($cv['time'])?><?=($legacy ? "&legacy=true":"")?>"></a>
+ <a class="fa fa-undo" title="<?=gettext('Restore this revision')?>" href="services_acb.php?hostname=<?=urlencode($hostname)?>&userkey=<?=urlencode($userkey)?>&newver=<?=urlencode($cv['time'])?><?=($legacy ? "&legacy=true":"")?>" onclick="return confirm('<?=gettext("Are you sure you want to restore {$cv['localtime']}?")?>')"></a>
+ <a class="fa fa-download" title="<?=gettext('Show info')?>" href="services_acb.php?download=<?=urlencode($cv['time'])?>&hostname=<?=urlencode($hostname)?>&userkey=<?=urlencode($userkey)?>&reason=<?=urlencode($cv['reason'])?><?=($legacy ? "&legacy=true":"")?> "></a>
+ <a class="fa fa-trash" title="<?=gettext('Delete config')?>" href="services_acb.php?hostname=<?=urlencode($hostname)?>&userkey=<?=urlencode($userkey)?>&rmver=<?=urlencode($cv['time'])?><?=($legacy ? "&legacy=true":"")?>"></a>
</td>
</tr>
<?php $counter++;
OpenPOWER on IntegriCloud