functions.php - code style fixes

1 files changed, 103 insertions, 71 deletions

diff --git a/config/filemgr/rbfminc/functions.php b/config/filemgr/rbfminc/functions.php
index 8dffd5e4..bab912a7 100644
--- a/config/filemgr/rbfminc/functions.php
+++ b/config/filemgr/rbfminc/functions.php
@@ -1,118 +1,149 @@
 <?php
-function RecursiveFolderDelete ( $folderPath )
-{
-	if ( is_dir ( $folderPath ) )
-	{
-		foreach ( scandir ( $folderPath )  as $value )
-		{
-			if ( $value != "." && $value != ".." )
-			{
+/*
+	functions.php
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2010 Tom Schaefer <tom@tomschaefer.org>
+	Copyright (C) 2015 ESF, LLC
+	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.
+*/
+function RecursiveFolderDelete($folderPath) {
+	if (is_dir($folderPath )) {
+		foreach (scandir($folderPath) as $value) {
+			if ($value != "." && $value != "..") {
 				$value = $folderPath . "/" . $value;
-				if ( is_dir ( $value ) )
-				{
-					RecursiveFolderDelete ( $value );
-				}
-				elseif ( is_file ( $value ) )
-				{
-					@unlink ( $value );
+				if (is_dir($value)) {
+					RecursiveFolderDelete($value);
+				} elseif (is_file($value)) {
+					@unlink($value);
 				}
 			}
 		}
-		if(!@rmdir ( $folderPath )){
+		if (!@rmdir($folderPath)) {
 			return FALSE;
-		}else{
+		} else {
 			return TRUE;
 		}
-	}
-	else
-	{
+	} else {
 		return FALSE;
 	}
 }
 
 
-
 function GetFilePerms($file) {
-   $perms = fileperms($file);
-   if (($perms & 0xC000) == 0xC000) {$info = 's'; } // Socket
-   elseif (($perms & 0xA000) == 0xA000) {$info = 'l'; } // Symbolic Link
-   elseif (($perms & 0x8000) == 0x8000) {$info = '-'; } // Regular
-   elseif (($perms & 0x6000) == 0x6000) {$info = 'b'; } // Block special
-   elseif (($perms & 0x4000) == 0x4000) {$info = 'd'; } // Directory
-   elseif (($perms & 0x2000) == 0x2000) {$info = 'c'; } // Character special
-   elseif (($perms & 0x1000) == 0x1000) {$info = 'p'; } // FIFO pipe
-   else {$info = '?';} // Unknown
-   // Owner
-   $info .= " ".(($perms & 0x0100) ? 'r' : '-');
-   $info .= (($perms & 0x0080) ? 'w' : '-');
-   $info .= (($perms & 0x0040) ?
-  (($perms & 0x0800) ? 's' : 'x' ) :
-  (($perms & 0x0800) ? 'S' : '-'));
-   // Group
-   $info .= " ".(($perms & 0x0020) ? 'r' : '-');
-   $info .= (($perms & 0x0010) ? 'w' : '-');
-   $info .= (($perms & 0x0008) ?
-    (($perms & 0x0400) ? 's' : 'x' ) :
-    (($perms & 0x0400) ? 'S' : '-'));
-   // World
-   $info .= " ".(($perms & 0x0004) ? 'r' : '-');
-   $info .= (($perms & 0x0002) ? 'w' : '-');
-   $info .= (($perms & 0x0001) ?
-  (($perms & 0x0200) ? 't' : 'x' ) :
-  (($perms & 0x0200) ? 'T' : '-'));
- 
-  $info = "[".substr(sprintf('%o', fileperms($file)), -4)."] ".$info;
- 
- return $info;
-}
+	$perms = fileperms($file);
+	
+	if (($perms & 0xC000) == 0xC000) {
+		// Socket
+		$info = 's';
+	} elseif (($perms & 0xA000) == 0xA000) {
+		// Symbolic Link
+		$info = 'l';
+	} elseif (($perms & 0x8000) == 0x8000) {
+		// Regular
+		$info = '-';
+	} elseif (($perms & 0x6000) == 0x6000) {
+		// Block special
+		$info = 'b';
+	} elseif (($perms & 0x4000) == 0x4000) {
+		// Directory
+		$info = 'd';
+	} elseif (($perms & 0x2000) == 0x2000) {
+		// Character special
+		$info = 'c';
+	} elseif (($perms & 0x1000) == 0x1000) {
+		// FIFO pipe
+		$info = 'p';
+	} else {
+		// Unknown
+		$info = '?';
+	}
 
+	// Owner
+	$info .= " " . (($perms & 0x0100) ? 'r' : '-');
+	$info .= (($perms & 0x0080) ? 'w' : '-');
+	$info .= (($perms & 0x0040) ? (($perms & 0x0800) ? 's' : 'x' ) : (($perms & 0x0800) ? 'S' : '-'));
+	// Group
+	$info .= " " . (($perms & 0x0020) ? 'r' : '-');
+	$info .= (($perms & 0x0010) ? 'w' : '-');
+	$info .= (($perms & 0x0008) ? (($perms & 0x0400) ? 's' : 'x' ) : (($perms & 0x0400) ? 'S' : '-'));
+	// World
+	$info .= " ".(($perms & 0x0004) ? 'r' : '-');
+	$info .= (($perms & 0x0002) ? 'w' : '-');
+	$info .= (($perms & 0x0001) ? (($perms & 0x0200) ? 't' : 'x' ) : (($perms & 0x0200) ? 'T' : '-'));
+
+	$info = "[" . substr(sprintf('%o', fileperms($file)), -4) . "] " . $info;
+	return $info;
+}
 
 
 function merge_filters($tag) {
 	global $wp_filter, $merged_filters;
 
-	if ( isset($wp_filter['all']) && is_array($wp_filter['all']) )
+	if (isset($wp_filter['all']) && is_array($wp_filter['all'])) {
 		$wp_filter[$tag] = array_merge($wp_filter['all'], (array) $wp_filter[$tag]);
+	}
 
-	if ( isset($wp_filter[$tag]) ){
+	if (isset($wp_filter[$tag])) {
 		reset($wp_filter[$tag]);
 		uksort($wp_filter[$tag], "strnatcasecmp");
 	}
-	$merged_filters[ $tag ] = true;
+	$merged_filters[$tag] = true;
 }
 
 
-
 function apply_filters($tag, $string) {
 	global $wp_filter, $merged_filters;
 
-	if ( !isset( $merged_filters[ $tag ] ) )
+	if (!isset($merged_filters[$tag])) {
 		merge_filters($tag);
+	}
 
-	if ( !isset($wp_filter[$tag]) )
+	if (!isset($wp_filter[$tag])) {
 		return $string;
+	}
 
-	reset( $wp_filter[ $tag ] );
+	reset($wp_filter[$tag]);
 
 	$args = func_get_args();
 
-	do{
-		foreach( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) ){
+	do {
+		foreach ((array)current($wp_filter[$tag]) as $the_) {
+			if (!is_null($the_['function'])) {
 				$args[1] = $string;
 				$string = call_user_func_array($the_['function'], array_slice($args, 1, (int) $the_['accepted_args']));
 			}
+		}
 
-	} while ( next($wp_filter[$tag]) !== false );
+	} while (next($wp_filter[$tag]) !== false);
 
 	return $string;
 } 
 
 
-
 function wp_check_filetype($filename, $mimes = null) {
 	// Accepted MIME types are set here as PCRE unless provided.
-	$mimes = is_array($mimes) ? $mimes : apply_filters('upload_mimes', array (
+	$mimes = is_array($mimes) ? $mimes : apply_filters('upload_mimes', array(
 		'jpg|jpeg|jpe' => 'image/jpeg',
 		'gif' => 'image/gif',
 		'png' => 'image/png',
@@ -165,7 +196,7 @@ function wp_check_filetype($filename, $mimes = null) {
 
 	foreach ($mimes as $ext_preg => $mime_match) {
 		$ext_preg = '!\.(' . $ext_preg . ')$!i';
-		if ( preg_match($ext_preg, $filename, $ext_matches) ) {
+		if (preg_match($ext_preg, $filename, $ext_matches)) {
 			$type = $mime_match;
 			$ext = $ext_matches[1];
 			break;
@@ -177,13 +208,14 @@ function wp_check_filetype($filename, $mimes = null) {
 
 
 
-function roundsize($size){
+function roundsize($size) {
 	$i=0;
 	$iec = array("B", "Kb", "Mb", "Gb", "Tb");
 	while (($size/1024)>1) {
-	$size=$size/1024;
-	$i++;}
-	return(round($size,1)." ".$iec[$i]);
+		$size=$size/1024;
+		$i++;
+	}
+	return(round($size, 1) . " " . $iec[$i]);
 }
 
 ?>