diff --git a/src/etc/inc/ipsec.auth-user.php b/src/etc/inc/ipsec.auth-user.php
index 3f0509a0b..b2e35e3ba 100755
--- a/src/etc/inc/ipsec.auth-user.php
+++ b/src/etc/inc/ipsec.auth-user.php
@@ -2,30 +2,30 @@
 <?php
 
 /*
-	Copyright (C) 2008 Shrew Soft Inc
-	Copyright (C) 2010 Ermal Luçi
-	All rights reserved.
+    Copyright (C) 2008 Shrew Soft Inc
+    Copyright (C) 2010 Ermal Luçi
+    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.
 */
 
 /*
@@ -39,146 +39,161 @@ require_once("auth.inc");
 require_once("interfaces.inc");
 require_once("util.inc");
 
-function cisco_to_cidr($addr) {
-	if (!is_ipaddr($addr))
-		return 0;
-	$mask = decbin(~ip2long($addr));
-	$mask = substr($mask, -32);
-	$k = 0;
-	for ($i = 0; $i <= 32; $i++) {
-		$k += intval($mask[$i]);
-	}
-	return $k;
+function cisco_to_cidr($addr)
+{
+    if (!is_ipaddr($addr)) {
+        return 0;
+    }
+
+    $mask = decbin(~ip2long($addr));
+    $mask = substr($mask, -32);
+    $k = 0;
+    for ($i = 0; $i <= 32; $i++) {
+        $k += intval($mask[$i]);
+    }
+    return $k;
 }
 
-function cisco_extract_index($prule) {
-
-	$index = explode("#", $prule);
-	if (is_numeric($index[1]))
-		return intval($index[1]);
-	else
-		syslog(LOG_WARNING, "Error parsing rule {$prule}: Could not extract index");
-	return -1;;
+function cisco_extract_index($prule)
+{
+    $index = explode("#", $prule);
+    if (is_numeric($index[1])) {
+        return intval($index[1]);
+    } else {
+        syslog(LOG_WARNING, "Error parsing rule {$prule}: Could not extract index");
+    }
+    return -1;;
 }
 
-function parse_cisco_acl($attribs) {
-	global $attributes;
-	if (!is_array($attribs))
-		return "";
+function parse_cisco_acl($attribs)
+{
+    global $attributes;
+    if (!is_array($attribs)) {
+        return "";
+    }
 
-	$devname = "enc0";
-	$finalrules = "";
-	if (is_array($attribs['ciscoavpair'])) {
-		$inrules = array();
-		$outrules = array();
-		foreach ($attribs['ciscoavpair'] as $avrules) {
-			$rule = explode("=", $avrules);
-			$dir = "";
-			if (strstr($rule[0], "inacl")) {
-				$dir = "in";
-			} else if (strstr($rule[0], "outacl"))
-				$dir = "out";
-			else if (strstr($rule[0], "dns-servers")) {
-				$attributes['dns-servers'] = explode(" ", $rule[1]);
-				continue;
-			} else if (strstr($rule[0], "route")) {
-				if (!is_array($attributes['routes']))
-					$attributes['routes'] = array();
-				$attributes['routes'][] = $rule[1];
-				continue;
-			}
-			$rindex = cisco_extract_index($rule[0]);
-			if ($rindex < 0)
-				continue;
+    $devname = "enc0";
+    $finalrules = "";
+    if (is_array($attribs['ciscoavpair'])) {
+        $inrules = array();
+        $outrules = array();
+        foreach ($attribs['ciscoavpair'] as $avrules) {
+            $rule = explode("=", $avrules);
+            $dir = "";
+            if (strstr($rule[0], "inacl")) {
+                $dir = "in";
+            } elseif (strstr($rule[0], "outacl")) {
+                $dir = "out";
+            } elseif (strstr($rule[0], "dns-servers")) {
+                $attributes['dns-servers'] = explode(" ", $rule[1]);
+                continue;
+            } else if (strstr($rule[0], "route")) {
+                if (!is_array($attributes['routes'])) {
+                    $attributes['routes'] = array();
+                }
+                $attributes['routes'][] = $rule[1];
+                continue;
+            }
+            $rindex = cisco_extract_index($rule[0]);
+            if ($rindex < 0) {
+                continue;
+            }
 
-			$rule = $rule[1];
-			$rule = explode(" ", $rule);
-			$tmprule = "";
-			$index = 0;
-			$isblock = false;
-			if ($rule[$index] == "permit")
-				$tmprule = "pass {$dir} quick on {$devname} ";
-			else if ($rule[$index] == "deny") {
-				//continue;
-				$isblock = true;
-				$tmprule = "block {$dir} quick on {$devname} ";
-			} else {
-				continue;
-			}
+            $rule = $rule[1];
+            $rule = explode(" ", $rule);
+            $tmprule = "";
+            $index = 0;
+            $isblock = false;
+            if ($rule[$index] == "permit") {
+                $tmprule = "pass {$dir} quick on {$devname} ";
+            } elseif ($rule[$index] == "deny") {
+                //continue;
+                $isblock = true;
+                $tmprule = "block {$dir} quick on {$devname} ";
+            } else {
+                continue;
+            }
 
-			$index++;
+            $index++;
 
-			switch ($rule[$index]) {
-			case "tcp":
-			case "udp":
-				$tmprule .= "proto {$rule[$index]} ";
-				break;
+            switch ($rule[$index]) {
+                case "tcp":
+                case "udp":
+                    $tmprule .= "proto {$rule[$index]} ";
+                    break;
+            }
 
-			}
+            $index++;
+            /* Source */
+            if (trim($rule[$index]) == "host") {
+                $index++;
+                $tmprule .= "from {$rule[$index]} ";
+                $index++;
+                if ($isblock == true) {
+                    $isblock = false;
+                }
+            } else if (trim($rule[$index]) == "any") {
+                $tmprule .= "from any";
+                $index++;
+            } else {
+                $tmprule .= "from {$rule[$index]}";
+                $index++;
+                $netmask = cisco_to_cidr($rule[$index]);
+                $tmprule .= "/{$netmask} ";
+                $index++;
+                if ($isblock == true) {
+                    $isblock = false;
+                }
+            }
+            /* Destination */
+            if (trim($rule[$index]) == "host") {
+                $index++;
+                $tmprule .= "to {$rule[$index]} ";
+                $index++;
+                if ($isblock == true) {
+                    $isblock = false;
+                }
+            } else if (trim($rule[$index]) == "any") {
+                $index++;
+                $tmprule .= "to any";
+            } else {
+                $tmprule .= "to {$rule[$index]}";
+                $index++;
+                $netmask = cisco_to_cidr($rule[$index]);
+                $tmprule .= "/{$netmask} ";
+                $index++;
+                if ($isblock == true) {
+                    $isblock = false;
+                }
+            }
 
