From 222494afb5b97170ac99ed8bb05d9ba9865074b2 Mon Sep 17 00:00:00 2001 From: Colin Smith Date: Sun, 10 Apr 2005 17:56:46 +0000 Subject: Add tabs to firmware page and remove "auto update" entry from manual update page. --- usr/local/www/system_firmware.php | 55 +++++++++++++--------------------- usr/local/www/system_firmware_auto.php | 12 ++++---- 2 files changed, 26 insertions(+), 41 deletions(-) diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index 0584f41..54989c6 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -32,14 +32,7 @@ $d_isfwfile = 1; require("guiconfig.inc"); - -/* Handle auto upgrade */ -if($_POST) { - if (stristr($_POST['autoupgrade'], "Auto")) { - auto_upgrade(); - $savemsg = "pfSense is now auto upgrading. The firewall will automatically reboot if it succeeds."; - } -} +//require("xmlrpc_client.inc"); /* Handle manual upgrade */ if ($_POST && !file_exists($d_firmwarelock_path)) { @@ -56,8 +49,7 @@ if ($_POST && !file_exists($d_firmwarelock_path)) { else if ($_POST['sig_no']) { if(file_exists("{$g['tmp_path']}/firmware.tgz")) unlink("{$g['tmp_path']}/firmware.tgz"); - } - + } if ($mode) { if ($mode == "enable") { exec_rc_script("/etc/rc.firmware enable"); @@ -102,7 +94,6 @@ if ($_POST && !file_exists($d_firmwarelock_path)) { /* fire up the update script in the background */ touch($d_firmwarelock_path); exec_rc_script_async("/etc/rc.firmware pfSenseupgrade {$g['tmp_path']}/firmware.tgz"); - $savemsg = "The firmware is now being installed. The firewall will reboot automatically."; } } @@ -110,8 +101,8 @@ if ($_POST && !file_exists($d_firmwarelock_path)) { } else { /* Only check firmware version if we're setup to go against pfsense.org and user wants us to */ if (!isset($config['system']['disablefirmwarecheck'])) { - $fwinfo = check_firmware_version(); - if(is_null($fwinfo)) { +// $versions = check_firmware_version(); + if(!is_array($fwinfo)) { $fwinfo = "Unable to determine if a new firmware version is available."; } } @@ -130,18 +121,15 @@ $dir = ini_get('upload_progress_meter.file.filename_template'); - - +

System: Firmware

- - "") print_info_box($fwinfo); ?>

Firmware uploading is not supported on this platform.

@@ -160,20 +148,18 @@ print_info_box($sig_warning);
- - + + + + + + + +
+ +
- - - - - - - @@ -194,11 +180,12 @@ print_info_box($sig_warning);

- + You must reboot the system before you can upgrade the firmware. + @@ -206,10 +193,10 @@ print_info_box($sig_warning); DO NOT abort the firmware upgrade once it has started. The firewall will reboot automatically after storing the new firmware. The configuration will be maintained. - -
Invoke pfSense Auto Upgrade
  -

Click this button to automatically upgrade pfSense in the background. This may take a while.
-
- -

 
Invoke pfSense Manual Upgrade
 
- +
diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php index 6d8a155..9645b81 100755 --- a/usr/local/www/system_firmware_auto.php +++ b/usr/local/www/system_firmware_auto.php @@ -5,10 +5,7 @@ system_firmware_auto.php part of pfSense (http://www.pfsense.com) - Copyright (C) 2005 Scott Ullrich - - Based originally on system_firmware.php - (C)2003-2004 Manuel Kasper + Copyright (C) 2005 Scott Ullrich and Colin Smith All rights reserved. @@ -59,7 +56,8 @@ require_once("xmlrpc_client.inc"); @@ -73,11 +71,11 @@ require_once("xmlrpc_client.inc");

- - -- cgit v1.1