phpipam / phpipam

app/admin/ripe-import/ripe-telnet.php

Indentation +93 added lines, -93 removed lines

@@ -20,7 +20,7 @@ 
 
 //strip AS if provided, to get just the number
 if(substr($_POST['as'], 0,2)=="AS" || substr($_POST['as'], 0,2)=="as") {
-	$_POST['as'] = substr($_POST['as'], 2);
+    $_POST['as'] = substr($_POST['as'], 2);
 };
 
 
@@ -34,100 +34,100 @@ 
 
 //none found
 if(sizeof(@$subnet) == 0) {
-	print "<hr>";
-	$Result->show("danger alert-absolute", _('No subnets found').'!', true);
+    print "<hr>";
+    $Result->show("danger alert-absolute", _('No subnets found').'!', true);
 }
 else {
-	//form
-	print '<form name="asImport" id="asImport">';
-	//table
-	print '<table class="asImport table table-striped table-condensed table-top table-auto">';
-	//headers
-	print '<tr>';
-	print '	<th colspan="5">'._('I found the following routes belonging to AS').' '.$_POST['as'].':</th>';
-	print '</tr> ';
-
-	print "<tr>";
-	print "	<th></th>";
-	print "	<th>"._('Subnet')."</th>";
-	print "	<th>"._('select section')."</th>";
-	print "	<th>"._('Description')."</th>";
-	print "	<th>"._('VLAN')."</th>";
-	print "	<th>"._('VRF')."</th>";
-	print "	<th>"._('Show name')."</th>";
-
-	print "</tr>";
-
-	//print found subnets
-	$m = 0;
-	foreach ($subnet as $route) {
-		# only not empty
-		if(strlen($route)>2) {
-			print '<tr>'. "\n";
-
-			//delete
-			print '<td class="removeSubnet">'. "\n";
-			print '	<button class="btn btn-xs btn-default btn-danger" rel="tooltip" title="'._('Remove this subnet').'"><i class="fa fa-times"></i></button>'. "\n";
-			print '</td>'. "\n";
-			//subnet
-			print '<td>'. "\n";
-			print '<input type="text" class="form-control input-sm" name="subnet-'. $m .'" value="'. $route .'">'. "\n";
-			print '</td>'. "\n";
-			//section
-			print '<td>'. "\n";
-			print '<select name="section-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
-			foreach($sections as $section) {
-				print '<option value="'. $section->id .'">'. $section->name .'</option>';
-			}
-			print '</select>'. "\n";
-			print '</td>'. "\n";
-			//description
-			print '<td>'. "\n";
-			print '<input type="text" class="form-control input-sm input-w-250" name="description-'. $m .'">'. "\n";
-			print '</td>'. "\n";
-			//VLAN
-			print '<td>'. "\n";
-			print '<select name="vlan-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
-			print '<option value="0">No VLAN</option>';
-			if(sizeof(@$vlans)>0) {
-				foreach($vlans as $vlan) {
-					# set description
-					$vlan_description = strlen($vlan->description)>0 ? " (".$vlan->description.")" : "";
-					print '<option value="'.$vlan->vlanId.'">'.$vlan->number.$vlan_description.'</option>';
-				}
-			}
-			//VRF
-			print '<td>'. "\n";
-			print '<select name="vrf-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
-			print '<option value="0">No VRF</option>';
-			if(sizeof(@$vrfs)>0) {
-				foreach($vrfs as $vrf) {
-					# set description
-					$vrf_description = strlen($vrf->description)>0 ? " (".$vrf->description.")" : "";
-					print '<option value="'.$vrf->vrfId.'">'.$vrf->name.$vrf_description.'</option>';
-				}
-			}
-			//show name
-			print '<td>'. "\n";
-			print '<select name="showName-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
-			print '<option value="0">'._('No') .'</option>';
-			print '<option value="1">'._('Yes').'</option>';
-			print '</td>'. "\n";
-
-			print '</tr>'. "\n";
-		}
-		$m++;
-	}
-
-	//submit
-	print '<tr style="border-top:1px solid white" class="th">'. "\n";
-	print '<td colspan="7" style="text-align:right">'. "\n";
-	print '	<input type="submit" class="btn btn-sm btn-default" value="'._('Import to database').'">'. "\n";
-	print '</td>'. "\n";
-	print '</tr>'. "\n";
-
-	print '</table>'. "\n";
-	print '</form>'. "\n";
+    //form
+    print '<form name="asImport" id="asImport">';
+    //table
+    print '<table class="asImport table table-striped table-condensed table-top table-auto">';
+    //headers
+    print '<tr>';
+    print '	<th colspan="5">'._('I found the following routes belonging to AS').' '.$_POST['as'].':</th>';
+    print '</tr> ';
+
+    print "<tr>";
+    print "	<th></th>";
+    print "	<th>"._('Subnet')."</th>";
+    print "	<th>"._('select section')."</th>";
+    print "	<th>"._('Description')."</th>";
+    print "	<th>"._('VLAN')."</th>";
+    print "	<th>"._('VRF')."</th>";
+    print "	<th>"._('Show name')."</th>";
+
+    print "</tr>";
+
+    //print found subnets
+    $m = 0;
+    foreach ($subnet as $route) {
+        # only not empty
+        if(strlen($route)>2) {
+            print '<tr>'. "\n";
+
+            //delete
+            print '<td class="removeSubnet">'. "\n";
+            print '	<button class="btn btn-xs btn-default btn-danger" rel="tooltip" title="'._('Remove this subnet').'"><i class="fa fa-times"></i></button>'. "\n";
+            print '</td>'. "\n";
+            //subnet
+            print '<td>'. "\n";
+            print '<input type="text" class="form-control input-sm" name="subnet-'. $m .'" value="'. $route .'">'. "\n";
+            print '</td>'. "\n";
+            //section
+            print '<td>'. "\n";
+            print '<select name="section-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
+            foreach($sections as $section) {
+                print '<option value="'. $section->id .'">'. $section->name .'</option>';
+            }
+            print '</select>'. "\n";
+            print '</td>'. "\n";
+            //description
+            print '<td>'. "\n";
+            print '<input type="text" class="form-control input-sm input-w-250" name="description-'. $m .'">'. "\n";
+            print '</td>'. "\n";
+            //VLAN
+            print '<td>'. "\n";
+            print '<select name="vlan-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
+            print '<option value="0">No VLAN</option>';
+            if(sizeof(@$vlans)>0) {
+                foreach($vlans as $vlan) {
+                    # set description
+                    $vlan_description = strlen($vlan->description)>0 ? " (".$vlan->description.")" : "";
+                    print '<option value="'.$vlan->vlanId.'">'.$vlan->number.$vlan_description.'</option>';
+                }
+            }
+            //VRF
+            print '<td>'. "\n";
+            print '<select name="vrf-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
+            print '<option value="0">No VRF</option>';
+            if(sizeof(@$vrfs)>0) {
+                foreach($vrfs as $vrf) {
+                    # set description
+                    $vrf_description = strlen($vrf->description)>0 ? " (".$vrf->description.")" : "";
+                    print '<option value="'.$vrf->vrfId.'">'.$vrf->name.$vrf_description.'</option>';
+                }
+            }
+            //show name
+            print '<td>'. "\n";
+            print '<select name="showName-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
+            print '<option value="0">'._('No') .'</option>';
+            print '<option value="1">'._('Yes').'</option>';
+            print '</td>'. "\n";
+
+            print '</tr>'. "\n";
+        }
+        $m++;
+    }
+
+    //submit
+    print '<tr style="border-top:1px solid white" class="th">'. "\n";
+    print '<td colspan="7" style="text-align:right">'. "\n";
+    print '	<input type="submit" class="btn btn-sm btn-default" value="'._('Import to database').'">'. "\n";
+    print '</td>'. "\n";
+    print '</tr>'. "\n";
+
+    print '</table>'. "\n";
+    print '</form>'. "\n";
 }
 ?>
 <div class="ripeImportResult"></div>
\ No newline at end of file

Spacing +58 added lines, -58 removed lines

