phpipam / phpipam

app/admin/authentication-methods/index.php

Indentation +37 added lines, -37 removed lines

@@ -17,7 +17,7 @@ 
 <div class="btn-group" style="margin-bottom: 20px;">
 <?php
 foreach($all_method_types as $type) {
-	print "<button class='btn btn-sm btn-default editAuthMethod' style='margin-bottom:10px;' data-action='add' data-type='$type'><i class='fa fa-plus'></i> "._("Create new $type authentication")."</button>";
+    print "<button class='btn btn-sm btn-default editAuthMethod' style='margin-bottom:10px;' data-action='add' data-type='$type'><i class='fa fa-plus'></i> "._("Create new $type authentication")."</button>";
 }
 ?>
 </div>
@@ -39,44 +39,44 @@ 
 <?php
 //loop
 foreach($all_methods as $method) {
-	//set protected
-	$protected_class = $method->protected=="yes" ? "danger" : "";
+    //set protected
+    $protected_class = $method->protected=="yes" ? "danger" : "";
 
-	//number of users
-	$user_num = $Database->numObjectsFilter("users", "authMethod", $method->id);
+    //number of users
+    $user_num = $Database->numObjectsFilter("users", "authMethod", $method->id);
 
-	print "<tr>";
-	print "	<td>$method->type</td>";
-	print "	<td>$method->description</td>";
-	//parameters
-	print "	<td>";
-	print "	<span class='text-muted'>";
-	if(strlen($method->params)>0) {
-		$params = json_decode($method->params);
-		foreach($params as $key=>$parameter) {
-			// mask user/pass
-			if($key=="adminPassword")	{ $parameter = "********"; }
-			// print
-			print $key." => ".$parameter."<br>";
-		}
-	}
-	else {
-		print "no parameters";
-	}
-	print "	</span>";
-	print "	</td>";
-	print "	<td class='$protected_class'>$user_num</td>";
-	print "	<td class='$protected_class'>$method->protected</td>";
-	//actions
-	$disabled = $method->type=="local" ? "disabled" : "";
-	print "	<td class='actions'>";
-	print "	<div class='btn-group'>";
-	print "		<button class='btn btn-xs btn-default editAuthMethod' data-id='$method->id' data-action='edit'   data-type='$method->type' rel='tooltip' title='Edit'><i class='fa fa-pencil'></i></button>";
-	print "		<button class='btn btn-xs btn-default editAuthMethod' data-id='$method->id' data-action='delete' data-type='$method->type' rel='tooltip' title='Delete'><i class='fa fa-times'></i></button>";
-	print "		<button class='btn btn-xs btn-default checkAuthMethod' data-id='$method->id' data-action='check' data-type='$method->type' rel='tooltip' title='Verify connection' $disabled><i class='fa fa-bolt'></i></button>";
-	print "	</div>";
-	print "	</td>";
-	print "</tr>";
+    print "<tr>";
+    print "	<td>$method->type</td>";
+    print "	<td>$method->description</td>";
+    //parameters
+    print "	<td>";
+    print "	<span class='text-muted'>";
+    if(strlen($method->params)>0) {
+        $params = json_decode($method->params);
+        foreach($params as $key=>$parameter) {
+            // mask user/pass
+            if($key=="adminPassword")	{ $parameter = "********"; }
+            // print
+            print $key." => ".$parameter."<br>";
+        }
+    }
+    else {
+        print "no parameters";
+    }
+    print "	</span>";
+    print "	</td>";
+    print "	<td class='$protected_class'>$user_num</td>";
+    print "	<td class='$protected_class'>$method->protected</td>";
+    //actions
+    $disabled = $method->type=="local" ? "disabled" : "";
+    print "	<td class='actions'>";
+    print "	<div class='btn-group'>";
+    print "		<button class='btn btn-xs btn-default editAuthMethod' data-id='$method->id' data-action='edit'   data-type='$method->type' rel='tooltip' title='Edit'><i class='fa fa-pencil'></i></button>";
+    print "		<button class='btn btn-xs btn-default editAuthMethod' data-id='$method->id' data-action='delete' data-type='$method->type' rel='tooltip' title='Delete'><i class='fa fa-times'></i></button>";
+    print "		<button class='btn btn-xs btn-default checkAuthMethod' data-id='$method->id' data-action='check' data-type='$method->type' rel='tooltip' title='Verify connection' $disabled><i class='fa fa-bolt'></i></button>";
+    print "	</div>";
+    print "	</td>";
+    print "</tr>";
 }
 ?>
 </table>

Spacing +29 added lines, -29 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all auth methods
-$all_methods = $Admin->fetch_all_objects("usersAuthMethod");
+$all_methods = $Admin->fetch_all_objects ("usersAuthMethod");
 # fetch all parameters for each method
-$all_method_types = $User->fetch_available_auth_method_types();
+$all_method_types = $User->fetch_available_auth_method_types ();
 ?>
 
 
-<h4><?php print _("Authentication methods"); ?></h4>
+<h4><?php print _ ("Authentication methods"); ?></h4>
 <hr>
 
 <!-- Add new -->
 <div class="btn-group" style="margin-bottom: 20px;">
 <?php
