phpipam / phpipam

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?

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>";
+        }
 }
 ?>
 

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

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>
 
 

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>

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

Indentation +21 added lines, -21 removed lines

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

app/admin/authentication-methods/index.php

Indentation +37 added lines, -37 removed lines

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

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

Indentation +24 added lines, -24 removed lines

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

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

Indentation +8 added lines, -8 removed lines

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