@@ -5,22 +5,22 @@ 
  *************************************************/
 
 /* 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);
 $Subnets	= new Subnets ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 
 //strip AS if provided, to get just the number
-if(substr($_POST['as'], 0,2)=="AS" || substr($_POST['as'], 0,2)=="as") {
-	$_POST['as'] = substr($_POST['as'], 2);
+if (substr ($_POST['as'], 0, 2) == "AS" || substr ($_POST['as'], 0, 2) == "as") {
+	$_POST['as'] = substr ($_POST['as'], 2);
 };
 
 
@@ -29,13 +29,13 @@ 
 
 # fetch all sections
 $sections = $Admin->fetch_all_objects ("sections", "id");
-$vlans	  = $Admin->fetch_all_objects ("vlans", "vlanId");
-$vrfs	  = $Admin->fetch_all_objects ("vrf", "vrfId");
+$vlans = $Admin->fetch_all_objects ("vlans", "vlanId");
+$vrfs = $Admin->fetch_all_objects ("vrf", "vrfId");
 
 //none found
-if(sizeof(@$subnet) == 0) {
+if (sizeof (@$subnet) == 0) {
 	print "<hr>";
-	$Result->show("danger alert-absolute", _('No subnets found').'!', true);
+	$Result->show ("danger alert-absolute", _ ('No subnets found').'!', true);
 }
 else {
 	//form
@@ -44,17 +44,17 @@ 
 	print '<table class="asImport table table-striped table-condensed table-top table-auto">';
 	//headers
 	print '<tr>';
-	print '	<th colspan="5">'._('I found the following routes belonging to AS').' '.$_POST['as'].':</th>';
+	print '	<th colspan="5">'._ ('I found the following routes belonging to AS').' '.$_POST['as'].':</th>';
 	print '</tr> ';
 
 	print "<tr>";
 	print "	<th></th>";
-	print "	<th>"._('Subnet')."</th>";
-	print "	<th>"._('select section')."</th>";
-	print "	<th>"._('Description')."</th>";
-	print "	<th>"._('VLAN')."</th>";
-	print "	<th>"._('VRF')."</th>";
-	print "	<th>"._('Show name')."</th>";
+	print "	<th>"._ ('Subnet')."</th>";
+	print "	<th>"._ ('select section')."</th>";
+	print "	<th>"._ ('Description')."</th>";
+	print "	<th>"._ ('VLAN')."</th>";
+	print "	<th>"._ ('VRF')."</th>";
+	print "	<th>"._ ('Show name')."</th>";
 
 	print "</tr>";
 
@@ -62,72 +62,72 @@ 
 	$m = 0;
 	foreach ($subnet as $route) {
 		# only not empty
-		if(strlen($route)>2) {
-			print '<tr>'. "\n";
+		if (strlen ($route) > 2) {
+			print '<tr>'."\n";
 
 			//delete
-			print '<td class="removeSubnet">'. "\n";
-			print '	<button class="btn btn-xs btn-default btn-danger" rel="tooltip" title="'._('Remove this subnet').'"><i class="fa fa-times"></i></button>'. "\n";
-			print '</td>'. "\n";
+			print '<td class="removeSubnet">'."\n";
+			print '	<button class="btn btn-xs btn-default btn-danger" rel="tooltip" title="'._ ('Remove this subnet').'"><i class="fa fa-times"></i></button>'."\n";
+			print '</td>'."\n";
 			//subnet
-			print '<td>'. "\n";
-			print '<input type="text" class="form-control input-sm" name="subnet-'. $m .'" value="'. $route .'">'. "\n";
-			print '</td>'. "\n";
+			print '<td>'."\n";
+			print '<input type="text" class="form-control input-sm" name="subnet-'.$m.'" value="'.$route.'">'."\n";
+			print '</td>'."\n";
 			//section
-			print '<td>'. "\n";
-			print '<select name="section-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
-			foreach($sections as $section) {
-				print '<option value="'. $section->id .'">'. $section->name .'</option>';
+			print '<td>'."\n";
+			print '<select name="section-'.$m.'" class="form-control input-sm input-w-auto">'."\n";
+			foreach ($sections as $section) {
+				print '<option value="'.$section->id.'">'.$section->name.'</option>';
 			}
-			print '</select>'. "\n";
-			print '</td>'. "\n";
+			print '</select>'."\n";
+			print '</td>'."\n";
 			//description
-			print '<td>'. "\n";
-			print '<input type="text" class="form-control input-sm input-w-250" name="description-'. $m .'">'. "\n";
-			print '</td>'. "\n";
+			print '<td>'."\n";
+			print '<input type="text" class="form-control input-sm input-w-250" name="description-'.$m.'">'."\n";
+			print '</td>'."\n";
 			//VLAN
-			print '<td>'. "\n";
-			print '<select name="vlan-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
+			print '<td>'."\n";
+			print '<select name="vlan-'.$m.'" class="form-control input-sm input-w-auto">'."\n";
 			print '<option value="0">No VLAN</option>';
-			if(sizeof(@$vlans)>0) {
-				foreach($vlans as $vlan) {
+			if (sizeof (@$vlans) > 0) {
+				foreach ($vlans as $vlan) {
 					# set description
-					$vlan_description = strlen($vlan->description)>0 ? " (".$vlan->description.")" : "";
+					$vlan_description = strlen ($vlan->description) > 0 ? " (".$vlan->description.")" : "";
 					print '<option value="'.$vlan->vlanId.'">'.$vlan->number.$vlan_description.'</option>';
 				}
 			}
 			//VRF
-			print '<td>'. "\n";
-			print '<select name="vrf-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
+			print '<td>'."\n";
+			print '<select name="vrf-'.$m.'" class="form-control input-sm input-w-auto">'."\n";
 			print '<option value="0">No VRF</option>';
-			if(sizeof(@$vrfs)>0) {
-				foreach($vrfs as $vrf) {
+			if (sizeof (@$vrfs) > 0) {
+				foreach ($vrfs as $vrf) {
 					# set description
-					$vrf_description = strlen($vrf->description)>0 ? " (".$vrf->description.")" : "";
+					$vrf_description = strlen ($vrf->description) > 0 ? " (".$vrf->description.")" : "";
 					print '<option value="'.$vrf->vrfId.'">'.$vrf->name.$vrf_description.'</option>';
 				}
 			}
 			//show name
-			print '<td>'. "\n";
-			print '<select name="showName-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
-			print '<option value="0">'._('No') .'</option>';
-			print '<option value="1">'._('Yes').'</option>';
-			print '</td>'. "\n";
+			print '<td>'."\n";
+			print '<select name="showName-'.$m.'" class="form-control input-sm input-w-auto">'."\n";
+			print '<option value="0">'._ ('No').'</option>';
+			print '<option value="1">'._ ('Yes').'</option>';
+			print '</td>'."\n";
 
-			print '</tr>'. "\n";
+			print '</tr>'."\n";
 		}
 		$m++;
 	}
 
 	//submit
-	print '<tr style="border-top:1px solid white" class="th">'. "\n";
-	print '<td colspan="7" style="text-align:right">'. "\n";
-	print '	<input type="submit" class="btn btn-sm btn-default" value="'._('Import to database').'">'. "\n";
-	print '</td>'. "\n";
-	print '</tr>'. "\n";
-
-	print '</table>'. "\n";
-	print '</form>'. "\n";
+	print '<tr style="border-top:1px solid white" class="th">'."\n";
+	print '<td colspan="7" style="text-align:right">'."\n";
+	print '	<input type="submit" class="btn btn-sm btn-default" value="'._ ('Import to database').'">'."\n";
+	print '</td>'."\n";
+	print '</tr>'."\n";
+
+	print '</table>'."\n";
+	print '</form>'."\n";
 }
 ?>
 <div class="ripeImportResult"></div>
\ No newline at end of file

app/admin/users/ad-search-result-groups-membership.php

Indentation +40 added lines, -40 removed lines

@@ -29,52 +29,52 @@
 
 //open connection
 try {
-	if($server->type == "NetIQ") { $params->account_suffix = ""; }
-	//set options
-	$options = array(
-			'base_dn'=>$params->base_dn,
-			'account_suffix'=>$params->account_suffix,
-			'domain_controllers'=>explode(";",$params->domain_controllers),
-			'use_ssl'=>$params->use_ssl,
-			'use_tls'=>$params->use_tls,
-			'ad_port'=>$params->ad_port
-			);
-	//AD
-	$adldap = new adLDAP($options);
+    if($server->type == "NetIQ") { $params->account_suffix = ""; }
+    //set options
+    $options = array(
+            'base_dn'=>$params->base_dn,
+            'account_suffix'=>$params->account_suffix,
+            'domain_controllers'=>explode(";",$params->domain_controllers),
+            'use_ssl'=>$params->use_ssl,
+            'use_tls'=>$params->use_tls,
+            'ad_port'=>$params->ad_port
+            );
+    //AD
+    $adldap = new adLDAP($options);
 
-	//try to login with higher credentials for search
-	$authUser = $adldap->authenticate($params->adminUsername, $params->adminPassword);
-	if ($authUser == false) {
-		$Result->show("danger", _("Invalid credentials"), true);
-	}
+    //try to login with higher credentials for search
+    $authUser = $adldap->authenticate($params->adminUsername, $params->adminPassword);
+    if ($authUser == false) {
+        $Result->show("danger", _("Invalid credentials"), true);
+    }
 
-	// set OpenLDAP flag
-	if($server->type == "LDAP") { $adldap->setUseOpenLDAP(true); }
+    // set OpenLDAP flag
+    if($server->type == "LDAP") { $adldap->setUseOpenLDAP(true); }
 
-	//fetch all groups
-	$all_groups = $Admin->fetch_all_objects ("userGroups", "g_id");
-	if($all_groups !== false) {
-		foreach($all_groups as $k=>$g) {
-			//members
-			$domain_group_members = $adldap->group()->members($g->g_name);
-			//false
-			if($domain_group_members!==false) {
-				foreach($domain_group_members as $m) {
-					if($m==$_POST['username']) {
-						$membership[] = $g->g_id;
-					}
-				}
-			}
-		}
-	}
+    //fetch all groups
+    $all_groups = $Admin->fetch_all_objects ("userGroups", "g_id");
+    if($all_groups !== false) {
+        foreach($all_groups as $k=>$g) {
+            //members
+            $domain_group_members = $adldap->group()->members($g->g_name);
+            //false
+            if($domain_group_members!==false) {
+                foreach($domain_group_members as $m) {
+                    if($m==$_POST['username']) {
+                        $membership[] = $g->g_id;
+                    }
+                }
+            }
+        }
+    }
 
-	# if something set print it
-	if (isset($membership)) {
-		print trim(implode(";", array_filter($membership)));
-	}
+    # if something set print it
+    if (isset($membership)) {
+        print trim(implode(";", array_filter($membership)));
+    }
 
 }
 catch (adLDAPException $e) {
-	$Result->show("danger", $e->getMessage(), true);
+    $Result->show("danger", $e->getMessage(), true);
 }
 ?>
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -73,8 +73,7 @@
 		print trim(implode(";", array_filter($membership)));
 	}
 
-}
-catch (adLDAPException $e) {
+} catch (adLDAPException $e) {
 	$Result->show("danger", $e->getMessage(), true);
 }
 ?>
\ No newline at end of file

Spacing +24 added lines, -24 removed lines

@@ -5,62 +5,62 @@ 
  *************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
-require( dirname(__FILE__) . "/../../../functions/adLDAP/src/adLDAP.php");
+require(dirname (__FILE__).'/../../../functions/functions.php');
+require(dirname (__FILE__)."/../../../functions/adLDAP/src/adLDAP.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 ();
 
 # fetch server
-$server = $Admin->fetch_object("usersAuthMethod", "id", $_POST['server']);
-$server!==false ? : $Result->show("danger", _("Invalid server ID"), true);
+$server = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['server']);
+$server !== false ? : $Result->show ("danger", _ ("Invalid server ID"), true);
 
 //parse parameters
-$params = json_decode($server->params);
+$params = json_decode ($server->params);
 
 //no login parameters
-if(strlen(@$params->adminUsername)==0 || strlen(@$params->adminPassword)==0)	{ $Result->show("danger", _("Missing credentials"), true); }
+if (strlen (@$params->adminUsername) == 0 || strlen (@$params->adminPassword) == 0) { $Result->show ("danger", _ ("Missing credentials"), true); }
 
 //open connection
 try {
-	if($server->type == "NetIQ") { $params->account_suffix = ""; }
+	if ($server->type == "NetIQ") { $params->account_suffix = ""; }
 	//set options
-	$options = array(
+	$options = array (
 			'base_dn'=>$params->base_dn,
 			'account_suffix'=>$params->account_suffix,
-			'domain_controllers'=>explode(";",$params->domain_controllers),
+			'domain_controllers'=>explode (";", $params->domain_controllers),
 			'use_ssl'=>$params->use_ssl,
 			'use_tls'=>$params->use_tls,
 			'ad_port'=>$params->ad_port
 			);
 	//AD
-	$adldap = new adLDAP($options);
+	$adldap = new adLDAP ($options);
 
 	//try to login with higher credentials for search
-	$authUser = $adldap->authenticate($params->adminUsername, $params->adminPassword);
+	$authUser = $adldap->authenticate ($params->adminUsername, $params->adminPassword);
 	if ($authUser == false) {
-		$Result->show("danger", _("Invalid credentials"), true);
+		$Result->show ("danger", _ ("Invalid credentials"), true);
 	}
 
 	// set OpenLDAP flag
-	if($server->type == "LDAP") { $adldap->setUseOpenLDAP(true); }
+	if ($server->type == "LDAP") { $adldap->setUseOpenLDAP (true); }
 
 	//fetch all groups
 	$all_groups = $Admin->fetch_all_objects ("userGroups", "g_id");
-	if($all_groups !== false) {
-		foreach($all_groups as $k=>$g) {
+	if ($all_groups !== false) {
+		foreach ($all_groups as $k=>$g) {
 			//members
-			$domain_group_members = $adldap->group()->members($g->g_name);
+			$domain_group_members = $adldap->group ()->members ($g->g_name);
 			//false
-			if($domain_group_members!==false) {
-				foreach($domain_group_members as $m) {
-					if($m==$_POST['username']) {
+			if ($domain_group_members !== false) {
+				foreach ($domain_group_members as $m) {
+					if ($m == $_POST['username']) {
 						$membership[] = $g->g_id;
 					}
 				}
@@ -70,11 +70,11 @@ 
 
 	# if something set print it
 	if (isset($membership)) {
-		print trim(implode(";", array_filter($membership)));
+		print trim (implode (";", array_filter ($membership)));
 	}
 
 }
 catch (adLDAPException $e) {
-	$Result->show("danger", $e->getMessage(), true);
+	$Result->show ("danger", $e->getMessage (), true);
 }
 ?>
\ No newline at end of file

app/admin/users/ad-search-result.php

Indentation +56 added lines, -56 removed lines

@@ -32,70 +32,70 @@
 
 //open connection
 try {
-	if($server->type == "NetIQ") { $params->account_suffix = ""; }
-	//set options
-	$options = array(
-			'base_dn'=>$params->base_dn,
-			'account_suffix'=>$params->account_suffix,
-			'domain_controllers'=>explode(";",$params->domain_controllers),
-			'use_ssl'=>$params->use_ssl,
-			'use_tls'=>$params->use_tls,
-			'ad_port'=>$params->ad_port
-			);
-	//AD
-	$adldap = new adLDAP($options);
-
-	//try to login with higher credentials for search
-	$authUser = $adldap->authenticate($params->adminUsername, $params->adminPassword);
-	if ($authUser == false) {
-		$Result->show("danger", _("Invalid credentials"), true);
-	}
-
-	// set OpenLDAP flag
-	if($server->type == "LDAP") { $adldap->setUseOpenLDAP(true); }
-
-	//search for domain user!
-	$userinfo = $adldap->user()->info("$_POST[dname]*", array("*"),false,$server->type);
-
-	//echo $adldap->getLastError();
+    if($server->type == "NetIQ") { $params->account_suffix = ""; }
+    //set options
+    $options = array(
+            'base_dn'=>$params->base_dn,
+            'account_suffix'=>$params->account_suffix,
+            'domain_controllers'=>explode(";",$params->domain_controllers),
+            'use_ssl'=>$params->use_ssl,
+            'use_tls'=>$params->use_tls,
+            'ad_port'=>$params->ad_port
+            );
+    //AD
+    $adldap = new adLDAP($options);
+
+    //try to login with higher credentials for search
+    $authUser = $adldap->authenticate($params->adminUsername, $params->adminPassword);
+    if ($authUser == false) {
+        $Result->show("danger", _("Invalid credentials"), true);
+    }
+
+    // set OpenLDAP flag
+    if($server->type == "LDAP") { $adldap->setUseOpenLDAP(true); }
+
+    //search for domain user!
+    $userinfo = $adldap->user()->info("$_POST[dname]*", array("*"),false,$server->type);
+
+    //echo $adldap->getLastError();
 }
 catch (adLDAPException $e) {
-	$Result->show("danger", $e->getMessage(), true);
+    $Result->show("danger", $e->getMessage(), true);
 }
 
 
 //check for found
 if(!isset($userinfo['count'])) {
-	print "<div class='alert alert-info'>";
-	print _('No users found')."!<hr>";
-	print _('Possible reasons').":";
-	print "<ul>";
-	print "<li>"._('Username not existing')."</li>";
-	print "<li>"._('Invalid baseDN setting for AD')."</li>";
-	print "<li>"._('AD account does not have enough privileges for search')."</li>";
-	print "</div>";
+    print "<div class='alert alert-info'>";
+    print _('No users found')."!<hr>";
+    print _('Possible reasons').":";
+    print "<ul>";
+    print "<li>"._('Username not existing')."</li>";
+    print "<li>"._('Invalid baseDN setting for AD')."</li>";
+    print "<li>"._('AD account does not have enough privileges for search')."</li>";
+    print "</div>";
 } else {
-	print _(" Following users were found").": ($userinfo[count]):<hr>";
-
-	print "<table class='table table-striped'>";
-
-	unset($userinfo['count']);
-	if(sizeof(@$userinfo)>0 && isset($userinfo)) {
-		// loop
-		foreach($userinfo as $u) {
-			print "<tr>";
-			print "	<td>".$u['displayname'][0];
-			print "</td>";
-			print "	<td>".$u['samaccountname'][0]."</td>";
-			print "	<td>".$u['mail'][0]."</td>";
-			//actions
-			print " <td style='width:10px;'>";
-			print "		<a href='' class='btn btn-sm btn-default btn-success userselect' data-uname='".$u['displayname'][0]."' data-username='".$u['samaccountname'][0]."' data-email='".$u['mail'][0]."' data-server='".$_POST['server']."' data-server-type='".$server->type."'>"._('Select')."</a>";
-			print "	</td>";
-			print "</tr>";
-		}
-	}
-	print "</table>";
+    print _(" Following users were found").": ($userinfo[count]):<hr>";
+
+    print "<table class='table table-striped'>";
+
+    unset($userinfo['count']);
+    if(sizeof(@$userinfo)>0 && isset($userinfo)) {
+        // loop
+        foreach($userinfo as $u) {
+            print "<tr>";
+            print "	<td>".$u['displayname'][0];
+            print "</td>";
+            print "	<td>".$u['samaccountname'][0]."</td>";
+            print "	<td>".$u['mail'][0]."</td>";
+            //actions
+            print " <td style='width:10px;'>";
+            print "		<a href='' class='btn btn-sm btn-default btn-success userselect' data-uname='".$u['displayname'][0]."' data-username='".$u['samaccountname'][0]."' data-email='".$u['mail'][0]."' data-server='".$_POST['server']."' data-server-type='".$server->type."'>"._('Select')."</a>";
+            print "	</td>";
+            print "</tr>";
+        }
+    }
+    print "</table>";
 }
 
 ?>
\ No newline at end of file

Braces +3 added lines, -3 removed lines

@@ -58,8 +58,7 @@ 
 	$userinfo = $adldap->user()->info("$_POST[dname]*", array("*"),false,$server->type);
 
 	//echo $adldap->getLastError();
-}
-catch (adLDAPException $e) {
+} catch (adLDAPException $e) {
 	$Result->show("danger", $e->getMessage(), true);
 }
 
@@ -74,7 +73,8 @@ 
 	print "<li>"._('Invalid baseDN setting for AD')."</li>";
 	print "<li>"._('AD account does not have enough privileges for search')."</li>";
 	print "</div>";
-} else {
+}
+else {
 	print _(" Following users were found").": ($userinfo[count]):<hr>";
 
 	print "<table class='table table-striped'>";

Spacing +29 added lines, -29 removed lines

@@ -5,84 +5,84 @@ 
  *************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
-require( dirname(__FILE__) . "/../../../functions/adLDAP/src/adLDAP.php");
+require(dirname (__FILE__).'/../../../functions/functions.php');
+require(dirname (__FILE__)."/../../../functions/adLDAP/src/adLDAP.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 ();
 
 # fetch server
-$server = $Admin->fetch_object("usersAuthMethod", "id", $_POST['server']);
-$server!==false ? : $Result->show("danger", _("Invalid server ID"), true);
+$server = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['server']);
+$server !== false ? : $Result->show ("danger", _ ("Invalid server ID"), true);
 
 //parse parameters
-$params = json_decode($server->params);
+$params = json_decode ($server->params);
 
 //no login parameters
-if(strlen(@$params->adminUsername)==0 || strlen(@$params->adminPassword)==0)	{ $Result->show("danger", _("Missing credentials"), true); }
+if (strlen (@$params->adminUsername) == 0 || strlen (@$params->adminPassword) == 0) { $Result->show ("danger", _ ("Missing credentials"), true); }
 //at least 2 chars
-if(strlen($_POST['dname'])<2) 													{ $Result->show("danger", _('Please enter at least 2 characters'), true); }
+if (strlen ($_POST['dname']) < 2) { $Result->show ("danger", _ ('Please enter at least 2 characters'), true); }
 
 
 //open connection
 try {
-	if($server->type == "NetIQ") { $params->account_suffix = ""; }
+	if ($server->type == "NetIQ") { $params->account_suffix = ""; }
 	//set options
-	$options = array(
+	$options = array (
 			'base_dn'=>$params->base_dn,
 			'account_suffix'=>$params->account_suffix,
-			'domain_controllers'=>explode(";",$params->domain_controllers),
+			'domain_controllers'=>explode (";", $params->domain_controllers),
 			'use_ssl'=>$params->use_ssl,
 			'use_tls'=>$params->use_tls,
 			'ad_port'=>$params->ad_port
 			);
 	//AD
-	$adldap = new adLDAP($options);
+	$adldap = new adLDAP ($options);
 
 	//try to login with higher credentials for search
-	$authUser = $adldap->authenticate($params->adminUsername, $params->adminPassword);
+	$authUser = $adldap->authenticate ($params->adminUsername, $params->adminPassword);
 	if ($authUser == false) {
-		$Result->show("danger", _("Invalid credentials"), true);
+		$Result->show ("danger", _ ("Invalid credentials"), true);
 	}
 
 	// set OpenLDAP flag
-	if($server->type == "LDAP") { $adldap->setUseOpenLDAP(true); }
+	if ($server->type == "LDAP") { $adldap->setUseOpenLDAP (true); }
 
 	//search for domain user!
-	$userinfo = $adldap->user()->info("$_POST[dname]*", array("*"),false,$server->type);
+	$userinfo = $adldap->user ()->info ("$_POST[dname]*", array ("*"), false, $server->type);
 
 	//echo $adldap->getLastError();
 }
 catch (adLDAPException $e) {
-	$Result->show("danger", $e->getMessage(), true);
+	$Result->show ("danger", $e->getMessage (), true);
 }
 
 
 //check for found
-if(!isset($userinfo['count'])) {
+if (!isset($userinfo['count'])) {
 	print "<div class='alert alert-info'>";
-	print _('No users found')."!<hr>";
-	print _('Possible reasons').":";
+	print _ ('No users found')."!<hr>";
+	print _ ('Possible reasons').":";
 	print "<ul>";
-	print "<li>"._('Username not existing')."</li>";
-	print "<li>"._('Invalid baseDN setting for AD')."</li>";
-	print "<li>"._('AD account does not have enough privileges for search')."</li>";
+	print "<li>"._ ('Username not existing')."</li>";
+	print "<li>"._ ('Invalid baseDN setting for AD')."</li>";
+	print "<li>"._ ('AD account does not have enough privileges for search')."</li>";
 	print "</div>";
 } else {
-	print _(" Following users were found").": ($userinfo[count]):<hr>";
+	print _ (" Following users were found").": ($userinfo[count]):<hr>";
 
 	print "<table class='table table-striped'>";
 
 	unset($userinfo['count']);
-	if(sizeof(@$userinfo)>0 && isset($userinfo)) {
+	if (sizeof (@$userinfo) > 0 && isset($userinfo)) {
 		// loop
-		foreach($userinfo as $u) {
+		foreach ($userinfo as $u) {
 			print "<tr>";
 			print "	<td>".$u['displayname'][0];
 			print "</td>";
@@ -90,7 +90,7 @@ 
 			print "	<td>".$u['mail'][0]."</td>";
 			//actions
 			print " <td style='width:10px;'>";
-			print "		<a href='' class='btn btn-sm btn-default btn-success userselect' data-uname='".$u['displayname'][0]."' data-username='".$u['samaccountname'][0]."' data-email='".$u['mail'][0]."' data-server='".$_POST['server']."' data-server-type='".$server->type."'>"._('Select')."</a>";
+			print "		<a href='' class='btn btn-sm btn-default btn-success userselect' data-uname='".$u['displayname'][0]."' data-username='".$u['samaccountname'][0]."' data-email='".$u['mail'][0]."' data-server='".$_POST['server']."' data-server-type='".$server->type."'>"._ ('Select')."</a>";
 			print "	</td>";
 			print "</tr>";
 		}

app/admin/users/edit-notify.php

Indentation +19 added lines, -19 removed lines

@@ -10,9 +10,9 @@ 
 # fetch users to receive notification and filter
 $users = $Admin->fetch_multiple_objects ("users", "role", "Administrator");
 foreach ($users as $k=>$u) {
-	if ($u->mailNotify != "Yes") {
-		unset($users[$k]);
-	}
+    if ($u->mailNotify != "Yes") {
+        unset($users[$k]);
+    }
 }
 
 # fetch mailer settings
@@ -20,7 +20,7 @@ 
 
 # verify admin mail and name
 if (strlen($mail_settings->mAdminMail)==0 || strlen($mail_settings->mAdminName)==0) {
-	$Result->show("danger", _("Cannot send mail, mail settings are missing. Please set them under administration > Mail Settings !"), true);
+    $Result->show("danger", _("Cannot send mail, mail settings are missing. Please set them under administration > Mail Settings !"), true);
 }
 
 # initialize mailer
@@ -79,23 +79,23 @@ 
 
 # try to send
 try {
-	$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
-	$phpipam_mail->Php_mailer->addAddress(addslashes(trim($_POST['email'])), addslashes(trim($_POST['real_name'])));
-	//add all admins to CC
-	if (sizeof($users)>0) {
-		foreach($users as $admin) {
-			$phpipam_mail->Php_mailer->AddCC($admin->email);
-		}
-	}
-	$phpipam_mail->Php_mailer->Subject = $subject;
-	$phpipam_mail->Php_mailer->msgHTML($content);
-	$phpipam_mail->Php_mailer->AltBody = $content_plain;
-	//send
-	$phpipam_mail->Php_mailer->send();
+    $phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
+    $phpipam_mail->Php_mailer->addAddress(addslashes(trim($_POST['email'])), addslashes(trim($_POST['real_name'])));
+    //add all admins to CC
+    if (sizeof($users)>0) {
+        foreach($users as $admin) {
+            $phpipam_mail->Php_mailer->AddCC($admin->email);
+        }
+    }
+    $phpipam_mail->Php_mailer->Subject = $subject;
+    $phpipam_mail->Php_mailer->msgHTML($content);
+    $phpipam_mail->Php_mailer->AltBody = $content_plain;
+    //send
+    $phpipam_mail->Php_mailer->send();
 } catch (phpmailerException $e) {
-	$Result->show("danger", "Mailer Error: ".$e->errorMessage(), true);
+    $Result->show("danger", "Mailer Error: ".$e->errorMessage(), true);
 } catch (Exception $e) {
-	$Result->show("danger", "Mailer Error: ".$e->errorMessage(), true);
+    $Result->show("danger", "Mailer Error: ".$e->errorMessage(), true);
 }
 
 //if error not sent print ok

Spacing +43 added lines, -43 removed lines

@@ -5,7 +5,7 @@ 
  ***********************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch users to receive notification and filter
 $users = $Admin->fetch_multiple_objects ("users", "role", "Administrator");
@@ -16,89 +16,89 @@ 
 }
 
 # fetch mailer settings
-$mail_settings = $Admin->fetch_object("settingsMail", "id", 1);
+$mail_settings = $Admin->fetch_object ("settingsMail", "id", 1);
 
 # verify admin mail and name
-if (strlen($mail_settings->mAdminMail)==0 || strlen($mail_settings->mAdminName)==0) {
-	$Result->show("danger", _("Cannot send mail, mail settings are missing. Please set them under administration > Mail Settings !"), true);
+if (strlen ($mail_settings->mAdminMail) == 0 || strlen ($mail_settings->mAdminName) == 0) {
+	$Result->show ("danger", _ ("Cannot send mail, mail settings are missing. Please set them under administration > Mail Settings !"), true);
 }
 
 # initialize mailer
-$phpipam_mail = new phpipam_mail($User->settings, $mail_settings);
-$phpipam_mail->initialize_mailer();
+$phpipam_mail = new phpipam_mail ($User->settings, $mail_settings);
+$phpipam_mail->initialize_mailer ();
 
 
 # set subject
-if ($_POST['action'] == "Add") 			{ $subject	= _('New ipam account created'); }
-else if ($_POST['action'] == "Edit") 	{ $subject	= _('User ipam account updated'); }
-else 									{ $subject	= _('IPAM account details'); }
+if ($_POST['action'] == "Add") { $subject = _ ('New ipam account created'); }
+else if ($_POST['action'] == "Edit") { $subject = _ ('User ipam account updated'); }
+else { $subject = _ ('IPAM account details'); }
 
 
 # set html content
 $content[] = "<table style='margin-left:10px;margin-top:5px;width:auto;padding:0px;border-collapse:collapse;'>";
 $content[] = "<tr><td style='padding:5px;margin:0px;color:#333;font-size:16px;text-shadow:1px 1px 1px white;border-bottom:1px solid #eeeeee;' colspan='2'><font face='Helvetica, Verdana, Arial, sans-serif' style='font-size:16px;'>$subject</font></td></tr>";
-$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;border-top:1px solid white;padding-top:10px;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._('Name').'</font></td>	  	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;padding-top:10px;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">'. $_POST['real_name'] .'</font></td></tr>';
+$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;border-top:1px solid white;padding-top:10px;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._ ('Name').'</font></td>	  	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;padding-top:10px;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">'.$_POST['real_name'].'</font></td></tr>';
 //we dont need pass for domain account
-if($auth_method->type == "local") {
-$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._('Username').'</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">'. $_POST['username'] 	.'</font></td></tr>';
-if(strlen($_POST['password2']) != 0) {
-$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._('Password').'</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">'. $_POST['password2'] .'</font></td></tr>';
+if ($auth_method->type == "local") {
+$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._ ('Username').'</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">'.$_POST['username'].'</font></td></tr>';
+if (strlen ($_POST['password2']) != 0) {
+$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._ ('Password').'</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">'.$_POST['password2'].'</font></td></tr>';
 }}
 else {
-$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._('Username').'</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">* '._('your domain username').' ('. $_POST['username'] .')</font></td></tr>';
-$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._('Password').'</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">* '._('your domain password').'</font></td></tr>';
+$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._ ('Username').'</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">* '._ ('your domain username').' ('.$_POST['username'].')</font></td></tr>';
+$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._ ('Password').'</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">* '._ ('your domain password').'</font></td></tr>';
 }
-$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._('Email').'</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;"><a href="mailto:'.$_POST['email'].'" style="color:#08c;">'.$_POST['email'].'</a></font></td></tr>';
-$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._('Role').'</font></td>		<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">'. $_POST['role'] 		.'</font></td></tr>';
-$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;border-bottom:1px solid #eeeeee;padding-bottom:10px;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._('WebApp').'</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;border-bottom:1px solid #eeeeee;padding-bottom:10px;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;"> <a href="'. $User->settings->siteURL .'" style="color:#08c;">'. $User->settings->siteURL. '</font></a><td></tr>';
-$content[] = "<tr><td style='padding:5px;padding-left:15px;margin:0px;font-style:italic;padding-bottom:3px;text-align:right;color:#ccc;text-shadow:1px 1px 1px white;border-top:1px solid white;' colspan='2'><font face='Helvetica, Verdana, Arial, sans-serif' style='font-size:11px;'>"._('Sent by user')." ".$User->user->real_name." at ".date('Y/m/d H:i')."</font></td></tr>";
+$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._ ('Email').'</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;"><a href="mailto:'.$_POST['email'].'" style="color:#08c;">'.$_POST['email'].'</a></font></td></tr>';
+$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._ ('Role').'</font></td>		<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">'.$_POST['role'].'</font></td></tr>';
+$content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;border-bottom:1px solid #eeeeee;padding-bottom:10px;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;">&bull; '._ ('WebApp').'</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;border-bottom:1px solid #eeeeee;padding-bottom:10px;"><font face="Helvetica, Verdana, Arial, sans-serif" style="font-size:13px;"> <a href="'.$User->settings->siteURL.'" style="color:#08c;">'.$User->settings->siteURL.'</font></a><td></tr>';
+$content[] = "<tr><td style='padding:5px;padding-left:15px;margin:0px;font-style:italic;padding-bottom:3px;text-align:right;color:#ccc;text-shadow:1px 1px 1px white;border-top:1px solid white;' colspan='2'><font face='Helvetica, Verdana, Arial, sans-serif' style='font-size:11px;'>"._ ('Sent by user')." ".$User->user->real_name." at ".date ('Y/m/d H:i')."</font></td></tr>";
 $content[] = "</table>";
 
 # plain
 $content_plain[] = "$subject"."\r\n------------------------------\r\n";
-$content_plain[] = _("Name").": $_POST[real_name]";
+$content_plain[] = _ ("Name").": $_POST[real_name]";
 # we dont need pass for domain account
-if($auth_method->type == "local") {
-$content_plain[] = _("Username").": $_POST[username]";
-if(strlen($_POST['password2']) != 0) {
-$content_plain[] = _("Password").": $_POST[password2]";
+if ($auth_method->type == "local") {
+$content_plain[] = _ ("Username").": $_POST[username]";
+if (strlen ($_POST['password2']) != 0) {
+$content_plain[] = _ ("Password").": $_POST[password2]";
 }}
 else {
-$content_plain[] = _("Username").": * your domain username($_POST[username]";
-$content_plain[] = _("Password").": * your domain password";
+$content_plain[] = _ ("Username").": * your domain username($_POST[username]";
+$content_plain[] = _ ("Password").": * your domain password";
 }
-$content_plain[] = _("Email").": $_POST[email]";
-$content_plain[] = _("Role").": $_POST[role]";
-$content_plain[] = _("WebApp").": ".$User->settings->siteURL;
-$content_plain[] = "\r\n"._("Sent by user")." ".$User->user->real_name." at ".date('Y/m/d H:i');
+$content_plain[] = _ ("Email").": $_POST[email]";
+$content_plain[] = _ ("Role").": $_POST[role]";
+$content_plain[] = _ ("WebApp").": ".$User->settings->siteURL;
+$content_plain[] = "\r\n"._ ("Sent by user")." ".$User->user->real_name." at ".date ('Y/m/d H:i');
 
 
 # set content
-$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-$content_plain 	= implode("\r\n",$content_plain);
+$content = $phpipam_mail->generate_message (implode ("\r\n", $content));
+$content_plain = implode ("\r\n", $content_plain);
 
 # try to send
 try {
-	$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
-	$phpipam_mail->Php_mailer->addAddress(addslashes(trim($_POST['email'])), addslashes(trim($_POST['real_name'])));
+	$phpipam_mail->Php_mailer->setFrom ($mail_settings->mAdminMail, $mail_settings->mAdminName);
+	$phpipam_mail->Php_mailer->addAddress (addslashes (trim ($_POST['email'])), addslashes (trim ($_POST['real_name'])));
 	//add all admins to CC
-	if (sizeof($users)>0) {
-		foreach($users as $admin) {
-			$phpipam_mail->Php_mailer->AddCC($admin->email);
+	if (sizeof ($users) > 0) {
+		foreach ($users as $admin) {
+			$phpipam_mail->Php_mailer->AddCC ($admin->email);
 		}
 	}
 	$phpipam_mail->Php_mailer->Subject = $subject;
-	$phpipam_mail->Php_mailer->msgHTML($content);
+	$phpipam_mail->Php_mailer->msgHTML ($content);
 	$phpipam_mail->Php_mailer->AltBody = $content_plain;
 	//send
-	$phpipam_mail->Php_mailer->send();
+	$phpipam_mail->Php_mailer->send ();
 } catch (phpmailerException $e) {
-	$Result->show("danger", "Mailer Error: ".$e->errorMessage(), true);
+	$Result->show ("danger", "Mailer Error: ".$e->errorMessage (), true);
 } catch (Exception $e) {
-	$Result->show("danger", "Mailer Error: ".$e->errorMessage(), true);
+	$Result->show ("danger", "Mailer Error: ".$e->errorMessage (), true);
 }
 
 //if error not sent print ok
-$Result->show("success", _('Notification mail for new account sent').'!', true);
+$Result->show ("success", _ ('Notification mail for new account sent').'!', true);
 
 ?>
\ No newline at end of file

app/admin/users/index.php

Indentation +3 added lines, -3 removed lines

@@ -9,9 +9,9 @@
 
 // switch user
 if(@$_GET['subnetId']=="switch"){
-	$_SESSION['realipamusername'] = $_SESSION['ipamusername'];
-	$_SESSION['ipamusername'] = $_GET['sPage'];
-	print '<script>window.location.href = "'.create_link(null).'";</script>';
+    $_SESSION['realipamusername'] = $_SESSION['ipamusername'];
+    $_SESSION['ipamusername'] = $_GET['sPage'];
+    print '<script>window.location.href = "'.create_link(null).'";</script>';
 }
 
 # print all or specific user?

Braces +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 $User->check_user_session();
 
 // switch user
-if(@$_GET['subnetId']=="switch"){
+if(@$_GET['subnetId']=="switch") {
 	$_SESSION['realipamusername'] = $_SESSION['ipamusername'];
 	$_SESSION['ipamusername'] = $_GET['sPage'];
 	print '<script>window.location.href = "'.create_link(null).'";</script>';

Spacing +5 added lines, -5 removed lines

@@ -5,16 +5,16 @@
  *************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 // switch user
-if(@$_GET['subnetId']=="switch"){
+if (@$_GET['subnetId'] == "switch") {
 	$_SESSION['realipamusername'] = $_SESSION['ipamusername'];
 	$_SESSION['ipamusername'] = $_GET['sPage'];
-	print '<script>window.location.href = "'.create_link(null).'";</script>';
+	print '<script>window.location.href = "'.create_link (null).'";</script>';
 }
 
 # print all or specific user?
-if(isset($_GET['subnetId']))	{ include("print-user.php"); }
-else							{ include("print-all.php"); }
+if (isset($_GET['subnetId'])) { include("print-user.php"); }
+else { include("print-all.php"); }
 ?>
\ No newline at end of file

app/admin/users/print-user.php

Indentation +39 added lines, -39 removed lines

@@ -70,9 +70,9 @@ 
 	<td><?php print _('Authentication'); ?></td>
 	<td>
 	<?php
-	if($auth_details===false) 	{ print "<span class='text-muted'>No auth method</span>"; }
-	else 					 	{ print $auth_details->type." <span class='text-muted'>(".$auth_details->description.")</span>"; }
-	?>
+    if($auth_details===false) 	{ print "<span class='text-muted'>No auth method</span>"; }
+    else 					 	{ print $auth_details->type." <span class='text-muted'>(".$auth_details->description.")</span>"; }
+    ?>
 	</td>
 </tr>
 <tr>
@@ -87,22 +87,22 @@ 
 	<td><?php print _('Groups'); ?></td>
 	<td>
 	<?php
-	if($user->role == "Administrator") {
-	print _('All groups');
-	}
-	else {
-		$groups = json_decode($user->groups, true);
-		$gr = $Admin->groups_parse($groups);
-		if(sizeof($gr)>0) {
-			foreach($gr as $group) {
-				print $group['g_name']."<br>";
-			}
-		}
-		else {
-			print "<span class='text-muted'>No groups</span>";
-		}
-	}
-	?>
+    if($user->role == "Administrator") {
+    print _('All groups');
+    }
+    else {
+        $groups = json_decode($user->groups, true);
+        $gr = $Admin->groups_parse($groups);
+        if(sizeof($gr)>0) {
+            foreach($gr as $group) {
+                print $group['g_name']."<br>";
+            }
+        }
+        else {
+            print "<span class='text-muted'>No groups</span>";
+        }
+    }
+    ?>
 	</td>
 </tr>
 <tr>
@@ -151,26 +151,26 @@ 
 <?php
 # custom subnet fields
 if(sizeof($custom_fields) > 0) {
-	foreach($custom_fields as $key=>$field) {
-		$user->$key = str_replace("\n", "<br>",$user->$key);
-		print "<tr>";
-		print "	<td>$key</td>";
-		print "	<td>";
-		//no length
-		if(strlen($user->$key)==0) {
-			print "/";
-		}
-		//booleans
-		elseif($field['type']=="tinyint(1)")	{
-			if($user->$key == "0")		{ print _("No"); }
-			elseif($user->$key == "1")	{ print _("Yes"); }
-		}
-		else {
-			print $user->$key;
-		}
-		print "	</td>";
-		print "</tr>";
-		}
+    foreach($custom_fields as $key=>$field) {
+        $user->$key = str_replace("\n", "<br>",$user->$key);
+        print "<tr>";
+        print "	<td>$key</td>";
+        print "	<td>";
+        //no length
+        if(strlen($user->$key)==0) {
+            print "/";
+        }
+        //booleans
+        elseif($field['type']=="tinyint(1)")	{
+            if($user->$key == "0")		{ print _("No"); }
+            elseif($user->$key == "1")	{ print _("Yes"); }
+        }
+        else {
+            print $user->$key;
+        }
+        print "	</td>";
+        print "</tr>";
+        }
 }
 ?>
 

Braces +1 added lines, -1 removed lines

@@ -161,7 +161,7 @@
 			print "/";
 		}
 		//booleans
-		elseif($field['type']=="tinyint(1)")	{
+		elseif($field['type']=="tinyint(1)") {
 			if($user->$key == "0")		{ print _("No"); }
 			elseif($user->$key == "1")	{ print _("Yes"); }
 		}

Spacing +48 added lines, -48 removed lines

@@ -5,46 +5,46 @@ 
  *************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch user details
-$user 		  = $Admin->fetch_object("users", "id", $_GET['subnetId']);
+$user = $Admin->fetch_object ("users", "id", $_GET['subnetId']);
 
 # invalid?
-if($user===false)		{ $Result->show("danger", _("Invalid ID"), true); }
+if ($user === false) { $Result->show ("danger", _ ("Invalid ID"), true); }
 
 # fetch user lang
-$language 	  = $Admin->fetch_object("lang", "l_id", $user->lang);
+$language = $Admin->fetch_object ("lang", "l_id", $user->lang);
 # check users auth method
-$auth_details = $Admin->fetch_object("usersAuthMethod", "id", $user->authMethod);
+$auth_details = $Admin->fetch_object ("usersAuthMethod", "id", $user->authMethod);
 # fetch custom fields
-$custom_fields = $Tools->fetch_custom_fields('users');
+$custom_fields = $Tools->fetch_custom_fields ('users');
 ?>
 
 <!-- display existing users -->
-<h4><?php print _('User details'); ?></h4>
+<h4><?php print _ ('User details'); ?></h4>
 <hr><br>
 
 <!-- Add new -->
-<a class='btn btn-sm btn-default' href="<?php print create_link("administration","users"); ?>" style="margin-bottom:10px;"><i class='fa fa-angle-left'></i> <?php print _('All users'); ?></a>
+<a class='btn btn-sm btn-default' href="<?php print create_link ("administration", "users"); ?>" style="margin-bottom:10px;"><i class='fa fa-angle-left'></i> <?php print _ ('All users'); ?></a>
 
 <!-- table -->
 <table id="userPrint" class="table table-hover table-auto table-condensed">
 
 <tr>
-	<td><?php print _('Real Name'); ?></td>
+	<td><?php print _ ('Real Name'); ?></td>
 	<td><strong><?php print $user->real_name; ?></strong></td>
 </tr>
 <tr>
-	<td><?php print _('Username'); ?></td>
+	<td><?php print _ ('Username'); ?></td>
 	<td><?php print $user->username; ?></td>
 </tr>
 <tr>
-	<td><?php print _('E-mail'); ?></td>
+	<td><?php print _ ('E-mail'); ?></td>
 	<td><?php print $user->email; ?></td>
 </tr>
 <tr>
-	<td><?php print _('Language'); ?></td>
+	<td><?php print _ ('Language'); ?></td>
 	<td><?php print $language->l_name; ?></td>
 </tr>
 <tr>
@@ -59,42 +59,42 @@ 
 
 
 <tr>
-	<td colspan="2"><h4><?php print _('Authentication settings'); ?></h4><hr></td>
+	<td colspan="2"><h4><?php print _ ('Authentication settings'); ?></h4><hr></td>
 </tr>
 
 <tr>
-	<td><?php print _('Role'); ?></td>
+	<td><?php print _ ('Role'); ?></td>
 	<td><?php print $user->role; ?></td>
 </tr>
 <tr>
-	<td><?php print _('Authentication'); ?></td>
+	<td><?php print _ ('Authentication'); ?></td>
 	<td>
 	<?php
-	if($auth_details===false) 	{ print "<span class='text-muted'>No auth method</span>"; }
-	else 					 	{ print $auth_details->type." <span class='text-muted'>(".$auth_details->description.")</span>"; }
+	if ($auth_details === false) { print "<span class='text-muted'>No auth method</span>"; }
+	else { print $auth_details->type." <span class='text-muted'>(".$auth_details->description.")</span>"; }
 	?>
 	</td>
 </tr>
 <tr>
-	<td><?php print _('Last login'); ?></td>
-	<td><?php print strlen($user->lastLogin)>0 ? $user->lastLogin : "<span class='text-muted'>"._("Never")."</span>"; ?></td>
+	<td><?php print _ ('Last login'); ?></td>
+	<td><?php print strlen ($user->lastLogin) > 0 ? $user->lastLogin : "<span class='text-muted'>"._ ("Never")."</span>"; ?></td>
 </tr>
 <tr>
-	<td><?php print _('Last activity'); ?></td>
-	<td><?php print strlen($user->lastActivity)>0 ? $user->lastActivity : "<span class='text-muted'>"._("Never")."</span>"; ?></td>
+	<td><?php print _ ('Last activity'); ?></td>
+	<td><?php print strlen ($user->lastActivity) > 0 ? $user->lastActivity : "<span class='text-muted'>"._ ("Never")."</span>"; ?></td>
 </tr>
 <tr>
-	<td><?php print _('Groups'); ?></td>
+	<td><?php print _ ('Groups'); ?></td>
 	<td>
 	<?php
-	if($user->role == "Administrator") {
-	print _('All groups');
+	if ($user->role == "Administrator") {
+	print _ ('All groups');
 	}
 	else {
-		$groups = json_decode($user->groups, true);
-		$gr = $Admin->groups_parse($groups);
-		if(sizeof($gr)>0) {
-			foreach($gr as $group) {
+		$groups = json_decode ($user->groups, true);
+		$gr = $Admin->groups_parse ($groups);
+		if (sizeof ($gr) > 0) {
+			foreach ($gr as $group) {
 				print $group['g_name']."<br>";
 			}
 		}
@@ -106,64 +106,64 @@ 
 	</td>
 </tr>
 <tr>
-	<td><?php print _('Password change required'); ?></td>
+	<td><?php print _ ('Password change required'); ?></td>
 	<td><?php print $user->passChange; ?></td>
 </tr>
 
 
 
 <tr>
-	<td colspan="2"><h4><?php print _('Display settings'); ?></h4><hr></td>
+	<td colspan="2"><h4><?php print _ ('Display settings'); ?></h4><hr></td>
 </tr>
 <tr>
-	<td><?php print _('compress override'); ?></td>
-	<td><?php print $user->compressOverride==1 ? _("Yes") : _("No") ?></td>
+	<td><?php print _ ('compress override'); ?></td>
+	<td><?php print $user->compressOverride == 1 ? _ ("Yes") : _ ("No") ?></td>
 </tr>
 <tr>
-	<td><?php print _('Hide free range'); ?></td>
-	<td><?php print $user->hideFreeRange==1 ? _("Yes") : _("No") ?></td>
+	<td><?php print _ ('Hide free range'); ?></td>
+	<td><?php print $user->hideFreeRange == 1 ? _ ("Yes") : _ ("No") ?></td>
 </tr>
 <tr>
-	<td><?php print _('IP address print limit'); ?></td>
+	<td><?php print _ ('IP address print limit'); ?></td>
 	<td><?php print $user->printLimit; ?></td>
 </tr>
 
 
 
 <tr>
-	<td colspan="2"><h4><?php print _('Mail settings'); ?></h4><hr></td>
+	<td colspan="2"><h4><?php print _ ('Mail settings'); ?></h4><hr></td>
 </tr>
 <tr>
-	<td><?php print _('Mail notifications'); ?></td>
-	<td><?php print $user->role == "Administrator" ? _($user->mailNotify) : _("No"); ?></td>
+	<td><?php print _ ('Mail notifications'); ?></td>
+	<td><?php print $user->role == "Administrator" ? _ ($user->mailNotify) : _ ("No"); ?></td>
 </tr>
 <tr>
-	<td><?php print _('Changelog notifications'); ?></td>
-	<td><?php print $user->role == "Administrator" ? _($user->mailChangelog) : _("No"); ?></td>
+	<td><?php print _ ('Changelog notifications'); ?></td>
+	<td><?php print $user->role == "Administrator" ? _ ($user->mailChangelog) : _ ("No"); ?></td>
 </tr>
 
 
 
 <tr>
-	<td colspan="2"><h4><?php print _('Custom fields'); ?></h4><hr></td>
+	<td colspan="2"><h4><?php print _ ('Custom fields'); ?></h4><hr></td>
 </tr>
 
 <?php
 # custom subnet fields
-if(sizeof($custom_fields) > 0) {
-	foreach($custom_fields as $key=>$field) {
-		$user->$key = str_replace("\n", "<br>",$user->$key);
+if (sizeof ($custom_fields) > 0) {
+	foreach ($custom_fields as $key=>$field) {
+		$user->$key = str_replace ("\n", "<br>", $user->$key);
 		print "<tr>";
 		print "	<td>$key</td>";
 		print "	<td>";
 		//no length
-		if(strlen($user->$key)==0) {
+		if (strlen ($user->$key) == 0) {
 			print "/";
 		}
 		//booleans
-		elseif($field['type']=="tinyint(1)")	{
-			if($user->$key == "0")		{ print _("No"); }
-			elseif($user->$key == "1")	{ print _("Yes"); }
+		elseif ($field['type'] == "tinyint(1)") {
+			if ($user->$key == "0") { print _ ("No"); }
+			elseif ($user->$key == "1") { print _ ("Yes"); }
 		}
 		else {
 			print $user->$key;

app/admin/users/edit-result.php

Indentation +50 added lines, -50 removed lines

@@ -32,17 +32,17 @@ 
 
 # ID must be numeric
 if($_POST['action']=="edit"||$_POST['action']=="delete") {
-	if(!is_numeric($_POST['userId']))									{ $Result->show("danger", _("Invalid ID"), true); }
+    if(!is_numeric($_POST['userId']))									{ $Result->show("danger", _("Invalid ID"), true); }
 }
 
 # if password changes check and hash passwords
 if(strlen(@$_POST['password1'])>0 || (@$_POST['action']=="add" && $auth_method->type=="local")) {
-	//checks
-	if($_POST['password1']!=$_POST['password2'])						{ $Result->show("danger", _("Passwords do not match"), true); }
-	if(strlen($_POST['password1'])<8)									{ $Result->show("danger", _("Password must be at least 8 characters long!"), true); }
+    //checks
+    if($_POST['password1']!=$_POST['password2'])						{ $Result->show("danger", _("Passwords do not match"), true); }
+    if(strlen($_POST['password1'])<8)									{ $Result->show("danger", _("Password must be at least 8 characters long!"), true); }
 
-	//hash passowrd
-	$_POST['password1'] = $User->crypt_user_pass ($_POST['password1']);
+    //hash passowrd
+    $_POST['password1'] = $User->crypt_user_pass ($_POST['password1']);
 }
 
 # general checks
@@ -52,16 +52,16 @@ 
 
 # username must not already exist (if action is add)
 if ($_POST['action']=="add") {
-	//username > 8 chars
-	if ($auth_method->type=="local") {
-		if(strlen($_POST['username'])<6)								{ $Result->show("danger", _("Username must be at least 6 characters long!"), true); }
-	} else {
-		if(strlen($_POST['username'])==0)								{ $Result->show("danger", _("Username must be at least 1 character long!"), true); }
-	}
-	//check duplicate
-	if($Admin->fetch_object("users", "username", $_POST['username'])!==false) {
-																		{ $Result->show("danger", _("User")." ".$_POST['username']." "._("already exists!"), true); }
-	}
+    //username > 8 chars
+    if ($auth_method->type=="local") {
+        if(strlen($_POST['username'])<6)								{ $Result->show("danger", _("Username must be at least 6 characters long!"), true); }
+    } else {
+        if(strlen($_POST['username'])==0)								{ $Result->show("danger", _("Username must be at least 1 character long!"), true); }
+    }
+    //check duplicate
+    if($Admin->fetch_object("users", "username", $_POST['username'])!==false) {
+                                                                        { $Result->show("danger", _("User")." ".$_POST['username']." "._("already exists!"), true); }
+    }
 }
 # admin user cannot be deleted
 if($_POST['action']=="delete" && $_POST['username']=="admin") 			{ $Result->show("danger", _("Admin user cannot be deleted"), true); }
@@ -69,21 +69,21 @@ 
 # custom fields check
 $myFields = $Tools->fetch_custom_fields('users');
 if(sizeof($myFields) > 0) {
-	foreach($myFields as $myField) {
-		# replace possible ___ back to spaces!
-		$myField['nameTest']      = str_replace(" ", "___", $myField['name']);
-
-		if(isset($_POST[$myField['nameTest']])) { $_POST[$myField['name']] = $_POST[$myField['nameTest']];}
-
-		//booleans can be only 0 and 1!
-		if($myField['type']=="tinyint(1)") {
-			if($_POST[$myField['name']]>1) {
-				$$_POST[$myField['name']] = "";
-			}
-		}
-		//not null!
-		if($myField['Null']=="NO" && strlen($_POST[$myField['name']])==0) { $Result->show("danger", '"'.$myField['name'].'" can not be empty!', true); }
-	}
+    foreach($myFields as $myField) {
+        # replace possible ___ back to spaces!
+        $myField['nameTest']      = str_replace(" ", "___", $myField['name']);
+
+        if(isset($_POST[$myField['nameTest']])) { $_POST[$myField['name']] = $_POST[$myField['nameTest']];}
+
+        //booleans can be only 0 and 1!
+        if($myField['type']=="tinyint(1)") {
+            if($_POST[$myField['name']]>1) {
+                $$_POST[$myField['name']] = "";
+            }
+        }
+        //not null!
+        if($myField['Null']=="NO" && strlen($_POST[$myField['name']])==0) { $Result->show("danger", '"'.$myField['name'].'" can not be empty!', true); }
+    }
 }
 
 
@@ -91,34 +91,34 @@ 
 
 # formulate update values
 $values = array("id"=>@$_POST['userId'],
-				"real_name"=>$_POST['real_name'],
-				"username"=>$_POST['username'],
-				"email"=>$_POST['email'],
-				"role"=>$_POST['role'],
-				"authMethod"=>$_POST['authMethod'],
-				"lang"=>$_POST['lang'],
-				"mailNotify"=>$_POST['mailNotify'],
-				"mailChangelog"=>$_POST['mailChangelog'],
-				"pdns"=>$_POST['pdns']
-				);
+                "real_name"=>$_POST['real_name'],
+                "username"=>$_POST['username'],
+                "email"=>$_POST['email'],
+                "role"=>$_POST['role'],
+                "authMethod"=>$_POST['authMethod'],
+                "lang"=>$_POST['lang'],
+                "mailNotify"=>$_POST['mailNotify'],
+                "mailChangelog"=>$_POST['mailChangelog'],
+                "pdns"=>$_POST['pdns']
+                );
 # update pass ?
 if(strlen(@$_POST['password1'])>0 || (@$_POST['action']=="add" && $auth_method->type=="local")) {
-	$values['password'] = $_POST['password1'];
+    $values['password'] = $_POST['password1'];
 }
 # pass change
 if(isset($_POST['passChange']) && $auth_method->type=="local") {
-	$values['passChange'] = "Yes";
+    $values['passChange'] = "Yes";
 }
 # set groups user belongs to
 if($_POST['role']=="Administrator") {
-	$values['groups'] = null;
+    $values['groups'] = null;
 } else {
-	foreach($_POST as $key=>$post) {
-		if(substr($key, 0,5) == "group") {
-			$group[substr($key, 5)] = substr($key, 5);
-		}
-	}
-	$values['groups'] = json_encode(@$group);
+    foreach($_POST as $key=>$post) {
+        if(substr($key, 0,5) == "group") {
+            $group[substr($key, 5)] = substr($key, 5);
+        }
+    }
+    $values['groups'] = json_encode(@$group);
 }
 
 # execute

Braces +4 added lines, -2 removed lines

@@ -55,7 +55,8 @@ 
 	//username > 8 chars
 	if ($auth_method->type=="local") {
 		if(strlen($_POST['username'])<6)								{ $Result->show("danger", _("Username must be at least 6 characters long!"), true); }
-	} else {
+	}
+	else {
 		if(strlen($_POST['username'])==0)								{ $Result->show("danger", _("Username must be at least 1 character long!"), true); }
 	}
 	//check duplicate
@@ -112,7 +113,8 @@ 
 # set groups user belongs to
 if($_POST['role']=="Administrator") {
 	$values['groups'] = null;
-} else {
+}
+else {
 	foreach($_POST as $key=>$post) {
 		if(substr($key, 0,5) == "group") {
 			$group[substr($key, 5)] = substr($key, 5);

Spacing +41 added lines, -41 removed lines

@@ -5,85 +5,85 @@ 
  *************************************/
 
 /* 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);
 $Tools	 	= new Tools ($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", "user", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "user", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # fetch auth method
 $auth_method = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['authMethod']);
-$auth_method!==false ? : $Result->show("danger", _("Invalid authentication method"), true);
+$auth_method !== false ? : $Result->show ("danger", _ ("Invalid authentication method"), true);
 
 
 /* checks */
 
 # ID must be numeric
