From 64bedf7f5cd87c07ddbb424f72314b9e1c043080 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Sun, 23 Aug 2015 14:04:53 +0200
Subject: autoconfigbackup - code style fixes

- Fix copyright header
- Code style and whitespace fixes
- XHTML fixes
---
 .../autoconfigbackup/autoconfigbackup_backup.php   | 156 ++++++++++-----------
 1 file changed, 74 insertions(+), 82 deletions(-)

diff --git a/config/autoconfigbackup/autoconfigbackup_backup.php b/config/autoconfigbackup/autoconfigbackup_backup.php
index 3c5ea423..ee08d170 100644
--- a/config/autoconfigbackup/autoconfigbackup_backup.php
+++ b/config/autoconfigbackup/autoconfigbackup_backup.php
@@ -1,128 +1,120 @@
 <?php
-/* $Id$ */
 /*
-    autoconfigbackup_backup.php
-    Copyright (C) 2008 Scott Ullrich
-    All rights reserved.
+	autoconfigbackup_backup.php
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2008 Scott Ullrich
+	Copyright (C) 2008-2015 Electric Sheep Fencing LP
+	All rights reserved.
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
+	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.
+	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.
+	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.
 
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS 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
-    AUTHOR 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.
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS 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
+	AUTHOR 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.
 */
-
 require("globals.inc");
 require("guiconfig.inc");
 require("autoconfigbackup.inc");
 
-$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
-if ($pf_version < 2.0)
+global $pf_version;
+$pf_version = substr(trim(file_get_contents("/etc/version")), 0, 3);
+if ($pf_version < 2.0) {
 	require("crypt_acb.php");
+}
 
-if(!$config['installedpackages']['autoconfigbackup']['config'][0]['username']) {
+if (!$config['installedpackages']['autoconfigbackup']['config'][0]['username']) {
 	Header("Location: /pkg_edit.php?xml=autoconfigbackup.xml&id=0&savemsg=Please+setup+Auto+Config+Backup");
 	exit;
 }
 
-if($_POST) {	
-	if($_REQUEST['nooverwrite'])
+if ($_POST) {
+	if ($_REQUEST['nooverwrite']) {
 		touch("/tmp/acb_nooverwrite");
-	if($_REQUEST['reason']) 
+	}
+	if ($_REQUEST['reason']) {
 		write_config($_REQUEST['reason']);
-	else 
+	} else {
 		write_config("Backup invoked via Auto Config Backup.");
+	}
 	$config = parse_config(true);
 	conf_mount_rw();
-	@unlink("/cf/conf/lastpfSbackup.txt", "");
+	unlink_if_exists("/cf/conf/lastpfSbackup.txt");
 	conf_mount_ro();
 	upload_config($_REQUEST['reason']);
 	$savemsg = "Backup completed successfully.";
-	$donotshowheader=true;
+	$donotshowheader = true;
 }
 
 $pgtitle = "Diagnostics: Auto Configuration Backup Now";
-
 include("head.inc");
 
 ?>
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <div id='maincontent'>
 <?php
-	include("fbegin.inc"); 
-	if ($pf_version < 2.0)
+	include("fbegin.inc");
+	if ($pf_version < 2.0) {
 		echo "<p class=\"pgtitle\">{$pgtitle}</p>";
-	if($savemsg) {
+	}
+	if ($savemsg) {
 		print_info_box($savemsg);
-	}	
-	if ($input_errors)
+	}
+	if ($input_errors) {
 		print_input_errors($input_errors);
-
+	}
 ?>
 <form method="post" action="autoconfigbackup_backup.php">
-<table width="100%" border="0" cellpadding="0" cellspacing="0">  
-	<tr>
-		<td>
-			<div id='feedbackdiv'>
-			</div>
-			<?php
-				$tab_array = array();
-				$tab_array[] = array("Settings", false, "/pkg_edit.php?xml=autoconfigbackup.xml&amp;id=0");
-				$tab_array[] = array("Restore", false, "/autoconfigbackup.php");
-				$tab_array[] = array("Backup now", true, "/autoconfigbackup_backup.php");
-				$tab_array[] = array("Stats", false, "/autoconfigbackup_stats.php");
-				display_top_tabs($tab_array);
-			?>			
-  		</td>
-	</tr>
-  	<tr>
-    	<td>
-			<table id="backuptable" class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0">
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr><td>
+	<div id='feedbackdiv'></div>
+	<?php
+		$tab_array = array();
+		$tab_array[] = array("Settings", false, "/pkg_edit.php?xml=autoconfigbackup.xml&amp;id=0");
+		$tab_array[] = array("Restore", false, "/autoconfigbackup.php");
+		$tab_array[] = array("Backup now", true, "/autoconfigbackup_backup.php");
+		$tab_array[] = array("Stats", false, "/autoconfigbackup_stats.php");
+		display_top_tabs($tab_array);
+	?>
+</td></tr>
+<tr><td>
+	<table id="backuptable" class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0">
+		<tr><td colspan="2" align="left">
+			<table>
+				<tr>
+					<td align="right">Enter the backup reason:</td>
+					<td>
+						<input name="reason" id="reason" size="80" />
+					</td>
+				</tr>
+				<tr>
+					<td>&nbsp;</td>
+				</tr>
 				<tr>
-					<td colspan="2" align="left">
-						<table>
-							<tr>
-								<td align="right">
-									Enter the backup reason:
-								</td>
-								<td>
-									<input name="reason" id="reason" size="80">
-								</td>
-							</tr>
-							<tr>
-								<td>
-									&nbsp;
-								</td>
-							</tr>
-							<tr>
-								<td align="right">
-									<input type="submit" name="Backup" value="Backup">
-								</td>
-							</tr>
-						</table>
+					<td align="right">
+						<input type="submit" name="Backup" value="Backup" />
 					</td>
 				</tr>
 			</table>
-		</td>
-	</tr>
-	</div>
-	</td>
-  </tr>
+		</td></tr>
+	</table>
+</td></tr>
+</div>
+</td></tr>
 </table>
 </form>
 <?php include("fend.inc"); ?>
-- 
cgit v1.2.3