From 32d82fd5ce8d0cb383608100744f243723b8e159 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 22 Jan 2016 15:29:20 +0100
Subject: [PATCH] (legacy) spacing legacy.inc

---
 src/etc/inc/xmlrpc/legacy.inc | 143 ++++++++++++++++------------------
 1 file changed, 68 insertions(+), 75 deletions(-)

diff --git a/src/etc/inc/xmlrpc/legacy.inc b/src/etc/inc/xmlrpc/legacy.inc
index c0e0ad86f..e46bf010a 100644
--- a/src/etc/inc/xmlrpc/legacy.inc
+++ b/src/etc/inc/xmlrpc/legacy.inc
@@ -39,7 +39,6 @@ function xmlrpc_publishable_legacy()
         'firmware_version_xmlrpc','reboot_xmlrpc','get_notices_xmlrpc'
     );
 
-
     return $publish;
 }
 
@@ -48,88 +47,86 @@ function xmlrpc_publishable_legacy()
  * configured.
  */
 function does_vip_exist($vip) {
-	global $config;
+    global $config;
 
-	if(!$vip)
-		return false;
+    if(!$vip) {
+        return false;
+    }
 
+    switch ($vip['mode']) {
+        case "carp":
+        case "ipalias":
+            /* XXX: Make proper checks? */
+            $realif = get_real_interface($vip['interface']);
+            if (!does_interface_exist($realif)) {
+                return false;
+            }
+            break;
+        case "proxyarp":
+            /* XXX: Implement this */
+        default:
+            return false;
+    }
 
-	switch ($vip['mode']) {
-	case "carp":
-	case "ipalias":
-		/* XXX: Make proper checks? */
-		$realif = get_real_interface($vip['interface']);
-		if (!does_interface_exist($realif)) {
-			return false;
-		}
-		break;
-	case "proxyarp":
-		/* XXX: Implement this */
-	default:
-		return false;
-	}
+    $ifacedata = pfSense_getall_interface_addresses($realif);
+    foreach ($ifacedata as $vipips) {
+        if ($vipips == "{$vip['subnet']}/{$vip['subnet_bits']}") {
+            return true;
+        }
+    }
 
-	$ifacedata = pfSense_getall_interface_addresses($realif);
-	foreach ($ifacedata as $vipips) {
-		if ($vipips == "{$vip['subnet']}/{$vip['subnet_bits']}")
-			return true;
-	}
-
-	return false;
+    return false;
 }
 
 /*
-	This function was borrowed from a comment on PHP.net at the following URL:
-	http://www.php.net/manual/en/function.array-merge-recursive.php#73843
+  This function was borrowed from a comment on PHP.net at the following URL:
+  http://www.php.net/manual/en/function.array-merge-recursive.php#73843
  */
 function array_merge_recursive_unique($array0, $array1) {
+    $arrays = func_get_args();
+    $remains = $arrays;
 
-	$arrays = func_get_args();
-	$remains = $arrays;
+    // We walk through each arrays and put value in the results (without
+    // considering previous value).
+    $result = array();
 
-	// We walk through each arrays and put value in the results (without
-	// considering previous value).
-	$result = array();
+    // loop available array
+    foreach($arrays as $array) {
+        // The first remaining array is $array. We are processing it. So
+        // we remove it from remaing arrays.
+        array_shift($remains);
+        // We don't care non array param, like array_merge since PHP 5.0.
+        if(is_array($array)) {
+            // Loop values
+            foreach($array as $key => $value) {
+                if(is_array($value)) {
+                    // we gather all remaining arrays that have such key available
+                    $args = array();
+                    foreach($remains as $remain) {
+                        if(array_key_exists($key, $remain)) {
+                            array_push($args, $remain[$key]);
+                        }
+                    }
 
-	// loop available array
-	foreach($arrays as $array) {
-
-		// The first remaining array is $array. We are processing it. So
-		// we remove it from remaing arrays.
-		array_shift($remains);
-
-		// We don't care non array param, like array_merge since PHP 5.0.
-		if(is_array($array)) {
-			// Loop values
-			foreach($array as $key => $value) {
-				if(is_array($value)) {
-					// we gather all remaining arrays that have such key available
-					$args = array();
-					foreach($remains as $remain) {
-						if(array_key_exists($key, $remain)) {
-							array_push($args, $remain[$key]);
-						}
-					}
-
-					if(count($args) > 2) {
-						// put the recursion
-						$result[$key] = call_user_func_array(__FUNCTION__, $args);
-					} else {
-						foreach($value as $vkey => $vval) {
-							if (!isset($result[$key]) || !is_array($result[$key])) {
-								$result[$key] = array();
-							}
-							$result[$key][$vkey] = $vval;
-						}
-					}
-				} else {
-					// simply put the value
-					$result[$key] = $value;
-				}
-			}
-		}
-	}
-	return $result;
+                    if(count($args) > 2) {
+                        // put the recursion
+                        $result[$key] = call_user_func_array(__FUNCTION__, $args);
+                    } else {
+                        foreach($value as $vkey => $vval) {
+                            if (!isset($result[$key]) || !is_array($result[$key])) {
+                                $result[$key] = array();
+                            }
+                            $result[$key][$vkey] = $vval;
+                        }
+                    }
+                } else {
+                    // simply put the value
+                    $result[$key] = $value;
+                }
+            }
+        }
+    }
+    return $result;
 }
 
 
@@ -146,7 +143,6 @@ function get_notices_xmlrpc($category = null)
     } else {
         return get_notices($category);
     }
-
 }
 
 /**
@@ -156,7 +152,6 @@ function get_notices_xmlrpc($category = null)
 function reboot_xmlrpc()
 {
     mwexec_bg("/usr/local/etc/rc.reboot");
-
     return true;
 }
 
@@ -167,7 +162,6 @@ function reboot_xmlrpc()
 function firmware_version_xmlrpc()
 {
     require_once("pfsense-utils.inc");
-
     return host_firmware_version();
 }
 
@@ -354,7 +348,6 @@ function restore_config_section_xmlrpc($new_config)
         vpn_ipsec_configure();
     }
 
-
     unset($old_config);
 
     return true;