From e27953e73a41c644717708c1e7ace02800c7fc4b Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@world.inf.org>
Date: Fri, 1 Feb 2013 11:51:48 +0545
Subject: Allow clear package lock when 1st install fails

I upgraded a system this morning. An issue during the 1st package reinstall caused the package lock to be set, but no packages installed. The Backup/Restore GUI page did not show the section for resetting the package lock, because it only displays that if there is at least 1 package installed - catch-22.
This fixes that odd condition.
---
 usr/local/www/diag_backup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index d84a501..5bc538e 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -736,7 +736,7 @@ function backuparea_change(obj) {
 						<p><strong><span class="red"><?=gettext("Note:"); ?></span></strong><br /><?=gettext("The firewall will reboot after restoring the configuration."); ?><br /></p>
 					</td>
 				</tr>
-				<?php if($config['installedpackages']['package'] != "") { ?>
+				<?php if(($config['installedpackages']['package'] != "") || (is_subsystem_dirty("packagelock"))) { ?>
 				<tr>
 					<td colspan="2" class="list" height="12">&nbsp;</td>
 				</tr>
-- 
cgit v1.1


From b328217211d0fc34097c355b10389493631691ef Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@world.inf.org>
Date: Fri, 1 Feb 2013 13:04:33 +0545
Subject: Display only needed Reinstall and Clear Package Lock buttons

Make the code a bit smarter, so the user only sees whichever of the reinstall and clear package lock buttons that are actually relevant.
---
 usr/local/www/diag_backup.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index 5bc538e..e869fec 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -736,7 +736,7 @@ function backuparea_change(obj) {
 						<p><strong><span class="red"><?=gettext("Note:"); ?></span></strong><br /><?=gettext("The firewall will reboot after restoring the configuration."); ?><br /></p>
 					</td>
 				</tr>
-				<?php if(($config['installedpackages']['package'] != "") || (is_subsystem_dirty("packagelock"))) { ?>
+				<?php if (($config['installedpackages']['package'] != "") || (is_subsystem_dirty("packagelock"))) { ?>
 				<tr>
 					<td colspan="2" class="list" height="12">&nbsp;</td>
 				</tr>
@@ -746,12 +746,16 @@ function backuparea_change(obj) {
 				<tr>
 					<td width="22%" valign="baseline" class="vncell">&nbsp;</td>
 					<td width="78%" class="vtable">
-						<p><?=gettext("Click this button to reinstall all system packages.  This may take a while."); ?> <br /><br />
-		  				<input name="Submit" type="submit" class="formbtn" id="reinstallpackages" value="<?=gettext("Reinstall packages"); ?>">
-						<br/>
-						<br/>
-						<p><?=gettext("Click this button to clear the package lock if a package fails to reinstall properly after an upgrade."); ?> <br /><br />
-						<input name="Submit" type="submit" class="formbtn" id="clearpackagelock" value="<?=gettext("Clear Package Lock"); ?>">
+						<?php if ($config['installedpackages']['package'] != "") { ?>
+							<p><?=gettext("Click this button to reinstall all system packages.  This may take a while."); ?> <br /><br />
+							<input name="Submit" type="submit" class="formbtn" id="reinstallpackages" value="<?=gettext("Reinstall packages"); ?>">
+							<br/>
+							<br/>
+						<?php } ?>
+						<?php if (is_subsystem_dirty("packagelock")) { ?>
+							<p><?=gettext("Click this button to clear the package lock if a package fails to reinstall properly after an upgrade."); ?> <br /><br />
+							<input name="Submit" type="submit" class="formbtn" id="clearpackagelock" value="<?=gettext("Clear Package Lock"); ?>">
+						<?php } ?>
 					</td>
 				</tr>
 				<?php } ?>
-- 
cgit v1.1