-			$index++;
-			/* Source */
-			if (trim($rule[$index]) == "host") {
-				$index++;
-				$tmprule .= "from {$rule[$index]} ";
-				$index++;
-				if ($isblock == true)
-					$isblock = false;
-			} else if (trim($rule[$index]) == "any") {
-				$tmprule .= "from any";
-				$index++;
-			} else {
-				$tmprule .= "from {$rule[$index]}";
-				$index++;
-				$netmask = cisco_to_cidr($rule[$index]);
-				$tmprule .= "/{$netmask} ";
-				$index++;
-				if ($isblock == true)
-					$isblock = false;
-			}
-			/* Destination */
-			if (trim($rule[$index]) == "host") {
-				$index++;
-				$tmprule .= "to {$rule[$index]} ";
-				$index++;
-				if ($isblock == true)
-					$isblock = false;
-			} else if (trim($rule[$index]) == "any") {
-				$index++;
-				$tmprule .= "to any";
-			} else {
-				$tmprule .= "to {$rule[$index]}";
-				$index++;
-				$netmask = cisco_to_cidr($rule[$index]);
-				$tmprule .= "/{$netmask} ";
-				$index++;
-				if ($isblock == true)
-					$isblock = false;
-			}
+            if ($isblock == true) {
+                continue;
+            }
 
-			if ($isblock == true)
-				continue;
+            if ($dir == "in") {
+                $inrules[$rindex] = $tmprule;
+            } elseif ($dir == "out") {
+                $outrules[$rindex] = $tmprule;
+            }
+        }
 
-			if ($dir == "in")
-				$inrules[$rindex] = $tmprule;
-			else if ($dir == "out")
-				$outrules[$rindex] = $tmprule;
-		}
-
-
-		$state = "";
-		if (!empty($outrules))
-			$state = "no state";
-		ksort($inrules, SORT_NUMERIC);
-		foreach ($inrules as $inrule)
-			$finalrules .= "{$inrule} {$state}\n";
-		if (!empty($outrules)) {
-			ksort($outrules, SORT_NUMERIC);
-			foreach ($outrules as $outrule)
-				$finalrules .= "{$outrule} {$state}\n";
-		}
-	}
-	return $finalrules;
+        $state = "";
+        if (!empty($outrules)) {
+            $state = "no state";
+        }
+        ksort($inrules, SORT_NUMERIC);
+        foreach ($inrules as $inrule) {
+            $finalrules .= "{$inrule} {$state}\n";
+        }
+        if (!empty($outrules)) {
+            ksort($outrules, SORT_NUMERIC);
+            foreach ($outrules as $outrule) {
+                $finalrules .= "{$outrule} {$state}\n";
+            }
+        }
+    }
+    return $finalrules;
 }
 
 
