From 931efa6867904764e40dc8df2d1ea9eef4a66a84 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 27 Feb 2015 14:50:16 +0100
Subject: [PATCH] src: fix all the whitespaces!

---
 src/etc/inc/captiveportal.inc                        |  2 +-
 src/etc/inc/openvpn.auth-user.php                    |  2 +-
 src/etc/rc.filter_synchronize                        |  4 ++--
 src/etc/rc.initial                                   |  2 +-
 src/opnsense/service/configd_ctl.py                  |  6 ------
 src/opnsense/service/execute_command.py              |  3 ---
 .../service/templates/OPNsense/Proxy/rc.conf.d       |  2 +-
 src/www/firewall_nat.php                             | 12 ++++++------
 8 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc
index f5cb16055..f15189338 100644
--- a/src/etc/inc/captiveportal.inc
+++ b/src/etc/inc/captiveportal.inc
@@ -241,7 +241,7 @@ function captiveportal_init_rules($reinit = false) {
         $cpc = new OPNsense\CaptivePortal\CPClient();
 	if ($cpc->isEnabled()) {
 	    // load modules ( only if CP is enabled )
-	    captiveportal_load_modules();	
+	    captiveportal_load_modules();
 	}
         $cpc->reconfigure();
         unset($cpc);
diff --git a/src/etc/inc/openvpn.auth-user.php b/src/etc/inc/openvpn.auth-user.php
index 51ad3d5cd..36b0588bb 100644
--- a/src/etc/inc/openvpn.auth-user.php
+++ b/src/etc/inc/openvpn.auth-user.php
@@ -78,7 +78,7 @@ openlog("openvpn", LOG_ODELAY, LOG_AUTH);
 if (count($argv) > 6) {
 	$authmodes = explode(',', $argv[5]);
         $username = base64_decode(str_replace('%3D', '=', $argv[1]));
-        $password = base64_decode(str_replace('%3D', '=', $argv[2]));        
+        $password = base64_decode(str_replace('%3D', '=', $argv[2]));
 	$common_name = $argv[3];
 	$modeid = $argv[6];
 	$strictusercn = $argv[4] == 'false' ? false : true;
diff --git a/src/etc/rc.filter_synchronize b/src/etc/rc.filter_synchronize
index cfd0261ab..3f23a46a6 100755
--- a/src/etc/rc.filter_synchronize
+++ b/src/etc/rc.filter_synchronize
@@ -91,7 +91,7 @@ function carp_check_version($url, $username, $password, $port = 80, $method = 'p
 	global $config, $g;
 
 	if(file_exists("/var/run/booting") {
-        	return;
+		return;
 	}
 
 	$params = array(
@@ -142,7 +142,7 @@ function carp_sync_xml($url, $username, $password, $sections, $port = 80, $metho
 	global $config, $g;
 
 	if(file_exists("/var/run/booting") {
-        	return;
+		return;
 	}
 
 	update_filter_reload_status("Syncing CARP data to {$url}");
diff --git a/src/etc/rc.initial b/src/etc/rc.initial
index 7a1530d07..c5d3a0507 100755
--- a/src/etc/rc.initial
+++ b/src/etc/rc.initial
@@ -23,7 +23,7 @@ if [ -n "${*}" ]; then
 	/bin/csh "${@}"
 	exit ${?}
 fi
-		
+
 
 # endless loop
 while : ; do
diff --git a/src/opnsense/service/configd_ctl.py b/src/opnsense/service/configd_ctl.py
index 6a6eebfa3..2f794c221 100755
--- a/src/opnsense/service/configd_ctl.py
+++ b/src/opnsense/service/configd_ctl.py
@@ -62,9 +62,3 @@ else:
             print (''.join(data))
         finally:
             sock.close()
-
-
-
-
-
-
diff --git a/src/opnsense/service/execute_command.py b/src/opnsense/service/execute_command.py
index 23fb563f5..49459d79a 100755
--- a/src/opnsense/service/execute_command.py
+++ b/src/opnsense/service/execute_command.py
@@ -73,6 +73,3 @@ try:
     print ('response:%s'% ''.join(data) )
 finally:
     sock.close()
-
-
-
diff --git a/src/opnsense/service/templates/OPNsense/Proxy/rc.conf.d b/src/opnsense/service/templates/OPNsense/Proxy/rc.conf.d
index b908894f0..e71ed574d 100644
--- a/src/opnsense/service/templates/OPNsense/Proxy/rc.conf.d
+++ b/src/opnsense/service/templates/OPNsense/Proxy/rc.conf.d
@@ -1 +1 @@
-squid_enable=YES
\ No newline at end of file
+squid_enable=YES
diff --git a/src/www/firewall_nat.php b/src/www/firewall_nat.php
index 8a519fad3..10de2f310 100644
--- a/src/www/firewall_nat.php
+++ b/src/www/firewall_nat.php
@@ -244,7 +244,7 @@ $main_buttons = array(
 
 											$alias_popup = rule_popup($natent['source']['address'], pprint_port($natent['source']['port']), $natent['destination']['address'], pprint_port($natent['destination']['port']));
                                                                                         $alias_popup = rule_popup($natent['source']['address'], pprint_port($natent['source']['port']), $natent['destination']['address'], pprint_port($natent['destination']['port']));
-											  
+
 
 											$alias_src_span_begin      = $alias_popup["src"];
 											$alias_src_port_span_begin = $alias_popup["srcport"];
@@ -303,7 +303,7 @@ $main_buttons = array(
 
 									                  <td class="listr"  id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
 													    <?=$textss;?>
-													    <?php 
+													    <?php
 													    if ($alias_src_span_begin) echo htmlspecialchars(pprint_address($alias_src_span_begin));
 													    else echo htmlspecialchars(pprint_address($natent['source']));
 													    if ($alias_src_span_end) echo htmlspecialchars(pprint_address($alias_src_span_end));
@@ -312,7 +312,7 @@ $main_buttons = array(
 									                  </td>
 									                  <td class="listr"  id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
 													    <?=$textss;?>
-													    <?php 
+													    <?php
 													    if ($alias_src_port_span_begin) echo htmlspecialchars(pprint_port($alias_src_port_span_begin));
 													    else echo htmlspecialchars(pprint_port($natent['source']['port']));
 													    if($alias_src_port_span_end) echo htmlspecialchars(pprint_port($alias_src_port_span_end));
@@ -321,7 +321,7 @@ $main_buttons = array(
 
 									                  <td class="listr"  id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
 													    <?=$textss;?>
-													    <?php 
+													    <?php
 													    if ($alias_dst_span_begin) echo htmlspecialchars(pprint_address($alias_dst_span_begin));
 													    else echo htmlspecialchars(pprint_address($natent['destination']));
 													    if ($alias_dst_span_end)  echo htmlspecialchars(pprint_address($alias_dst_span_end));
@@ -338,7 +338,7 @@ $main_buttons = array(
 
 									                  <td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
 													    <?=$textss;?>
-													    <?php 
+													    <?php
 													    if ($alias_target_span_begin) echo htmlspecialchars(pprint_address($alias_target_span_begin));
 													    else  echo htmlspecialchars($natent['target']);
 													    if ($alias_target_span_end) echo htmlspecialchars(pprint_address($alias_target_span_end));
@@ -355,7 +355,7 @@ $main_buttons = array(
 																$localport   .= '-' . $localendport;
 															}
 														?>
-													    <?=$textss;?><?php 
+													    <?=$textss;?><?php
 													    if ($alias_local_port_span_begin) echo htmlspecialchars(pprint_port($alias_local_port_span_begin['address']));
 													    else  echo htmlspecialchars(pprint_port($localport));
 													    if ($alias_local_port_span_end) echo htmlspecialchars(pprint_port($alias_local_port_span_end['address']));