-foreach($all_method_types as $type) {
-	print "<button class='btn btn-sm btn-default editAuthMethod' style='margin-bottom:10px;' data-action='add' data-type='$type'><i class='fa fa-plus'></i> "._("Create new $type authentication")."</button>";
+foreach ($all_method_types as $type) {
+	print "<button class='btn btn-sm btn-default editAuthMethod' style='margin-bottom:10px;' data-action='add' data-type='$type'><i class='fa fa-plus'></i> "._ ("Create new $type authentication")."</button>";
 }
 ?>
 </div>
@@ -27,23 +27,23 @@ 
 
 <!-- Headers -->
 <tr>
-    <th><?php print _('Type'); ?></th>
-    <th><?php print _('Description'); ?></th>
-    <th><?php print _('Parameters'); ?></th>
-    <th><?php print _('Users'); ?></th>
-    <th><?php print _('Protected'); ?></th>
+    <th><?php print _ ('Type'); ?></th>
+    <th><?php print _ ('Description'); ?></th>
+    <th><?php print _ ('Parameters'); ?></th>
+    <th><?php print _ ('Users'); ?></th>
+    <th><?php print _ ('Protected'); ?></th>
     <th></th>
 </tr>
 
 <!-- data -->
 <?php
 //loop
-foreach($all_methods as $method) {
+foreach ($all_methods as $method) {
 	//set protected
-	$protected_class = $method->protected=="yes" ? "danger" : "";
+	$protected_class = $method->protected == "yes" ? "danger" : "";
 
 	//number of users
-	$user_num = $Database->numObjectsFilter("users", "authMethod", $method->id);
+	$user_num = $Database->numObjectsFilter ("users", "authMethod", $method->id);
 
 	print "<tr>";
 	print "	<td>$method->type</td>";
@@ -51,11 +51,11 @@ 
 	//parameters
 	print "	<td>";
 	print "	<span class='text-muted'>";
-	if(strlen($method->params)>0) {
-		$params = json_decode($method->params);
-		foreach($params as $key=>$parameter) {
+	if (strlen ($method->params) > 0) {
+		$params = json_decode ($method->params);
+		foreach ($params as $key=>$parameter) {
 			// mask user/pass
-			if($key=="adminPassword")	{ $parameter = "********"; }
+			if ($key == "adminPassword") { $parameter = "********"; }
 			// print
 			print $key." => ".$parameter."<br>";
 		}
@@ -68,7 +68,7 @@ 
 	print "	<td class='$protected_class'>$user_num</td>";
 	print "	<td class='$protected_class'>$method->protected</td>";
 	//actions
-	$disabled = $method->type=="local" ? "disabled" : "";
+	$disabled = $method->type == "local" ? "disabled" : "";
 	print "	<td class='actions'>";
 	print "	<div class='btn-group'>";
 	print "		<button class='btn btn-xs btn-default editAuthMethod' data-id='$method->id' data-action='edit'   data-type='$method->type' rel='tooltip' title='Edit'><i class='fa fa-pencil'></i></button>";
@@ -84,18 +84,18 @@ 
 
 <hr>
 <div class="alert alert-info alert-absolute" style="margin-top:30px;">
-	<?php print _("Here you can set different authentication methods for your users."); ?>
+	<?php print _ ("Here you can set different authentication methods for your users."); ?>
 	<hr>
-	<?php print _("phpIPAM currently supports 6 methods for authentication:"); ?>
+	<?php print _ ("phpIPAM currently supports 6 methods for authentication:"); ?>
 	<ul>
-		<li><?php print _("Local authentication"); ?></li>
-		<li><?php print _("Apache authentication"); ?></li>
-		<li><?php print _("AD (Active Directory) authentication"); ?></li>
-		<li><?php print _("LDAP authentication"); ?></li>
-		<li><?php print _("NetIQ authentication"); ?></li>
-		<li><?php print _("Radius authentication"); ?></li>
+		<li><?php print _ ("Local authentication"); ?></li>
+		<li><?php print _ ("Apache authentication"); ?></li>
+		<li><?php print _ ("AD (Active Directory) authentication"); ?></li>
+		<li><?php print _ ("LDAP authentication"); ?></li>
+		<li><?php print _ ("NetIQ authentication"); ?></li>
+		<li><?php print _ ("Radius authentication"); ?></li>
 	</ul>
 	<br>
-	<?php print _("For AD/LDAP/NetIQ connection phpipam is using adLDAP, for documentation please check ")."<a href='http://adldap.sourceforge.net/'>adLDAP</a><br><br>"; ?>
-	<?php print _('First create new user under user management with <u>same username as on AD</u> and set authention type to one of available methods.')."<br>"._('Also set proper permissions - group membership for new user'); ?>
+	<?php print _ ("For AD/LDAP/NetIQ connection phpipam is using adLDAP, for documentation please check ")."<a href='http://adldap.sourceforge.net/'>adLDAP</a><br><br>"; ?>
+	<?php print _ ('First create new user under user management with <u>same username as on AD</u> and set authention type to one of available methods.')."<br>"._ ('Also set proper permissions - group membership for new user'); ?>
 </div>

app/admin/authentication-methods/check-connection.php

Indentation +24 added lines, -24 removed lines

@@ -26,31 +26,31 @@
 
 # AD?
 if($auth_settings->type=="AD" || $auth_settings->type=="LDAP" || $auth_settings->type=="NetIQ") {
-	# adLDAP function
-	include (dirname(__FILE__) . "/../../../functions/adLDAP/src/adLDAP.php");
-	# set controllers
-	$controllers = explode(";", str_replace(" ", "", $parameters->domain_controllers));
-
-	//open connection
-	try {
-		$adldap = new adLDAP(array( 'base_dn'=>$parameters->base_dn, 'account_suffix'=>@$parameters->account_suffix,
-									'domain_controllers'=>$controllers, 'use_ssl'=>$parameters->use_ssl,
-									'use_tls'=> $parameters->use_tls, 'ad_port'=> $parameters->ad_port
-		    						));
-		//LDAP?
-		if($auth_settings->type=="LDAP") $adldap->setUseOpenLDAP(true);
-
-	} catch (adLDAPException $e) {
-		//catch AD error
-		$Result->show("danger", $e, true, true);
-	}
-	//result
-	foreach($controllers as $c) {
-		if($fp = @fsockopen($c, $parameters->ad_port, $errno, $errstr, 3)==false)	{ $Result->show("danger",  "$c: $errstr ($errno)", false, true); }
-		else 																	 	{ $Result->show("success", "$c: "._('AD network connection ok')."!", false, true); }
-	}
+    # adLDAP function
+    include (dirname(__FILE__) . "/../../../functions/adLDAP/src/adLDAP.php");
+    # set controllers
+    $controllers = explode(";", str_replace(" ", "", $parameters->domain_controllers));
+
+    //open connection
+    try {
+        $adldap = new adLDAP(array( 'base_dn'=>$parameters->base_dn, 'account_suffix'=>@$parameters->account_suffix,
+                                    'domain_controllers'=>$controllers, 'use_ssl'=>$parameters->use_ssl,
+                                    'use_tls'=> $parameters->use_tls, 'ad_port'=> $parameters->ad_port
+                                    ));
+        //LDAP?
+        if($auth_settings->type=="LDAP") $adldap->setUseOpenLDAP(true);
+
+    } catch (adLDAPException $e) {
+        //catch AD error
+        $Result->show("danger", $e, true, true);
+    }
+    //result
+    foreach($controllers as $c) {
+        if($fp = @fsockopen($c, $parameters->ad_port, $errno, $errstr, 3)==false)	{ $Result->show("danger",  "$c: $errstr ($errno)", false, true); }
+        else 																	 	{ $Result->show("success", "$c: "._('AD network connection ok')."!", false, true); }
+    }
 }
 else {
-	$Result->show("danger", _("Check for  not implemented"), true, true);
+    $Result->show("danger", _("Check for  not implemented"), true, true);
 }
 ?>
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -38,7 +38,9 @@
 									'use_tls'=> $parameters->use_tls, 'ad_port'=> $parameters->ad_port
 		    						));
 		//LDAP?
-		if($auth_settings->type=="LDAP") $adldap->setUseOpenLDAP(true);
+		if($auth_settings->type=="LDAP") {
+		    $adldap->setUseOpenLDAP(true);
+		}
 
 	} catch (adLDAPException $e) {
 		//catch AD error

Spacing +16 added lines, -16 removed lines

@@ -7,50 +7,50 @@
 
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # feth settings
 $auth_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
-if($auth_settings===false)	{ $Result->show("danger", _("Invalid ID"), true, true); }
+if ($auth_settings === false) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 //set params
-$parameters = json_decode($auth_settings->params);
+$parameters = json_decode ($auth_settings->params);
 
 # AD?
-if($auth_settings->type=="AD" || $auth_settings->type=="LDAP" || $auth_settings->type=="NetIQ") {
+if ($auth_settings->type == "AD" || $auth_settings->type == "LDAP" || $auth_settings->type == "NetIQ") {
 	# adLDAP function
-	include (dirname(__FILE__) . "/../../../functions/adLDAP/src/adLDAP.php");
+	include (dirname (__FILE__)."/../../../functions/adLDAP/src/adLDAP.php");
 	# set controllers
-	$controllers = explode(";", str_replace(" ", "", $parameters->domain_controllers));
+	$controllers = explode (";", str_replace (" ", "", $parameters->domain_controllers));
 
 	//open connection
 	try {
-		$adldap = new adLDAP(array( 'base_dn'=>$parameters->base_dn, 'account_suffix'=>@$parameters->account_suffix,
+		$adldap = new adLDAP (array ('base_dn'=>$parameters->base_dn, 'account_suffix'=>@$parameters->account_suffix,
 									'domain_controllers'=>$controllers, 'use_ssl'=>$parameters->use_ssl,
 									'use_tls'=> $parameters->use_tls, 'ad_port'=> $parameters->ad_port
 		    						));
 		//LDAP?
-		if($auth_settings->type=="LDAP") $adldap->setUseOpenLDAP(true);
+		if ($auth_settings->type == "LDAP") $adldap->setUseOpenLDAP (true);
 
 	} catch (adLDAPException $e) {
 		//catch AD error
-		$Result->show("danger", $e, true, true);
+		$Result->show ("danger", $e, true, true);
 	}
 	//result
-	foreach($controllers as $c) {
-		if($fp = @fsockopen($c, $parameters->ad_port, $errno, $errstr, 3)==false)	{ $Result->show("danger",  "$c: $errstr ($errno)", false, true); }
-		else 																	 	{ $Result->show("success", "$c: "._('AD network connection ok')."!", false, true); }
+	foreach ($controllers as $c) {
+		if ($fp = @fsockopen ($c, $parameters->ad_port, $errno, $errstr, 3) == false) { $Result->show ("danger", "$c: $errstr ($errno)", false, true); }
+		else { $Result->show ("success", "$c: "._ ('AD network connection ok')."!", false, true); }
 	}
 }
 else {
-	$Result->show("danger", _("Check for  not implemented"), true, true);
+	$Result->show ("danger", _ ("Check for  not implemented"), true, true);
 }
 ?>
\ No newline at end of file

app/admin/authentication-methods/edit-result.php

Indentation +8 added lines, -8 removed lines

@@ -28,25 +28,25 @@ 
 
 //for adding remove id
 if($action=="add") {
-	unset($_POST['id']);
+    unset($_POST['id']);
 }
 else {
-	//check id
-	if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true); }
+    //check id
+    if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true); }
 }
 
 # set update query
 $values = array("id"=>@$_POST['id'],
-				"type"=>$_POST['type'],
-				"description"=>@$_POST['description'],
-				);
+                "type"=>$_POST['type'],
+                "description"=>@$_POST['description'],
+                );
 # add params
 unset($_POST['id'], $_POST['type'], $_POST['description'], $_POST['action']);
 $values["params"]=json_encode($_POST);
 
 # add - set protected
 if($action=="add") {
-	$values['protected'] = "No";
+    $values['protected'] = "No";
 }
 
 # update
@@ -55,6 +55,6 @@ 
 
 # if delete also reset all users that have thos auth method
 if($action=="delete") {
-	$Database->runQuery("update `users` set `authMethod`=1 where `authMethod`= ?;", array($values['id']));
+    $Database->runQuery("update `users` set `authMethod`=1 where `authMethod`= ?;", array($values['id']));
 }
 ?>
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -6,55 +6,55 @@
  */
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin 		= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # strip input tags
-$_POST = $Admin->strip_input_tags($_POST);
+$_POST = $Admin->strip_input_tags ($_POST);
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "authmethods", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "authmethods", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # get action
 $action = $_POST['action'];
 
 //for adding remove id
-if($action=="add") {
+if ($action == "add") {
 	unset($_POST['id']);
 }
 else {
 	//check id
-	if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true); }
+	if (!is_numeric ($_POST['id'])) { $Result->show ("danger", _ ("Invalid ID"), true); }
 }
 
 # set update query
-$values = array("id"=>@$_POST['id'],
+$values = array ("id"=>@$_POST['id'],
 				"type"=>$_POST['type'],
 				"description"=>@$_POST['description'],
 				);
 # add params
 unset($_POST['id'], $_POST['type'], $_POST['description'], $_POST['action']);
-$values["params"]=json_encode($_POST);
+$values["params"] = json_encode ($_POST);
 
 # add - set protected
-if($action=="add") {
+if ($action == "add") {
 	$values['protected'] = "No";
 }
 
 # update
-if(!$Admin->object_modify("usersAuthMethod", $action, "id", $values))	{ $Result->show("danger",  _("Failed to edit authentication method"), false); }
-else																	{ $Result->show("success", _("Authentication method updated"), false); }
+if (!$Admin->object_modify ("usersAuthMethod", $action, "id", $values)) { $Result->show ("danger", _ ("Failed to edit authentication method"), false); }
+else { $Result->show ("success", _ ("Authentication method updated"), false); }
 
 # if delete also reset all users that have thos auth method
-if($action=="delete") {
-	$Database->runQuery("update `users` set `authMethod`=1 where `authMethod`= ?;", array($values['id']));
+if ($action == "delete") {
+	$Database->runQuery ("update `users` set `authMethod`=1 where `authMethod`= ?;", array ($values['id']));
 }
 ?>
\ No newline at end of file

app/admin/authentication-methods/edit-NetIQ.php

Indentation +21 added lines, -21 removed lines

@@ -9,19 +9,19 @@ 
 
 # ID must be numeric */
 if($_POST['action']!="add") {
-	if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
+    if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
 
-	# feth method settings
-	$method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
-	$method_settings->params = json_decode($method_settings->params);
+    # feth method settings
+    $method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
+    $method_settings->params = json_decode($method_settings->params);
 }
 else {
-	$method_settings = new StdClass ();
-	# set default values
-   @$method_settings->params->domain_controllers = "dc1.domain.local;dc2.domain.local";
-	$method_settings->params->base_dn = "ou=user,o=domain.local";
-	$method_settings->params->account_suffix = ",ou=user,o=domain.local";
-	$method_settings->params->ad_port = 389;
+    $method_settings = new StdClass ();
+    # set default values
+    @$method_settings->params->domain_controllers = "dc1.domain.local;dc2.domain.local";
+    $method_settings->params->base_dn = "ou=user,o=domain.local";
+    $method_settings->params->account_suffix = ",ou=user,o=domain.local";
+    $method_settings->params->ad_port = 389;
 }
 
 # set delete flag
@@ -35,9 +35,9 @@ 
 <div class="pContent">
 
 	<?php
-	# make sure LDAP is supported !
-	if (!in_array("ldap", get_loaded_extensions())) 	{ $Result->show("danger", _("ldap extension not enabled in php")."!<hr>", false); }
-	?>
+    # make sure LDAP is supported !
+    if (!in_array("ldap", get_loaded_extensions())) 	{ $Result->show("danger", _("ldap extension not enabled in php")."!<hr>", false); }
+    ?>
 
 	<form id="editAuthMethod" name="editAuthMethod">
 	<table class="editAuthMethod table table-noborder table-condensed">
@@ -163,14 +163,14 @@ 
 	</div>
 
 	<?php
-	if($_POST['action']=="delete") {
-		# check for mathing users
-		$users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
-		if($users!==false) {
-			$Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
-		}
-	}
-	?>
+    if($_POST['action']=="delete") {
+        # check for mathing users
+        $users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
+        if($users!==false) {
+            $Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
+        }
+    }
+    ?>
 
 	<!-- Result -->
 	<div class="editAuthMethodResult"></div>

Braces +4 added lines, -1 removed lines

@@ -174,7 +174,10 @@
 <div class="pFooter">
 	<div class="btn-group">
 		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; }
+else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; }
+else if ($_POST['action']=="delete") { print "fa-trash-o"; }
+else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
 	</div>
 
 	<?php

Spacing +34 added lines, -34 removed lines

@@ -5,15 +5,15 @@ 
  *****************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # ID must be numeric */
-if($_POST['action']!="add") {
-	if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
+if ($_POST['action'] != "add") {
+	if (!is_numeric ($_POST['id'])) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 	# feth method settings
 	$method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
-	$method_settings->params = json_decode($method_settings->params);
+	$method_settings->params = json_decode ($method_settings->params);
 }
 else {
 	$method_settings = new StdClass ();
@@ -25,18 +25,18 @@ 
 }
 
 # set delete flag
-$delete = $_POST['action']=="delete" ? "disabled" : "";
+$delete = $_POST['action'] == "delete" ? "disabled" : "";
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _('NetIQ connection settings'); ?></div>
+<div class="pHeader"><?php print _ ('NetIQ connection settings'); ?></div>
 
 <!-- content -->
 <div class="pContent">
 
 	<?php
 	# make sure LDAP is supported !
-	if (!in_array("ldap", get_loaded_extensions())) 	{ $Result->show("danger", _("ldap extension not enabled in php")."!<hr>", false); }
+	if (!in_array ("ldap", get_loaded_extensions ())) { $Result->show ("danger", _ ("ldap extension not enabled in php")."!<hr>", false); }
 	?>
 
 	<form id="editAuthMethod" name="editAuthMethod">
@@ -44,12 +44,12 @@ 
 
 	<!-- description -->
 	<tr>
-		<td><?php print _('Description'); ?></td>
+		<td><?php print _ ('Description'); ?></td>
 		<td>
 			<input type="text" name="description" class="form-control input-sm" value="<?php print @$method_settings->description; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="base_dn info2">
-			<?php print _('Set name for authentication method'); ?>
+			<?php print _ ('Set name for authentication method'); ?>
 		</td>
 	</tr>
 
@@ -59,7 +59,7 @@ 
 
 	<!-- DC -->
 	<tr>
-		<td style="width:130px;"><?php print _('Domain controllers'); ?></td>
+		<td style="width:130px;"><?php print _ ('Domain controllers'); ?></td>
 		<td style="width:250px;">
 			<input type="text" name="domain_controllers" class="form-control input-sm" value="<?php print @$method_settings->params->domain_controllers; ?>" <?php print $delete; ?>>
 			<input type="hidden" name="type" value="NetIQ">
@@ -67,70 +67,70 @@ 
 			<input type="hidden" name="action" value="<?php print @$_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 		</td>
-		<td class="info2"><?php print _('Enter domain controllers, separated by ;'); ?>
+		<td class="info2"><?php print _ ('Enter domain controllers, separated by ;'); ?>
 		</td>
 	</tr>
 
 	<!-- BasedN -->
 	<tr>
-		<td><?php print _('Base DN'); ?></td>
+		<td><?php print _ ('Base DN'); ?></td>
 		<td>
 			<input type="text" name="base_dn" class="form-control input-sm" value="<?php print @$method_settings->params->base_dn; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="base_dn info2">
-			<?php print _('Enter base DN for LDAP'); ?>
+			<?php print _ ('Enter base DN for LDAP'); ?>
 		</td>
 	</tr>
 
 	<!-- Account suffix -->
 	<tr>
-		<td><?php print _('Account suffix'); ?></td>
+		<td><?php print _ ('Account suffix'); ?></td>
 		<td>
 			<input type="text" name="account_suffix" class="form-control input-sm" value="<?php print @$method_settings->params->account_suffix; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="info2">
-			<?php print _('The account suffix for your domain'); ?>
+			<?php print _ ('The account suffix for your domain'); ?>
 		</td>
 	</tr>
 
 
 	<!-- SSL -->
 	<tr>
-		<td><?php print _('Use SSL'); ?></td>
+		<td><?php print _ ('Use SSL'); ?></td>
 		<td>
 			<select name="use_ssl" class="form-control input-sm input-w-auto" <?php print $delete; ?>>
-				<option value="0" <?php if(@$method_settings->params->use_ssl == 0) { print 'selected'; } ?>><?php print _('false'); ?></option>
-				<option value="1" <?php if(@$method_settings->params->use_ssl == 1) { print 'selected'; } ?>><?php print _('true'); ?></option>
+				<option value="0" <?php if (@$method_settings->params->use_ssl == 0) { print 'selected'; } ?>><?php print _ ('false'); ?></option>
+				<option value="1" <?php if (@$method_settings->params->use_ssl == 1) { print 'selected'; } ?>><?php print _ ('true'); ?></option>
 			</select>
 		</td>
 		<td class="info2">
-			<?php print _('Use SSL (LDAPS), your server needs to be setup (default: false)'); ?><br>
+			<?php print _ ('Use SSL (LDAPS), your server needs to be setup (default: false)'); ?><br>
 		</td>
 	</tr>
 
 	<!-- TLS -->
 	<tr>
-		<td><?php print _('Use TLS'); ?></td>
+		<td><?php print _ ('Use TLS'); ?></td>
 		<td>
 			<select name="use_tls" class="form-control input-sm input-w-auto" <?php print $delete; ?>>
-				<option value="0" <?php if(@$method_settings->params->use_tls == 0) { print 'selected'; } ?>><?php print _('false'); ?></option>
-				<option value="1" <?php if(@$method_settings->params->use_tls == 1) { print 'selected'; } ?>><?php print _('true'); ?></option>
+				<option value="0" <?php if (@$method_settings->params->use_tls == 0) { print 'selected'; } ?>><?php print _ ('false'); ?></option>
+				<option value="1" <?php if (@$method_settings->params->use_tls == 1) { print 'selected'; } ?>><?php print _ ('true'); ?></option>
 			</select>
 		</td>
 		<td class="info2">
-			<?php print _('If you wish to use TLS you should ensure that useSSL is set to false and vice-versa (default: false)'); ?>
+			<?php print _ ('If you wish to use TLS you should ensure that useSSL is set to false and vice-versa (default: false)'); ?>
 		</td>
 	</tr>
 
 
 	<!-- AD port -->
 	<tr>
-		<td><?php print _('AD port'); ?></td>
+		<td><?php print _ ('AD port'); ?></td>
 		<td>
 			<input type="text" name="ad_port" class="form-control input-sm input-w-100" value="<?php print @$method_settings->params->ad_port; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="port info2">
-			<?php print _('The default port for LDAP non-SSL connections'); ?>
+			<?php print _ ('The default port for LDAP non-SSL connections'); ?>
 		</td>
 	</tr>
 
@@ -140,13 +140,13 @@ 
 	</tr>
 	<!-- Username -->
 	<tr>
-		<td><?php print _('Domain account'); ?></td>
+		<td><?php print _ ('Domain account'); ?></td>
 		<td>
-			<input type="text" name="adminUsername" class="form-control input-sm" style="margin-bottom:5px;" placeholder="<?php print _('Username'); ?>" value="<?php print @$method_settings->params->adminUsername; ?>" <?php print $delete; ?>>
-			<input type="password" name="adminPassword" class="form-control input-sm" placeholder="<?php print _('Password'); ?>" value="<?php print @$method_settings->params->adminPassword; ?>" <?php print $delete; ?>>
+			<input type="text" name="adminUsername" class="form-control input-sm" style="margin-bottom:5px;" placeholder="<?php print _ ('Username'); ?>" value="<?php print @$method_settings->params->adminUsername; ?>" <?php print $delete; ?>>
+			<input type="password" name="adminPassword" class="form-control input-sm" placeholder="<?php print _ ('Password'); ?>" value="<?php print @$method_settings->params->adminPassword; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="info2">
-			<?php print _('Domain account for search operations (optional)'); ?>
+			<?php print _ ('Domain account for search operations (optional)'); ?>
 		</td>
 	</tr>
 
@@ -158,16 +158,16 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default <?php if ($_POST['action'] == "delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if ($_POST['action'] == "add") { print "fa-plus"; } else if ($_POST['action'] == "delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords (_ ($_POST['action'])); ?></button>
 	</div>
 
 	<?php
-	if($_POST['action']=="delete") {
+	if ($_POST['action'] == "delete") {
 		# check for mathing users
 		$users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
-		if($users!==false) {
-			$Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
+		if ($users !== false) {
+			$Result->show ("warning", sizeof ($users)._ (" users have this method for logging in. They will be reset to local auth!"), false);
 		}
 	}
 	?>

app/admin/authentication-methods/edit-Radius.php

Indentation +29 added lines, -29 removed lines

@@ -9,18 +9,18 @@ 
 
 # ID must be numeric */
 if($_POST['action']!="add") {
-	if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
+    if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
 
-	# feth method settings
-	$method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
-	$method_settings->params = json_decode($method_settings->params);
+    # feth method settings
+    $method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
+    $method_settings->params = json_decode($method_settings->params);
 }
 else {
-	$method_settings = new StdClass ();
-	# set default values
-   @$method_settings->params->hostname = "localhost";
-	$method_settings->params->port = 1812;
-	$method_settings->params->timeout = 2;
+    $method_settings = new StdClass ();
+    # set default values
+    @$method_settings->params->hostname = "localhost";
+    $method_settings->params->port = 1812;
+    $method_settings->params->timeout = 2;
 
 }
 
@@ -105,12 +105,12 @@ 
 		<td>
 			<select name="timeout" class="form-control input-w-auto">
 			<?php
-			$values = array(1,2,3,5,10);
-			foreach($values as $v) {
-				if($v==@$method_settings->params->timeout)	{ print "<option value='$v' selected=selected>$v</option>"; }
-				else										{ print "<option value='$v'					 >$v</option>"; }
-			}
-			?>
+            $values = array(1,2,3,5,10);
+            foreach($values as $v) {
+                if($v==@$method_settings->params->timeout)	{ print "<option value='$v' selected=selected>$v</option>"; }
+                else										{ print "<option value='$v'					 >$v</option>"; }
+            }
+            ?>
 			</select>
 		</td>
 		<td class="base_dn info2">
@@ -122,12 +122,12 @@ 
 	</form>
 
 	<?php
-	# check for socket support !
-	if(!in_array("sockets", get_loaded_extensions())) {
-		$Log->write( "Radius login", "php Socket extension missing!", 2 );
-		$Result->show("danger", _("php Socket extension missing!"), false);
-	}
-	?>
+    # check for socket support !
+    if(!in_array("sockets", get_loaded_extensions())) {
+        $Log->write( "Radius login", "php Socket extension missing!", 2 );
+        $Result->show("danger", _("php Socket extension missing!"), false);
+    }
+    ?>
 </div>
 
 
@@ -139,14 +139,14 @@ 
 	</div>
 
 	<?php
-	# check for mathing users
-	if($_POST['action']=="delete") {
-		$users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
-		if($users!==false) {
-			$Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
-		}
-	}
-	?>
+    # check for mathing users
+    if($_POST['action']=="delete") {
+        $users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
+        if($users!==false) {
+            $Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
+        }
+    }
+    ?>
 
 	<!-- Result -->
 	<div class="editAuthMethodResult"></div>

Braces +4 added lines, -1 removed lines

@@ -174,7 +174,10 @@
 <div class="pFooter">
 	<div class="btn-group">
 		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; }
+else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; }
+else if ($_POST['action']=="delete") { print "fa-trash-o"; }
+else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
 	</div>
 
 	<?php

Spacing +30 added lines, -30 removed lines

@@ -5,15 +5,15 @@ 
  *****************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # ID must be numeric */
-if($_POST['action']!="add") {
-	if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
+if ($_POST['action'] != "add") {
+	if (!is_numeric ($_POST['id'])) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 	# feth method settings
 	$method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
-	$method_settings->params = json_decode($method_settings->params);
+	$method_settings->params = json_decode ($method_settings->params);
 }
 else {
 	$method_settings = new StdClass ();
@@ -25,11 +25,11 @@ 
 }
 
 # set delete flag
-$delete = $_POST['action']=="delete" ? "disabled" : "";
+$delete = $_POST['action'] == "delete" ? "disabled" : "";
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _('Radius connection settings'); ?></div>
+<div class="pHeader"><?php print _ ('Radius connection settings'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -39,12 +39,12 @@ 
 
 	<!-- description -->
 	<tr>
-		<td><?php print _('Description'); ?></td>
+		<td><?php print _ ('Description'); ?></td>
 		<td>
 			<input type="text" name="description" class="form-control input-sm" value="<?php print @$method_settings->description; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="base_dn info2">
-			<?php print _('Set name for authentication method'); ?>
+			<?php print _ ('Set name for authentication method'); ?>
 		</td>
 	</tr>
 
@@ -54,7 +54,7 @@ 
 
 	<!-- Server -->
 	<tr>
-		<td style="width:130px;"><?php print _('Radius server'); ?></td>
+		<td style="width:130px;"><?php print _ ('Radius server'); ?></td>
 		<td style="width:250px;">
 			<input type="text" name="hostname" class="form-control input-sm" value="<?php print @$method_settings->params->hostname; ?>" <?php print $delete; ?>>
 			<input type="hidden" name="type" value="Radius">
@@ -62,59 +62,59 @@ 
 			<input type="hidden" name="action" value="<?php print @$_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 		</td>
-		<td class="info2"><?php print _('Enter Radius server'); ?>
+		<td class="info2"><?php print _ ('Enter Radius server'); ?>
 		</td>
 	</tr>
 
 	<!-- secret -->
 	<tr>
-		<td><?php print _('Secret'); ?></td>
+		<td><?php print _ ('Secret'); ?></td>
 		<td>
 			<input type="password" name="secret" class="form-control input-sm" value="<?php print @$method_settings->params->secret; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="base_dn info2">
-			<?php print _('Enter radius secret'); ?>
+			<?php print _ ('Enter radius secret'); ?>
 		</td>
 	</tr>
 
 	<!-- port -->
 	<tr>
-		<td><?php print _('Port'); ?></td>
+		<td><?php print _ ('Port'); ?></td>
 		<td>
 			<input type="text" name="port" class="form-control input-sm" value="<?php print @$method_settings->params->port; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="base_dn info2">
-			<?php print _('Enter radius port (default 1812)'); ?>
+			<?php print _ ('Enter radius port (default 1812)'); ?>
 		</td>
 	</tr>
 
 	<!-- port -->
 	<tr>
-		<td><?php print _('Suffix'); ?></td>
+		<td><?php print _ ('Suffix'); ?></td>
 		<td>
 			<input type="text" name="suffix" class="form-control input-sm" value="<?php print @$method_settings->params->suffix; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="base_dn info2">
-			<?php print _('Enter suffix'); ?>
+			<?php print _ ('Enter suffix'); ?>
 		</td>
 	</tr>
 
 	<!-- timeout -->
 	<tr>
-		<td><?php print _('Timeout'); ?></td>
+		<td><?php print _ ('Timeout'); ?></td>
 		<td>
 			<select name="timeout" class="form-control input-w-auto">
 			<?php
-			$values = array(1,2,3,5,10);
-			foreach($values as $v) {
-				if($v==@$method_settings->params->timeout)	{ print "<option value='$v' selected=selected>$v</option>"; }
-				else										{ print "<option value='$v'					 >$v</option>"; }
+			$values = array (1, 2, 3, 5, 10);
+			foreach ($values as $v) {
+				if ($v == @$method_settings->params->timeout) { print "<option value='$v' selected=selected>$v</option>"; }
+				else { print "<option value='$v'					 >$v</option>"; }
 			}
 			?>
 			</select>
 		</td>
 		<td class="base_dn info2">
-			<?php print _('Set timeout in seconds'); ?>
+			<?php print _ ('Set timeout in seconds'); ?>
 		</td>
 	</tr>
 
@@ -123,9 +123,9 @@ 
 
 	<?php
 	# check for socket support !
-	if(!in_array("sockets", get_loaded_extensions())) {
-		$Log->write( "Radius login", "php Socket extension missing!", 2 );
-		$Result->show("danger", _("php Socket extension missing!"), false);
+	if (!in_array ("sockets", get_loaded_extensions ())) {
+		$Log->write ("Radius login", "php Socket extension missing!", 2);
+		$Result->show ("danger", _ ("php Socket extension missing!"), false);
 	}
 	?>
 </div>
@@ -134,16 +134,16 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default <?php if ($_POST['action'] == "delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if ($_POST['action'] == "add") { print "fa-plus"; } else if ($_POST['action'] == "delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords (_ ($_POST['action'])); ?></button>
 	</div>
 
 	<?php
 	# check for mathing users
-	if($_POST['action']=="delete") {
+	if ($_POST['action'] == "delete") {
 		$users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
-		if($users!==false) {
-			$Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
+		if ($users !== false) {
+			$Result->show ("warning", sizeof ($users)._ (" users have this method for logging in. They will be reset to local auth!"), false);
 		}
 	}
 	?>

app/admin/authentication-methods/edit-LDAP.php

Indentation +21 added lines, -21 removed lines

@@ -9,19 +9,19 @@ 
 
 # ID must be numeric */
 if($_POST['action']!="add") {
-	if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
+    if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
 
-	# feth method settings
-	$method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
-	$method_settings->params = json_decode($method_settings->params);
+    # feth method settings
+    $method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
+    $method_settings->params = json_decode($method_settings->params);
 }
 else {
-	$method_settings = new StdClass ();
-	# set default values
-   @$method_settings->params->domain_controllers = "ldap1.domain.local;ldap2.domain.local";
-	$method_settings->params->base_dn = "CN=Users,CN=Company,DC=domain,DC=local";
-	$method_settings->params->account_suffix = "";
-	$method_settings->params->ad_port = 389;
+    $method_settings = new StdClass ();
+    # set default values
+    @$method_settings->params->domain_controllers = "ldap1.domain.local;ldap2.domain.local";
+    $method_settings->params->base_dn = "CN=Users,CN=Company,DC=domain,DC=local";
+    $method_settings->params->account_suffix = "";
+    $method_settings->params->ad_port = 389;
 }
 
 # set delete flag
@@ -45,9 +45,9 @@ 
 <div class="pContent">
 
 	<?php
-	# make sure LDAP is supported !
-	if (!in_array("ldap", get_loaded_extensions())) 	{ $Result->show("danger", _("ldap extension not enabled in php")."!<hr>", false); }
-	?>
+    # make sure LDAP is supported !
+    if (!in_array("ldap", get_loaded_extensions())) 	{ $Result->show("danger", _("ldap extension not enabled in php")."!<hr>", false); }
+    ?>
 
 	<form id="editAuthMethod" name="editAuthMethod">
 	<table class="editAuthMethod table table-noborder table-condensed">
@@ -178,14 +178,14 @@ 
 	</div>
 
 	<?php
-	if($_POST['action']=="delete") {
-		# check for mathing users
-		$users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
-		if($users!==false) {
-			$Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
-		}
-	}
-	?>
+    if($_POST['action']=="delete") {
+        # check for mathing users
+        $users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
+        if($users!==false) {
+            $Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
+        }
+    }
+    ?>
 
 	<!-- Result -->
 	<div class="editAuthMethodResult"></div>

Braces +4 added lines, -1 removed lines

@@ -174,7 +174,10 @@
 <div class="pFooter">
 	<div class="btn-group">
 		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; }
+else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; }
+else if ($_POST['action']=="delete") { print "fa-trash-o"; }
+else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
 	</div>
 
 	<?php

Spacing +35 added lines, -35 removed lines

@@ -5,15 +5,15 @@ 
  *****************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # ID must be numeric */
-if($_POST['action']!="add") {
-	if(!is_numeric($_POST['id']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
+if ($_POST['action'] != "add") {
+	if (!is_numeric ($_POST['id'])) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 	# feth method settings
 	$method_settings = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
-	$method_settings->params = json_decode($method_settings->params);
+	$method_settings->params = json_decode ($method_settings->params);
 }
 else {
 	$method_settings = new StdClass ();
@@ -25,11 +25,11 @@ 
 }
 
 # set delete flag
-$delete = $_POST['action']=="delete" ? "disabled" : "";
+$delete = $_POST['action'] == "delete" ? "disabled" : "";
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _('LDAP connection settings'); ?></div>
+<div class="pHeader"><?php print _ ('LDAP connection settings'); ?></div>
 
 <script>
 	$( "select#ldap_security" ).change(function () {
@@ -46,7 +46,7 @@ 
 
 	<?php
 	# make sure LDAP is supported !
-	if (!in_array("ldap", get_loaded_extensions())) 	{ $Result->show("danger", _("ldap extension not enabled in php")."!<hr>", false); }
+	if (!in_array ("ldap", get_loaded_extensions ())) { $Result->show ("danger", _ ("ldap extension not enabled in php")."!<hr>", false); }
 	?>
 
 	<form id="editAuthMethod" name="editAuthMethod">
@@ -54,12 +54,12 @@ 
 
 	<!-- description -->
 	<tr>
-		<td><?php print _('Description'); ?></td>
+		<td><?php print _ ('Description'); ?></td>
 		<td>
 			<input type="text" name="description" class="form-control input-sm" value="<?php print @$method_settings->description; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="base_dn info2">
-			<?php print _('Set name for authentication method'); ?>
+			<?php print _ ('Set name for authentication method'); ?>
 		</td>
 	</tr>
 
@@ -69,7 +69,7 @@ 
 
 	<!-- DC -->
 	<tr>
-		<td style="width:130px;"><?php print _('LDAP servers'); ?></td>
+		<td style="width:130px;"><?php print _ ('LDAP servers'); ?></td>
 		<td style="width:250px;">
 			<input type="text" name="domain_controllers" class="form-control input-sm" value="<?php print @$method_settings->params->domain_controllers; ?>" <?php print $delete; ?>>
 			<input type="hidden" name="type" value="LDAP">
@@ -77,66 +77,66 @@ 
 			<input type="hidden" name="action" value="<?php print @$_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 		</td>
-		<td class="info2"><?php print _('LDAP hosts, separated by a semicolon (;)'); ?>
+		<td class="info2"><?php print _ ('LDAP hosts, separated by a semicolon (;)'); ?>
 		</td>
 	</tr>
 
 	<!-- BaseDN -->
 	<tr>
-		<td><?php print _('Base DN'); ?></td>
+		<td><?php print _ ('Base DN'); ?></td>
 		<td>
 			<input type="text" name="base_dn" class="form-control input-sm" value="<?php print @$method_settings->params->base_dn; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="base_dn info2">
-			<?php print _('Base DN for your directory'); ?>
+			<?php print _ ('Base DN for your directory'); ?>
 		</td>
 	</tr>
 
 	<!-- UsersDN -->
 	<tr>
-		<td><?php print _('Users DN'); ?></td>
+		<td><?php print _ ('Users DN'); ?></td>
 		<td>
 			<input type="text" name="users_base_dn" class="form-control input-sm" value="<?php print @$method_settings->params->users_base_dn; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="users_base_dn info2">
-			<?php print _('Base DN for your users, if different from the base DN above.'); ?>
+			<?php print _ ('Base DN for your users, if different from the base DN above.'); ?>
 		</td>
 	</tr>
 
 	<!-- UIDAttr -->
 	<tr>
-		<td><?php print _('UID Attribute'); ?></td>
+		<td><?php print _ ('UID Attribute'); ?></td>
 		<td>
 			<input type="text" name="uid_attr" class="form-control input-sm" value="<?php print @$method_settings->params->uid_attr; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="uid_attr_dn info2">
-			<?php print _('LDAP uid naming attribute for users, e.g. "uid" or "cn"'); ?>
+			<?php print _ ('LDAP uid naming attribute for users, e.g. "uid" or "cn"'); ?>
 		</td>
 	</tr>
 
 	<!-- TLS -->
 	<tr>
-		<td><?php print _('LDAP Security Type'); ?></td>
+		<td><?php print _ ('LDAP Security Type'); ?></td>
 		<td>
 			<select id='ldap_security' name="ldap_security" class="form-control input-sm input-w-auto" <?php print $delete; ?>>
-				<option name="ldap_security" class="form-control input-sm input-w-auto" value="tls" <?php if(@$method_settings->params->ldap_security == 'tls') { print 'selected'; } ?>>TLS</option>
-				<option name="ldap_security" class="form-control input-sm input-w-auto" value="ssl" <?php if(@$method_settings->params->ldap_security == 'ssl') { print 'selected'; } ?>>SSL</option>
-				<option name="ldap_security" class="form-control input-sm input-w-auto" value="none" <?php if(@$method_settings->params->ldap_security == 'none') { print 'selected'; } ?>>None</option>
+				<option name="ldap_security" class="form-control input-sm input-w-auto" value="tls" <?php if (@$method_settings->params->ldap_security == 'tls') { print 'selected'; } ?>>TLS</option>
+				<option name="ldap_security" class="form-control input-sm input-w-auto" value="ssl" <?php if (@$method_settings->params->ldap_security == 'ssl') { print 'selected'; } ?>>SSL</option>
+				<option name="ldap_security" class="form-control input-sm input-w-auto" value="none" <?php if (@$method_settings->params->ldap_security == 'none') { print 'selected'; } ?>>None</option>
 			</select>
 		</td>
 		<td class="info2">
-			<?php print _('SSL, TLS, or None (default: TLS)'); ?>
+			<?php print _ ('SSL, TLS, or None (default: TLS)'); ?>
 		</td>
 	</tr>
 
 	<!-- LDAP port -->
 	<tr>
-		<td><?php print _('LDAP port'); ?></td>
+		<td><?php print _ ('LDAP port'); ?></td>
 		<td>
 			<input type="text" id="ad_port" name="ad_port" class="form-control input-sm input-w-100" value="<?php print @$method_settings->params->ad_port; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="port info2">
-			<?php print _('Listening port for your LDAP service. TLS/unencrypted Default: 389 <br /> SSL Default: 636'); ?>
+			<?php print _ ('Listening port for your LDAP service. TLS/unencrypted Default: 389 <br /> SSL Default: 636'); ?>
 		</td>
 	</tr>
 
@@ -145,23 +145,23 @@ 
 	</tr>
 	<!-- Username -->
 	<tr>
-		<td><?php print _('Bind user'); ?></td>
+		<td><?php print _ ('Bind user'); ?></td>
 		<td>
-			<input type="text" name="adminUsername" class="form-control input-sm" style="margin-bottom:5px;" placeholder="<?php print _('Username'); ?>" value="<?php print @$method_settings->params->adminUsername; ?>" <?php print $delete; ?>>
+			<input type="text" name="adminUsername" class="form-control input-sm" style="margin-bottom:5px;" placeholder="<?php print _ ('Username'); ?>" value="<?php print @$method_settings->params->adminUsername; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="info2">
-			<?php print _('User DN to bind as for search operations (optional). '); ?>
+			<?php print _ ('User DN to bind as for search operations (optional). '); ?>
 		</td>
 	</tr>
 
 	<!-- Username -->
 	<tr>
-		<td><?php print _('Bind password'); ?></td>
+		<td><?php print _ ('Bind password'); ?></td>
 		<td>
-			<input type="password" name="adminPassword" class="form-control input-sm" placeholder="<?php print _('Password'); ?>" value="<?php print @$method_settings->params->adminPassword; ?>" <?php print $delete; ?>>
+			<input type="password" name="adminPassword" class="form-control input-sm" placeholder="<?php print _ ('Password'); ?>" value="<?php print @$method_settings->params->adminPassword; ?>" <?php print $delete; ?>>
 		</td>
 		<td class="info2">
-			<?php print _('Password for the bind account (only required if bind user is set).'); ?>
+			<?php print _ ('Password for the bind account (only required if bind user is set).'); ?>
 		</td>
 	</tr>
 
@@ -173,16 +173,16 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default <?php if ($_POST['action'] == "delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editAuthMethodSubmit"><i class="fa <?php if ($_POST['action'] == "add") { print "fa-plus"; } else if ($_POST['action'] == "delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords (_ ($_POST['action'])); ?></button>
 	</div>
 
 	<?php
-	if($_POST['action']=="delete") {
+	if ($_POST['action'] == "delete") {
 		# check for mathing users
 		$users = $Admin->fetch_multiple_objects ("users", "authMethod", @$method_settings->id);
-		if($users!==false) {
-			$Result->show("warning", sizeof($users)._(" users have this method for logging in. They will be reset to local auth!"), false);
+		if ($users !== false) {
+			$Result->show ("warning", sizeof ($users)._ (" users have this method for logging in. They will be reset to local auth!"), false);
 		}
 	}
 	?>

app/admin/authentication-methods/edit.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 
 # if edit check if protected?
 if($_POST['action']!="add") {
-	$auth_method = $Admin->fetch_object("usersAuthMethod", "id", $_POST['id']);
-	if($auth_method->protected=="Yes")								{ $Result->show("danger", _("Method cannot be change as it is protected"), true, true); }
+    $auth_method = $Admin->fetch_object("usersAuthMethod", "id", $_POST['id']);
+    if($auth_method->protected=="Yes")								{ $Result->show("danger", _("Method cannot be change as it is protected"), true, true); }
 }
 
 # route to proper auth method editing

Spacing +10 added lines, -10 removed lines

@@ -1,28 +1,28 @@
 <?php
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin 		= new Admin ($Database);
 $Result 	= new Result ();
-$Log 		= new Logging ($Database, $User->settings);
+$Log = new Logging ($Database, $User->settings);
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "authmethods");
 
 # if edit check if protected?
-if($_POST['action']!="add") {
-	$auth_method = $Admin->fetch_object("usersAuthMethod", "id", $_POST['id']);
-	if($auth_method->protected=="Yes")								{ $Result->show("danger", _("Method cannot be change as it is protected"), true, true); }
+if ($_POST['action'] != "add") {
+	$auth_method = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['id']);
+	if ($auth_method->protected == "Yes") { $Result->show ("danger", _ ("Method cannot be change as it is protected"), true, true); }
 }
 
 # route to proper auth method editing
-if(!file_exists(dirname(__FILE__)."/edit-$_POST[type].php"))	{ $Result->show("danger", _("Invalid method type"), true, true); }
-else															{ include("edit-$_POST[type].php"); }
+if (!file_exists (dirname (__FILE__)."/edit-$_POST[type].php")) { $Result->show ("danger", _ ("Invalid method type"), true, true); }
+else { include("edit-$_POST[type].php"); }
 ?>
\ No newline at end of file

app/admin/settings/settings-save.php

Indentation +39 added lines, -39 removed lines

@@ -48,45 +48,45 @@
 
 # set update values
 $values = array("id"=>1,
-				//site settings
-				"siteTitle"=>@$_POST['siteTitle'],
-				"siteDomain"=>@$_POST['siteDomain'],
-				"siteURL"=>@$_POST['siteURL'],
-				"siteLoginText"=>@$_POST['siteLoginText'],
-				"prettyLinks"=>@$_POST['prettyLinks'],
-				"defaultLang"=>@$_POST['defaultLang'],
-				"inactivityTimeout"=>@$_POST['inactivityTimeout'],
-				//admin
-				"siteAdminName"=>@$_POST['siteAdminName'],
-				"siteAdminMail"=>@$_POST['siteAdminMail'],
-				//features
-				"api"=>$Admin->verify_checkbox(@$_POST['api']),
-				"enableIPrequests"=>$Admin->verify_checkbox(@$_POST['enableIPrequests']),
-				"enableMulticast"=>$Admin->verify_checkbox(@$_POST['enableMulticast']),
-				"enableRACK"=>$Admin->verify_checkbox(@$_POST['enableRACK']),
-				"enableSNMP"=>$Admin->verify_checkbox(@$_POST['enableSNMP']),
-				"enableThreshold"=>$Admin->verify_checkbox(@$_POST['enableThreshold']),
-				"enableVRF"=>$Admin->verify_checkbox(@$_POST['enableVRF']),
-				"enableDNSresolving"=>$Admin->verify_checkbox(@$_POST['enableDNSresolving']),
-				"vlanDuplicate"=>$Admin->verify_checkbox(@$_POST['vlanDuplicate']),
-				"vlanMax"=>@$_POST['vlanMax'],
-				"enableChangelog"=>$Admin->verify_checkbox(@$_POST['enableChangelog']),
-				"tempShare"=>$Admin->verify_checkbox(@$_POST['tempShare']),
-				"enablePowerDNS"=>$Admin->verify_checkbox(@$_POST['enablePowerDNS']),
-				"enableFirewallZones"=>$Admin->verify_checkbox(@$_POST['enableFirewallZones']),
-				"log"=>@$_POST['log'],
-				//display
-				"donate"=>$Admin->verify_checkbox(@$_POST['donate']),
-				"visualLimit"=>@$_POST['visualLimit'],
-				"subnetOrdering"=>@$_POST['subnetOrdering'],
-				"subnetView"=>@$_POST['subnetView'],
-				//ping
-				"scanPingType"=>@$_POST['scanPingType'],
-				"pingStatus"=>@$_POST['pingStatus'],
-				"scanPingPath"=>@$_POST['scanPingPath'],
-				"scanFPingPath"=>@$_POST['scanFPingPath'],
-				"scanMaxThreads"=>@$_POST['scanMaxThreads']
-				);
+                //site settings
+                "siteTitle"=>@$_POST['siteTitle'],
+                "siteDomain"=>@$_POST['siteDomain'],
+                "siteURL"=>@$_POST['siteURL'],
+                "siteLoginText"=>@$_POST['siteLoginText'],
+                "prettyLinks"=>@$_POST['prettyLinks'],
+                "defaultLang"=>@$_POST['defaultLang'],
+                "inactivityTimeout"=>@$_POST['inactivityTimeout'],
+                //admin
+                "siteAdminName"=>@$_POST['siteAdminName'],
+                "siteAdminMail"=>@$_POST['siteAdminMail'],
+                //features
+                "api"=>$Admin->verify_checkbox(@$_POST['api']),
+                "enableIPrequests"=>$Admin->verify_checkbox(@$_POST['enableIPrequests']),
+                "enableMulticast"=>$Admin->verify_checkbox(@$_POST['enableMulticast']),
+                "enableRACK"=>$Admin->verify_checkbox(@$_POST['enableRACK']),
+                "enableSNMP"=>$Admin->verify_checkbox(@$_POST['enableSNMP']),
+                "enableThreshold"=>$Admin->verify_checkbox(@$_POST['enableThreshold']),
+                "enableVRF"=>$Admin->verify_checkbox(@$_POST['enableVRF']),
+                "enableDNSresolving"=>$Admin->verify_checkbox(@$_POST['enableDNSresolving']),
+                "vlanDuplicate"=>$Admin->verify_checkbox(@$_POST['vlanDuplicate']),
+                "vlanMax"=>@$_POST['vlanMax'],
+                "enableChangelog"=>$Admin->verify_checkbox(@$_POST['enableChangelog']),
+                "tempShare"=>$Admin->verify_checkbox(@$_POST['tempShare']),
+                "enablePowerDNS"=>$Admin->verify_checkbox(@$_POST['enablePowerDNS']),
+                "enableFirewallZones"=>$Admin->verify_checkbox(@$_POST['enableFirewallZones']),
+                "log"=>@$_POST['log'],
+                //display
+                "donate"=>$Admin->verify_checkbox(@$_POST['donate']),
+                "visualLimit"=>@$_POST['visualLimit'],
+                "subnetOrdering"=>@$_POST['subnetOrdering'],
+                "subnetView"=>@$_POST['subnetView'],
+                //ping
+                "scanPingType"=>@$_POST['scanPingType'],
+                "pingStatus"=>@$_POST['pingStatus'],
+                "scanPingPath"=>@$_POST['scanPingPath'],
+                "scanFPingPath"=>@$_POST['scanFPingPath'],
+                "scanMaxThreads"=>@$_POST['scanMaxThreads']
+                );
 if(!$Admin->object_modify("settings", "edit", "id", $values))	{ $Result->show("danger",  _("Cannot update settings"), true); }
 else															{ $Result->show("success", _("Settings updated successfully"), true); }
 ?>

Braces +8 added lines, -4 removed lines

@@ -39,12 +39,16 @@
 if(!is_numeric($_POST['vlanMax']))											{ $Result->show("danger", _("Invalid value for Max VLAN number"), true); }
 
 //verify snmp support
-if ($Admin->verify_checkbox(@$_POST['enableSNMP'])==1)
-if (!in_array("snmp", get_loaded_extensions()))                             { $Result->show("danger", _("Missing snmp support in php"), true); }
+if ($Admin->verify_checkbox(@$_POST['enableSNMP'])==1) {
+    if (!in_array("snmp", get_loaded_extensions()))                             { $Result->show("danger", _("Missing snmp support in php"), true);
+}
+}
 
 //verify racktables gd support
-if ($Admin->verify_checkbox(@$_POST['enableRACK'])==1)
-if (!in_array("gd", get_loaded_extensions()))                               { $Result->show("danger", _("Missing gd support in php"), true); }
+if ($Admin->verify_checkbox(@$_POST['enableRACK'])==1) {
+    if (!in_array("gd", get_loaded_extensions()))                               { $Result->show("danger", _("Missing gd support in php"), true);
+}
+}
 
 # set update values
 $values = array("id"=>1,

Spacing +35 added lines, -35 removed lines

@@ -5,49 +5,49 @@ 
  **************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "settings", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "settings", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 
 //check for http/https
-if ( (strpos($_POST['siteURL'],'http://') !== false) || (strpos($_POST['siteURL'],'https://') !== false) ) 	{}
-else 																										{ $_POST['siteURL'] = "http://".$_POST['siteURL']; }
+if ((strpos ($_POST['siteURL'], 'http://') !== false) || (strpos ($_POST['siteURL'], 'https://') !== false)) {}
+else { $_POST['siteURL'] = "http://".$_POST['siteURL']; }
 
 //verify ping status fields
-$_POST['pingStatus'] = str_replace(" ", "", $_POST['pingStatus']);		//remove possible spaces
-$_POST['pingStatus'] = str_replace(",", ";", $_POST['pingStatus']);		//change possible , for ;
-$statuses = explode(";", $_POST['pingStatus']);
+$_POST['pingStatus'] = str_replace (" ", "", $_POST['pingStatus']); //remove possible spaces
+$_POST['pingStatus'] = str_replace (",", ";", $_POST['pingStatus']); //change possible , for ;
+$statuses = explode (";", $_POST['pingStatus']);
 
-if(sizeof($statuses)!=2)													{ $Result->show("danger", _("Invalid ping status intervals"), true); }
-if(!is_numeric($statuses[0]) || !is_numeric($statuses[1]))					{ $Result->show("danger", _("Invalid ping status intervals"), true); }
+if (sizeof ($statuses) != 2) { $Result->show ("danger", _ ("Invalid ping status intervals"), true); }
+if (!is_numeric ($statuses[0]) || !is_numeric ($statuses[1])) { $Result->show ("danger", _ ("Invalid ping status intervals"), true); }
 
 //verify email
-if(filter_var($_POST['siteAdminMail'], FILTER_VALIDATE_EMAIL) === false)	{ $Result->show("danger", _("Invalid email"), true); }
+if (filter_var ($_POST['siteAdminMail'], FILTER_VALIDATE_EMAIL) === false) { $Result->show ("danger", _ ("Invalid email"), true); }
 
 //verify numbers
-if(!is_numeric($_POST['vlanMax']))											{ $Result->show("danger", _("Invalid value for Max VLAN number"), true); }
+if (!is_numeric ($_POST['vlanMax'])) { $Result->show ("danger", _ ("Invalid value for Max VLAN number"), true); }
 
 //verify snmp support
-if ($Admin->verify_checkbox(@$_POST['enableSNMP'])==1)
-if (!in_array("snmp", get_loaded_extensions()))                             { $Result->show("danger", _("Missing snmp support in php"), true); }
+if ($Admin->verify_checkbox (@$_POST['enableSNMP']) == 1)
+if (!in_array ("snmp", get_loaded_extensions ())) { $Result->show ("danger", _ ("Missing snmp support in php"), true); }
 
 //verify racktables gd support
-if ($Admin->verify_checkbox(@$_POST['enableRACK'])==1)
-if (!in_array("gd", get_loaded_extensions()))                               { $Result->show("danger", _("Missing gd support in php"), true); }
+if ($Admin->verify_checkbox (@$_POST['enableRACK']) == 1)
+if (!in_array ("gd", get_loaded_extensions ())) { $Result->show ("danger", _ ("Missing gd support in php"), true); }
 
 # set update values
-$values = array("id"=>1,
+$values = array ("id"=>1,
 				//site settings
 				"siteTitle"=>@$_POST['siteTitle'],
 				"siteDomain"=>@$_POST['siteDomain'],
@@ -60,23 +60,23 @@ 
 				"siteAdminName"=>@$_POST['siteAdminName'],
 				"siteAdminMail"=>@$_POST['siteAdminMail'],
 				//features
-				"api"=>$Admin->verify_checkbox(@$_POST['api']),
-				"enableIPrequests"=>$Admin->verify_checkbox(@$_POST['enableIPrequests']),
-				"enableMulticast"=>$Admin->verify_checkbox(@$_POST['enableMulticast']),
-				"enableRACK"=>$Admin->verify_checkbox(@$_POST['enableRACK']),
-				"enableSNMP"=>$Admin->verify_checkbox(@$_POST['enableSNMP']),
-				"enableThreshold"=>$Admin->verify_checkbox(@$_POST['enableThreshold']),
-				"enableVRF"=>$Admin->verify_checkbox(@$_POST['enableVRF']),
-				"enableDNSresolving"=>$Admin->verify_checkbox(@$_POST['enableDNSresolving']),
-				"vlanDuplicate"=>$Admin->verify_checkbox(@$_POST['vlanDuplicate']),
+				"api"=>$Admin->verify_checkbox (@$_POST['api']),
+				"enableIPrequests"=>$Admin->verify_checkbox (@$_POST['enableIPrequests']),
+				"enableMulticast"=>$Admin->verify_checkbox (@$_POST['enableMulticast']),
+				"enableRACK"=>$Admin->verify_checkbox (@$_POST['enableRACK']),
+				"enableSNMP"=>$Admin->verify_checkbox (@$_POST['enableSNMP']),
+				"enableThreshold"=>$Admin->verify_checkbox (@$_POST['enableThreshold']),
+				"enableVRF"=>$Admin->verify_checkbox (@$_POST['enableVRF']),
+				"enableDNSresolving"=>$Admin->verify_checkbox (@$_POST['enableDNSresolving']),
+				"vlanDuplicate"=>$Admin->verify_checkbox (@$_POST['vlanDuplicate']),
 				"vlanMax"=>@$_POST['vlanMax'],
-				"enableChangelog"=>$Admin->verify_checkbox(@$_POST['enableChangelog']),
-				"tempShare"=>$Admin->verify_checkbox(@$_POST['tempShare']),
-				"enablePowerDNS"=>$Admin->verify_checkbox(@$_POST['enablePowerDNS']),
-				"enableFirewallZones"=>$Admin->verify_checkbox(@$_POST['enableFirewallZones']),
+				"enableChangelog"=>$Admin->verify_checkbox (@$_POST['enableChangelog']),
+				"tempShare"=>$Admin->verify_checkbox (@$_POST['tempShare']),
+				"enablePowerDNS"=>$Admin->verify_checkbox (@$_POST['enablePowerDNS']),
+				"enableFirewallZones"=>$Admin->verify_checkbox (@$_POST['enableFirewallZones']),
 				"log"=>@$_POST['log'],
 				//display
-				"donate"=>$Admin->verify_checkbox(@$_POST['donate']),
+				"donate"=>$Admin->verify_checkbox (@$_POST['donate']),
 				"visualLimit"=>@$_POST['visualLimit'],
 				"subnetOrdering"=>@$_POST['subnetOrdering'],
 				"subnetView"=>@$_POST['subnetView'],
@@ -87,6 +87,6 @@ 
 				"scanFPingPath"=>@$_POST['scanFPingPath'],
 				"scanMaxThreads"=>@$_POST['scanMaxThreads']
 				);
-if(!$Admin->object_modify("settings", "edit", "id", $values))	{ $Result->show("danger",  _("Cannot update settings"), true); }
-else															{ $Result->show("success", _("Settings updated successfully"), true); }
+if (!$Admin->object_modify ("settings", "edit", "id", $values)) { $Result->show ("danger", _ ("Cannot update settings"), true); }
+else { $Result->show ("success", _ ("Settings updated successfully"), true); }
 ?>

app/admin/settings/index.php

Indentation +81 added lines, -81 removed lines

@@ -82,10 +82,10 @@ 
 	<td>
 		<select name="prettyLinks" class="form-control input-sm input-w-auto">
 		<?php
-			print "<option value='No'>"._('No')."</option>";
-			if($settings['prettyLinks']=="Yes") { print "<option value='Yes' selected='selected'>"._('Yes')."</option>"; }
-			else								{ print "<option value='Yes'>"._('Yes')."</option>"; }
-		?>
+            print "<option value='No'>"._('No')."</option>";
+            if($settings['prettyLinks']=="Yes") { print "<option value='Yes' selected='selected'>"._('Yes')."</option>"; }
+            else								{ print "<option value='Yes'>"._('Yes')."</option>"; }
+        ?>
 		</select>
 	</td>
 	<td class="info2">
@@ -104,15 +104,15 @@ 
 	<td>
 		<select name="defaultLang" class="form-control input-sm input-w-auto">
 		<?php
-		if(sizeof($languages)>0) {
-			//default
-			print "<option value='0'>Default</option>";
-			foreach($languages as $lang) {
-				if($lang->l_id==$settings['defaultLang']) 	{ print "<option value='$lang->l_id' selected='selected'>$lang->l_name ($lang->l_code)</option>"; }
-				else										{ print "<option value='$lang->l_id' 					>$lang->l_name ($lang->l_code)</option>"; }
-			}
-		}
-		?>
+        if(sizeof($languages)>0) {
+            //default
+            print "<option value='0'>Default</option>";
+            foreach($languages as $lang) {
+                if($lang->l_id==$settings['defaultLang']) 	{ print "<option value='$lang->l_id' selected='selected'>$lang->l_name ($lang->l_code)</option>"; }
+                else										{ print "<option value='$lang->l_id' 					>$lang->l_name ($lang->l_code)</option>"; }
+            }
+        }
+        ?>
 		</select>
 	</td>
 	<td class="info2"><?php print _('Select default language'); ?></td>
@@ -124,13 +124,13 @@ 
 	<td>
 		<select name="inactivityTimeout" class="form-control input-sm input-w-auto">
 		<?php
-		$durations = array("900"=>"15 minutes","1800"=>"30 minutes", "3600"=>"1 hour", "7200"=>"2 hours", "21600"=>"6 hours", "43200"=>"12 hours", "86400"=>"24 hours");
-		//default
-		foreach($durations as $k=>$d) {
-			if($k==$settings['inactivityTimeout']) 	{ print "<option value='$k' selected='selected'>$d</option>"; }
-			else									{ print "<option value='$k' 				   >$d</option>"; }
-		}
-		?>
+        $durations = array("900"=>"15 minutes","1800"=>"30 minutes", "3600"=>"1 hour", "7200"=>"2 hours", "21600"=>"6 hours", "43200"=>"12 hours", "86400"=>"24 hours");
+        //default
+        foreach($durations as $k=>$d) {
+            if($k==$settings['inactivityTimeout']) 	{ print "<option value='$k' selected='selected'>$d</option>"; }
+            else									{ print "<option value='$k' 				   >$d</option>"; }
+        }
+        ?>
 		</select>
 	</td>
 	<td class="info2"><?php print _('Select inactive timeout for user sessions. Please note that if default php session settings in php.ini are lower they will override this'); ?></td>
@@ -320,13 +320,13 @@ 
 	<td>
 		<select name="log" class="form-control input-sm input-w-auto">
 		<?php
-		$types = array("Database"=>"Database", "syslog"=>"Syslog", "both"=>"Syslog and local Database");
-		//default
-		foreach($types as $k=>$d) {
-			if($k==$settings['log']) 	{ print "<option value='$k' selected='selected'>$d</option>"; }
-			else						{ print "<option value='$k' 				   >$d</option>"; }
-		}
-		?>
+        $types = array("Database"=>"Database", "syslog"=>"Syslog", "both"=>"Syslog and local Database");
+        //default
+        foreach($types as $k=>$d) {
+            if($k==$settings['log']) 	{ print "<option value='$k' selected='selected'>$d</option>"; }
+            else						{ print "<option value='$k' 				   >$d</option>"; }
+        }
+        ?>
 		</select>
 
 	</td>
@@ -348,13 +348,13 @@ 
 	<td>
 		<select name="scanPingType" class="form-control input-sm input-w-auto">
 		<?php
-		$types = array("ping"=>"ping", "pear"=>"pear ping", "fping"=>"fping");
-		//default
-		foreach($types as $k=>$d) {
-			if($k==$settings['scanPingType']) 	{ print "<option value='$k' selected='selected'>$d</option>"; }
-			else								{ print "<option value='$k' 				   >$d</option>"; }
-		}
-		?>
+        $types = array("ping"=>"ping", "pear"=>"pear ping", "fping"=>"fping");
+        //default
+        foreach($types as $k=>$d) {
+            if($k==$settings['scanPingType']) 	{ print "<option value='$k' selected='selected'>$d</option>"; }
+            else								{ print "<option value='$k' 				   >$d</option>"; }
+        }
+        ?>
 		</select>
 	</td>
 	<td class="info2"><?php print _('Select which utility to use for status checks.'); ?></td>
@@ -365,10 +365,10 @@ 
 <tr>
 	<td class="title"><?php print _('Ping path'); ?></td>
 	<?php
-	//verify that ping file exists!
-	if(!file_exists($settings['scanPingPath'])&&$settings['scanFPingType']=="ping")		{ $class="danger"; }
-	else																				{ $class=""; }
-	?>
+    //verify that ping file exists!
+    if(!file_exists($settings['scanPingPath'])&&$settings['scanFPingType']=="ping")		{ $class="danger"; }
+    else																				{ $class=""; }
+    ?>
 	<td class="<?php print $class; ?>">
 		<input type="text" class="form-control input-sm" name="scanPingPath" value="<?php print $settings['scanPingPath']; ?>">
 	</td>
@@ -381,10 +381,10 @@ 
 <tr>
 	<td class="title"><?php print _('FPing path'); ?></td>
 	<?php
-	//verify that ping file exists!
-	if(!file_exists($settings['scanFPingPath'])&&$settings['scanFPingType']=="fping")	{ $class="danger"; }
-	else																				{ $class=""; }
-	?>
+    //verify that ping file exists!
+    if(!file_exists($settings['scanFPingPath'])&&$settings['scanFPingType']=="fping")	{ $class="danger"; }
+    else																				{ $class=""; }
+    ?>
 	<td class="<?php print $class; ?>">
 		<input type="text" class="form-control input-sm" name="scanFPingPath" value="<?php print $settings['scanFPingPath']; ?>">
 	</td>
@@ -441,22 +441,22 @@ 
 	<td>
 		<select name="visualLimit" class="form-control input-sm input-w-auto">
 			<?php
-			$opts = array(
-				"0"=>_("Don't show visual display"),
-				"19"=>"/19 (8190)",
-				"20"=>"/20 (4094)",
-				"21"=>"/21 (2046)",
-				"22"=>"/22 (1024)",
-				"23"=>"/23 (512)",
-				"24"=>"/24 (256)"
-			);
-
-			foreach($opts as $key=>$line) {
-				if($settings['visualLimit'] == $key) { print "<option value='$key' selected>$line</option>"; }
-				else 								{ print "<option value='$key'>$line</option>"; }
-			}
-
-			?>
+            $opts = array(
+                "0"=>_("Don't show visual display"),
+                "19"=>"/19 (8190)",
+                "20"=>"/20 (4094)",
+                "21"=>"/21 (2046)",
+                "22"=>"/22 (1024)",
+                "23"=>"/23 (512)",
+                "24"=>"/24 (256)"
+            );
+
+            foreach($opts as $key=>$line) {
+                if($settings['visualLimit'] == $key) { print "<option value='$key' selected>$line</option>"; }
+                else 								{ print "<option value='$key'>$line</option>"; }
+            }
+
+            ?>
 		</select>
 	</td>
 	<td class="info2">
@@ -470,19 +470,19 @@ 
 	<td>
 		<select name="subnetOrdering" class="form-control input-sm input-w-auto">
 			<?php
-			$opts = array(
-				"subnet,asc"		=> _("Subnet, ascending"),
-				"subnet,desc"		=> _("Subnet, descending"),
-				"description,asc"	=> _("Description, ascending"),
-				"description,desc"	=> _("Description, descending"),
-			);
-
-			foreach($opts as $key=>$line) {
-				if($settings['subnetOrdering'] == $key) { print "<option value='$key' selected>$line</option>"; }
-				else 									{ print "<option value='$key'>$line</option>"; }
-			}
-
-			?>
+            $opts = array(
+                "subnet,asc"		=> _("Subnet, ascending"),
+                "subnet,desc"		=> _("Subnet, descending"),
+                "description,asc"	=> _("Description, ascending"),
+                "description,desc"	=> _("Description, descending"),
+            );
+
+            foreach($opts as $key=>$line) {
+                if($settings['subnetOrdering'] == $key) { print "<option value='$key' selected>$line</option>"; }
+                else 									{ print "<option value='$key'>$line</option>"; }
+            }
+
+            ?>
 		</select>
 	</td>
 	<td class="info2">
@@ -496,16 +496,16 @@ 
 	<td>
 		<select name="subnetView" class="form-control input-sm input-w-auto">
 			<?php
-			$opts = array(
-				"0"=>_("Subnet Network Only"),
-				"1"=>"Description Only",
-				"2"=>"Subnet Network and Description"
-			);
-			foreach($opts as $key=>$line) {
-				if($settings['subnetView'] == $key) { print "<option value='$key' selected>$line</option>"; }
-				else 								{ print "<option value='$key'>$line</option>"; }
-			}
-			?>
+            $opts = array(
+                "0"=>_("Subnet Network Only"),
+                "1"=>"Description Only",
+                "2"=>"Subnet Network and Description"
+            );
+            foreach($opts as $key=>$line) {
+                if($settings['subnetView'] == $key) { print "<option value='$key' selected>$line</option>"; }
+                else 								{ print "<option value='$key'>$line</option>"; }
+            }
+            ?>
 		</select>
 	</td>
 	<td class="info2">

Braces +58 added lines, -13 removed lines

@@ -186,7 +186,10 @@ 
 <tr>
 	<td class="title"><?php print _('API'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="api" <?php if($settings['api'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="api" <?php if($settings['api'] == 1) {
+    print 'checked';
+}
+?>>
 	</td>
 	<td class="info2">
 		<?php print _('Enable or disable API server module'); ?>
@@ -197,7 +200,10 @@ 
 <tr>
 	<td class="title"><?php print _('IP request module'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enableIPrequests" <?php if($settings['enableIPrequests'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enableIPrequests" <?php if($settings['enableIPrequests'] == 1) {
+    print 'checked';
+}
+?>>
 	</td>
 	<td class="info2">
 		<?php print _('Enable or disable IP request module'); ?>
@@ -208,7 +214,10 @@ 
 <tr>
 	<td class="title"><?php print _('Enable VRF support'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enableVRF" <?php if($settings['enableVRF'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enableVRF" <?php if($settings['enableVRF'] == 1) {
+    print 'checked';
+}
+?>>
 	</td>
 	<td class="info2">
 		<?php print _('Enable or disable VRF module'); ?>
@@ -219,7 +228,10 @@ 
 <tr>
 	<td class="title"><?php print _('Enable PowerDNS'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enablePowerDNS" <?php if($settings['enablePowerDNS'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enablePowerDNS" <?php if($settings['enablePowerDNS'] == 1) {
+    print 'checked';
+}
+?>>
 	</td>
 	<td class="info2">
 		<?php print _('Enable or disable PowerDNS module'); ?>
@@ -230,7 +242,10 @@ 
 <tr>
 	<td class="title"><?php print _('Enable Firewall Zones'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enableFirewallZones" <?php if($settings['enableFirewallZones'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enableFirewallZones" <?php if($settings['enableFirewallZones'] == 1) {
+    print 'checked';
+}
+?>>
 	</td>
 	<td class="info2">
 		<?php print _('Enable or disable firewall zone management module'); ?>
@@ -241,7 +256,10 @@ 
 <tr>
 	<td class="title"><?php print _('Resolve DNS names'); ?></td>
 	<td>
-		<input type="checkbox" value="1" class="input-switch" name="enableDNSresolving" <?php if($settings['enableDNSresolving'] == 1) print 'checked'; ?>>
+		<input type="checkbox" value="1" class="input-switch" name="enableDNSresolving" <?php if($settings['enableDNSresolving'] == 1) {
+    print 'checked';
+}
+?>>
 	</td>
 	<td class="info2">
 		<?php print _('Check reverse dns lookups for IP addresses that do not have hostname in database. (Activating this feature can significantly increase ip address pages loading time!)'); ?>
@@ -252,7 +270,13 @@ 
 <tr>
 	<td class="title"><?php print _('Temporary shares'); ?></td>
 	<td>
-		<input type="checkbox" value="1" class="input-switch" name="tempShare" <?php if($settings['tempShare'] == 0) print ''; else print 'checked'; ?>>
+		<input type="checkbox" value="1" class="input-switch" name="tempShare" <?php if($settings['tempShare'] == 0) {
+    print '';
+}
+else {
+    print 'checked';
+}
+?>>
 	</td>
 	<td class="info2">
 		<?php print _('Allow temporary subnet sharing'); ?>
@@ -263,7 +287,13 @@ 
 <tr>
 	<td class="title"><?php print _('Changelog'); ?></td>
 	<td>
-		<input type="checkbox" value="1" class="input-switch" name="enableChangelog" <?php if($settings['enableChangelog'] == 0) print ''; else print 'checked'; ?>>
+		<input type="checkbox" value="1" class="input-switch" name="enableChangelog" <?php if($settings['enableChangelog'] == 0) {
+    print '';
+}
+else {
+    print 'checked';
+}
+?>>
 	</td>
 	<td class="info2">
 		<?php print _('Enable changelog module'); ?>
@@ -274,7 +304,10 @@ 
 <tr>
 	<td class="title"><?php print _('Multicast module'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enableMulticast" <?php if($settings['enableMulticast'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enableMulticast" <?php if($settings['enableMulticast'] == 1) {
+    print 'checked';
+}
+?>>
 	</td>
 	<td class="info2">
 		<?php print _('Enable or disable multicast module'); ?>
@@ -285,7 +318,10 @@ 
 <tr>
 	<td class="title"><?php print _('Threshold module'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enableThreshold" <?php if($settings['enableThreshold'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enableThreshold" <?php if($settings['enableThreshold'] == 1) {
+    print 'checked';
+}
+?>>
 	</td>
 	<td class="info2">
 		<?php print _('Enable or disable threshold module'); ?>
@@ -296,7 +332,10 @@ 
 <tr>
 	<td class="title"><?php print _('Rack module'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enableRACK" <?php if($settings['enableRACK'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enableRACK" <?php if($settings['enableRACK'] == 1) {
+    print 'checked';
+}
+?>>
 	</td>
 	<td class="info2">
 		<?php print _('Enable or disable rack drawing module'); ?>
@@ -307,7 +346,10 @@ 
 <tr>
 	<td class="title"><?php print _('SNMP module'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enableSNMP" <?php if($settings['enableSNMP'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enableSNMP" <?php if($settings['enableSNMP'] == 1) {
+    print 'checked';
+}
+?>>
 	</td>
 	<td class="info2">
 		<?php print _('Enable or disable SNMP module for devices'); ?>
@@ -428,7 +470,10 @@ 
 <tr>
 	<td class="title"><?php print _('Hide donation button'); ?></td>
 	<td>
-		<input type="checkbox" value="1" class="input-switch" name="donate" <?php if($settings['donate'] == 1) print 'checked'; ?>>
+		<input type="checkbox" value="1" class="input-switch" name="donate" <?php if($settings['donate'] == 1) {
+    print 'checked';
+}
+?>>
 	</td>
 	<td class="info2">
 		<?php print _('Hide donation button'); ?>

Spacing +130 added lines, -130 removed lines

@@ -5,13 +5,13 @@ 
  **************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "settings");
 
 # fetch all languages
-$languages = $Admin->fetch_all_objects("lang", "l_id");
+$languages = $Admin->fetch_all_objects ("lang", "l_id");
 
 # set settings
 $settings = (array) $User->settings;
@@ -30,7 +30,7 @@ 
 </script>
 
 <!-- title -->
-<h4><?php print _('phpIPAM Server settings'); ?></h4>
+<h4><?php print _ ('phpIPAM Server settings'); ?></h4>
 <hr>
 
 <form name="settings" id="settings">
@@ -38,111 +38,111 @@ 
 
 <!-- site settings -->
 <tr class="settings-title">
-	<th colspan="3"><h4><?php print _('Site settings'); ?></h4></th>
+	<th colspan="3"><h4><?php print _ ('Site settings'); ?></h4></th>
 </tr>
 
 <!-- site title -->
 <tr>
-	<td><?php print _('Site title'); ?></th>
+	<td><?php print _ ('Site title'); ?></th>
 	<td>
 		<input type="text" class="form-control input-sm" name="siteTitle" value="<?php print $settings['siteTitle']; ?>">
 		<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 	</td>
-	<td class="info2"><?php print _('Set site title'); ?></td>
+	<td class="info2"><?php print _ ('Set site title'); ?></td>
 </tr>
 
 <!-- site domain -->
 <tr>
-	<td><?php print _('Site domain'); ?></td>
+	<td><?php print _ ('Site domain'); ?></td>
 	<td>
 		<input type="text" class="form-control input-sm" name="siteDomain" value="<?php print $settings['siteDomain']; ?>">
 	</td>
-	<td class="info2"><?php print _('Set domain for sending mail notifications'); ?></td>
+	<td class="info2"><?php print _ ('Set domain for sending mail notifications'); ?></td>
 </tr>
 
 <!-- site URL -->
 <tr>
-	<td class="title"><?php print _('Site URL'); ?></td>
+	<td class="title"><?php print _ ('Site URL'); ?></td>
 	<td>
 		<input type="text" class="form-control input-sm" name="siteURL" value="<?php print $settings['siteURL']; ?>">
 	</td>
-	<td class="info2"><?php print _('Set site URL'); ?></td>
+	<td class="info2"><?php print _ ('Set site URL'); ?></td>
 </tr>
 <!-- Login header text -->
 <tr>
-        <td class="title"><?php print _('Login text'); ?></td>
+        <td class="title"><?php print _ ('Login text'); ?></td>
         <td>
                 <input type="text" class="form-control input-sm" name="siteLoginText" value="<?php print $settings['siteLoginText']; ?>">
         </td>
-        <td class="info2"><?php print _("Show text above 'username' field on login page (default empty)"); ?></td>
+        <td class="info2"><?php print _ ("Show text above 'username' field on login page (default empty)"); ?></td>
 </tr>
 <!-- prettyLinks -->
 <tr>
-	<td class="title"><?php print _('Prettify links'); ?></td>
+	<td class="title"><?php print _ ('Prettify links'); ?></td>
 	<td>
 		<select name="prettyLinks" class="form-control input-sm input-w-auto">
 		<?php
-			print "<option value='No'>"._('No')."</option>";
-			if($settings['prettyLinks']=="Yes") { print "<option value='Yes' selected='selected'>"._('Yes')."</option>"; }
-			else								{ print "<option value='Yes'>"._('Yes')."</option>"; }
+			print "<option value='No'>"._ ('No')."</option>";
+			if ($settings['prettyLinks'] == "Yes") { print "<option value='Yes' selected='selected'>"._ ('Yes')."</option>"; }
+			else { print "<option value='Yes'>"._ ('Yes')."</option>"; }
 		?>
 		</select>
 	</td>
 	<td class="info2">
-		<?php print _('Use nicer URL structure'); ?>?<br>
+		<?php print _ ('Use nicer URL structure'); ?>?<br>
 		<ul>
-			<li><?php print _("No"); ?>:  ?page=administration&link2=settings</li>
-			<li><?php print _("Yes"); ?>: /administration/settings/</li>
+			<li><?php print _ ("No"); ?>:  ?page=administration&link2=settings</li>
+			<li><?php print _ ("Yes"); ?>: /administration/settings/</li>
 		</ul>
-		<?php print _("Please note that mod_rewrite is required with appropriate settings if pretified links are selected."); ?><br>
+		<?php print _ ("Please note that mod_rewrite is required with appropriate settings if pretified links are selected."); ?><br>
 		<a href="http://phpipam.net/prettified-links-with-mod_rewrite/">http://phpipam.net/prettified-links-with-mod_rewrite/</a>
 		</td>
 </tr>
 <!-- Default language -->
 <tr>
-	<td class="title"><?php print _('Default language'); ?></td>
+	<td class="title"><?php print _ ('Default language'); ?></td>
 	<td>
 		<select name="defaultLang" class="form-control input-sm input-w-auto">
 		<?php
-		if(sizeof($languages)>0) {
+		if (sizeof ($languages) > 0) {
 			//default
 			print "<option value='0'>Default</option>";
-			foreach($languages as $lang) {
-				if($lang->l_id==$settings['defaultLang']) 	{ print "<option value='$lang->l_id' selected='selected'>$lang->l_name ($lang->l_code)</option>"; }
-				else										{ print "<option value='$lang->l_id' 					>$lang->l_name ($lang->l_code)</option>"; }
+			foreach ($languages as $lang) {
+				if ($lang->l_id == $settings['defaultLang']) { print "<option value='$lang->l_id' selected='selected'>$lang->l_name ($lang->l_code)</option>"; }
+				else { print "<option value='$lang->l_id' 					>$lang->l_name ($lang->l_code)</option>"; }
 			}
 		}
 		?>
 		</select>
 	</td>
-	<td class="info2"><?php print _('Select default language'); ?></td>
+	<td class="info2"><?php print _ ('Select default language'); ?></td>
 </tr>
 
 <!-- Mex session duration -->
 <tr>
-	<td class="title"><?php print _('Inactivity timeout'); ?></td>
+	<td class="title"><?php print _ ('Inactivity timeout'); ?></td>
 	<td>
 		<select name="inactivityTimeout" class="form-control input-sm input-w-auto">
 		<?php
-		$durations = array("900"=>"15 minutes","1800"=>"30 minutes", "3600"=>"1 hour", "7200"=>"2 hours", "21600"=>"6 hours", "43200"=>"12 hours", "86400"=>"24 hours");
+		$durations = array ("900"=>"15 minutes", "1800"=>"30 minutes", "3600"=>"1 hour", "7200"=>"2 hours", "21600"=>"6 hours", "43200"=>"12 hours", "86400"=>"24 hours");
 		//default
-		foreach($durations as $k=>$d) {
-			if($k==$settings['inactivityTimeout']) 	{ print "<option value='$k' selected='selected'>$d</option>"; }
-			else									{ print "<option value='$k' 				   >$d</option>"; }
+		foreach ($durations as $k=>$d) {
+			if ($k == $settings['inactivityTimeout']) { print "<option value='$k' selected='selected'>$d</option>"; }
+			else { print "<option value='$k' 				   >$d</option>"; }
 		}
 		?>
 		</select>
 	</td>
-	<td class="info2"><?php print _('Select inactive timeout for user sessions. Please note that if default php session settings in php.ini are lower they will override this'); ?></td>
+	<td class="info2"><?php print _ ('Select inactive timeout for user sessions. Please note that if default php session settings in php.ini are lower they will override this'); ?></td>
 </tr>
 <!-- Max VLAN number -->
 <tr>
-	<td class="title"><?php print _('Highest VLAN number'); ?></td>
+	<td class="title"><?php print _ ('Highest VLAN number'); ?></td>
 	<td>
 		<input type="text" class="form-control input-sm" name="vlanMax" value="<?php print $settings['vlanMax']; ?>">
 	</td>
 	<td class="info2">
-		<?php print _('Set highest VLAN number (default 4096)'); ?>
+		<?php print _ ('Set highest VLAN number (default 4096)'); ?>
 	</td>
 </tr>
 
@@ -150,28 +150,28 @@ 
 
 <!-- Admin settings -->
 <tr class="settings-title">
-	<th colspan="3"><h4><?php print _('Admin settings'); ?></h4></th>
+	<th colspan="3"><h4><?php print _ ('Admin settings'); ?></h4></th>
 </tr>
 
 <!-- Admin name -->
 <tr>
-	<td class="title"><?php print _('Admin name'); ?></td>
+	<td class="title"><?php print _ ('Admin name'); ?></td>
 	<td>
 		<input type="text" class="form-control input-sm" name="siteAdminName" value="<?php print $settings['siteAdminName']; ?>">
 	</td>
 	<td class="info2">
-		<?php print _('Set administrator name'); ?>
+		<?php print _ ('Set administrator name'); ?>
 	</td>
 </tr>
 
 <!-- Admin mail -->
 <tr>
-	<td class="title"><?php print _('Admin mail'); ?></td>
+	<td class="title"><?php print _ ('Admin mail'); ?></td>
 	<td>
 		<input type="text" class="form-control input-sm" name="siteAdminMail" value="<?php print $settings['siteAdminMail']; ?>">
 	</td>
 	<td class="info2">
-		<?php print _('Set administrator e-mail'); ?>
+		<?php print _ ('Set administrator e-mail'); ?>
 	</td>
 </tr>
 
@@ -179,159 +179,159 @@ 
 
 <!-- features -->
 <tr class="settings-title">
-	<th colspan="3"><h4><?php print _('Feature settings'); ?></h4></th>
+	<th colspan="3"><h4><?php print _ ('Feature settings'); ?></h4></th>
 </tr>
 
 <!-- API -->
 <tr>
-	<td class="title"><?php print _('API'); ?></td>
+	<td class="title"><?php print _ ('API'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="api" <?php if($settings['api'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="api" <?php if ($settings['api'] == 1) print 'checked'; ?>>
 	</td>
 	<td class="info2">
-		<?php print _('Enable or disable API server module'); ?>
+		<?php print _ ('Enable or disable API server module'); ?>
 	</td>
 </tr>
 
 <!-- IP requests -->
 <tr>
-	<td class="title"><?php print _('IP request module'); ?></td>
+	<td class="title"><?php print _ ('IP request module'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enableIPrequests" <?php if($settings['enableIPrequests'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enableIPrequests" <?php if ($settings['enableIPrequests'] == 1) print 'checked'; ?>>
 	</td>
 	<td class="info2">
-		<?php print _('Enable or disable IP request module'); ?>
+		<?php print _ ('Enable or disable IP request module'); ?>
 	</td>
 </tr>
 
 <!-- VRF -->
 <tr>
-	<td class="title"><?php print _('Enable VRF support'); ?></td>
+	<td class="title"><?php print _ ('Enable VRF support'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enableVRF" <?php if($settings['enableVRF'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enableVRF" <?php if ($settings['enableVRF'] == 1) print 'checked'; ?>>
 	</td>
 	<td class="info2">
-		<?php print _('Enable or disable VRF module'); ?>
+		<?php print _ ('Enable or disable VRF module'); ?>
 	</td>
 </tr>
 
 <!-- powerdns -->
 <tr>
-	<td class="title"><?php print _('Enable PowerDNS'); ?></td>
+	<td class="title"><?php print _ ('Enable PowerDNS'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enablePowerDNS" <?php if($settings['enablePowerDNS'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enablePowerDNS" <?php if ($settings['enablePowerDNS'] == 1) print 'checked'; ?>>
 	</td>
 	<td class="info2">
-		<?php print _('Enable or disable PowerDNS module'); ?>
+		<?php print _ ('Enable or disable PowerDNS module'); ?>
 	</td>
 </tr>
 
 <!-- firewall zone management -->
 <tr>
-	<td class="title"><?php print _('Enable Firewall Zones'); ?></td>
+	<td class="title"><?php print _ ('Enable Firewall Zones'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enableFirewallZones" <?php if($settings['enableFirewallZones'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enableFirewallZones" <?php if ($settings['enableFirewallZones'] == 1) print 'checked'; ?>>
 	</td>
 	<td class="info2">
-		<?php print _('Enable or disable firewall zone management module'); ?>
+		<?php print _ ('Enable or disable firewall zone management module'); ?>
 	</td>
 </tr>
 
 <!-- DNS resolving -->
 <tr>
-	<td class="title"><?php print _('Resolve DNS names'); ?></td>
+	<td class="title"><?php print _ ('Resolve DNS names'); ?></td>
 	<td>
-		<input type="checkbox" value="1" class="input-switch" name="enableDNSresolving" <?php if($settings['enableDNSresolving'] == 1) print 'checked'; ?>>
+		<input type="checkbox" value="1" class="input-switch" name="enableDNSresolving" <?php if ($settings['enableDNSresolving'] == 1) print 'checked'; ?>>
 	</td>
 	<td class="info2">
-		<?php print _('Check reverse dns lookups for IP addresses that do not have hostname in database. (Activating this feature can significantly increase ip address pages loading time!)'); ?>
+		<?php print _ ('Check reverse dns lookups for IP addresses that do not have hostname in database. (Activating this feature can significantly increase ip address pages loading time!)'); ?>
 	</td>
 </tr>
 
 <!-- Share -->
 <tr>
-	<td class="title"><?php print _('Temporary shares'); ?></td>
+	<td class="title"><?php print _ ('Temporary shares'); ?></td>
 	<td>
-		<input type="checkbox" value="1" class="input-switch" name="tempShare" <?php if($settings['tempShare'] == 0) print ''; else print 'checked'; ?>>
+		<input type="checkbox" value="1" class="input-switch" name="tempShare" <?php if ($settings['tempShare'] == 0) print ''; else print 'checked'; ?>>
 	</td>
 	<td class="info2">
-		<?php print _('Allow temporary subnet sharing'); ?>
+		<?php print _ ('Allow temporary subnet sharing'); ?>
 	</td>
 </tr>
 
 <!-- changelog -->
 <tr>
-	<td class="title"><?php print _('Changelog'); ?></td>
+	<td class="title"><?php print _ ('Changelog'); ?></td>
 	<td>
-		<input type="checkbox" value="1" class="input-switch" name="enableChangelog" <?php if($settings['enableChangelog'] == 0) print ''; else print 'checked'; ?>>
+		<input type="checkbox" value="1" class="input-switch" name="enableChangelog" <?php if ($settings['enableChangelog'] == 0) print ''; else print 'checked'; ?>>
 	</td>
 	<td class="info2">
-		<?php print _('Enable changelog module'); ?>
+		<?php print _ ('Enable changelog module'); ?>
 	</td>
 </tr>
 
 <!-- Multicast -->
 <tr>
-	<td class="title"><?php print _('Multicast module'); ?></td>
+	<td class="title"><?php print _ ('Multicast module'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enableMulticast" <?php if($settings['enableMulticast'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enableMulticast" <?php if ($settings['enableMulticast'] == 1) print 'checked'; ?>>
 	</td>
 	<td class="info2">
-		<?php print _('Enable or disable multicast module'); ?>
+		<?php print _ ('Enable or disable multicast module'); ?>
 	</td>
 </tr>
 
 <!-- threshold -->
 <tr>
-	<td class="title"><?php print _('Threshold module'); ?></td>
+	<td class="title"><?php print _ ('Threshold module'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enableThreshold" <?php if($settings['enableThreshold'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enableThreshold" <?php if ($settings['enableThreshold'] == 1) print 'checked'; ?>>
 	</td>
 	<td class="info2">
-		<?php print _('Enable or disable threshold module'); ?>
+		<?php print _ ('Enable or disable threshold module'); ?>
 	</td>
 </tr>
 
 <!-- Rack -->
 <tr>
-	<td class="title"><?php print _('Rack module'); ?></td>
+	<td class="title"><?php print _ ('Rack module'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enableRACK" <?php if($settings['enableRACK'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enableRACK" <?php if ($settings['enableRACK'] == 1) print 'checked'; ?>>
 	</td>
 	<td class="info2">
-		<?php print _('Enable or disable rack drawing module'); ?>
+		<?php print _ ('Enable or disable rack drawing module'); ?>
 	</td>
 </tr>
 
 <!-- Rack -->
 <tr>
-	<td class="title"><?php print _('SNMP module'); ?></td>
+	<td class="title"><?php print _ ('SNMP module'); ?></td>
 	<td>
-		<input type="checkbox" class="input-switch" value="1" name="enableSNMP" <?php if($settings['enableSNMP'] == 1) print 'checked'; ?>>
+		<input type="checkbox" class="input-switch" value="1" name="enableSNMP" <?php if ($settings['enableSNMP'] == 1) print 'checked'; ?>>
 	</td>
 	<td class="info2">
-		<?php print _('Enable or disable SNMP module for devices'); ?>
+		<?php print _ ('Enable or disable SNMP module for devices'); ?>
 	</td>
 </tr>
 
 <!-- Log location -->
 <tr>
-	<td class="title"><?php print _('Syslog'); ?></td>
+	<td class="title"><?php print _ ('Syslog'); ?></td>
 	<td>
 		<select name="log" class="form-control input-sm input-w-auto">
 		<?php
-		$types = array("Database"=>"Database", "syslog"=>"Syslog", "both"=>"Syslog and local Database");
+		$types = array ("Database"=>"Database", "syslog"=>"Syslog", "both"=>"Syslog and local Database");
 		//default
-		foreach($types as $k=>$d) {
-			if($k==$settings['log']) 	{ print "<option value='$k' selected='selected'>$d</option>"; }
-			else						{ print "<option value='$k' 				   >$d</option>"; }
+		foreach ($types as $k=>$d) {
+			if ($k == $settings['log']) { print "<option value='$k' selected='selected'>$d</option>"; }
+			else { print "<option value='$k' 				   >$d</option>"; }
 		}
 		?>
 		</select>
 
 	</td>
 	<td class="info2">
-		<?php print _('Set where to send system logs'); ?>
+		<?php print _ ('Set where to send system logs'); ?>
 	</td>
 </tr>
 
@@ -339,79 +339,79 @@ 
 
 <!-- ICPM -->
 <tr class="settings-title">
-	<th colspan="3"><h4><?php print _('ICMP settings'); ?></h4></th>
+	<th colspan="3"><h4><?php print _ ('ICMP settings'); ?></h4></th>
 </tr>
 
 <!-- Scan type -->
 <tr>
-	<td class="title"><?php print _('Scan type'); ?></td>
+	<td class="title"><?php print _ ('Scan type'); ?></td>
 	<td>
 		<select name="scanPingType" class="form-control input-sm input-w-auto">
 		<?php
-		$types = array("ping"=>"ping", "pear"=>"pear ping", "fping"=>"fping");
+		$types = array ("ping"=>"ping", "pear"=>"pear ping", "fping"=>"fping");
 		//default
-		foreach($types as $k=>$d) {
-			if($k==$settings['scanPingType']) 	{ print "<option value='$k' selected='selected'>$d</option>"; }
-			else								{ print "<option value='$k' 				   >$d</option>"; }
+		foreach ($types as $k=>$d) {
+			if ($k == $settings['scanPingType']) { print "<option value='$k' selected='selected'>$d</option>"; }
+			else { print "<option value='$k' 				   >$d</option>"; }
 		}
 		?>
 		</select>
 	</td>
-	<td class="info2"><?php print _('Select which utility to use for status checks.'); ?></td>
+	<td class="info2"><?php print _ ('Select which utility to use for status checks.'); ?></td>
 </tr>
 
 
 <!-- Ping path -->
 <tr>
-	<td class="title"><?php print _('Ping path'); ?></td>
+	<td class="title"><?php print _ ('Ping path'); ?></td>
 	<?php
 	//verify that ping file exists!
-	if(!file_exists($settings['scanPingPath'])&&$settings['scanFPingType']=="ping")		{ $class="danger"; }
-	else																				{ $class=""; }
+	if (!file_exists ($settings['scanPingPath']) && $settings['scanFPingType'] == "ping") { $class = "danger"; }
+	else { $class = ""; }
 	?>
 	<td class="<?php print $class; ?>">
 		<input type="text" class="form-control input-sm" name="scanPingPath" value="<?php print $settings['scanPingPath']; ?>">
 	</td>
 	<td class="info2">
-		<?php print _('Set path for ping executable file (default /bin/ping)'); ?>
+		<?php print _ ('Set path for ping executable file (default /bin/ping)'); ?>
 	</td>
 </tr>
 
 <!-- fping path -->
 <tr>
-	<td class="title"><?php print _('FPing path'); ?></td>
+	<td class="title"><?php print _ ('FPing path'); ?></td>
 	<?php
 	//verify that ping file exists!
-	if(!file_exists($settings['scanFPingPath'])&&$settings['scanFPingType']=="fping")	{ $class="danger"; }
-	else																				{ $class=""; }
+	if (!file_exists ($settings['scanFPingPath']) && $settings['scanFPingType'] == "fping") { $class = "danger"; }
+	else { $class = ""; }
 	?>
 	<td class="<?php print $class; ?>">
 		<input type="text" class="form-control input-sm" name="scanFPingPath" value="<?php print $settings['scanFPingPath']; ?>">
 	</td>
 	<td class="info2">
-		<?php print _('Set path for fping executable file (default /bin/fping)'); ?>
+		<?php print _ ('Set path for fping executable file (default /bin/fping)'); ?>
 	</td>
 </tr>
 
 <!-- Ping status intervals -->
 <tr>
-	<td class="title"><?php print _('Ping status intervals'); ?></td>
+	<td class="title"><?php print _ ('Ping status intervals'); ?></td>
 	<td>
 		<input type="text" class="form-control input-sm" name="pingStatus" value="<?php print $settings['pingStatus']; ?>">
 	</td>
 	<td class="info2">
-		<?php print _('Ping status intervals for IP addresses in seconds - warning;offline (Default: 1800;3600)'); ?>
+		<?php print _ ('Ping status intervals for IP addresses in seconds - warning;offline (Default: 1800;3600)'); ?>
 	</td>
 </tr>
 
 <!-- Ping threads -->
 <tr>
-	<td class="title"><?php print _('Max scan threads'); ?></td>
+	<td class="title"><?php print _ ('Max scan threads'); ?></td>
 	<td>
 		<input type="text" class="form-control input-sm" name="scanMaxThreads" value="<?php print $settings['scanMaxThreads']; ?>">
 	</td>
 	<td class="info2">
-		<?php print _('Set maximum number of concurrent ICMP checks (default 128)'); ?>
+		<?php print _ ('Set maximum number of concurrent ICMP checks (default 128)'); ?>
 	</td>
 </tr>
 
@@ -421,28 +421,28 @@ 
 
 <!-- Display -->
 <tr class="settings-title">
-	<th colspan="3"><h4><?php print _('Display settings'); ?></h4></th>
+	<th colspan="3"><h4><?php print _ ('Display settings'); ?></h4></th>
 </tr>
 
 <!-- Disable donation field -->
 <tr>
-	<td class="title"><?php print _('Hide donation button'); ?></td>
+	<td class="title"><?php print _ ('Hide donation button'); ?></td>
 	<td>
-		<input type="checkbox" value="1" class="input-switch" name="donate" <?php if($settings['donate'] == 1) print 'checked'; ?>>
+		<input type="checkbox" value="1" class="input-switch" name="donate" <?php if ($settings['donate'] == 1) print 'checked'; ?>>
 	</td>
 	<td class="info2">
-		<?php print _('Hide donation button'); ?>
+		<?php print _ ('Hide donation button'); ?>
 	</td>
 </tr>
 
 <!-- Visual display limit -->
 <tr>
-	<td class="title"><?php print _('IP visual display limit'); ?></td>
+	<td class="title"><?php print _ ('IP visual display limit'); ?></td>
 	<td>
 		<select name="visualLimit" class="form-control input-sm input-w-auto">
 			<?php
-			$opts = array(
-				"0"=>_("Don't show visual display"),
+			$opts = array (
+				"0"=>_ ("Don't show visual display"),
 				"19"=>"/19 (8190)",
 				"20"=>"/20 (4094)",
 				"21"=>"/21 (2046)",
@@ -451,65 +451,65 @@ 
 				"24"=>"/24 (256)"
 			);
 
-			foreach($opts as $key=>$line) {
-				if($settings['visualLimit'] == $key) { print "<option value='$key' selected>$line</option>"; }
-				else 								{ print "<option value='$key'>$line</option>"; }
+			foreach ($opts as $key=>$line) {
+				if ($settings['visualLimit'] == $key) { print "<option value='$key' selected>$line</option>"; }
+				else { print "<option value='$key'>$line</option>"; }
 			}
 
 			?>
 		</select>
 	</td>
 	<td class="info2">
-		<?php print _('Select netmask limit for visual display of IP addresses (mask equal or bigger than - more then /22 not recommended)'); ?>
+		<?php print _ ('Select netmask limit for visual display of IP addresses (mask equal or bigger than - more then /22 not recommended)'); ?>
 	</td>
 </tr>
 
 <!-- Subnet ordering -->
 <tr>
-	<td class="title"><?php print _('Subnet ordering'); ?></td>
+	<td class="title"><?php print _ ('Subnet ordering'); ?></td>
 	<td>
 		<select name="subnetOrdering" class="form-control input-sm input-w-auto">
 			<?php
-			$opts = array(
-				"subnet,asc"		=> _("Subnet, ascending"),
-				"subnet,desc"		=> _("Subnet, descending"),
-				"description,asc"	=> _("Description, ascending"),
-				"description,desc"	=> _("Description, descending"),
+			$opts = array (
+				"subnet,asc"		=> _ ("Subnet, ascending"),
+				"subnet,desc"		=> _ ("Subnet, descending"),
+				"description,asc"	=> _ ("Description, ascending"),
+				"description,desc"	=> _ ("Description, descending"),
 			);
 
-			foreach($opts as $key=>$line) {
-				if($settings['subnetOrdering'] == $key) { print "<option value='$key' selected>$line</option>"; }
-				else 									{ print "<option value='$key'>$line</option>"; }
+			foreach ($opts as $key=>$line) {
+				if ($settings['subnetOrdering'] == $key) { print "<option value='$key' selected>$line</option>"; }
+				else { print "<option value='$key'>$line</option>"; }
 			}
 
 			?>
 		</select>
 	</td>
 	<td class="info2">
-		<?php print _('How to order display of subnets'); ?>
+		<?php print _ ('How to order display of subnets'); ?>
 	</td>
 </tr>
 
 <!-- Subnet View -->
 <tr>
-	<td class="title"><?php print _('Subnet Display'); ?></td>
+	<td class="title"><?php print _ ('Subnet Display'); ?></td>
 	<td>
 		<select name="subnetView" class="form-control input-sm input-w-auto">
 			<?php
-			$opts = array(
-				"0"=>_("Subnet Network Only"),
+			$opts = array (
+				"0"=>_ ("Subnet Network Only"),
 				"1"=>"Description Only",
 				"2"=>"Subnet Network and Description"
 			);
-			foreach($opts as $key=>$line) {
-				if($settings['subnetView'] == $key) { print "<option value='$key' selected>$line</option>"; }
-				else 								{ print "<option value='$key'>$line</option>"; }
+			foreach ($opts as $key=>$line) {
+				if ($settings['subnetView'] == $key) { print "<option value='$key' selected>$line</option>"; }
+				else { print "<option value='$key'>$line</option>"; }
 			}
 			?>
 		</select>
 	</td>
 	<td class="info2">
-		<?php print _('Select which view you would prefer on the menu'); ?>
+		<?php print _ ('Select which view you would prefer on the menu'); ?>
 	</td>
 </tr>
 
@@ -526,7 +526,7 @@ 
 <tr class="th">
 	<td class="title"></td>
 	<td class="submit">
-		<input type="submit" class="btn btn-sm btn-success pull-right" value="<?php print _('Save changes'); ?>">
+		<input type="submit" class="btn btn-sm btn-success pull-right" value="<?php print _ ('Save changes'); ?>">
 	</td>
 	<td></td>
 </tr>