autoconfigbackup - code style fixes

- Fix copyright header
- Code style and whitespace fixes

N.B.: This code produces "Fatal error: Cannot redeclare stripos()" on any PHP5+ version, really no idea why's it still here for which prehistoric pfS versions. Not touching it otherwise.

1 files changed, 110 insertions, 110 deletions

diff --git a/config/autoconfigbackup/crypt_acb.php b/config/autoconfigbackup/crypt_acb.php
index 9f897cb5..29d6a74f 100644
--- a/config/autoconfigbackup/crypt_acb.php
+++ b/config/autoconfigbackup/crypt_acb.php
@@ -1,135 +1,135 @@
 <?php
-
-/* $Id$ */
 /*
-    Copyright (C) 2008 Shrew Soft Inc
-    All rights reserved.
-
-    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.
-
-    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.
-
-    DISABLE_PHP_LINT_CHECKING
+	crypt_acb.php
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2008 Shrew Soft Inc
+	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:
+
+	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.
+
+	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.
+
+	DISABLE_PHP_LINT_CHECKING
 */
-
-	function crypt_data($val, $pass, $opt) {
-		$file = tempnam("/tmp", "php-encrypt");
-		file_put_contents("{$file}.dec", $val);
-		exec("/usr/bin/openssl enc {$opt} -aes-256-cbc -in {$file}.dec -out {$file}.enc -k " . escapeshellarg($pass));
-		if (file_exists("{$file}.enc"))
-			$result = file_get_contents("{$file}.enc");
-		else {
-			$result = "";
-			log_error("Failed to encrypt/decrypt data!");
-		}
-		@unlink($file);
-		@unlink("{$file}.dec");
-		@unlink("{$file}.enc");
-		return $result;
+function crypt_data($val, $pass, $opt) {
+	$file = tempnam("/tmp", "php-encrypt");
+	file_put_contents("{$file}.dec", $val);
+	exec("/usr/bin/openssl enc {$opt} -aes-256-cbc -in {$file}.dec -out {$file}.enc -k " . escapeshellarg($pass));
+	if (file_exists("{$file}.enc")) {
+		$result = file_get_contents("{$file}.enc");
+	} else {
+		$result = "";
+		log_error("Failed to encrypt/decrypt data!");
 	}
-
-	function crypt_dataA(& $data, $pass, $opt) {
-		log_error("entering crypt_data()");
-		$pspec = "/usr/bin/openssl enc {$opt} -aes-256-cbc -k {$pass}";
-		$dspec = array( 0 => array("pipe", "r"),
-				1 => array("pipe", "w"),
-				2 => array("pipe", "e"));
-		log_error("proc_open");
-		$fp = proc_open($pspec, $dspec, $pipes);
-		if (!$fp)
-			return false;
-		log_error("writing to pipe[0]");
-		fwrite($pipes[0], $data);
-		log_error("closing pipe[0]");
-		fclose($pipes[0]);
-		
-		log_error("enter while()");
-		
-		while (!feof($pipes[1])) {
-		  $rslt .= fread($pipes[1], 8192);
-		}
-		
-		log_error("exit while()");
-		
-		fclose($pipes[1]);
-
-		proc_close($fp);
-
-		return $rslt;
+	unlink_if_exists($file);
+	unlink_if_exists("{$file}.dec");
+	unlink_if_exists("{$file}.enc");
+	return $result;
+}
+
+function crypt_dataA(& $data, $pass, $opt) {
+	log_error("entering crypt_data()");
+	$pspec = "/usr/bin/openssl enc {$opt} -aes-256-cbc -k {$pass}";
+	$dspec = array( 0 => array("pipe", "r"),
+			1 => array("pipe", "w"),
+			2 => array("pipe", "e"));
+	log_error("proc_open");
+	$fp = proc_open($pspec, $dspec, $pipes);
+	if (!$fp) {
+		return false;
 	}
+	log_error("writing to pipe[0]");
+	fwrite($pipes[0], $data);
+	log_error("closing pipe[0]");
+	fclose($pipes[0]);
 
-	function encrypt_data(& $data, $pass) {
-		return trim(base64_encode(crypt_data($data, $pass, "-e")));
-	}
+	log_error("enter while()");
 
-	function decrypt_data(& $data, $pass) {
-		return trim(crypt_data(base64_decode($data), $pass, "-d"));
+	while (!feof($pipes[1])) {
+		$rslt .= fread($pipes[1], 8192);
 	}
 
-	function tagfile_reformat($in, & $out, $tag) {
+	log_error("exit while()");
+	fclose($pipes[1]);
+	proc_close($fp);
+	return $rslt;
+}
 
-		$out = "---- BEGIN {$tag} ----\n";
+function encrypt_data(& $data, $pass) {
+	return trim(base64_encode(crypt_data($data, $pass, "-e")));
+}
 
-		$size = 80;
-		$oset = 0;
-		while ($size >= 64) {
-			$line = substr($in, $oset, 64);
-			$out .= $line."\n";
-			$size = strlen($line);
-			$oset += $size;
-		}
+function decrypt_data(& $data, $pass) {
+	return trim(crypt_data(base64_decode($data), $pass, "-d"));
+}
 
-		$out .= "---- END {$tag} ----";
+function tagfile_reformat($in, & $out, $tag) {
 
-		$out = trim($out);
+	$out = "---- BEGIN {$tag} ----\n";
 
-		return true;
+	$size = 80;
+	$oset = 0;
+	while ($size >= 64) {
+		$line = substr($in, $oset, 64);
+		$out .= $line."\n";
+		$size = strlen($line);
+		$oset += $size;
 	}
 
-	function tagfile_deformat($in, & $out, $tag) {
-
-		$btag_val = "---- BEGIN {$tag} ----";
-		$etag_val = "---- END {$tag} ----";
+	$out .= "---- END {$tag} ----";
 
-		$btag_len = strlen($btag_val);
-		$etag_len = strlen($etag_val);
+	$out = trim($out);
 
-		$btag_pos = stripos($in, $btag_val);
-		$etag_pos = stripos($in, $etag_val);
+	return true;
+}
 
-		if (($btag_pos === false) || ($etag_pos === false))
-			return false;
+function tagfile_deformat($in, &$out, $tag) {
 
-		$body_pos = $btag_pos + $btag_len;
-		$body_len = strlen($in);
-		$body_len -= strlen($btag_len);
-		$body_len -= strlen($etag_len);
+	$btag_val = "---- BEGIN {$tag} ----";
+	$etag_val = "---- END {$tag} ----";
 
-		$out = substr($in, $body_pos, $body_len);
+	$btag_len = strlen($btag_val);
+	$etag_len = strlen($etag_val);
 
-		$out = trim($out);
+	$btag_pos = stripos($in, $btag_val);
+	$etag_pos = stripos($in, $etag_val);
 
-		return true;
-	}
-	
-	function stripos($str,$needle) {
-		return strpos(strtolower($str), strtolower($needle));
+	if (($btag_pos === false) || ($etag_pos === false)) {
+		return false;
 	}
 
+	$body_pos = $btag_pos + $btag_len;
+	$body_len = strlen($in);
+	$body_len -= strlen($btag_len);
+	$body_len -= strlen($etag_len);
+
+	$out = substr($in, $body_pos, $body_len);
+
+	$out = trim($out);
+
+	return true;
+}
+
+function stripos($str, $needle) {
+	return strpos(strtolower($str), strtolower($needle));
+}
+
+?>