summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-08-20 02:52:25 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-08-20 02:52:25 +0000
commit18e28fdf3c4ba954bac01cf85fdbfd7913295c70 (patch)
treec8bac8736ca09460fba6ca9598c745dfdfb8113f /usr
parent36babadc35b220a3d46c38a952ed3df7d99494f0 (diff)
downloadpfsense-18e28fdf3c4ba954bac01cf85fdbfd7913295c70.zip
pfsense-18e28fdf3c4ba954bac01cf85fdbfd7913295c70.tar.gz
Actually allow upgrade
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/system_firmware.php34
1 files changed, 17 insertions, 17 deletions
diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php
index 51de8bc..16bc49d 100755
--- a/usr/local/www/system_firmware.php
+++ b/usr/local/www/system_firmware.php
@@ -34,23 +34,6 @@ $d_isfwfile = 1;
require_once("guiconfig.inc");
require_once("xmlrpc_client.inc");
-/* if upgrade in progress, alert user */
-if(file_exists($d_firmwarelock_path)) {
- $pgtitle = "System: Firmware: Manual Update";
- include("head.inc");
- echo "<body link=\"#0000CC\" vlink=\"#0000CC\" alink=\"#0000CC\">\n";
- include("fbegin.inc");
- echo "<p class=\"pgtitle\"><?=$pgtitle?></p>\n";
- echo "<div>\n";
- print_info_box("A upgrade is currently in progress.<p>The firewall will reboot when the operation is complete.");
- echo "<center><img src='/themes/{$g['theme']}/images/icons/icon_fw-update.gif'>";
- echo "</div>\n";
- include("fend.inc");
- echo "</body>";
- echo "</html>";
- exit;
-}
-
/* Handle manual upgrade */
if ($_POST && !file_exists($d_firmwarelock_path)) {
@@ -122,6 +105,23 @@ if ($_POST && !file_exists($d_firmwarelock_path)) {
}
}
+/* if upgrade in progress, alert user */
+if(file_exists($d_firmwarelock_path)) {
+ $pgtitle = "System: Firmware: Manual Update";
+ include("head.inc");
+ echo "<body link=\"#0000CC\" vlink=\"#0000CC\" alink=\"#0000CC\">\n";
+ include("fbegin.inc");
+ echo "<p class=\"pgtitle\"><?=$pgtitle?></p>\n";
+ echo "<div>\n";
+ print_info_box("A upgrade is currently in progress.<p>The firewall will reboot when the operation is complete.");
+ echo "<center><img src='/themes/{$g['theme']}/images/icons/icon_fw-update.gif'>";
+ echo "</div>\n";
+ include("fend.inc");
+ echo "</body>";
+ echo "</html>";
+ exit;
+}
+
/* upload progress bar id */
$id = rand() . '.' . time();
$mth = ini_get('upload_progress_meter.store_method');
OpenPOWER on IntegriCloud