@@ -191,9 +206,8 @@ if (!function_exists("getNasID")) {
     function getNasID()
     {
         global $g;
-
         $nasId = gethostname();
-        if(empty($nasId)) {
+        if (empty($nasId)) {
             $nasId = $g['product_name'];
         }
         return $nasId;
@@ -210,76 +224,78 @@ $common_name = getenv("common_name");
 $authmodes = explode(",", getenv("authcfg"));
 
 if (!$username || !$password) {
-	syslog(LOG_ERR, "invalid user authentication environment");
-	if (isset($_GET['username'])) {
-		echo "FAILED";
-		closelog();
-		return;
-	} else {
-		closelog();
-		exit(-1);
-	}
+    syslog(LOG_ERR, "invalid user authentication environment");
+    if (isset($_GET['username'])) {
+        echo "FAILED";
+        closelog();
+        return;
+    } else {
+        closelog();
+        exit(-1);
+    }
 }
 
 $authenticated = false;
 
 if (($strictusercn === true) && ($common_name != $username)) {
-	syslog(LOG_WARNING, "Username does not match certificate common name ({$username} != {$common_name}), access denied.\n");
-	if (isset($_GET['username'])) {
-		echo "FAILED";
-		closelog();
-		return;
-	} else {
-		closelog();
-		exit(1);
-	}
+    syslog(LOG_WARNING, "Username does not match certificate common name ({$username} != {$common_name}), access denied.\n");
+    if (isset($_GET['username'])) {
+        echo "FAILED";
+        closelog();
+        return;
+    } else {
+        closelog();
+        exit(1);
+    }
 }
 
 $attributes = array();
 foreach ($authmodes as $authmode) {
-	$authcfg = auth_get_authserver($authmode);
-	if (!$authcfg && $authmode != "local")
-		continue;
+    $authcfg = auth_get_authserver($authmode);
+    if (!$authcfg && $authmode != "local") {
+        continue;
+    }
 
-	$authenticated = authenticate_user($username, $password, $authcfg);
-	if ($authenticated == true) {
-		if (stristr($authmode, "local")) {
-			$user = getUserEntry($username);
-			if (!is_array($user) || !userHasPrivilege($user, "user-ipsec-xauth-dialin")) {
-				$authenticated = false;
-				syslog(LOG_WARNING, "user '{$username}' cannot authenticate through IPsec since the required privileges are missing.\n");
-				continue;
-			}
-		}
-		break;
-	}
+    $authenticated = authenticate_user($username, $password, $authcfg);
+    if ($authenticated == true) {
+        if (stristr($authmode, "local")) {
+            $user = getUserEntry($username);
+            if (!is_array($user) || !userHasPrivilege($user, "user-ipsec-xauth-dialin")) {
+                $authenticated = false;
+                syslog(LOG_WARNING, "user '{$username}' cannot authenticate through IPsec since the required privileges are missing.\n");
+                continue;
+            }
+        }
+        break;
+    }
 }
 
 if ($authenticated == false) {
-	syslog(LOG_WARNING, "user '{$username}' could not authenticate.\n");
-	if (isset($_GET['username'])) {
-		echo "FAILED";
-		closelog();
-		return;
-	} else {
-		closelog();
-		exit(-1);
-	}
+    syslog(LOG_WARNING, "user '{$username}' could not authenticate.\n");
+    if (isset($_GET['username'])) {
+        echo "FAILED";
+        closelog();
+        return;
+    } else {
+        closelog();
+        exit(-1);
+    }
 }
 
 if (empty($common_name)) {
-	$common_name = getenv("common_name");
-	if (empty($common_name))
-		$common_name = getenv("username");
+    $common_name = getenv("common_name");
+    if (empty($common_name)) {
+        $common_name = getenv("username");
+    }
 }
 
 
 $rules = parse_cisco_acl($attributes);
 if (!empty($rules)) {
-	$pid = getmypid();
-	@file_put_contents("/tmp/ipsec_{$pid}{$common_name}.rules", $rules);
-	mwexec("/sbin/pfctl -a " . escapeshellarg("ipsec/{$common_name}") . " -f /tmp/ipsec_{$pid}" . escapeshellarg($common_name) . ".rules");
-	@unlink("/tmp/ipsec_{$pid}{$common_name}.rules");
+    $pid = getmypid();
+    @file_put_contents("/tmp/ipsec_{$pid}{$common_name}.rules", $rules);
+    mwexec("/sbin/pfctl -a " . escapeshellarg("ipsec/{$common_name}") . " -f /tmp/ipsec_{$pid}" . escapeshellarg($common_name) . ".rules");
+    @unlink("/tmp/ipsec_{$pid}{$common_name}.rules");
 }
 
 syslog(LOG_NOTICE, "user '{$username}' authenticated\n");