Code style system firmware

author: Phil Davis <phil.davis@inf.org> 2015-05-30 17:11:24 +0545
committer: Phil Davis <phil.davis@inf.org> 2015-05-30 17:11:24 +0545
commit: 0e88de0c3bd7736f6dd949063270b18ef84b5274 (patch)
tree: f54120190540a7ff70c4d91d5f1f344c24fbc6a4 /usr/local/www/system_firmware.php
parent: 5dcec9f242a94894086dd425ecf9d2f00ccdebd5 (diff)
download: pfsense-0e88de0c3bd7736f6dd949063270b18ef84b5274.zip
pfsense-0e88de0c3bd7736f6dd949063270b18ef84b5274.tar.gz
1 files changed, 125 insertions, 97 deletions
diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php
index 2eb0589..b3564c0 100644
--- a/usr/local/www/system_firmware.php
+++ b/usr/local/www/system_firmware.php
@@ -59,16 +59,18 @@ 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"))
+	if ($g['platform'] == "nanobsd") {
+		if (stristr($ul_name, "nanobsd")) {
 			return true;
-		else
+		} else {
 			return false;
+		}
 	}
 	$_gb = exec("/usr/bin/tar xzf $filename -C /tmp/ etc/platform");
 	unset($_gb);
-	if(!file_exists("/tmp/etc/platform"))
+	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");
@@ -79,28 +81,28 @@ function file_is_for_platform($filename, $ul_name) {
 
 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');
+		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"));
+if (is_subsystem_dirty('firmwarelock')) {
+	$pgtitle = array(gettext("System"), gettext("Firmware"), gettext("Manual Update"));
 	include("head.inc");
 	echo "<body link=\"#0000CC\" vlink=\"#0000CC\" alink=\"#0000CC\">\n";
 	include("fbegin.inc");
@@ -113,8 +115,9 @@ if(is_subsystem_dirty('firmwarelock')) {
 	exit;
 }
 
-if($_POST['backupbeforeupgrade'])
+if ($_POST['backupbeforeupgrade']) {
 	touch("/tmp/perform_full_backup.txt");
+}
 
 /* Handle manual upgrade */
 if ($_POST && !is_subsystem_dirty('firmwarelock')) {
@@ -122,15 +125,16 @@ if ($_POST && !is_subsystem_dirty('firmwarelock')) {
 	unset($input_errors);
 	unset($sig_warning);
 
-	if (stristr($_POST['Submit'], gettext("Enable")))
+	if (stristr($_POST['Submit'], gettext("Enable"))) {
 		$mode = "enable";
-	else if (stristr($_POST['Submit'], gettext("Disable")))
+	} else if (stristr($_POST['Submit'], gettext("Disable"))) {
 		$mode = "disable";
-	else if (stristr($_POST['Submit'], gettext("Upgrade")) || $_POST['sig_override'])
+	} 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");
+	} else if ($_POST['sig_no']) {
+		if (file_exists("{$g['upload_path']}/firmware.tgz")) {
+			unlink("{$g['upload_path']}/firmware.tgz");
+		}
 	}
 	if ($mode) {
 		if ($mode == "enable") {
@@ -140,13 +144,14 @@ if ($_POST && !is_subsystem_dirty('firmwarelock')) {
 			conf_mount_ro();
 			clear_subsystem_dirty('firmware');
 		} else if ($mode == "upgrade") {
-			if ($_FILES['ulfile']['error'])
+			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'])
+				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'])) {
+				} 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");
@@ -158,12 +163,13 @@ if ($_POST && !is_subsystem_dirty('firmwarelock')) {
 					/* check digital signature */
 					$sigchk = verify_digital_signature("{$g['upload_path']}/firmware.tgz");
 
-					if ($sigchk == 1)
+					if ($sigchk == 1) {
 						$sig_warning = gettext("The digital signature on this image is invalid.");
-					else if ($sigchk == 2 && !isset($config['system']['firmware']['allowinvalidsig']))
+					} else if ($sigchk == 2 && !isset($config['system']['firmware']['allowinvalidsig'])) {
 						$sig_warning = gettext("This image is not digitally signed.");
-					else if (($sigchk >= 3))
+					} 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.");
@@ -180,26 +186,28 @@ if ($_POST && !is_subsystem_dirty('firmwarelock')) {
 					/* 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")
+					if (stristr($_FILES['ulfile']['name'], "nanobsd") or $_POST['isnano'] == "yes") {
 						mwexec_bg("/etc/rc.firmware pfSenseNanoBSDupgrade {$g['upload_path']}/firmware.tgz");
-					else if(stristr($_FILES['ulfile']['name'],"bdiff"))
+					} else if (stristr($_FILES['ulfile']['name'], "bdiff")) {
 						mwexec_bg("/etc/rc.firmware delta_update {$g['upload_path']}/firmware.tgz");
-					else  {
-						if($g['platform'] == "nanobsd")
+					} else  {
+						if ($g['platform'] == "nanobsd") {
 							$whichone = "pfSenseNanoBSDupgrade";
-						else
+						} 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);
+				} else {
+					$savemsg = sprintf(gettext("Firmware image missing or other error, please try again %s."), $errortext);
+				}
 			}
 		}
 	}
 }
 
-$pgtitle = array(gettext("System"),gettext("Firmware"));
+$pgtitle = array(gettext("System"), gettext("Firmware"));
 include("head.inc");
 
 ?>
@@ -207,73 +215,83 @@ include("head.inc");
 <form action="system_firmware.php" method="post" enctype="multipart/form-data">
 <?php
 	/* Construct an upload_id for this session */
-	if (!session_id())
+	if (!session_id()) {
 		$upload_id = uniqid();
-	else
+	} else {
 		$upload_id = session_id();
+	}
 ?>
 <input type="hidden" name="UPLOAD_IDENTIFIER" value="<?php echo $upload_id;?>" />
 <?php include("fbegin.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if ($fwinfo <> "") print_info_box($fwinfo); ?>
-<?php if ($sig_warning && !$input_errors): ?>
 <?php
-	$sig_warning = "<strong>" . $sig_warning . "</strong><br />" . gettext("This means that 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);
-if(stristr($_FILES['ulfile']['name'],"nanobsd"))
-	echo "<input type='hidden' name='isnano' id='isnano' value='yes' />\n";
+	if ($sig_warning && !$input_errors):
+		$sig_warning = "<strong>" . $sig_warning . "</strong><br />" . gettext("This means that 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);
+		if (stristr($_FILES['ulfile']['name'], "nanobsd")) {
+			echo "<input type='hidden' name='isnano' id='isnano' value='yes' />\n";
+		}
 ?>
 <input name="sig_override" type="submit" class="formbtn" id="sig_override" value=" <?=gettext("Yes");?> " />
 <input name="sig_no" type="submit" class="formbtn" id="sig_no" value=" <?=gettext("No"); ?> " />
-<?php else: ?>
-<?php if (!is_subsystem_dirty('firmwarelock')): ?>
+<?php
+	else:
+		if (!is_subsystem_dirty('firmwarelock')):
+?>
 	<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="firmware">
 		<tr>
 			<td>
 <?php
-	$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");
-	if($g['hidedownloadbackup'] == false)
-		$tab_array[] = array(gettext("Restore Full Backup"), false, "system_firmware_restorefullbackup.php");
-	display_top_tabs($tab_array);
+			$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");
+			if ($g['hidedownloadbackup'] == false) {
+				$tab_array[] = array(gettext("Restore Full Backup"), false, "system_firmware_restorefullbackup.php");
+			}
+			display_top_tabs($tab_array);
 ?>
 			</td>
 		</tr>
 		<tr>
 			<td>
 				<div id="mainarea">
-					<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
+				<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
 					<tr>
 						<td colspan="2" class="listtopic"><?=gettext("Invoke") ." ". $g['product_name'] ." ".  gettext("Manual Upgrade"); ?></td>
 					</tr>
 					<tr>
 						<td width="22%" valign="baseline" class="vncell">&nbsp;</td>
 						<td width="78%" class="vtable">
-						<?php if (!is_subsystem_dirty('rebootreq')): ?>
-						<?php if (!is_subsystem_dirty('firmware')): ?>
-						<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Enable firmware upload");?>" />
-						<br />
-							<?php printf(gettext('Click "Enable firmware upload" to begin.'),$g['firmware_update_text']);?>
-						<br />
-						<?php else: ?>
+<?php
+			if (!is_subsystem_dirty('rebootreq')):
+				if (!is_subsystem_dirty('firmware')):
+?>
+							<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Enable firmware upload");?>" />
+							<br />
+							<?php printf(gettext('Click "Enable firmware upload" to begin.'), $g['firmware_update_text']);?>
+							<br />
+<?php
+				else:
+?>
 							<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Disable firmware upload");?>" />
-					</td>
+						</td>
 					</tr>
 					<tr>
 						<td width="22%" valign="baseline" class="vncell">&nbsp;</td>
 						<td width="78%" class="vtable">
 							<?php
-								if ($g['platform'] == "nanobsd")
+								if ($g['platform'] == "nanobsd") {
 									$type = "*.img.gz";
-								else
+								} else {
 									$type = "*.tgz";
+								}
 							?>
 							<strong><?=gettext("Firmware image file ($type):");?> </strong>
 							<input name="ulfile" type="file" class="formfld" />
@@ -284,33 +302,43 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd"))
 							<?php endif; ?>
 							<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Upgrade firmware");?>" />
 							<?=gettext('Click "Upgrade firmware" to start the upgrade process.');?>
-						<?php endif; else: ?>
+<?php
+				endif;
+			else:
+?>
 							<strong><?=gettext("You must reboot the system before you can upgrade the firmware.");?></strong>
-						<?php endif; ?>
-				</td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top">&nbsp;</td>
-				<td width="78%">
+<?php
+			endif;
+?>
+						</td>
+					</tr>
+					<tr>
+						<td width="22%" valign="top">&nbsp;</td>
+						<td width="78%">
 						<?php if (is_subsystem_dirty('firmware')): ?>
-					<span class="vexpl">
-						<span class="red">
-							<strong>
-								<?=gettext("Warning:");?><br />
-							</strong>
-						</span>
-						<?=gettext("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.");?>
-					</span>
+							<span class="vexpl">
+								<span class="red">
+									<strong>
+										<?=gettext("Warning:");?><br />
+									</strong>
+								</span>
+								<?=gettext("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.");?>
+							</span>
 						<?php endif; ?>
-				</td></tr>
-			</table>
-		</div>
-	</td></tr>
-</table>
+						</td>
+					</tr>
+				</table>
+				</div>
+			</td>
+		</tr>
+	</table>
 
-<?php endif; endif; ?>
+<?php
+		endif;
+	endif;
+?>
 <?php include("fend.inc"); ?>
 </form>
 </body>
author	Phil Davis <phil.davis@inf.org>	2015-05-30 17:11:24 +0545
committer	Phil Davis <phil.davis@inf.org>	2015-05-30 17:11:24 +0545
commit	0e88de0c3bd7736f6dd949063270b18ef84b5274 (patch)
tree	f54120190540a7ff70c4d91d5f1f344c24fbc6a4 /usr/local/www/system_firmware.php
parent	5dcec9f242a94894086dd425ecf9d2f00ccdebd5 (diff)
download	pfsense-0e88de0c3bd7736f6dd949063270b18ef84b5274.zip pfsense-0e88de0c3bd7736f6dd949063270b18ef84b5274.tar.gz