-if($_POST['action']=="edit"||$_POST['action']=="delete") {
-	if(!is_numeric($_POST['userId']))									{ $Result->show("danger", _("Invalid ID"), true); }
+if ($_POST['action'] == "edit" || $_POST['action'] == "delete") {
+	if (!is_numeric ($_POST['userId'])) { $Result->show ("danger", _ ("Invalid ID"), true); }
 }
 
 # if password changes check and hash passwords
-if($auth_method->type != "local") { $_POST['password1'] = ""; $_POST['password2'] = ""; }
-if((strlen(@$_POST['password1'])>0 || (@$_POST['action']=="add") && $auth_method->type=="local")) {
+if ($auth_method->type != "local") { $_POST['password1'] = ""; $_POST['password2'] = ""; }
+if ((strlen (@$_POST['password1']) > 0 || (@$_POST['action'] == "add") && $auth_method->type == "local")) {
 	//checks
-	if($_POST['password1']!=$_POST['password2'])						{ $Result->show("danger", _("Passwords do not match"), true); }
-	if(strlen($_POST['password1'])<8)									{ $Result->show("danger", _("Password must be at least 8 characters long!"), true); }
+	if ($_POST['password1'] != $_POST['password2']) { $Result->show ("danger", _ ("Passwords do not match"), true); }
+	if (strlen ($_POST['password1']) < 8) { $Result->show ("danger", _ ("Password must be at least 8 characters long!"), true); }
 
 	//hash passowrd
 	$_POST['password1'] = $User->crypt_user_pass ($_POST['password1']);
 }
 
 # general checks
-if(strlen(@$_POST['real_name'])==0)										{ $Result->show("danger", _("Real name field is mandatory!"), true); }
+if (strlen (@$_POST['real_name']) == 0) { $Result->show ("danger", _ ("Real name field is mandatory!"), true); }
 # email format must be valid
-if (!$Result->validate_email(@$_POST['email'])) 						{ $Result->show("danger", _("Invalid email address!"), true); }
+if (!$Result->validate_email (@$_POST['email'])) { $Result->show ("danger", _ ("Invalid email address!"), true); }
 
 # username must not already exist (if action is add)
-if ($_POST['action']=="add") {
+if ($_POST['action'] == "add") {
 	//username > 8 chars
-	if ($auth_method->type=="local") {
-		if(strlen($_POST['username'])<6)								{ $Result->show("danger", _("Username must be at least 6 characters long!"), true); }
+	if ($auth_method->type == "local") {
+		if (strlen ($_POST['username']) < 6) { $Result->show ("danger", _ ("Username must be at least 6 characters long!"), true); }
 	} else {
-		if(strlen($_POST['username'])==0)								{ $Result->show("danger", _("Username must be at least 1 character long!"), true); }
+		if (strlen ($_POST['username']) == 0) { $Result->show ("danger", _ ("Username must be at least 1 character long!"), true); }
 	}
 	//check duplicate
-	if($Admin->fetch_object("users", "username", $_POST['username'])!==false) {
-																		{ $Result->show("danger", _("User")." ".$_POST['username']." "._("already exists!"), true); }
+	if ($Admin->fetch_object ("users", "username", $_POST['username']) !== false) {
+																		{ $Result->show ("danger", _ ("User")." ".$_POST['username']." "._ ("already exists!"), true); }
 	}
 }
 # admin user cannot be deleted
-if($_POST['action']=="delete" && $_POST['username']=="admin") 			{ $Result->show("danger", _("Admin user cannot be deleted"), true); }
+if ($_POST['action'] == "delete" && $_POST['username'] == "admin") { $Result->show ("danger", _ ("Admin user cannot be deleted"), true); }
 
 # custom fields check
-$myFields = $Tools->fetch_custom_fields('users');
-if(sizeof($myFields) > 0) {
-	foreach($myFields as $myField) {
+$myFields = $Tools->fetch_custom_fields ('users');
+if (sizeof ($myFields) > 0) {
+	foreach ($myFields as $myField) {
 		# replace possible ___ back to spaces!
-		$myField['nameTest']      = str_replace(" ", "___", $myField['name']);
+		$myField['nameTest'] = str_replace (" ", "___", $myField['name']);
 
-		if(isset($_POST[$myField['nameTest']])) { $_POST[$myField['name']] = $_POST[$myField['nameTest']];}
+		if (isset($_POST[$myField['nameTest']])) { $_POST[$myField['name']] = $_POST[$myField['nameTest']]; }
 
 		//booleans can be only 0 and 1!
-		if($myField['type']=="tinyint(1)") {
-			if($_POST[$myField['name']]>1) {
+		if ($myField['type'] == "tinyint(1)") {
+			if ($_POST[$myField['name']] > 1) {
 				$$_POST[$myField['name']] = "";
 			}
 		}
 		//not null!
-		if($myField['Null']=="NO" && strlen($_POST[$myField['name']])==0) { $Result->show("danger", '"'.$myField['name'].'" can not be empty!', true); }
+		if ($myField['Null'] == "NO" && strlen ($_POST[$myField['name']]) == 0) { $Result->show ("danger", '"'.$myField['name'].'" can not be empty!', true); }
 	}
 }
 
@@ -91,7 +91,7 @@ 
 /* update */
 
 # formulate update values
-$values = array("id"=>@$_POST['userId'],
+$values = array ("id"=>@$_POST['userId'],
 				"real_name"=>$_POST['real_name'],
 				"username"=>$_POST['username'],
 				"email"=>$_POST['email'],
@@ -103,30 +103,30 @@ 
 				"pdns"=>$_POST['pdns']
 				);
 # update pass ?
-if(strlen(@$_POST['password1'])>0 || (@$_POST['action']=="add" && $auth_method->type=="local")) {
+if (strlen (@$_POST['password1']) > 0 || (@$_POST['action'] == "add" && $auth_method->type == "local")) {
 	$values['password'] = $_POST['password1'];
 }
 # pass change
-if(isset($_POST['passChange']) && $auth_method->type=="local") {
+if (isset($_POST['passChange']) && $auth_method->type == "local") {
 	$values['passChange'] = "Yes";
 }
 # set groups user belongs to
-if($_POST['role']=="Administrator") {
+if ($_POST['role'] == "Administrator") {
 	$values['groups'] = null;
 } else {
-	foreach($_POST as $key=>$post) {
-		if(substr($key, 0,5) == "group") {
-			$group[substr($key, 5)] = substr($key, 5);
+	foreach ($_POST as $key=>$post) {
+		if (substr ($key, 0, 5) == "group") {
+			$group[substr ($key, 5)] = substr ($key, 5);
 		}
 	}
-	$values['groups'] = json_encode(@$group);
+	$values['groups'] = json_encode (@$group);
 }
 
 # execute
-if(!$Admin->object_modify("users", $_POST['action'], "id", $values))	{ $Result->show("danger",  _("User $_POST[action] failed").'!', true); }
-else																	{ $Result->show("success", _("User $_POST[action] successfull").'!', false); }
+if (!$Admin->object_modify ("users", $_POST['action'], "id", $values)) { $Result->show ("danger", _ ("User $_POST[action] failed").'!', true); }
+else { $Result->show ("success", _ ("User $_POST[action] successfull").'!', false); }
 
 # mail user
-if($Admin->verify_checkbox(@$_POST['notifyUser'])!="0") { include("edit-notify.php"); }
+if ($Admin->verify_checkbox (@$_POST['notifyUser']) != "0") { include("edit-notify.php"); }
 
 ?>

app/admin/users/edit.php

Indentation +135 added lines, -135 removed lines

@@ -33,17 +33,17 @@ 
 
 # set header parameters and fetch user
 if($_POST['action']!="add") {
-	$user = $Admin->fetch_object ("users", "id", $_POST['id']);
-	//false
-	if($user===false)		{ $Result->show("danger", _("Invalid ID"), true, true); }
-	else {
-		$user = (array) $user;
-	}
+    $user = $Admin->fetch_object ("users", "id", $_POST['id']);
+    //false
+    if($user===false)		{ $Result->show("danger", _("Invalid ID"), true, true); }
+    else {
+        $user = (array) $user;
+    }
 }
 else {
-	$user = array();
-	//set default lang
-	$user['lang']=$User->settings->defaultLang;
+    $user = array();
+    //set default lang
+    $user['lang']=$User->settings->defaultLang;
 }
 ?>
 
@@ -129,12 +129,12 @@ 
 		<td>
 			<select name="authMethod" id="authMethod" class="form-control input-sm input-w-auto">
 			<?php
-			foreach($auth_types as $type) {
-				# match
-				if($type->id==@$user['authMethod'])	{ print "<option value='$type->id' selected>$type->type ($type->description)</option>"; }
-				else								{ print "<option value='$type->id'         >$type->type ($type->description)</option>"; }
-			}
-			?>
+            foreach($auth_types as $type) {
+                # match
+                if($type->id==@$user['authMethod'])	{ print "<option value='$type->id' selected>$type->type ($type->description)</option>"; }
+                else								{ print "<option value='$type->id'         >$type->type ($type->description)</option>"; }
+            }
+            ?>
 			</select>
 		</td>
 		<td class="info2"><?php print _("Select authentication method for user"); ?></td>
@@ -184,11 +184,11 @@ 
 		<td>
 			<select name="lang" class="form-control input-sm input-w-auto">
 				<?php
-				foreach($langs as $lang) {
-					if($lang->l_id==$user['lang'])	{ print "<option value='$lang->l_id' selected>$lang->l_name ($lang->l_code)</option>"; }
-					else							{ print "<option value='$lang->l_id'		 >$lang->l_name ($lang->l_code)</option>"; }
-				}
-				?>
+                foreach($langs as $lang) {
+                    if($lang->l_id==$user['lang'])	{ print "<option value='$lang->l_id' 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 language'); ?></td>
@@ -241,28 +241,28 @@ 
 		<td><?php print _('Groups'); ?></td>
 		<td class="groups">
 		<?php
-		//print groups
-		if($groups!==false) {
-			//set groups
-			$ugroups = json_decode(@$user['groups'], true);
-			$ugroups = $Admin->groups_parse_ids($ugroups);
-
-			foreach($groups as $g) {
-				# empty fix
-				if(sizeof($ugroups) > 0) {
-					if(in_array($g->g_id, $ugroups)) 	{ print "<input type='checkbox' name='group$g->g_id' checked>$g->g_name<br>"; }
-					else 								{ print "<input type='checkbox' name='group$g->g_id'		>$g->g_name<br>"; }
-				}
-				else {
-														{ print "<input type='checkbox' name='group$g->g_id'>$g->g_name<br>"; }
-				}
-			}
-		}
-		else {
-			$Result->show("danger", _("No groups configured"), false);
-		}
-
-		?>
+        //print groups
+        if($groups!==false) {
+            //set groups
+            $ugroups = json_decode(@$user['groups'], true);
+            $ugroups = $Admin->groups_parse_ids($ugroups);
+
+            foreach($groups as $g) {
+                # empty fix
+                if(sizeof($ugroups) > 0) {
+                    if(in_array($g->g_id, $ugroups)) 	{ print "<input type='checkbox' name='group$g->g_id' checked>$g->g_name<br>"; }
+                    else 								{ print "<input type='checkbox' name='group$g->g_id'		>$g->g_name<br>"; }
+                }
+                else {
+                                                        { print "<input type='checkbox' name='group$g->g_id'>$g->g_name<br>"; }
+                }
+            }
+        }
+        else {
+            $Result->show("danger", _("No groups configured"), false);
+        }
+
+        ?>
 		</td>
 		<td class="info2"><?php print _('Select to which groups the user belongs to'); ?></td>
 	</tr>
@@ -284,99 +284,99 @@ 
 
 	<!-- Custom -->
 	<?php
-	if(sizeof($custom) > 0) {
-		print '<tr>';
-		print '	<td colspan="3"><hr></td>';
-		print '</tr>';
-
-		# count datepickers
-		$timeP = 0;
-
-		# all my fields
-		foreach($custom as $field) {
-			# replace spaces with |
-			$field['nameNew'] = str_replace(" ", "___", $field['name']);
-
-			# required
-			if($field['Null']=="NO")	{ $required = "*"; }
-			else						{ $required = ""; }
-
-			# set default value !
-			if ($_POST['action']=="add")	{ $user[$field['name']] = $field['Default']; }
-
-			print '<tr>'. "\n";
-			print '	<td>'. $field['name'] .' '.$required.'</td>'. "\n";
-			print '	<td>'. "\n";
-
-			//set type
-			if(substr($field['type'], 0,3) == "set" || substr($field['type'], 0,4) == "enum") {
-				//parse values
-				$tmp = substr($field['type'], 0,3)=="set" ? explode(",", str_replace(array("set(", ")", "'"), "", $field['type'])) : explode(",", str_replace(array("enum(", ")", "'"), "", $field['type']));
-				//null
-				if($field['Null']!="NO") { array_unshift($tmp, ""); }
-
-				print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
-				foreach($tmp as $v) {
-					if($v==$user[$field['name']])	{ print "<option value='$v' selected='selected'>$v</option>"; }
-					else								{ print "<option value='$v'>$v</option>"; }
-				}
-				print "</select>";
-			}
-			//date and time picker
-			elseif($field['type'] == "date" || $field['type'] == "datetime") {
-				// just for first
-				if($timeP==0) {
-					print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
-					print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
-					print '<script type="text/javascript">';
-					print '$(document).ready(function() {';
-					//date only
-					print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
-					//date + time
-					print '	$(".datetimepicker").datetimepicker( { pickDate: true, pickTime: true } );';
-
-					print '})';
-					print '</script>';
-				}
-				$timeP++;
-
-				//set size
-				if($field['type'] == "date")	{ $size = 10; $class='datepicker';		$format = "yyyy-MM-dd"; }
-				else							{ $size = 19; $class='datetimepicker';	$format = "yyyy-MM-dd"; }
-
-				//field
-				if(!isset($user[$field['name']]))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
-				else								{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" value="'. $user[$field['name']]. '" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
-			}
-			//boolean
-			elseif($field['type'] == "tinyint(1)") {
-				print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
-				$tmp = array(0=>"No",1=>"Yes");
-				//null
-				if($field['Null']!="NO") { $tmp[2] = ""; }
-
-				foreach($tmp as $k=>$v) {
-					if(strlen($user[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					elseif($k==$user[$field['name']])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					else											{ print "<option value='$k'>"._($v)."</option>"; }
-				}
-				print "</select>";
-			}
-			//text
-			elseif($field['type'] == "text") {
-				print ' <textarea class="form-control input-sm" name="'. $field['nameNew'] .'" placeholder="'. $field['name'] .'" rowspan=3>'. $user[$field['name']]. '</textarea>'. "\n";
-			}
-			//default - input field
-			else {
-				print ' <input type="text" class="ip_addr form-control input-sm" name="'. @$field['nameNew'] .'" placeholder="'. @$field['name'] .'" value="'. @$user[$field['name']]. '" size="30">'. "\n";
-			}
-
-			print "	<td class='info2'>".$field['Comment']."</td>";
-			print '	</td>'. "\n";
-			print '</tr>'. "\n";
-		}
-	}
-	?>
+    if(sizeof($custom) > 0) {
+        print '<tr>';
+        print '	<td colspan="3"><hr></td>';
+        print '</tr>';
+
+        # count datepickers
+        $timeP = 0;
+
+        # all my fields
+        foreach($custom as $field) {
+            # replace spaces with |
+            $field['nameNew'] = str_replace(" ", "___", $field['name']);
+
+            # required
+            if($field['Null']=="NO")	{ $required = "*"; }
+            else						{ $required = ""; }
+
+            # set default value !
+            if ($_POST['action']=="add")	{ $user[$field['name']] = $field['Default']; }
+
+            print '<tr>'. "\n";
+            print '	<td>'. $field['name'] .' '.$required.'</td>'. "\n";
+            print '	<td>'. "\n";
+
+            //set type
+            if(substr($field['type'], 0,3) == "set" || substr($field['type'], 0,4) == "enum") {
+                //parse values
+                $tmp = substr($field['type'], 0,3)=="set" ? explode(",", str_replace(array("set(", ")", "'"), "", $field['type'])) : explode(",", str_replace(array("enum(", ")", "'"), "", $field['type']));
+                //null
+                if($field['Null']!="NO") { array_unshift($tmp, ""); }
+
+                print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
+                foreach($tmp as $v) {
+                    if($v==$user[$field['name']])	{ print "<option value='$v' selected='selected'>$v</option>"; }
+                    else								{ print "<option value='$v'>$v</option>"; }
+                }
+                print "</select>";
+            }
+            //date and time picker
+            elseif($field['type'] == "date" || $field['type'] == "datetime") {
+                // just for first
+                if($timeP==0) {
+                    print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
+                    print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
+                    print '<script type="text/javascript">';
+                    print '$(document).ready(function() {';
+                    //date only
+                    print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
+                    //date + time
+                    print '	$(".datetimepicker").datetimepicker( { pickDate: true, pickTime: true } );';
+
+                    print '})';
+                    print '</script>';
+                }
+                $timeP++;
+
+                //set size
+                if($field['type'] == "date")	{ $size = 10; $class='datepicker';		$format = "yyyy-MM-dd"; }
+                else							{ $size = 19; $class='datetimepicker';	$format = "yyyy-MM-dd"; }
+
+                //field
+                if(!isset($user[$field['name']]))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+                else								{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" value="'. $user[$field['name']]. '" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+            }
+            //boolean
+            elseif($field['type'] == "tinyint(1)") {
+                print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
+                $tmp = array(0=>"No",1=>"Yes");
+                //null
+                if($field['Null']!="NO") { $tmp[2] = ""; }
+
+                foreach($tmp as $k=>$v) {
+                    if(strlen($user[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
+                    elseif($k==$user[$field['name']])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
+                    else											{ print "<option value='$k'>"._($v)."</option>"; }
+                }
+                print "</select>";
+            }
+            //text
+            elseif($field['type'] == "text") {
+                print ' <textarea class="form-control input-sm" name="'. $field['nameNew'] .'" placeholder="'. $field['name'] .'" rowspan=3>'. $user[$field['name']]. '</textarea>'. "\n";
+            }
+            //default - input field
+            else {
+                print ' <input type="text" class="ip_addr form-control input-sm" name="'. @$field['nameNew'] .'" placeholder="'. @$field['name'] .'" value="'. @$user[$field['name']]. '" size="30">'. "\n";
+            }
+
+            print "	<td class='info2'>".$field['Comment']."</td>";
+            print '	</td>'. "\n";
+            print '</tr>'. "\n";
+        }
+    }
+    ?>
 	</tbody>
 
 

Braces +38 added lines, -10 removed lines

@@ -85,7 +85,10 @@ 
     <!-- username -->
     <tr>
     	<td><?php print _('Username'); ?></td>
-    	<td><input type="text" class="form-control input-sm" name="username" value="<?php print @$user['username']; ?>" <?php if($_POST['action']=="edit"||$_POST['action']=="delete") print 'readonly'; ?>></td>
+    	<td><input type="text" class="form-control input-sm" name="username" value="<?php print @$user['username']; ?>" <?php if($_POST['action']=="edit"||$_POST['action']=="delete") {
+    print 'readonly';
+}
+?>></td>
     	<td class="info2">
     		<a class='btn btn-xs btn-default adsearchuser' rel='tooltip' title='Search AD for user details'><i class='fa fa-search'></i></a>
 			<?php print _('Enter username'); ?>
@@ -104,8 +107,14 @@ 
     	<td><?php print _('User role'); ?></td>
     	<td>
         <select name="role" class="form-control input-sm input-w-auto">
-            <option value="Administrator"   <?php if (@$user['role'] == "Administrator") print "selected"; ?>><?php print _('Administrator'); ?></option>
-            <option value="User" 			<?php if (@$user['role'] == "User" || $_POST['action'] == "add") print "selected"; ?>><?php print _('Normal User'); ?></option>
+            <option value="Administrator"   <?php if (@$user['role'] == "Administrator") {
+    print "selected";
+}
+?>><?php print _('Administrator'); ?></option>
+            <option value="User" 			<?php if (@$user['role'] == "User" || $_POST['action'] == "add") {
+    print "selected";
+}
+?>><?php print _('Normal User'); ?></option>
         </select>
 
 
@@ -147,7 +156,10 @@ 
 	</tbody>
 
     <!-- password -->
-	<tbody id="user_password" <?php if(@$user['authMethod']!="1" && isset($user['authMethod'])) print "style='display:none'"; ?>>
+	<tbody id="user_password" <?php if(@$user['authMethod']!="1" && isset($user['authMethod'])) {
+    print "style='display:none'";
+}
+?>>
 
     <tr class="password">
     	<td><?php print _('Password'); ?></td>
@@ -197,19 +209,26 @@ 
     <!-- send notification mail -->
     <tr>
     	<td><?php print _('Notification'); ?></td>
-    	<td><input type="checkbox" name="notifyUser" value="on" <?php if($_POST['action'] == "add") { print 'checked'; } else if($_POST['action'] == "delete") { print 'disabled="disabled"';} ?>></td>
+    	<td><input type="checkbox" name="notifyUser" value="on" <?php if($_POST['action'] == "add") { print 'checked'; }
+else if($_POST['action'] == "delete") { print 'disabled="disabled"';} ?>></td>
     	<td class="info2"><?php print _('Send notification email to user with account details'); ?></td>
     </tr>
 	</tbody>
 
 	<!-- mailNotify -->
-	<tbody id="user_notifications" <?php if(@$user['role']!="Administrator") print "style='display:none'"; ?>>
+	<tbody id="user_notifications" <?php if(@$user['role']!="Administrator") {
+    print "style='display:none'";
+}
+?>>
 	<tr>
     	<td><?php print _('Mail State changes'); ?></td>
     	<td>
         <select name="mailNotify" class="form-control input-sm input-w-auto">
             <option value="No"><?php print _('No'); ?></option>
-            <option value="Yes"  <?php if (@$user['mailNotify'] == "Yes") print "selected='selected'"; ?>><?php print _('Yes'); ?></option>
+            <option value="Yes"  <?php if (@$user['mailNotify'] == "Yes") {
+    print "selected='selected'";
+}
+?>><?php print _('Yes'); ?></option>
         </select>
 
 
@@ -223,7 +242,10 @@ 
     	<td>
         <select name="mailChangelog" class="form-control input-sm input-w-auto">
             <option value="No"><?php print _('No'); ?></option>
-            <option value="Yes" <?php if (@$user['mailChangelog'] == "Yes") print "selected='selected'"; ?>><?php print _('Yes'); ?></option>
+            <option value="Yes" <?php if (@$user['mailChangelog'] == "Yes") {
+    print "selected='selected'";
+}
+?>><?php print _('Yes'); ?></option>
         </select>
 
 
@@ -276,7 +298,10 @@ 
 	<tr>
     	<td><?php print _("PowerDNS"); ?></td>
     	<td>
-            <input type="checkbox" class="input-switch" value="Yes" name="pdns" <?php if(@$user->pdns == "Yes") print 'checked'; ?>>
+            <input type="checkbox" class="input-switch" value="Yes" name="pdns" <?php if(@$user->pdns == "Yes") {
+    print 'checked';
+}
+?>>
     	</td>
 		<td class="info2"><?php print _('Select to allow user to create DNS records'); ?></td>
 	</tr>
@@ -390,7 +415,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="editUserSubmit"><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="editUserSubmit"><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>
 
 	<!-- Result -->

Spacing +102 added lines, -102 removed lines

@@ -5,45 +5,45 @@ 
  *************************************************/
 
 /* 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);
 $Tools	 	= new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "user");
 
 
 # fetch custom fields
-$custom 	= $Tools->fetch_custom_fields('users');
+$custom 	= $Tools->fetch_custom_fields ('users');
 # fetch all languages
 $langs 		= $Admin->fetch_all_objects ("lang", "l_id");
 # fetch all auth types
 $auth_types = $Admin->fetch_all_objects ("usersAuthMethod", "id");
 # fetch all groups
-$groups		= $Admin->fetch_all_objects ("userGroups", "g_id");
+$groups = $Admin->fetch_all_objects ("userGroups", "g_id");
 
 
 # set header parameters and fetch user
-if($_POST['action']!="add") {
+if ($_POST['action'] != "add") {
 	$user = $Admin->fetch_object ("users", "id", $_POST['id']);
 	//false
-	if($user===false)		{ $Result->show("danger", _("Invalid ID"), true, true); }
+	if ($user === false) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 	else {
 		$user = (array) $user;
 	}
 }
 else {
-	$user = array();
+	$user = array ();
 	//set default lang
-	$user['lang']=$User->settings->defaultLang;
+	$user['lang'] = $User->settings->defaultLang;
 }
 ?>
 
@@ -65,7 +65,7 @@ 
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords($_POST['action'])." "._('user'); ?></div>
+<div class="pHeader"><?php print ucwords ($_POST['action'])." "._ ('user'); ?></div>
 
 
 <!-- content -->
@@ -77,35 +77,35 @@ 
 	<tbody>
 	<!-- real name -->
 	<tr>
-	    <td><?php print _('Real name'); ?></td>
+	    <td><?php print _ ('Real name'); ?></td>
 	    <td><input type="text" class="form-control input-sm" name="real_name" value="<?php print @$user['real_name']; ?>"></td>
-       	<td class="info2"><?php print _('Enter users real name'); ?></td>
+       	<td class="info2"><?php print _ ('Enter users real name'); ?></td>
     </tr>
 
     <!-- username -->
     <tr>
-    	<td><?php print _('Username'); ?></td>
-    	<td><input type="text" class="form-control input-sm" name="username" value="<?php print @$user['username']; ?>" <?php if($_POST['action']=="edit"||$_POST['action']=="delete") print 'readonly'; ?>></td>
+    	<td><?php print _ ('Username'); ?></td>
+    	<td><input type="text" class="form-control input-sm" name="username" value="<?php print @$user['username']; ?>" <?php if ($_POST['action'] == "edit" || $_POST['action'] == "delete") print 'readonly'; ?>></td>
     	<td class="info2">
     		<a class='btn btn-xs btn-default adsearchuser' rel='tooltip' title='Search AD for user details'><i class='fa fa-search'></i></a>
-			<?php print _('Enter username'); ?>
+			<?php print _ ('Enter username'); ?>
 		</td>
     </tr>
 
     <!-- email -->
     <tr>
-    	<td><?php print _('e-mail'); ?></td>
+    	<td><?php print _ ('e-mail'); ?></td>
     	<td><input type="text" class="form-control input-sm input-w-250" name="email" value="<?php print @$user['email']; ?>"></td>
-    	<td class="info2"><?php print _('Enter users email address'); ?></td>
+    	<td class="info2"><?php print _ ('Enter users email address'); ?></td>
     </tr>
 
     <!-- role -->
     <tr>
-    	<td><?php print _('User role'); ?></td>
+    	<td><?php print _ ('User role'); ?></td>
     	<td>
         <select name="role" class="form-control input-sm input-w-auto">
-            <option value="Administrator"   <?php if (@$user['role'] == "Administrator") print "selected"; ?>><?php print _('Administrator'); ?></option>
-            <option value="User" 			<?php if (@$user['role'] == "User" || $_POST['action'] == "add") print "selected"; ?>><?php print _('Normal User'); ?></option>
+            <option value="Administrator"   <?php if (@$user['role'] == "Administrator") print "selected"; ?>><?php print _ ('Administrator'); ?></option>
+            <option value="User" 			<?php if (@$user['role'] == "User" || $_POST['action'] == "add") print "selected"; ?>><?php print _ ('Normal User'); ?></option>
         </select>
 
 
@@ -114,10 +114,10 @@ 
         <input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 
         </td>
-        <td class="info2"><?php print _('Select user role'); ?>
+        <td class="info2"><?php print _ ('Select user role'); ?>
 	    	<ul>
-		    	<li><?php print _('Administrator is almighty'); ?></li>
-		    	<li><?php print _('Users have access defined based on groups'); ?></li>
+		    	<li><?php print _ ('Administrator is almighty'); ?></li>
+		    	<li><?php print _ ('Users have access defined based on groups'); ?></li>
 		    </ul>
 		</td>
 	</tr>
@@ -125,19 +125,19 @@ 
 
 	<!-- auth type -->
 	<tr>
-		<td><?php print _("Authentication method"); ?></td>
+		<td><?php print _ ("Authentication method"); ?></td>
 		<td>
 			<select name="authMethod" id="authMethod" class="form-control input-sm input-w-auto">
 			<?php
-			foreach($auth_types as $type) {
+			foreach ($auth_types as $type) {
 				# match
-				if($type->id==@$user['authMethod'])	{ print "<option value='$type->id' selected>$type->type ($type->description)</option>"; }
-				else								{ print "<option value='$type->id'         >$type->type ($type->description)</option>"; }
+				if ($type->id == @$user['authMethod']) { print "<option value='$type->id' selected>$type->type ($type->description)</option>"; }
+				else { print "<option value='$type->id'         >$type->type ($type->description)</option>"; }
 			}
 			?>
 			</select>
 		</td>
-		<td class="info2"><?php print _("Select authentication method for user"); ?></td>
+		<td class="info2"><?php print _ ("Select authentication method for user"); ?></td>
 	</tr>
 
 	<tr>
@@ -147,28 +147,28 @@ 
 	</tbody>
 
     <!-- password -->
-	<tbody id="user_password" <?php if(@$user['authMethod']!="1" && isset($user['authMethod'])) print "style='display:none'"; ?>>
+	<tbody id="user_password" <?php if (@$user['authMethod'] != "1" && isset($user['authMethod'])) print "style='display:none'"; ?>>
 
     <tr class="password">
-    	<td><?php print _('Password'); ?></td>
+    	<td><?php print _ ('Password'); ?></td>
     	<td><input type="password" class="userPass form-control input-sm" name="password1"></td>
-    	<td class="info2"><?php print _("User's password"); ?> (<a href="#" id="randomPass"><?php print _('click to generate random'); ?>!</a>)</td>
+    	<td class="info2"><?php print _ ("User's password"); ?> (<a href="#" id="randomPass"><?php print _ ('click to generate random'); ?>!</a>)</td>
     </tr>
 
     <!-- password repeat -->
     <tr class="password">
-    	<td><?php print _('Password'); ?></td>
+    	<td><?php print _ ('Password'); ?></td>
     	<td><input type="password" class="userPass form-control input-sm" name="password2"></td>
-    	<td class="info2"><?php print _('Re-type password'); ?></td>
+    	<td class="info2"><?php print _ ('Re-type password'); ?></td>
     </tr>
 
     <!-- password change request -->
-    <?php if($_POST['action']=="add") { ?>
+    <?php if ($_POST['action'] == "add") { ?>
     <tr class="password">
     	<td></td>
     	<td class="info2" colspan="2">
     		<input type="checkbox" name="passChange" value="On" checked>
-			<?php print _('Require user to change password after initial login'); ?>
+			<?php print _ ('Require user to change password after initial login'); ?>
 		</td>
     </tr>
     <?php } ?>
@@ -180,55 +180,55 @@ 
 	<tbody>
 	<!-- Language -->
 	<tr>
-		<td><?php print _('Language'); ?></td>
+		<td><?php print _ ('Language'); ?></td>
 		<td>
 			<select name="lang" class="form-control input-sm input-w-auto">
 				<?php
-				foreach($langs as $lang) {
-					if($lang->l_id==$user['lang'])	{ print "<option value='$lang->l_id' selected>$lang->l_name ($lang->l_code)</option>"; }
-					else							{ print "<option value='$lang->l_id'		 >$lang->l_name ($lang->l_code)</option>"; }
+				foreach ($langs as $lang) {
+					if ($lang->l_id == $user['lang']) { print "<option value='$lang->l_id' 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 language'); ?></td>
+		<td class="info2"><?php print _ ('Select language'); ?></td>
 	</tr>
 
     <!-- send notification mail -->
     <tr>
-    	<td><?php print _('Notification'); ?></td>
-    	<td><input type="checkbox" name="notifyUser" value="on" <?php if($_POST['action'] == "add") { print 'checked'; } else if($_POST['action'] == "delete") { print 'disabled="disabled"';} ?>></td>
-    	<td class="info2"><?php print _('Send notification email to user with account details'); ?></td>
+    	<td><?php print _ ('Notification'); ?></td>
+    	<td><input type="checkbox" name="notifyUser" value="on" <?php if ($_POST['action'] == "add") { print 'checked'; } else if ($_POST['action'] == "delete") { print 'disabled="disabled"'; } ?>></td>
+    	<td class="info2"><?php print _ ('Send notification email to user with account details'); ?></td>
     </tr>
 	</tbody>
 
 	<!-- mailNotify -->
-	<tbody id="user_notifications" <?php if(@$user['role']!="Administrator") print "style='display:none'"; ?>>
+	<tbody id="user_notifications" <?php if (@$user['role'] != "Administrator") print "style='display:none'"; ?>>
 	<tr>
-    	<td><?php print _('Mail State changes'); ?></td>
+    	<td><?php print _ ('Mail State changes'); ?></td>
     	<td>
         <select name="mailNotify" class="form-control input-sm input-w-auto">
-            <option value="No"><?php print _('No'); ?></option>
-            <option value="Yes"  <?php if (@$user['mailNotify'] == "Yes") print "selected='selected'"; ?>><?php print _('Yes'); ?></option>
+            <option value="No"><?php print _ ('No'); ?></option>
+            <option value="Yes"  <?php if (@$user['mailNotify'] == "Yes") print "selected='selected'"; ?>><?php print _ ('Yes'); ?></option>
         </select>
 
 
         </td>
-        <td class="info2"><?php print _('Select yes to receive notification change mail for State change'); ?></td>
+        <td class="info2"><?php print _ ('Select yes to receive notification change mail for State change'); ?></td>
 	</tr>
 
 	<!-- mailNotifyChangelog -->
 	<tr>
-    	<td><?php print _('Mail Changelog'); ?></td>
+    	<td><?php print _ ('Mail Changelog'); ?></td>
     	<td>
         <select name="mailChangelog" class="form-control input-sm input-w-auto">
-            <option value="No"><?php print _('No'); ?></option>
-            <option value="Yes" <?php if (@$user['mailChangelog'] == "Yes") print "selected='selected'"; ?>><?php print _('Yes'); ?></option>
+            <option value="No"><?php print _ ('No'); ?></option>
+            <option value="Yes" <?php if (@$user['mailChangelog'] == "Yes") print "selected='selected'"; ?>><?php print _ ('Yes'); ?></option>
         </select>
 
 
         </td>
-        <td class="info2"><?php print _('Select yes to receive notification change mail for changelog'); ?></td>
+        <td class="info2"><?php print _ ('Select yes to receive notification change mail for changelog'); ?></td>
 	</tr>
 	</tbody>
 
@@ -238,20 +238,20 @@ 
 		<td colspan="3"><hr></td>
 	</tr>
 	<tr>
-		<td><?php print _('Groups'); ?></td>
+		<td><?php print _ ('Groups'); ?></td>
 		<td class="groups">
 		<?php
 		//print groups
-		if($groups!==false) {
+		if ($groups !== false) {
 			//set groups
-			$ugroups = json_decode(@$user['groups'], true);
-			$ugroups = $Admin->groups_parse_ids($ugroups);
+			$ugroups = json_decode (@$user['groups'], true);
+			$ugroups = $Admin->groups_parse_ids ($ugroups);
 
-			foreach($groups as $g) {
+			foreach ($groups as $g) {
 				# empty fix
-				if(sizeof($ugroups) > 0) {
-					if(in_array($g->g_id, $ugroups)) 	{ print "<input type='checkbox' name='group$g->g_id' checked>$g->g_name<br>"; }
-					else 								{ print "<input type='checkbox' name='group$g->g_id'		>$g->g_name<br>"; }
+				if (sizeof ($ugroups) > 0) {
+					if (in_array ($g->g_id, $ugroups)) { print "<input type='checkbox' name='group$g->g_id' checked>$g->g_name<br>"; }
+					else { print "<input type='checkbox' name='group$g->g_id'		>$g->g_name<br>"; }
 				}
 				else {
 														{ print "<input type='checkbox' name='group$g->g_id'>$g->g_name<br>"; }
@@ -259,32 +259,32 @@ 
 			}
 		}
 		else {
-			$Result->show("danger", _("No groups configured"), false);
+			$Result->show ("danger", _ ("No groups configured"), false);
 		}
 
 		?>
 		</td>
-		<td class="info2"><?php print _('Select to which groups the user belongs to'); ?></td>
+		<td class="info2"><?php print _ ('Select to which groups the user belongs to'); ?></td>
 	</tr>
 
 	<!-- pdns -->
-    <?php if ($User->settings->enablePowerDNS==1) { ?>
+    <?php if ($User->settings->enablePowerDNS == 1) { ?>
 	<tbody>
 	<tr>
 		<td colspan="3"><hr></td>
 	</tr>
 	<tr>
-    	<td><?php print _("PowerDNS"); ?></td>
+    	<td><?php print _ ("PowerDNS"); ?></td>
     	<td>
-            <input type="checkbox" class="input-switch" value="Yes" name="pdns" <?php if(@$user->pdns == "Yes") print 'checked'; ?>>
+            <input type="checkbox" class="input-switch" value="Yes" name="pdns" <?php if (@$user->pdns == "Yes") print 'checked'; ?>>
     	</td>
-		<td class="info2"><?php print _('Select to allow user to create DNS records'); ?></td>
+		<td class="info2"><?php print _ ('Select to allow user to create DNS records'); ?></td>
 	</tr>
     <?php } ?>
 
 	<!-- Custom -->
 	<?php
-	if(sizeof($custom) > 0) {
+	if (sizeof ($custom) > 0) {
 		print '<tr>';
 		print '	<td colspan="3"><hr></td>';
 		print '</tr>';
@@ -293,39 +293,39 @@ 
 		$timeP = 0;
 
 		# all my fields
-		foreach($custom as $field) {
+		foreach ($custom as $field) {
 			# replace spaces with |
-			$field['nameNew'] = str_replace(" ", "___", $field['name']);
+			$field['nameNew'] = str_replace (" ", "___", $field['name']);
 
 			# required
-			if($field['Null']=="NO")	{ $required = "*"; }
-			else						{ $required = ""; }
+			if ($field['Null'] == "NO") { $required = "*"; }
+			else { $required = ""; }
 
 			# set default value !
-			if ($_POST['action']=="add")	{ $user[$field['name']] = $field['Default']; }
+			if ($_POST['action'] == "add") { $user[$field['name']] = $field['Default']; }
 
-			print '<tr>'. "\n";
-			print '	<td>'. $field['name'] .' '.$required.'</td>'. "\n";
-			print '	<td>'. "\n";
+			print '<tr>'."\n";
+			print '	<td>'.$field['name'].' '.$required.'</td>'."\n";
+			print '	<td>'."\n";
 
 			//set type
-			if(substr($field['type'], 0,3) == "set" || substr($field['type'], 0,4) == "enum") {
+			if (substr ($field['type'], 0, 3) == "set" || substr ($field['type'], 0, 4) == "enum") {
 				//parse values
-				$tmp = substr($field['type'], 0,3)=="set" ? explode(",", str_replace(array("set(", ")", "'"), "", $field['type'])) : explode(",", str_replace(array("enum(", ")", "'"), "", $field['type']));
+				$tmp = substr ($field['type'], 0, 3) == "set" ? explode (",", str_replace (array ("set(", ")", "'"), "", $field['type'])) : explode (",", str_replace (array ("enum(", ")", "'"), "", $field['type']));
 				//null
-				if($field['Null']!="NO") { array_unshift($tmp, ""); }
+				if ($field['Null'] != "NO") { array_unshift ($tmp, ""); }
 
 				print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
-				foreach($tmp as $v) {
-					if($v==$user[$field['name']])	{ print "<option value='$v' selected='selected'>$v</option>"; }
-					else								{ print "<option value='$v'>$v</option>"; }
+				foreach ($tmp as $v) {
+					if ($v == $user[$field['name']]) { print "<option value='$v' selected='selected'>$v</option>"; }
+					else { print "<option value='$v'>$v</option>"; }
 				}
 				print "</select>";
 			}
 			//date and time picker
-			elseif($field['type'] == "date" || $field['type'] == "datetime") {
+			elseif ($field['type'] == "date" || $field['type'] == "datetime") {
 				// just for first
-				if($timeP==0) {
+				if ($timeP == 0) {
 					print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
 					print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
 					print '<script type="text/javascript">';
@@ -341,39 +341,39 @@ 
 				$timeP++;
 
 				//set size
-				if($field['type'] == "date")	{ $size = 10; $class='datepicker';		$format = "yyyy-MM-dd"; }
-				else							{ $size = 19; $class='datetimepicker';	$format = "yyyy-MM-dd"; }
+				if ($field['type'] == "date") { $size = 10; $class = 'datepicker'; $format = "yyyy-MM-dd"; }
+				else { $size = 19; $class = 'datetimepicker'; $format = "yyyy-MM-dd"; }
 
 				//field
-				if(!isset($user[$field['name']]))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
-				else								{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" value="'. $user[$field['name']]. '" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+				if (!isset($user[$field['name']])) { print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'.$field['nameNew'].'" maxlength="'.$size.'" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'."\n"; }
+				else { print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'.$field['nameNew'].'" maxlength="'.$size.'" value="'.$user[$field['name']].'" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'."\n"; }
 			}
 			//boolean
-			elseif($field['type'] == "tinyint(1)") {
+			elseif ($field['type'] == "tinyint(1)") {
 				print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
-				$tmp = array(0=>"No",1=>"Yes");
+				$tmp = array (0=>"No", 1=>"Yes");
 				//null
-				if($field['Null']!="NO") { $tmp[2] = ""; }
+				if ($field['Null'] != "NO") { $tmp[2] = ""; }
 
-				foreach($tmp as $k=>$v) {
-					if(strlen($user[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					elseif($k==$user[$field['name']])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					else											{ print "<option value='$k'>"._($v)."</option>"; }
+				foreach ($tmp as $k=>$v) {
+					if (strlen ($user[$field['name']]) == 0 && $k == 2) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+					elseif ($k == $user[$field['name']]) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+					else { print "<option value='$k'>"._ ($v)."</option>"; }
 				}
 				print "</select>";
 			}
 			//text
-			elseif($field['type'] == "text") {
-				print ' <textarea class="form-control input-sm" name="'. $field['nameNew'] .'" placeholder="'. $field['name'] .'" rowspan=3>'. $user[$field['name']]. '</textarea>'. "\n";
+			elseif ($field['type'] == "text") {
+				print ' <textarea class="form-control input-sm" name="'.$field['nameNew'].'" placeholder="'.$field['name'].'" rowspan=3>'.$user[$field['name']].'</textarea>'."\n";
 			}
 			//default - input field
 			else {
-				print ' <input type="text" class="ip_addr form-control input-sm" name="'. @$field['nameNew'] .'" placeholder="'. @$field['name'] .'" value="'. @$user[$field['name']]. '" size="30">'. "\n";
+				print ' <input type="text" class="ip_addr form-control input-sm" name="'.@$field['nameNew'].'" placeholder="'.@$field['name'].'" value="'.@$user[$field['name']].'" size="30">'."\n";
 			}
 
 			print "	<td class='info2'>".$field['Comment']."</td>";
-			print '	</td>'. "\n";
-			print '</tr>'. "\n";
+			print '	</td>'."\n";
+			print '</tr>'."\n";
 		}
 	}
 	?>
@@ -389,8 +389,8 @@ 
 <!-- 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="editUserSubmit"><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="editUserSubmit"><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>
 
 	<!-- Result -->

app/admin/users/print-all.php

Indentation +106 added lines, -106 removed lines

@@ -41,14 +41,14 @@ 
     <th><?php print _('Groups'); ?></th>
     <th><?php print _('Last login'); ?></th>
 	<?php
-	if(sizeof(@$custom) > 0) {
-		foreach($custom as $field) {
-			if(!in_array($field['name'], $ffields)) {
-				print "<th>$field[name]</th>";
-			}
-		}
-	}
-	?>
+    if(sizeof(@$custom) > 0) {
+        foreach($custom as $field) {
+            if(!in_array($field['name'], $ffields)) {
+                print "<th>$field[name]</th>";
+            }
+        }
+    }
+    ?>
     <th></th>
 </tr>
 </thead>
@@ -57,104 +57,104 @@ 
 <?php
 /* print existing sections */
 foreach ($users as $user) {
-	//cast
-	$user = (array) $user;
-	print '<tr>' . "\n";
-
-	# set icon based on normal user or admin
-	if($user['role'] == "Administrator") 	{ print '	<td><img src="css/1.2/images/userVader.png" rel="tooltip" title="'._('Administrator').'"></td>'. "\n"; }
-	else 									{ print '	<td><img src="css/1.2/images/userTrooper.png" rel="tooltip" title="'. _($user['role']) .'"></td>'. "\n";	}
-
-	print '	<td><a href="'.create_link("administration","users",$user['id']).'">' . $user['real_name'] . '</a></td>'. "\n";
-	print '	<td>' . $user['username']  . '</td>'. "\n";
-	print '	<td>' . $user['email']     . '</td>'. "\n";
-	print '	<td>' . $user['role']      . '</td>'. "\n";
-
-	# language
-	if(strlen($user['lang'])>0) {
-		# get lang name
-		$lname = $Admin->fetch_object("lang", "l_id", $user['lang']);
-		print "<td>$lname->l_name</td>";
-	}
-	else {
-		print "<td>English (default)</td>";
-	}
-
-	# check users auth method
-	$auth_method = $Admin->fetch_object("usersAuthMethod", "id", $user['authMethod']);
-	//false
-	print "<td>";
-	if($auth_method===false) { print "<span class='text-muted'>No auth method</span>"; }
-	else 					 { print $auth_method->type." <span class='text-muted'>(".$auth_method->description."</a>)"; }
-	print "</span></td>";
-
-	# powerDNS
-	print "<td>";
-	print $user['pdns'];
-	print "</td>";
-
-	# groups
-	if($user['role'] == "Administrator") {
-	print '	<td>'._('All groups').'</td>'. "\n";
-	}
-	else {
-		$groups = json_decode($user['groups'], true);
-		$gr = $Admin->groups_parse($groups);
-
-		print '	<td>';
-		if(sizeof($gr)>0) {
-			foreach($gr as $group) {
-				print $group['g_name']."<br>";
-			}
-		}
-		else {
-			print "<span class='text-muted'>No groups</span>";
-		}
-		print '	</td>'. "\n";
-	}
-
-	# last login
-	print "<td>";
-	print strlen($user['lastLogin'])>0 ? $user['lastLogin'] : "<span class='text-muted'>"._("Never")."</span>";
-	print "</td>";
-
-	# custom
-	if(sizeof($custom) > 0) {
-		foreach($custom as $field) {
-			if(!in_array($field['name'], $ffields)) {
-				print "<td>";
-				//booleans
-				if($field['type']=="tinyint(1)")	{
-					if($user[$field['name']] == "0")		{ print _("No"); }
-					elseif($user[$field['name']] == "1")	{ print _("Yes"); }
-				}
-				//text
-				elseif($field['type']=="text") {
-					if(strlen($user[$field['name']])>0)		{ print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $user[$field['name']])."'>"; }
-					else									{ print ""; }
-				}
-				else {
-					print $user[$field['name']];
-
-				}
-				print "</td>";
-			}
-		}
-	}
-
-	# edit, delete
-	print "	<td class='actions'>";
-	print "	<div class='btn-group'>";
-	print "		<a class='btn btn-xs btn-default' href='".create_link("administration","users",$user['id'])."'><i class='fa fa-eye'></i></a></button>";
-	print "		<button class='btn btn-xs btn-default editUser' data-userid='$user[id]' data-action='edit'  ><i class='fa fa-pencil'></i></button>";
-	print "		<a class='btn btn-xs btn-default";
-	if($_SESSION['realipamusername']) { print " disabled";}
-	print "' href='".create_link("administration","users","switch","$user[username]")."'><i class='fa fa-exchange'></i></a></button>";
-	print "		<button class='btn btn-xs btn-default editUser' data-userid='$user[id]' data-action='delete'><i class='fa fa-times'></i></button>";
-	print "	</div>";
-	print "	</td>";
-
-	print '</tr>' . "\n";
+    //cast
+    $user = (array) $user;
+    print '<tr>' . "\n";
+
+    # set icon based on normal user or admin
+    if($user['role'] == "Administrator") 	{ print '	<td><img src="css/1.2/images/userVader.png" rel="tooltip" title="'._('Administrator').'"></td>'. "\n"; }
+    else 									{ print '	<td><img src="css/1.2/images/userTrooper.png" rel="tooltip" title="'. _($user['role']) .'"></td>'. "\n";	}
+
+    print '	<td><a href="'.create_link("administration","users",$user['id']).'">' . $user['real_name'] . '</a></td>'. "\n";
+    print '	<td>' . $user['username']  . '</td>'. "\n";
+    print '	<td>' . $user['email']     . '</td>'. "\n";
+    print '	<td>' . $user['role']      . '</td>'. "\n";
+
+    # language
+    if(strlen($user['lang'])>0) {
+        # get lang name
+        $lname = $Admin->fetch_object("lang", "l_id", $user['lang']);
+        print "<td>$lname->l_name</td>";
+    }
+    else {
+        print "<td>English (default)</td>";
+    }
+
+    # check users auth method
+    $auth_method = $Admin->fetch_object("usersAuthMethod", "id", $user['authMethod']);
+    //false
+    print "<td>";
+    if($auth_method===false) { print "<span class='text-muted'>No auth method</span>"; }
+    else 					 { print $auth_method->type." <span class='text-muted'>(".$auth_method->description."</a>)"; }
+    print "</span></td>";
+
+    # powerDNS
+    print "<td>";
+    print $user['pdns'];
+    print "</td>";
+
+    # groups
+    if($user['role'] == "Administrator") {
+    print '	<td>'._('All groups').'</td>'. "\n";
+    }
+    else {
+        $groups = json_decode($user['groups'], true);
+        $gr = $Admin->groups_parse($groups);
+
+        print '	<td>';
+        if(sizeof($gr)>0) {
+            foreach($gr as $group) {
+                print $group['g_name']."<br>";
+            }
+        }
+        else {
+            print "<span class='text-muted'>No groups</span>";
+        }
+        print '	</td>'. "\n";
+    }
+
+    # last login
+    print "<td>";
+    print strlen($user['lastLogin'])>0 ? $user['lastLogin'] : "<span class='text-muted'>"._("Never")."</span>";
+    print "</td>";
+
+    # custom
+    if(sizeof($custom) > 0) {
+        foreach($custom as $field) {
+            if(!in_array($field['name'], $ffields)) {
+                print "<td>";
+                //booleans
+                if($field['type']=="tinyint(1)")	{
+                    if($user[$field['name']] == "0")		{ print _("No"); }
+                    elseif($user[$field['name']] == "1")	{ print _("Yes"); }
+                }
+                //text
+                elseif($field['type']=="text") {
+                    if(strlen($user[$field['name']])>0)		{ print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $user[$field['name']])."'>"; }
+                    else									{ print ""; }
+                }
+                else {
+                    print $user[$field['name']];
+
+                }
+                print "</td>";
+            }
+        }
+    }
+
+    # edit, delete
+    print "	<td class='actions'>";
+    print "	<div class='btn-group'>";
+    print "		<a class='btn btn-xs btn-default' href='".create_link("administration","users",$user['id'])."'><i class='fa fa-eye'></i></a></button>";
+    print "		<button class='btn btn-xs btn-default editUser' data-userid='$user[id]' data-action='edit'  ><i class='fa fa-pencil'></i></button>";
+    print "		<a class='btn btn-xs btn-default";
+    if($_SESSION['realipamusername']) { print " disabled";}
+    print "' href='".create_link("administration","users","switch","$user[username]")."'><i class='fa fa-exchange'></i></a></button>";
+    print "		<button class='btn btn-xs btn-default editUser' data-userid='$user[id]' data-action='delete'><i class='fa fa-times'></i></button>";
+    print "	</div>";
+    print "	</td>";
+
+    print '</tr>' . "\n";
 }
 ?>
 </tbody>

Braces +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 				$html_custom[] = "	<th>$key</th>";
 				$html_custom[] = "	<td>";
 				#booleans
-				if($field['type']=="tinyint(1)")	{
+				if($field['type']=="tinyint(1)") {
 					if($subnet[$key] == "0")		{ $html_custom[] = _("No"); }
 					elseif($subnet[$key] == "1")	{ $html_custom[] = _("Yes"); }
 				}

Spacing +54 added lines, -54 removed lines

@@ -5,24 +5,24 @@ 
  *************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all APIs
-$users = $Admin->fetch_all_objects("users", "username");
+$users = $Admin->fetch_all_objects ("users", "username");
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('users');
+$custom = $Tools->fetch_custom_fields ('users');
 
 /* check customfields */
-$ffields = json_decode($User->settings->hiddenCustomFields, true);
-$ffields = is_array(@$ffields['users']) ? $ffields['users'] : array();
+$ffields = json_decode ($User->settings->hiddenCustomFields, true);
+$ffields = is_array (@$ffields['users']) ? $ffields['users'] : array ();
 ?>
 
 <!-- display existing users -->
-<h4><?php print _('User management'); ?></h4>
+<h4><?php print _ ('User management'); ?></h4>
 <hr><br>
 
 <!-- Add new -->
-<button class='btn btn-sm btn-default editUser' style="margin-bottom:10px;" data-action='add'><i class='fa fa-plus'></i> <?php print _('Create user'); ?></button>
+<button class='btn btn-sm btn-default editUser' style="margin-bottom:10px;" data-action='add'><i class='fa fa-plus'></i> <?php print _ ('Create user'); ?></button>
 
 <!-- table -->
 <table id="userPrint1" class="table sorted table-striped table-top">
@@ -31,19 +31,19 @@ 
 <thead>
 <tr>
 	<th></th>
-    <th><?php print _('Real Name'); ?></th>
-    <th><?php print _('Username'); ?></th>
-    <th><?php print _('E-mail'); ?></th>
-    <th><?php print _('Role'); ?></th>
-    <th><?php print _('Language'); ?></th>
-    <th><?php print _('Authentication'); ?></th>
-    <th><?php print _('PowerDNS'); ?></th>
-    <th><?php print _('Groups'); ?></th>
-    <th><?php print _('Last login'); ?></th>
+    <th><?php print _ ('Real Name'); ?></th>
+    <th><?php print _ ('Username'); ?></th>
+    <th><?php print _ ('E-mail'); ?></th>
+    <th><?php print _ ('Role'); ?></th>
+    <th><?php print _ ('Language'); ?></th>
+    <th><?php print _ ('Authentication'); ?></th>
+    <th><?php print _ ('PowerDNS'); ?></th>
+    <th><?php print _ ('Groups'); ?></th>
+    <th><?php print _ ('Last login'); ?></th>
 	<?php
-	if(sizeof(@$custom) > 0) {
-		foreach($custom as $field) {
-			if(!in_array($field['name'], $ffields)) {
+	if (sizeof (@$custom) > 0) {
+		foreach ($custom as $field) {
+			if (!in_array ($field['name'], $ffields)) {
 				print "<th>$field[name]</th>";
 			}
 		}
@@ -59,21 +59,21 @@ 
 foreach ($users as $user) {
 	//cast
 	$user = (array) $user;
-	print '<tr>' . "\n";
+	print '<tr>'."\n";
 
 	# set icon based on normal user or admin
-	if($user['role'] == "Administrator") 	{ print '	<td><img src="css/1.2/images/userVader.png" rel="tooltip" title="'._('Administrator').'"></td>'. "\n"; }
-	else 									{ print '	<td><img src="css/1.2/images/userTrooper.png" rel="tooltip" title="'. _($user['role']) .'"></td>'. "\n";	}
+	if ($user['role'] == "Administrator") { print '	<td><img src="css/1.2/images/userVader.png" rel="tooltip" title="'._ ('Administrator').'"></td>'."\n"; }
+	else { print '	<td><img src="css/1.2/images/userTrooper.png" rel="tooltip" title="'._ ($user['role']).'"></td>'."\n"; }
 
-	print '	<td><a href="'.create_link("administration","users",$user['id']).'">' . $user['real_name'] . '</a></td>'. "\n";
-	print '	<td>' . $user['username']  . '</td>'. "\n";
-	print '	<td>' . $user['email']     . '</td>'. "\n";
-	print '	<td>' . $user['role']      . '</td>'. "\n";
+	print '	<td><a href="'.create_link ("administration", "users", $user['id']).'">'.$user['real_name'].'</a></td>'."\n";
+	print '	<td>'.$user['username'].'</td>'."\n";
+	print '	<td>'.$user['email'].'</td>'."\n";
+	print '	<td>'.$user['role'].'</td>'."\n";
 
 	# language
-	if(strlen($user['lang'])>0) {
+	if (strlen ($user['lang']) > 0) {
 		# get lang name
-		$lname = $Admin->fetch_object("lang", "l_id", $user['lang']);
+		$lname = $Admin->fetch_object ("lang", "l_id", $user['lang']);
 		print "<td>$lname->l_name</td>";
 	}
 	else {
@@ -81,11 +81,11 @@ 
 	}
 
 	# check users auth method
-	$auth_method = $Admin->fetch_object("usersAuthMethod", "id", $user['authMethod']);
+	$auth_method = $Admin->fetch_object ("usersAuthMethod", "id", $user['authMethod']);
 	//false
 	print "<td>";
-	if($auth_method===false) { print "<span class='text-muted'>No auth method</span>"; }
-	else 					 { print $auth_method->type." <span class='text-muted'>(".$auth_method->description."</a>)"; }
+	if ($auth_method === false) { print "<span class='text-muted'>No auth method</span>"; }
+	else { print $auth_method->type." <span class='text-muted'>(".$auth_method->description."</a>)"; }
 	print "</span></td>";
 
 	# powerDNS
@@ -94,44 +94,44 @@ 
 	print "</td>";
 
 	# groups
-	if($user['role'] == "Administrator") {
-	print '	<td>'._('All groups').'</td>'. "\n";
+	if ($user['role'] == "Administrator") {
+	print '	<td>'._ ('All groups').'</td>'."\n";
 	}
 	else {
-		$groups = json_decode($user['groups'], true);
-		$gr = $Admin->groups_parse($groups);
+		$groups = json_decode ($user['groups'], true);
+		$gr = $Admin->groups_parse ($groups);
 
 		print '	<td>';
-		if(sizeof($gr)>0) {
-			foreach($gr as $group) {
+		if (sizeof ($gr) > 0) {
+			foreach ($gr as $group) {
 				print $group['g_name']."<br>";
 			}
 		}
 		else {
 			print "<span class='text-muted'>No groups</span>";
 		}
-		print '	</td>'. "\n";
+		print '	</td>'."\n";
 	}
 
 	# last login
 	print "<td>";
-	print strlen($user['lastLogin'])>0 ? $user['lastLogin'] : "<span class='text-muted'>"._("Never")."</span>";
+	print strlen ($user['lastLogin']) > 0 ? $user['lastLogin'] : "<span class='text-muted'>"._ ("Never")."</span>";
 	print "</td>";
 
 	# custom
-	if(sizeof($custom) > 0) {
-		foreach($custom as $field) {
-			if(!in_array($field['name'], $ffields)) {
+	if (sizeof ($custom) > 0) {
+		foreach ($custom as $field) {
+			if (!in_array ($field['name'], $ffields)) {
 				print "<td>";
 				//booleans
-				if($field['type']=="tinyint(1)")	{
-					if($user[$field['name']] == "0")		{ print _("No"); }
-					elseif($user[$field['name']] == "1")	{ print _("Yes"); }
+				if ($field['type'] == "tinyint(1)") {
+					if ($user[$field['name']] == "0") { print _ ("No"); }
+					elseif ($user[$field['name']] == "1") { print _ ("Yes"); }
 				}
 				//text
-				elseif($field['type']=="text") {
-					if(strlen($user[$field['name']])>0)		{ print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $user[$field['name']])."'>"; }
-					else									{ print ""; }
+				elseif ($field['type'] == "text") {
+					if (strlen ($user[$field['name']]) > 0) { print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace ("\n", "<br>", $user[$field['name']])."'>"; }
+					else { print ""; }
 				}
 				else {
 					print $user[$field['name']];
@@ -145,16 +145,16 @@ 
 	# edit, delete
 	print "	<td class='actions'>";
 	print "	<div class='btn-group'>";
-	print "		<a class='btn btn-xs btn-default' href='".create_link("administration","users",$user['id'])."'><i class='fa fa-eye'></i></a></button>";
+	print "		<a class='btn btn-xs btn-default' href='".create_link ("administration", "users", $user['id'])."'><i class='fa fa-eye'></i></a></button>";
 	print "		<button class='btn btn-xs btn-default editUser' data-userid='$user[id]' data-action='edit'  ><i class='fa fa-pencil'></i></button>";
 	print "		<a class='btn btn-xs btn-default";
-	if($_SESSION['realipamusername']) { print " disabled";}
-	print "' href='".create_link("administration","users","switch","$user[username]")."'><i class='fa fa-exchange'></i></a></button>";
+	if ($_SESSION['realipamusername']) { print " disabled"; }
+	print "' href='".create_link ("administration", "users", "switch", "$user[username]")."'><i class='fa fa-exchange'></i></a></button>";
 	print "		<button class='btn btn-xs btn-default editUser' data-userid='$user[id]' data-action='delete'><i class='fa fa-times'></i></button>";
 	print "	</div>";
 	print "	</td>";
 
-	print '</tr>' . "\n";
+	print '</tr>'."\n";
 }
 ?>
 </tbody>
@@ -162,7 +162,7 @@ 
 
 <div class="alert alert-info alert-absolute">
 <ul>
-	<li><?php print _('Administrator users will be able to view and edit all sections and subnets'); ?></li>
-	<li><?php print _('Normal users will have permissions set based on group access to sections and subnets'); ?></li>
+	<li><?php print _ ('Administrator users will be able to view and edit all sections and subnets'); ?></li>
+	<li><?php print _ ('Normal users will have permissions set based on group access to sections and subnets'); ?></li>
 </ul>
 </div>