Retire system_firmware.php, system_firmware_auto.php and system_firmware_check.php

5 files changed, 0 insertions, 856 deletions

diff --git a/src/usr/local/www/help.php b/src/usr/local/www/help.php
index 7408db3..cddb930 100644
--- a/src/usr/local/www/help.php
+++ b/src/usr/local/www/help.php
@@ -175,9 +175,6 @@ $helppages = array(
 	'system_advanced_network.php' => 'https://doc.pfsense.org/index.php/Advanced_Setup#Firewall.2FNAT',
 	'system_advanced_notifications.php' => 'https://doc.pfsense.org/index.php/Advanced_Setup#Notifications',
 	'system_advanced_sysctl.php' => 'https://doc.pfsense.org/index.php/Advanced_Setup#System_Tunables',
-	'system_firmware.php' => 'https://doc.pfsense.org/index.php/Firmware_Updates',
-	'system_firmware_auto.php' => 'https://doc.pfsense.org/index.php/Firmware_Updates',
-	'system_firmware_check.php' => 'https://doc.pfsense.org/index.php/Firmware_Updates',
 	'system_firmware_settings.php' => 'https://doc.pfsense.org/index.php/Firmware_Updates',
 	'system_gateway_groups.php' => 'https://doc.pfsense.org/index.php/Gateway_Settings',
 	'system_gateway_groups_edit.php' => 'https://doc.pfsense.org/index.php/Gateway_Settings',
diff --git a/src/usr/local/www/system_firmware.php b/src/usr/local/www/system_firmware.php
deleted file mode 100644
index 4587a91..0000000
--- a/src/usr/local/www/system_firmware.php
+++ /dev/null
@@ -1,353 +0,0 @@
-<?php
-/*
-	system_firmware.php
-*/
-/* ====================================================================
- *	Copyright (c)  2004-2015  Electric Sheep Fencing, LLC. All rights reserved.
- *
- *	Some or all of this file is based on the m0n0wall project which is
- *	Copyright (c)  2004 Manuel Kasper (BSD 2 clause)
- *
- *	Redistribution and use in source and binary forms, with or without modification,
- *	are permitted provided that the following conditions are met:
- *
- *	1. Redistributions of source code must retain the above copyright notice,
- *		this list of conditions and the following disclaimer.
- *
- *	2. Redistributions in binary form must reproduce the above copyright
- *		notice, this list of conditions and the following disclaimer in
- *		the documentation and/or other materials provided with the
- *		distribution.
- *
- *	3. All advertising materials mentioning features or use of this software
- *		must display the following acknowledgment:
- *		"This product includes software developed by the pfSense Project
- *		 for use in the pfSense software distribution. (http://www.pfsense.org/).
- *
- *	4. The names "pfSense" and "pfSense Project" must not be used to
- *		 endorse or promote products derived from this software without
- *		 prior written permission. For written permission, please contact
- *		 coreteam@pfsense.org.
- *
- *	5. Products derived from this software may not be called "pfSense"
- *		nor may "pfSense" appear in their names without prior written
- *		permission of the Electric Sheep Fencing, LLC.
- *
- *	6. Redistributions of any form whatsoever must retain the following
- *		acknowledgment:
- *
- *	"This product includes software developed by the pfSense Project
- *	for use in the pfSense software distribution (http://www.pfsense.org/).
- *
- *	THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
- *	EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- *	PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR
- *	ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *	NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- *	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- *	OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	====================================================================
- *
- */
-/*
-	pfSense_BUILDER_BINARIES:	/usr/bin/tar
-	pfSense_MODULE: firmware
-*/
-
-##|+PRIV
-##|*IDENT=page-system-firmware-manualupdate
-##|*NAME=System: Firmware: Manual Update page
-##|*DESCR=Allow access to the 'System: Firmware: Manual Update' page.
-##|*MATCH=system_firmware.php*
-##|-PRIV
-
-$d_isfwfile = 1;
-$nocsrf = true;
-
-require_once("globals.inc");
-require_once("functions.inc");
-require_once("guiconfig.inc");
-require_once("xmlrpc_client.inc");
-
-$curcfg = $config['system']['firmware'];
-
-/* Allow additional execution time 0 = no limit. */
-ini_set('max_execution_time', '9999');
-ini_set('max_input_time', '9999');
-
-function file_is_for_platform($filename, $ul_name) {
-	global $g;
-	if ($g['platform'] == "nanobsd") {
-		if (stristr($ul_name, "nanobsd")) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-	$_gb = exec("/usr/bin/tar xzf $filename -C /tmp/ etc/platform");
-	unset($_gb);
-	if (!file_exists("/tmp/etc/platform")) {
-		return false;
-	}
-	$upgrade_is_for_platform = trim(file_get_contents("/tmp/etc/platform", " \n\t\r"));
-	if ($g['platform'] == $upgrade_is_for_platform) {
-		@unlink("/tmp/etc/platform");
-		return true;
-	}
-	return false;
-}
-
-function file_upload_error_message($error_code) {
-	switch ($error_code) {
-		case UPLOAD_ERR_INI_SIZE:
-			return gettext('The uploaded file exceeds the upload_max_filesize directive in php.ini');
-		case UPLOAD_ERR_FORM_SIZE:
-			return gettext('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form');
-		case UPLOAD_ERR_PARTIAL:
-			return gettext('The uploaded file was only partially uploaded');
-		case UPLOAD_ERR_NO_FILE:
-			return gettext('No file was uploaded');
-		case UPLOAD_ERR_NO_TMP_DIR:
-			return gettext('Missing a temporary folder');
-		case UPLOAD_ERR_CANT_WRITE:
-			return gettext('Failed to write file to disk');
-		case UPLOAD_ERR_EXTENSION:
-			return gettext('File upload stopped by extension');
-		default:
-			return gettext('Unknown upload error');
-	}
-}
-
-/* if upgrade in progress, alert user */
-if (is_subsystem_dirty('firmwarelock')) {
-	$pgtitle = array(gettext("System"), gettext("Firmware"), gettext("Manual Update"));
-	include("head.inc");
-	include("fbegin.inc");
-	print_info_box(gettext("An upgrade is currently in progress. The firewall will reboot when the operation is complete."));
-	include("foot.inc");
-	exit;
-}
-
-if ($_POST['backupbeforeupgrade']) {
-	touch("/tmp/perform_full_backup.txt");
-}
-
-/* Handle manual upgrade */
-if ($_POST && !is_subsystem_dirty('firmwarelock')) {
-
-	unset($input_errors);
-	unset($sig_warning);
-
-	if (stristr($_POST['Submit'], gettext("Enable"))) {
-		$mode = "enable";
-	} else if (stristr($_POST['Submit'], gettext("Disable"))) {
-		$mode = "disable";
-	} else if (stristr($_POST['Submit'], gettext("Upgrade")) || $_POST['sig_override']) {
-		$mode = "upgrade";
-	} else if ($_POST['sig_no']) {
-		if (file_exists("{$g['upload_path']}/firmware.tgz")) {
-			unlink("{$g['upload_path']}/firmware.tgz");
-		}
-	}
-	if ($mode) {
-		if ($mode == "enable") {
-			conf_mount_rw();
-			mark_subsystem_dirty('firmware');
-		} else if ($mode == "disable") {
-			conf_mount_ro();
-			clear_subsystem_dirty('firmware');
-		} else if ($mode == "upgrade") {
-			if ($_FILES['ulfile']['error']) {
-				$errortext = "(" . file_upload_error_message($_FILES['ulfile']['error']) . ")";
-			}
-			if (is_uploaded_file($_FILES['ulfile']['tmp_name'])) {
-				/* verify firmware image(s) */
-				if (file_is_for_platform($_FILES['ulfile']['tmp_name'], $_FILES['ulfile']['name']) == false && !$_POST['sig_override']) {
-					$input_errors[] = gettext("The uploaded image file is not for this platform.");
-				} else if (!file_exists($_FILES['ulfile']['tmp_name'])) {
-					/* probably out of memory for the MFS */
-					$input_errors[] = gettext("Image upload failed (out of memory?)");
-					mwexec("/etc/rc.firmware disable");
-					clear_subsystem_dirty('firmware');
-				} else {
-					/* move the image so PHP won't delete it */
-					rename($_FILES['ulfile']['tmp_name'], "{$g['upload_path']}/firmware.tgz");
-
-					/* check digital signature */
-					$sigchk = verify_digital_signature("{$g['upload_path']}/firmware.tgz");
-
-					if ($sigchk == 1) {
-						$sig_warning = gettext("The digital signature on this image is invalid.");
-					} else if ($sigchk == 2 && !isset($config['system']['firmware']['allowinvalidsig'])) {
-						$sig_warning = gettext("This image is not digitally signed.");
-					} else if (($sigchk >= 3)) {
-						$sig_warning = gettext("There has been an error verifying the signature on this image.");
-					}
-
-					if (!verify_gzip_file("{$g['upload_path']}/firmware.tgz")) {
-						$input_errors[] = gettext("The image file is corrupt.");
-						unlink("{$g['upload_path']}/firmware.tgz");
-					}
-				}
-			}
-
-			run_plugins("/usr/local/pkg/firmware_upgrade");
-
-			/* Check for input errors, firmware locks, warnings, then check for firmware if sig_override is set */
-			if (!$input_errors && !is_subsystem_dirty('firmwarelock') && (!$sig_warning || $_POST['sig_override'])) {
-				if (file_exists("{$g['upload_path']}/firmware.tgz")) {
-					/* fire up the update script in the background */
-					mark_subsystem_dirty('firmwarelock');
-					$savemsg = gettext("The firmware is now being updated. The firewall will reboot automatically.");
-					if (stristr($_FILES['ulfile']['name'], "nanobsd") or $_POST['isnano'] == "yes") {
-						mwexec_bg("/etc/rc.firmware pfSenseNanoBSDupgrade {$g['upload_path']}/firmware.tgz");
-					} else {
-						if ($g['platform'] == "nanobsd") {
-							$whichone = "pfSenseNanoBSDupgrade";
-						} else {
-							$whichone = "pfSenseupgrade";
-						}
-						mwexec_bg("/etc/rc.firmware {$whichone} {$g['upload_path']}/firmware.tgz");
-						unset($whichone);
-					}
-				} else {
-					$savemsg = sprintf(gettext("Firmware image missing or other error, please try again %s."), $errortext);
-				}
-			}
-		}
-	}
-}
-
-$pgtitle = array(gettext("System"), gettext("Firmware"));
-include("head.inc");
-
-if ($input_errors)
-	print_input_errors($input_errors);
-
-if ($savemsg)
-	print_info_box($savemsg);
-
-if ($fwinfo != "")
-	print_info_box($fwinfo);
-
-$tab_array = array();
-$tab_array[] = array(gettext("Manual Update"), true, "system_firmware.php");
-$tab_array[] = array(gettext("Auto Update"), false, "system_firmware_check.php");
-$tab_array[] = array(gettext("Updater Settings"), false, "system_firmware_settings.php");
-
-display_top_tabs($tab_array);
-
-// For a simple yes/no we can use an HTML form
-if ($sig_warning && !$input_errors) {
-	$sig_warning = gettext("The image you uploaded " .
-		"is not an official/supported image and may lead to unexpected behavior or security " .
-		"compromises. Only install images that come from sources that you trust, and make sure ".
-		"that the image has not been tampered with.") . "<br /><br />".
-		gettext("Do you want to install this image anyway (on your own risk)?");
-
-	print_info_box($sig_warning);
-?>
-	<form action="system_firmware.php" method="post" enctype="multipart/form-data">
-		<input name="sig_override" type="submit" class="btn btn-danger" id="sig_override" value=" <?=gettext("Yes");?> " />
-		<input name="sig_no" type="submit" class="btn btn-default" id="sig_no" value=" <?=gettext("No"); ?> " />
-	</form>
-<?php
-
-} else {
-	// This is where the work gets done so Forms.classes will be used from this point
-	if (!is_subsystem_dirty('firmwarelock')) {
-		require_once('classes/Form.class.php');
-
-		if (!is_subsystem_dirty('rebootreq')) {
-			// Provide a button to enable firmware upgrades. Upgrades should be disabled on initial page load
-			if (!is_subsystem_dirty('firmware') || !$_POST || $_POST['save']) {
-				$enablebtn = new Form_Button(
-					'Submit',
-					'Enable firmware upload'
-					);
-
-				$enablebtn->addClass('btn-warning');
-				$form = new Form($enablebtn);
-				$section = new Form_Section('Invoke ' . $g['product_name'] .' Manual Upgrade');
-				$section->addInput(new Form_StaticText('Enable', 'Click the "Enable firmware upload" button below to begin.'));
-			}
-			else {
-				// Upgrades are now enabled
-				$form = new Form('Disable firmware upload');
-
-				$form->setMultipartEncoding();
-
-				$section = new Form_Section('Perform ' . $g['product_name'] .' Manual Upgrade');
-
-				if (!session_id())
-					$upload_id = uniqid();
-				else
-					$upload_id = session_id();
-
-				$section->addInput(new Form_Input(
-					'UPLOAD_IDENTIFIER',
-					'',
-					'hidden',
-					$upload_id
-					));
-
-				if(stristr($_FILES['ulfile']['name'],"nanobsd")) {
-					$section->addInput(new Form_Input(
-						'isnano',
-						'',
-						'hidden',
-						'yes'
-						));
-				}
-
-				if ($g['platform'] == "nanobsd")
-					$type = "*.img.gz";
-				else
-					$type = "*.tgz";
-
-				$filepicker = new Form_Input(
-					'ulfile',
-					'File to upload (' . $type . ')',
-					'file',
-					''
-				);
-
-				$section->addInput($filepicker)->setHelp('Choose the file you wish to upload');
-
-				if ($g['hidebackupbeforeupgrade'] === false) {
-					$section->addInput(new Form_Checkbox(
-						'backupbeforeupgrade',
-						Backup,
-						'Perform a full backup prior to upgrade',
-						false
-					));
-				}
-
-				$section->addInput(new Form_Button(
-					'Submit',
-					'Upgrade firmware'
-				))->addClass('btn-danger btn-sm')->setHelp('Click the "Upgrade firmware" button above to start the upgrade process');
-			}
-
-			$form->add($section);
-			print($form);
-		}
-	}
-	else {
-		print_info_box('<strong>' . gettext("You must reboot the system before you can upgrade the firmware.") . '</strong>');
-	}
-
-	if (is_subsystem_dirty('firmware') && !is_subsystem_dirty('firmwarelock')) {
-		print_info_box('<strong>' . gettext("DO NOT ") . '</strong>' . gettext('abort the firmware upgrade once it ' .
-			'has started. The firewall will reboot automatically after ' .
-			'storing the new firmware. The configuration will be maintained.'));
-	}
-}
-
-include("foot.inc"); ?>
diff --git a/src/usr/local/www/system_firmware_auto.php b/src/usr/local/www/system_firmware_auto.php
deleted file mode 100755
index 8affcc9..0000000
--- a/src/usr/local/www/system_firmware_auto.php
+++ /dev/null
@@ -1,295 +0,0 @@
-<?php
-/*
-	system_firmware_auto.php
-*/
-/* ====================================================================
- *	Copyright (c)  2004-2015  Electric Sheep Fencing, LLC. All rights reserved.
- *
- *	Some or all of this file is based on the m0n0wall project which is
- *	Copyright (c)  2004 Manuel Kasper (BSD 2 clause)
- *
- *	Redistribution and use in source and binary forms, with or without modification,
- *	are permitted provided that the following conditions are met:
- *
- *	1. Redistributions of source code must retain the above copyright notice,
- *		this list of conditions and the following disclaimer.
- *
- *	2. Redistributions in binary form must reproduce the above copyright
- *		notice, this list of conditions and the following disclaimer in
- *		the documentation and/or other materials provided with the
- *		distribution.
- *
- *	3. All advertising materials mentioning features or use of this software
- *		must display the following acknowledgment:
- *		"This product includes software developed by the pfSense Project
- *		 for use in the pfSense software distribution. (http://www.pfsense.org/).
- *
- *	4. The names "pfSense" and "pfSense Project" must not be used to
- *		 endorse or promote products derived from this software without
- *		 prior written permission. For written permission, please contact
- *		 coreteam@pfsense.org.
- *
- *	5. Products derived from this software may not be called "pfSense"
- *		nor may "pfSense" appear in their names without prior written
- *		permission of the Electric Sheep Fencing, LLC.
- *
- *	6. Redistributions of any form whatsoever must retain the following
- *		acknowledgment:
- *
- *	"This product includes software developed by the pfSense Project
- *	for use in the pfSense software distribution (http://www.pfsense.org/).
- *
- *	THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
- *	EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- *	PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR
- *	ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *	NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- *	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- *	OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	====================================================================
- *
- */
-/*
-	pfSense_BUILDER_BINARIES:	/usr/bin/tar	/usr/bin/nohup	/bin/cat	/sbin/sha256
-	pfSense_MODULE: firmware
-*/
-
-##|+PRIV
-##|*IDENT=page-system-firmware-checkforupdate
-##|*NAME=System: Firmware: Check For Update page
-##|*DESCR=Allow access to the 'System: Firmware: Check For Update' page.
-##|*MATCH=system_firmware_auto.php*
-##|-PRIV
-
-$nocsrf = true;
-
-require("guiconfig.inc");
-require_once("pfsense-utils.inc");
-
-$curcfg = $config['system']['firmware'];
-
-if (isset($curcfg['alturl']['enable'])) {
-	$updater_url = "{$config['system']['firmware']['alturl']['firmwareurl']}";
-} else {
-	$updater_url = $g['update_url'];
-}
-
-if ($_POST['backupbeforeupgrade']) {
-	touch("/tmp/perform_full_backup.txt");
-}
-
-$closehead = false;
-$pgtitle = array(gettext("Diagnostics"), gettext("Firmware"), gettext("Auto Update"));
-include("head.inc");
-
-$tab_array = array();
-$tab_array[] = array(gettext("Manual Update"), false, "system_firmware.php");
-$tab_array[] = array(gettext("Auto Update"), true, "system_firmware_check.php");
-$tab_array[] = array(gettext("Updater Settings"), false, "system_firmware_settings.php");
-
-display_top_tabs($tab_array);
-?>
-
-
-<div id="statusheading" name="statusheading" class="panel panel-default">
-   <div	 class="panel-heading" id="status" name="status"><?=gettext("Beginning firmware upgrade")?></div>
-   <div id='output' name='output' class="panel-body"></div>
-</div>
-
-
-<?php
-include("foot.inc"); ?>
-
-<?php
-
-panel_heading_text(gettext("Downloading current version information") . "...");
-panel_heading_class('info');
-
-$nanosize = "";
-if ($g['platform'] == "nanobsd") {
-	if (!isset($g['enableserial_force'])) {
-		$nanosize = "-nanobsd-vga-";
-	} else {
-		$nanosize = "-nanobsd-";
-	}
-
-	$nanosize .= strtolower(trim(file_get_contents("/etc/nanosize.txt")));
-}
-
-@unlink("/tmp/{$g['product_name']}_version");
-download_file_with_progress_bar("{$updater_url}/version{$nanosize}", "/tmp/{$g['product_name']}_version");
-$latest_version = str_replace("\n", "", @file_get_contents("/tmp/{$g['product_name']}_version"));
-if (!$latest_version) {
-	update_output_window(gettext("Unable to check for updates."));
-	require("foot.inc");
-	exit;
-} else {
-	$current_installed_buildtime = trim(file_get_contents("/etc/version.buildtime"));
-	$latest_version = trim(@file_get_contents("/tmp/{$g['product_name']}_version"));
-	$latest_version_pfsense = strtotime($latest_version);
-	if(!$latest_version) {
-		panel_heading_class('danger');
-		panel_heading_text(gettext('Version check'));
-		update_output_window(gettext("Unable to check for updates."));
-		require("foot.inc");
-		exit;
-	} else {
-		if (pfs_version_compare($current_installed_buildtime, $g['product_version'], $latest_version) == -1) {
-			panel_heading_text(gettext("Downloading updates") . '...');
-			panel_heading_class('info');
-
-			conf_mount_rw();
-			if ($g['platform'] == "nanobsd") {
-				$update_filename = "latest{$nanosize}.img.gz";
-			} else {
-				$update_filename = "latest.tgz";
-			}
-
-			$status = download_file_with_progress_bar("{$updater_url}/{$update_filename}", "{$g['upload_path']}/latest.tgz", "read_body_firmware");
-			$status = download_file_with_progress_bar("{$updater_url}/{$update_filename}.sha256", "{$g['upload_path']}/latest.tgz.sha256");
-			conf_mount_ro();
-			update_output_window("{$g['product_name']} " . gettext("download complete."));
-		} else {
-			panel_heading_class('success');
-			panel_heading_text(gettext('Version check complete'));
-			update_output_window(gettext("You are on the latest version."));
-			require("foot.inc");
-			exit;
-		}
-	}
-}
-
-/* launch external upgrade helper */
-$external_upgrade_helper_text = "/etc/rc.firmware ";
-
-if ($g['platform'] == "nanobsd") {
-	$external_upgrade_helper_text .= "pfSenseNanoBSDupgrade ";
-} else {
-	$external_upgrade_helper_text .= "pfSenseupgrade ";
-}
-
-$external_upgrade_helper_text .= "{$g['upload_path']}/latest.tgz";
-
-$downloaded_latest_tgz_sha256 = str_replace("\n", "", `/sbin/sha256 -q {$g['upload_path']}/latest.tgz`);
-$upgrade_latest_tgz_sha256 = str_replace("\n", "", `/bin/cat {$g['upload_path']}/latest.tgz.sha256 | awk '{ print $4 }'`);
-
-$sigchk = 0;
-
-if (!isset($curcfg['alturl']['enable'])) {
-	$sigchk = verify_digital_signature("{$g['upload_path']}/latest.tgz");
-}
-
-$exitstatus = 0;
-if ($sigchk == 1) {
-	$sig_warning = gettext("The digital signature on this image is invalid.");
-	$exitstatus = 1;
-} else if ($sigchk == 2) {
-	$sig_warning = gettext("This image is not digitally signed.");
-	if (!isset($config['system']['firmware']['allowinvalidsig'])) {
-		$exitstatus = 1;
-	}
-} else if (($sigchk >= 3)) {
-	$sig_warning = gettext("There has been an error verifying the signature on this image.");
-	$exitstatus = 1;
-}
-
-if ($exitstatus) {
-	panel_heading_text($sig_warning);
-	panel_heading_class('danger');
-
-	update_output_window(gettext("Update cannot continue.  You can disable this check on the Updater Settings tab."));
-	require("foot.inc");
-	exit;
-} else if ($sigchk == 2) {
-	panel_heading_text(gettext('Upgrade in progress...'));
-	panel_heading_class('info');
-
-	update_output_window("\n" . gettext("Upgrade Image does not contain a signature but the system has been configured to allow unsigned images. One moment please...") . "\n");
-}
-
-if (!verify_gzip_file("{$g['upload_path']}/latest.tgz")) {
-	panel_heading_text(gettext("The image file is corrupt."));
-	panel_heading_class('danger');
-
-	update_output_window(gettext("Update cannot continue"));
-	if (file_exists("{$g['upload_path']}/latest.tgz")) {
-		conf_mount_rw();
-		unlink("{$g['upload_path']}/latest.tgz");
-		conf_mount_ro();
-	}
-	require("foot.inc");
-	exit;
-}
-
-if($downloaded_latest_tgz_sha256 <> $upgrade_latest_tgz_sha256) {
-	panel_heading_text(gettext("Downloading complete but sha256 does not match."));
-	panel_heading_class('danger');
-
-	update_output_window(gettext("Auto upgrade aborted.") . "  \n\n" . gettext("Downloaded SHA256") . ": " . $downloaded_latest_tgz_sha256 . "\n\n" . gettext("Needed SHA256") . ": " . $upgrade_latest_tgz_sha256);
-} else {
-	update_output_window($g['product_name'] . " " . gettext("is now upgrading.") . "\\n\\n" . gettext("The firewall will reboot once the operation is completed."));
-	mwexec_bg($external_upgrade_helper_text);
-}
-
-/*
-	Helper functions
-*/
-
-function read_body_firmware($ch, $string) {
-	global $g, $fout, $file_size, $downloaded, $counter, $version, $latest_version;
-	$length = strlen($string);
-	$downloaded += intval($length);
-	$downloadProgress = round(100 * (1 - $downloaded / $file_size), 0);
-	$downloadProgress = 100 - $downloadProgress;
-	$a = $file_size;
-	$b = $downloaded;
-	$c = $downloadProgress;
-	$text  = "	" . gettext("Auto Update Download Status") . "\\n";
-	$text .= "----------------------------------------------------\\n";
-	$text .= "  " . gettext("Current Version") . " : {$g['product_version']}\\n";
-	$text .= "  " . gettext("Latest Version") . "  : {$latest_version}\\n";
-	$text .= "  " . gettext("File size") . "       : {$a}\\n";
-	$text .= "  " . gettext("Downloaded") . "      : {$b}\\n";
-	$text .= "  " . gettext("Percent") . "         : {$c}%\\n";
-	$text .= "----------------------------------------------------\\n";
-	$counter++;
-	if ($counter > 150) {
-		update_output_window($text);
-		update_progress_bar($downloadProgress);
-		$counter = 0;
-	}
-	fwrite($fout, $string);
-	return $length;
-}
-
-// Update the text in the panel-heading
-function panel_heading_text($text) {
-?>
-	<script>
-	events.push(function(){
-		$('#status').html('<?=$text?>');
-	});
-	</script>
-<?php
-}
-
-// Update the class of the message panel so that it's color changes
-// Use danger, success, info, warning, default etc
-function panel_heading_class($newclass = 'default') {
-?>
-	<script>
-	events.push(function(){
-		$('#statusheading').removeClass().addClass('panel panel-' + '<?=$newclass?>');
-	});
-	</script>
-<?php
-}
-
-?>
-
diff --git a/src/usr/local/www/system_firmware_check.php b/src/usr/local/www/system_firmware_check.php
deleted file mode 100644
index 692ed9c..0000000
--- a/src/usr/local/www/system_firmware_check.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/*
-	system_firmware_check.php
-*/
-/* ====================================================================
- *	Copyright (c)  2004-2015  Electric Sheep Fencing, LLC. All rights reserved.
- *
- *	Some or all of this file is based on the m0n0wall project which is
- *	Copyright (c)  2004 Manuel Kasper (BSD 2 clause)
- *
- *	Redistribution and use in source and binary forms, with or without modification,
- *	are permitted provided that the following conditions are met:
- *
- *	1. Redistributions of source code must retain the above copyright notice,
- *		this list of conditions and the following disclaimer.
- *
- *	2. Redistributions in binary form must reproduce the above copyright
- *		notice, this list of conditions and the following disclaimer in
- *		the documentation and/or other materials provided with the
- *		distribution.
- *
- *	3. All advertising materials mentioning features or use of this software
- *		must display the following acknowledgment:
- *		"This product includes software developed by the pfSense Project
- *		 for use in the pfSense software distribution. (http://www.pfsense.org/).
- *
- *	4. The names "pfSense" and "pfSense Project" must not be used to
- *		 endorse or promote products derived from this software without
- *		 prior written permission. For written permission, please contact
- *		 coreteam@pfsense.org.
- *
- *	5. Products derived from this software may not be called "pfSense"
- *		nor may "pfSense" appear in their names without prior written
- *		permission of the Electric Sheep Fencing, LLC.
- *
- *	6. Redistributions of any form whatsoever must retain the following
- *		acknowledgment:
- *
- *	"This product includes software developed by the pfSense Project
- *	for use in the pfSense software distribution (http://www.pfsense.org/).
- *
- *	THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
- *	EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- *	PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR
- *	ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *	NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- *	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- *	OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	====================================================================
- *
- */
-/*
-	pfSense_MODULE: firmware
-*/
-
-##|+PRIV
-##|*IDENT=page-system-firmware-autoupdate
-##|*NAME=System: Firmware: Auto Update page
-##|*DESCR=Allow access to the 'System: Firmware: Auto Update' page.
-##|*MATCH=system_firmware_check.php*
-##|-PRIV
-
-$d_isfwfile = 1;
-require("guiconfig.inc");
-require_once("pfsense-utils.inc");
-
-$curcfg = $config['system']['firmware'];
-$pgtitle = array(gettext("System"), gettext("Firmware"), gettext("Auto Update"));
-include("head.inc");
-
-$tab_array = array();
-$tab_array[] = array(gettext("Manual Update"), false, "system_firmware.php");
-$tab_array[] = array(gettext("Auto Update"), true, "system_firmware_check.php");
-$tab_array[] = array(gettext("Updater Settings"), false, "system_firmware_settings.php");
-display_top_tabs($tab_array);
-?>
-
-<form action="system_firmware_auto.php" method="post">
-	<div id="statusheading" class="panel panel-default">
-		<div class="panel-heading"><h2 class="panel-title"><?=gettext('Update progress')?></h2></div>
-		<div class="panel-body" name="output" id="output"></div>
-	</div>
-
-	<div id="backupdiv" style="visibility:hidden">
-		<?php if ($g['hidebackupbeforeupgrade'] === false): ?>
-		<br /><input type="checkbox" name="backupbeforeupgrade" id="backupbeforeupgrade" /><?=gettext("Perform full backup prior to upgrade")?>
-		<?php endif; ?>
-	</div>
-	<br />
-	<input id='invokeupgrade' class="btn btn-warning" style='visibility:hidden' type="submit" value="<?=gettext("Invoke Auto Upgrade"); ?>" />
-
-<?php
-
-/* Define necessary variables. */
-if (isset($curcfg['alturl']['enable'])) {
-	$updater_url = "{$config['system']['firmware']['alturl']['firmwareurl']}";
-} else {
-	$updater_url = $g['update_url'];
-}
-$needs_system_upgrade = false;
-$static_text .= gettext("Downloading new version information...");
-
-$nanosize = "";
-if ($g['platform'] == "nanobsd") {
-	if (!isset($g['enableserial_force'])) {
-		$nanosize = "-nanobsd-vga-";
-	} else {
-		$nanosize = "-nanobsd-";
-	}
-
-	$nanosize .= strtolower(trim(file_get_contents("/etc/nanosize.txt")));
-}
-
-if (download_file_with_progress_bar("{$updater_url}/version{$nanosize}", "/tmp/{$g['product_name']}_version", 'read_body', 5, 5) === true) {
-	$remote_version = trim(@file_get_contents("/tmp/{$g['product_name']}_version"));
-}
-$static_text .= gettext("done") . "\\n";
-if (!$remote_version) {
-	$static_text .= gettext("Unable to check for updates.") . "\\n";
-	if (isset($curcfg['alturl']['enable'])) {
-		$static_text .= gettext("Could not contact custom update server.") . "\\n";
-	} else {
-		$static_text .= sprintf(gettext('Could not contact %1$s update server %2$s%3$s'), $g['product_name'], $updater_url, "\\n");
-	}
-} else {
-	$static_text .= gettext("Obtaining current version information...");
-	panel_text($static_text);
-
-	$current_installed_buildtime = trim(file_get_contents("/etc/version.buildtime"));
-
-	$static_text .= "done<br />";
-	panel_text($static_text);
-
-	if (pfs_version_compare($current_installed_buildtime, $g['product_version'], $remote_version) == -1) {
-		$needs_system_upgrade = true;
-	} else {
-		$static_text .= "<br />" . gettext("You are on the latest version.") . "<br />";
-		panel_text($static_text);
-		panel_heading_class('success');
-	}
-}
-
-update_output_window($static_text);
-if ($needs_system_upgrade == false) {
-	print("</form>");
-	require("foot.inc");
-
-	exit;
-}
-?>
-<script>
-	events.push(function(){
-		$('#invokeupgrade').css('visibility','visible');
-		$('#backupdiv').css('visibility','visible');
-	});
-</script>
-<?php
-
-$txt  = gettext("A new version is now available") . "<br />";
-$txt .= gettext("Current version") .": ". $g['product_version'] . "<br />";
-if ($g['platform'] == "nanobsd") {
-	$txt .= "  " . gettext("NanoBSD Size") . " : " . trim(file_get_contents("/etc/nanosize.txt")) . "<br />";
-}
-$txt .= "	   " . gettext("Built On") .": ".  $current_installed_buildtime . "<br />";
-$txt .= "	" . gettext("New version") .": ".  htmlspecialchars($remote_version, ENT_QUOTES | ENT_HTML401). "<br /><br />";
-$txt .= "  " . gettext("Update source") .": ".	$updater_url . "<br />";
-panel_text($txt);
-panel_heading_class('info');
-?>
-
-</form>
-<?php
-
-// Update the class of the message panel so that it's color changes
-// Use danger, success, info, warning, default etc
-function panel_heading_class($newclass = 'default') {
-?>
-	<script>
-	events.push(function(){
-		$('#statusheading').removeClass().addClass('panel panel-' + '<?=$newclass?>');
-	});
-	</script>
-<?php
-}
-
-// Update the text in the panel-heading
-function panel_text($text) {
-?>
-	<script>
-	events.push(function(){
-		$('#output').html('<?=$text?>');
-	});
-	</script>
-<?php
-}
-
-include("foot.inc");
diff --git a/src/usr/local/www/system_firmware_settings.php b/src/usr/local/www/system_firmware_settings.php
index bbbe01e..5e62809 100644
--- a/src/usr/local/www/system_firmware_settings.php
+++ b/src/usr/local/www/system_firmware_settings.php
@@ -129,8 +129,6 @@ if ($savemsg)
 	print_info_box($savemsg, 'success');
 
 $tab_array = array();
-$tab_array[] = array(gettext("Manual Update"), false, "system_firmware.php");
-$tab_array[] = array(gettext("Auto Update"), false, "system_firmware_check.php");
 $tab_array[] = array(gettext("Updater Settings"), true, "system_firmware_settings.php");
 display_top_tabs($tab_array);