phpipam / phpipam

app/admin/groups/remove-users-result.php

Indentation +20 added lines, -20 removed lines

@@ -22,38 +22,38 @@
 
 # parse result
 foreach($_POST as $k=>$p) {
-	if(substr($k, 0,4) == "user") {
-		$users[substr($k, 4)] = substr($k, 4);
-	}
+    if(substr($k, 0,4) == "user") {
+        $users[substr($k, 4)] = substr($k, 4);
+    }
 }
 
 # remove each user from group
 if(sizeof($users)>0) {
-	foreach($users as $key=>$u) {
-		if(!$Admin->remove_group_from_user($_POST['gid'], $u)) {
-			# get user details
-			$user = $Admin->fetch_object("users", "id", $u);
-			$errors[] = $user->real_name;
-		}
-	}
+    foreach($users as $key=>$u) {
+        if(!$Admin->remove_group_from_user($_POST['gid'], $u)) {
+            # get user details
+            $user = $Admin->fetch_object("users", "id", $u);
+            $errors[] = $user->real_name;
+        }
+    }
 }
 else {
-	$errors[] = _("Please select user(s) to remove from group!");
+    $errors[] = _("Please select user(s) to remove from group!");
 }
 
 # print result
 if(isset($errors)) {
-	print "<div class='alert alert alert-danger'>";
-	print _("Failed to remove users").":<hr>";
-	print "<ul>";
-	foreach($errors as $e) {
-		print "<li>$e</li>";
-	}
-	print "</ul>";
-	print "</div>";
+    print "<div class='alert alert alert-danger'>";
+    print _("Failed to remove users").":<hr>";
+    print "<ul>";
+    foreach($errors as $e) {
+        print "<li>$e</li>";
+    }
+    print "</ul>";
+    print "</div>";
 }
 else {
-	$Result->show("success", _('Users removed from group'), true);
+    $Result->show("success", _('Users removed from group'), true);
 }
 
 ?>
\ No newline at end of file

Spacing +17 added lines, -17 removed lines

@@ -5,55 +5,55 @@
  *************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 
 # id must be numeric
-if(!is_numeric($_POST['gid']))		{ $Result->show("danger", _("Invalid ID"), true); }
+if (!is_numeric ($_POST['gid'])) { $Result->show ("danger", _ ("Invalid ID"), true); }
 
 # parse result
-foreach($_POST as $k=>$p) {
-	if(substr($k, 0,4) == "user") {
-		$users[substr($k, 4)] = substr($k, 4);
+foreach ($_POST as $k=>$p) {
+	if (substr ($k, 0, 4) == "user") {
+		$users[substr ($k, 4)] = substr ($k, 4);
 	}
 }
 
 # remove each user from group
-if(sizeof($users)>0) {
-	foreach($users as $key=>$u) {
-		if(!$Admin->remove_group_from_user($_POST['gid'], $u)) {
+if (sizeof ($users) > 0) {
+	foreach ($users as $key=>$u) {
+		if (!$Admin->remove_group_from_user ($_POST['gid'], $u)) {
 			# get user details
-			$user = $Admin->fetch_object("users", "id", $u);
+			$user = $Admin->fetch_object ("users", "id", $u);
 			$errors[] = $user->real_name;
 		}
 	}
 }
 else {
-	$errors[] = _("Please select user(s) to remove from group!");
+	$errors[] = _ ("Please select user(s) to remove from group!");
 }
 
 # print result
-if(isset($errors)) {
+if (isset($errors)) {
 	print "<div class='alert alert alert-danger'>";
-	print _("Failed to remove users").":<hr>";
+	print _ ("Failed to remove users").":<hr>";
 	print "<ul>";
-	foreach($errors as $e) {
+	foreach ($errors as $e) {
 		print "<li>$e</li>";
 	}
 	print "</ul>";
 	print "</div>";
 }
 else {
-	$Result->show("success", _('Users removed from group'), true);
+	$Result->show ("success", _ ('Users removed from group'), true);
 }
 
 ?>
\ No newline at end of file

app/admin/groups/remove-users.php

Indentation +14 added lines, -14 removed lines

@@ -49,24 +49,24 @@
 	</tr>
 
 	<?php
-	# show existing
-	foreach($existing as $m) {
-		# get user details
-		$u = (array) $Admin->fetch_object("users", "id", $m);
+    # show existing
+    foreach($existing as $m) {
+        # get user details
+        $u = (array) $Admin->fetch_object("users", "id", $m);
 
-		print "<tr>";
+        print "<tr>";
 
-		print "	<td>";
-		print "	<input type='checkbox' name='user$u[id]'>";
-		print "	</td>";
+        print "	<td>";
+        print "	<input type='checkbox' name='user$u[id]'>";
+        print "	</td>";
 
-		print "	<td>$u[real_name]</td>";
-		print "	<td>$u[username]</td>";
-		print "	<td>$u[email]</td>";
+        print "	<td>$u[real_name]</td>";
+        print "	<td>$u[username]</td>";
+        print "	<td>$u[email]</td>";
 
-		print "</tr>";
-	}
-	?>
+        print "</tr>";
+    }
+    ?>
 
     </table>
     </form>

Braces +2 added lines, -1 removed lines

@@ -71,7 +71,8 @@
     </table>
     </form>
 
-    <?php } else { $Result->show("info", _('No users in this group'), false);  } ?>
+    <?php }
+else { $Result->show("info", _('No users in this group'), false);  } ?>
 </div>
 
 

Spacing +17 added lines, -17 removed lines

@@ -5,36 +5,36 @@ 
  *************************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 
 # id must be numeric
-if(!is_numeric($_POST['g_id']))		{ $Result->show("danger", _("Invalid ID"), true, true); }
+if (!is_numeric ($_POST['g_id'])) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 # get group details
-$group   = $Admin->fetch_object("userGroups", "g_id", $_POST['g_id']);
+$group = $Admin->fetch_object ("userGroups", "g_id", $_POST['g_id']);
 # users in group - array of ids
 $existing = $Admin->group_fetch_users ($_POST['g_id']);
 ?>
 
 
 <!-- header -->
-<div class="pHeader"><?php print _('Remove users from group'); ?> <?php print $group->g_name; ?></div>
+<div class="pHeader"><?php print _ ('Remove users from group'); ?> <?php print $group->g_name; ?></div>
 
 
 <!-- content -->
 <div class="pContent">
 
-	<?php if(sizeof($existing) > 0) { ?>
+	<?php if (sizeof ($existing) > 0) { ?>
 
 	<form id="groupRemoveUsers" name="groupRemoveUsers">
 	<table class="groupEdit table table-condensed table-top">
@@ -43,16 +43,16 @@ 
 		<th>
 			<input type="hidden" name="gid" value="<?php print $_POST['g_id']; ?>">
 		</th>
-		<th><?php print _('Name'); ?></th>
-		<th><?php print _('Username'); ?></th>
-		<th><?php print _('Email'); ?></th>
+		<th><?php print _ ('Name'); ?></th>
+		<th><?php print _ ('Username'); ?></th>
+		<th><?php print _ ('Email'); ?></th>
 	</tr>
 
 	<?php
 	# show existing
-	foreach($existing as $m) {
+	foreach ($existing as $m) {
 		# get user details
-		$u = (array) $Admin->fetch_object("users", "id", $m);
+		$u = (array) $Admin->fetch_object ("users", "id", $m);
 
 		print "<tr>";
 
@@ -71,16 +71,16 @@ 
     </table>
     </form>
 
-    <?php } else { $Result->show("info", _('No users in this group'), false);  } ?>
+    <?php } else { $Result->show ("info", _ ('No users in this group'), false); } ?>
 </div>
 
 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<?php if(sizeof($existing) > 0) { ?>
-		<button class="btn btn-sm btn-default btn-success" id="groupRemoveUsersSubmit"><i class="fa fa-minus"></i> <?php print _('Remove selected users'); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<?php if (sizeof ($existing) > 0) { ?>
+		<button class="btn btn-sm btn-default btn-success" id="groupRemoveUsersSubmit"><i class="fa fa-minus"></i> <?php print _ ('Remove selected users'); ?></button>
 		<?php } ?>
 	</div>
 

app/admin/groups/edit-group-result.php

Indentation +18 added lines, -18 removed lines

@@ -26,11 +26,11 @@ 
 
 # remove users from this group if delete and remove group from sections
 if($_POST['action'] == "delete") {
-	$Admin->remove_group_from_users($_POST['g_id']);
-	$Admin->remove_group_from_sections($_POST['g_id']);
+    $Admin->remove_group_from_users($_POST['g_id']);
+    $Admin->remove_group_from_sections($_POST['g_id']);
 }
 else {
-	if(strlen($_POST['g_name']) < 2)										{ $Result->show("danger", _('Name must be at least 2 characters long')."!", true); }
+    if(strlen($_POST['g_name']) < 2)										{ $Result->show("danger", _('Name must be at least 2 characters long')."!", true); }
 }
 
 # unique name
@@ -40,8 +40,8 @@ 
 
 # create array of values for modification
 $values = array("g_id"=>@$_POST['g_id'],
-				"g_name"=>$_POST['g_name'],
-				"g_desc"=>@$_POST['g_desc']);
+                "g_name"=>$_POST['g_name'],
+                "g_desc"=>@$_POST['g_desc']);
 
 /* try to execute */
 if(!$Admin->object_modify("userGroups", $_POST['action'], "g_id", $values)) { $Result->show("danger",  _("Group $_POST[action] error")."!", false); }
@@ -49,19 +49,19 @@ 
 
 # from list of usernames provided from AD result if some user matches add him to group
 if (strlen($_POST['gmembers'])>0) {
-	// save id
-	$gid = $Admin->lastId;
-	// to array
-	$gmembers = explode(";", $_POST['gmembers']);
-	// check
-	foreach ($gmembers as $gm) {
-		// check if user exists
-		$user=$Admin->fetch_object("users","username",$gm);
-		if ($user!==false) {
-			// add to group
-			$Admin->add_group_to_user ($gid, $user->id);
-		}
-	}
+    // save id
+    $gid = $Admin->lastId;
+    // to array
+    $gmembers = explode(";", $_POST['gmembers']);
+    // check
+    foreach ($gmembers as $gm) {
+        // check if user exists
+        $user=$Admin->fetch_object("users","username",$gm);
+        if ($user!==false) {
+            // add to group
+            $Admin->add_group_to_user ($gid, $user->id);
+        }
+    }
 }
 
 ?>
\ No newline at end of file

Spacing +19 added lines, -19 removed lines

@@ -6,58 +6,58 @@
 
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # strip input tags
-$_POST = $Admin->strip_input_tags($_POST);
+$_POST = $Admin->strip_input_tags ($_POST);
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "group", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "group", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 
 # remove users from this group if delete and remove group from sections
-if($_POST['action'] == "delete") {
-	$Admin->remove_group_from_users($_POST['g_id']);
-	$Admin->remove_group_from_sections($_POST['g_id']);
+if ($_POST['action'] == "delete") {
+	$Admin->remove_group_from_users ($_POST['g_id']);
+	$Admin->remove_group_from_sections ($_POST['g_id']);
 }
 else {
-	if(strlen($_POST['g_name']) < 2)										{ $Result->show("danger", _('Name must be at least 2 characters long')."!", true); }
+	if (strlen ($_POST['g_name']) < 2) { $Result->show ("danger", _ ('Name must be at least 2 characters long')."!", true); }
 }
 
 # unique name
-if($_POST['action']=="add") {
-if($Admin->fetch_object("userGroups", "g_name", $_POST['g_name'])!==false)	{ $Result->show("danger", _('Group already exists')."!", true); }
+if ($_POST['action'] == "add") {
+if ($Admin->fetch_object ("userGroups", "g_name", $_POST['g_name']) !== false) { $Result->show ("danger", _ ('Group already exists')."!", true); }
 }
 
 # create array of values for modification
-$values = array("g_id"=>@$_POST['g_id'],
+$values = array ("g_id"=>@$_POST['g_id'],
 				"g_name"=>$_POST['g_name'],
 				"g_desc"=>@$_POST['g_desc']);
 
 /* try to execute */
-if(!$Admin->object_modify("userGroups", $_POST['action'], "g_id", $values)) { $Result->show("danger",  _("Group $_POST[action] error")."!", false); }
-else 					 													{ $Result->show("success", _("Group $_POST[action] success")."!", false); }
+if (!$Admin->object_modify ("userGroups", $_POST['action'], "g_id", $values)) { $Result->show ("danger", _ ("Group $_POST[action] error")."!", false); }
+else { $Result->show ("success", _ ("Group $_POST[action] success")."!", false); }
 
 # from list of usernames provided from AD result if some user matches add him to group
-if (strlen($_POST['gmembers'])>0) {
+if (strlen ($_POST['gmembers']) > 0) {
 	// save id
 	$gid = $Admin->lastId;
 	// to array
-	$gmembers = explode(";", $_POST['gmembers']);
+	$gmembers = explode (";", $_POST['gmembers']);
 	// check
 	foreach ($gmembers as $gm) {
 		// check if user exists
-		$user=$Admin->fetch_object("users","username",$gm);
-		if ($user!==false) {
+		$user = $Admin->fetch_object ("users", "username", $gm);
+		if ($user !== false) {
 			// add to group
 			$Admin->add_group_to_user ($gid, $user->id);
 		}

app/admin/groups/edit-group.php

Indentation +3 added lines, -3 removed lines

@@ -21,14 +21,14 @@
 
 # fetch group and set title
 if($_POST['action']=="add") {
-	$title = _('Add new group');
+    $title = _('Add new group');
 } else {
-	//fetch all group details
+    //fetch all group details
     $group = (array) $Admin->fetch_object("userGroups", "g_id", $_POST['id']);
     //false die
     $group!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
 
-	$title = ucwords($_POST['action']) .' '._('group').' '.$group['g_name'];
+    $title = ucwords($_POST['action']) .' '._('group').' '.$group['g_name'];
 }
 ?>
 

Braces +14 added lines, -4 removed lines

@@ -22,7 +22,8 @@ 
 # fetch group and set title
 if($_POST['action']=="add") {
 	$title = _('Add new group');
-} else {
+}
+else {
 	//fetch all group details
     $group = (array) $Admin->fetch_object("userGroups", "g_id", $_POST['id']);
     //false die
@@ -44,7 +45,10 @@ 
 	<!-- name -->
 	<tr>
 	    <td><?php print _('Group name'); ?></td>
-	    <td><input type="text" name="g_name" class="form-control input-sm" value="<?php print @$group['g_name']; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>></td>
+	    <td><input type="text" name="g_name" class="form-control input-sm" value="<?php print @$group['g_name']; ?>" <?php if($_POST['action'] == "delete") {
+    print "readonly";
+}
+?>></td>
        	<td class="info2">
 	   		<?php print _('Enter group name'); ?>
        	</td>
@@ -54,7 +58,10 @@ 
     <tr>
     	<td><?php print _('Description'); ?></td>
     	<td>
-    		<input type="text" name="g_desc" class="form-control input-sm" value="<?php print @$group['g_desc']; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>>
+    		<input type="text" name="g_desc" class="form-control input-sm" value="<?php print @$group['g_desc']; ?>" <?php if($_POST['action'] == "delete") {
+    print "readonly";
+}
+?>>
 
     		<input type="hidden" name="g_id" value="<?php print $_POST['id']; ?>">
     		<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
@@ -73,7 +80,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="editGroupSubmit"><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="editGroupSubmit"><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 +17 added lines, -17 removed lines

@@ -5,30 +5,30 @@ 
  *************************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "group");
 
 # fetch group and set title
-if($_POST['action']=="add") {
-	$title = _('Add new group');
+if ($_POST['action'] == "add") {
+	$title = _ ('Add new group');
 } else {
 	//fetch all group details
-    $group = (array) $Admin->fetch_object("userGroups", "g_id", $_POST['id']);
+    $group = (array) $Admin->fetch_object ("userGroups", "g_id", $_POST['id']);
     //false die
-    $group!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+    $group !== false ? : $Result->show ("danger", _ ("Invalid ID"), true, true);
 
-	$title = ucwords($_POST['action']) .' '._('group').' '.$group['g_name'];
+	$title = ucwords ($_POST['action']).' '._ ('group').' '.$group['g_name'];
 }
 ?>
 
@@ -43,24 +43,24 @@ 
 
 	<!-- name -->
 	<tr>
-	    <td><?php print _('Group name'); ?></td>
-	    <td><input type="text" name="g_name" class="form-control input-sm" value="<?php print @$group['g_name']; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>></td>
+	    <td><?php print _ ('Group name'); ?></td>
+	    <td><input type="text" name="g_name" class="form-control input-sm" value="<?php print @$group['g_name']; ?>" <?php if ($_POST['action'] == "delete") print "readonly"; ?>></td>
        	<td class="info2">
-	   		<?php print _('Enter group name'); ?>
+	   		<?php print _ ('Enter group name'); ?>
        	</td>
     </tr>
 
     <!-- description -->
     <tr>
-    	<td><?php print _('Description'); ?></td>
+    	<td><?php print _ ('Description'); ?></td>
     	<td>
-    		<input type="text" name="g_desc" class="form-control input-sm" value="<?php print @$group['g_desc']; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>>
+    		<input type="text" name="g_desc" class="form-control input-sm" value="<?php print @$group['g_desc']; ?>" <?php if ($_POST['action'] == "delete") print "readonly"; ?>>
 
     		<input type="hidden" name="g_id" value="<?php print $_POST['id']; ?>">
     		<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
     		<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
     	</td>
-    	<td class="info2"><?php print _('Enter description'); ?></td>
+    	<td class="info2"><?php print _ ('Enter description'); ?></td>
     </tr>
 
 </table>
@@ -72,8 +72,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="editGroupSubmit"><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="editGroupSubmit"><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/groups/ad-search-group-result.php

Indentation +76 added lines, -76 removed lines

@@ -30,9 +30,9 @@ 
 
 if ($server->type == "LDAP") {
 
-	// Just discovered that adLDAP flat out won't work for normal ldap groups. Stop LDAP here.
-	$Result->show("danger", _("Only AD group search is supported right now. Sorry."), true);
-	return;
+    // Just discovered that adLDAP flat out won't work for normal ldap groups. Stop LDAP here.
+    $Result->show("danger", _("Only AD group search is supported right now. Sorry."), true);
+    return;
 
 }
 
@@ -44,87 +44,87 @@ 
 
 //open connection
 try {
-	if($server->type == "NetIQ" || $server->type == "LDAP") { $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);
-
-	// Use credentials if they've been provided
-	if (isset($params->adminUsername) && isset($params->adminPassword)) {
-		$authUser = $adldap->authenticate($params->adminUsername, $params->adminPassword);
-		if ($authUser == false) {
-			$Result->show("danger", _("Invalid credentials"), true);
-		}
-	}
-
-	//search groups
-	$groups = $adldap->group()->search(adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP,true,"*$_POST[dfilter]*");
-
-	//echo $adldap->getLastError();
+    if($server->type == "NetIQ" || $server->type == "LDAP") { $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);
+
+    // Use credentials if they've been provided
+    if (isset($params->adminUsername) && isset($params->adminPassword)) {
+        $authUser = $adldap->authenticate($params->adminUsername, $params->adminPassword);
+        if ($authUser == false) {
+            $Result->show("danger", _("Invalid credentials"), true);
+        }
+    }
+
+    //search groups
+    $groups = $adldap->group()->search(adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP,true,"*$_POST[dfilter]*");
+
+    //echo $adldap->getLastError();
 }
 catch (adLDAPException $e) {
-	$Result->show("danger", $adldap->getLastError(), false);
-	$Result->show("danger", $e->getMessage(), true);
+    $Result->show("danger", $adldap->getLastError(), false);
+    $Result->show("danger", $e->getMessage(), true);
 }
 
 
 //check for found
 if(sizeof($groups)==0) {
-	print "<div class='alert alert-info'>";
-	print _('No groups found')."!<hr>";
-	print _('Possible reasons').":";
-	print "<ul>";
-	print "<li>"._('Invalid baseDN setting for ' . $server->type)."</li>";
-	print "<li>"._($server->type . ' account does not have enough privileges for search')."</li>";
-	print "</div>";
+    print "<div class='alert alert-info'>";
+    print _('No groups found')."!<hr>";
+    print _('Possible reasons').":";
+    print "<ul>";
+    print "<li>"._('Invalid baseDN setting for ' . $server->type)."</li>";
+    print "<li>"._($server->type . ' account does not have enough privileges for search')."</li>";
+    print "</div>";
 } else {
-	print _(" Following groups were found").": (".sizeof($groups)."):<hr>";
-
-	print "<table class='table table-top table-td-top  table-striped'>";
-
-	// loop
- 	foreach($groups as $k=>$g) {
-		print "<tr>";
-		print "	<td>$k</td>";
-		print "	<td>$g</td>";
-		//actions
-		print " <td style='width:10px;'>";
-		print "		<a href='' class='btn btn-sm btn-default btn-success groupselect' data-gname='$k' data-gdescription='$g' data-members='$members' data-gid='$k' data-csrf_cookie='$csrf'>"._('Add group')."</a>";
-		print "	</td>";
-		print "</tr>";
-
-		print "<tr>";
-		print "	<td>"._("Members:")."</td>";
-		print "<td colspan='2'>";
-		print "	<div class='adgroup-$k'></div>";
-		// search members
-		$groupMembers = $adldap->group()->members($k);
-		unset($members);
-		if($groupMembers!==false) {
-			foreach($groupMembers as $m) {
-				print "<span class='muted'>$m</span><br>";
-				$members[] = $m;
-			}
-			if(isset($members))
-			$members = implode(";", $members);
-		}
-		else {
-			$members = "";
-			print "<span class='muted'>"._("No members")."</span>";
-		}
-		print "	</td>";
-		print "	</tr>";
-
-	}
-	print "</table>";
+    print _(" Following groups were found").": (".sizeof($groups)."):<hr>";
+
+    print "<table class='table table-top table-td-top  table-striped'>";
+
+    // loop
+        foreach($groups as $k=>$g) {
+        print "<tr>";
+        print "	<td>$k</td>";
+        print "	<td>$g</td>";
+        //actions
+        print " <td style='width:10px;'>";
+        print "		<a href='' class='btn btn-sm btn-default btn-success groupselect' data-gname='$k' data-gdescription='$g' data-members='$members' data-gid='$k' data-csrf_cookie='$csrf'>"._('Add group')."</a>";
+        print "	</td>";
+        print "</tr>";
+
+        print "<tr>";
+        print "	<td>"._("Members:")."</td>";
+        print "<td colspan='2'>";
+        print "	<div class='adgroup-$k'></div>";
+        // search members
+        $groupMembers = $adldap->group()->members($k);
+        unset($members);
+        if($groupMembers!==false) {
+            foreach($groupMembers as $m) {
+                print "<span class='muted'>$m</span><br>";
+                $members[] = $m;
+            }
+            if(isset($members))
+            $members = implode(";", $members);
+        }
+        else {
+            $members = "";
+            print "<span class='muted'>"._("No members")."</span>";
+        }
+        print "	</td>";
+        print "	</tr>";
+
+    }
+    print "</table>";
 }
 
 ?>
\ No newline at end of file

Braces +6 added lines, -5 removed lines

@@ -69,8 +69,7 @@ 
 	$groups = $adldap->group()->search(adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP,true,"*$_POST[dfilter]*");
 
 	//echo $adldap->getLastError();
-}
-catch (adLDAPException $e) {
+} catch (adLDAPException $e) {
 	$Result->show("danger", $adldap->getLastError(), false);
 	$Result->show("danger", $e->getMessage(), true);
 }
@@ -85,7 +84,8 @@ 
 	print "<li>"._('Invalid baseDN setting for ' . $server->type)."</li>";
 	print "<li>"._($server->type . ' account does not have enough privileges for search')."</li>";
 	print "</div>";
-} else {
+}
+else {
 	print _(" Following groups were found").": (".sizeof($groups)."):<hr>";
 
 	print "<table class='table table-top table-td-top  table-striped'>";
@@ -113,8 +113,9 @@ 
 				print "<span class='muted'>$m</span><br>";
 				$members[] = $m;
 			}
-			if(isset($members))
-			$members = implode(";", $members);
+			if(isset($members)) {
+						$members = implode(";", $members);
+			}
 		}
 		else {
 			$members = "";

Spacing +35 added lines, -35 removed lines

@@ -5,119 +5,119 @@
  *************************************/
 
 /* 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);
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "group");
 
 //parse parameters
-$params = json_decode($server->params);
+$params = json_decode ($server->params);
 
 if ($server->type == "LDAP") {
 
 	// Just discovered that adLDAP flat out won't work for normal ldap groups. Stop LDAP here.
-	$Result->show("danger", _("Only AD group search is supported right now. Sorry."), true);
+	$Result->show ("danger", _ ("Only AD group search is supported right now. Sorry."), true);
 	return;
 
 }
 
 //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['dfilter'])<2) 												{ $Result->show("danger", _('Please enter at least 2 characters'), true); }
+if (strlen ($_POST['dfilter']) < 2) { $Result->show ("danger", _ ('Please enter at least 2 characters'), true); }
 
 
 //open connection
 try {
-	if($server->type == "NetIQ" || $server->type == "LDAP") { $params->account_suffix = ""; }
+	if ($server->type == "NetIQ" || $server->type == "LDAP") { $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);
 
 	// Use credentials if they've been provided
 	if (isset($params->adminUsername) && isset($params->adminPassword)) {
-		$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);
 		}
 	}
 
 	//search groups
-	$groups = $adldap->group()->search(adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP,true,"*$_POST[dfilter]*");
+	$groups = $adldap->group ()->search (adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP, true, "*$_POST[dfilter]*");
 
 	//echo $adldap->getLastError();
 }
 catch (adLDAPException $e) {
-	$Result->show("danger", $adldap->getLastError(), false);
-	$Result->show("danger", $e->getMessage(), true);
+	$Result->show ("danger", $adldap->getLastError (), false);
+	$Result->show ("danger", $e->getMessage (), true);
 }
 
 
 //check for found
-if(sizeof($groups)==0) {
+if (sizeof ($groups) == 0) {
 	print "<div class='alert alert-info'>";
-	print _('No groups found')."!<hr>";
-	print _('Possible reasons').":";
+	print _ ('No groups found')."!<hr>";
+	print _ ('Possible reasons').":";
 	print "<ul>";
-	print "<li>"._('Invalid baseDN setting for ' . $server->type)."</li>";
-	print "<li>"._($server->type . ' account does not have enough privileges for search')."</li>";
+	print "<li>"._ ('Invalid baseDN setting for '.$server->type)."</li>";
+	print "<li>"._ ($server->type.' account does not have enough privileges for search')."</li>";
 	print "</div>";
 } else {
-	print _(" Following groups were found").": (".sizeof($groups)."):<hr>";
+	print _ (" Following groups were found").": (".sizeof ($groups)."):<hr>";
 
 	print "<table class='table table-top table-td-top  table-striped'>";
 
 	// loop
- 	foreach($groups as $k=>$g) {
+ 	foreach ($groups as $k=>$g) {
 		print "<tr>";
 		print "	<td>$k</td>";
 		print "	<td>$g</td>";
 		//actions
 		print " <td style='width:10px;'>";
-		print "		<a href='' class='btn btn-sm btn-default btn-success groupselect' data-gname='$k' data-gdescription='$g' data-members='$members' data-gid='$k' data-csrf_cookie='$csrf'>"._('Add group')."</a>";
+		print "		<a href='' class='btn btn-sm btn-default btn-success groupselect' data-gname='$k' data-gdescription='$g' data-members='$members' data-gid='$k' data-csrf_cookie='$csrf'>"._ ('Add group')."</a>";
 		print "	</td>";
 		print "</tr>";
 
 		print "<tr>";
-		print "	<td>"._("Members:")."</td>";
+		print "	<td>"._ ("Members:")."</td>";
 		print "<td colspan='2'>";
 		print "	<div class='adgroup-$k'></div>";
 		// search members
-		$groupMembers = $adldap->group()->members($k);
+		$groupMembers = $adldap->group ()->members ($k);
 		unset($members);
-		if($groupMembers!==false) {
-			foreach($groupMembers as $m) {
+		if ($groupMembers !== false) {
+			foreach ($groupMembers as $m) {
 				print "<span class='muted'>$m</span><br>";
 				$members[] = $m;
 			}
-			if(isset($members))
-			$members = implode(";", $members);
+			if (isset($members))
+			$members = implode (";", $members);
 		}
 		else {
 			$members = "";
-			print "<span class='muted'>"._("No members")."</span>";
+			print "<span class='muted'>"._ ("No members")."</span>";
 		}
 		print "	</td>";
 		print "	</tr>";

app/admin/groups/index.php

Indentation +65 added lines, -65 removed lines

@@ -16,15 +16,15 @@ 
 # fetch all auth methods
 $auth_methods = $Admin->fetch_all_objects ("usersAuthMethod");
 if ($auth_methods!==false) {
-	foreach ($auth_methods as $k=>$m) {
-		if (!($m->type=="AD" || $m->type=="LDAP")) {
-			unset($auth_methods[$k]);
-		}
-	}
-	// none
-	if (sizeof($auth_methods)==0) {
-		$auth_methods = false;
-	}
+    foreach ($auth_methods as $k=>$m) {
+        if (!($m->type=="AD" || $m->type=="LDAP")) {
+            unset($auth_methods[$k]);
+        }
+    }
+    // none
+    if (sizeof($auth_methods)==0) {
+        $auth_methods = false;
+    }
 }
 ?>
 
@@ -62,10 +62,10 @@ 
 	<td><?php print _('Administrator level users'); ?></td>
 	<td>
 	<?php
-	foreach($admins as $a) {
-		print $a->real_name."<br>";
-	}
-	?>
+    foreach($admins as $a) {
+        print $a->real_name."<br>";
+    }
+    ?>
 	</td>
 	<td><?php print _('All sections :'); ?> <span class="badge badge1 badge5">Read / Write</span></td>
 	<td colspan="2"></td>
@@ -74,58 +74,58 @@ 
 <?php
 /* print existing sections */
 if($groups) {
-	foreach ($groups as $g) {
-		//cast
-		$g = (array) $g;
-
-		print '<tr>' . "\n";
-		print '	<td><strong>' . $g['g_name'] . '</strong></td>'. "\n";
-		print '	<td>' . $g['g_desc'] . '</td>'. "\n";
-		# users in group
-		print "	<td>";
-		$u = $Admin->group_fetch_users($g['g_id']);
-		if(sizeof($u)>0) {
-			foreach($u as $name) {
-				# get details
-				$user = $Admin->fetch_object("users", "id", $name);
-				print $user->real_name."<br>";
-			}
-		} else {
-			print "<span class='text-muted'>"._("No users")."</span>";
-		}
-		print "</td>";
-
-		# section permissions
-		print "	<td>";
-		$permissions = $Sections->get_group_section_permissions ($g['g_id']);
-		if(sizeof($permissions)>0) {
-			foreach($permissions as $sec=>$perm) {
-				# reformat permissions
-				$perm = $Subnets->parse_permissions($perm);
-				print $sec." : <span class='badge badge1 badge5'>".$perm."</span><br>";
-			}
-		}
-		print "</td>";
-
-
-		# add/remove users
-		print "	<td class='actions'>";
-		print "	<div class='btn-group'>";
-		print "		<button class='btn btn-xs btn-default addToGroup' 		data-groupid='$g[g_id]' data-action='add'    rel='tooltip' data-container='body'  title='"._('add users to this group')."'>   	<i class='fa fa-plus'></i></button>";
-		print "		<button class='btn btn-xs btn-default removeFromGroup' 	data-groupid='$g[g_id]' data-action='remove' rel='tooltip' data-container='body'  title='"._('remove users from this group')."'><i class='fa fa-minus'></i></button>";
-		print "	</div>";
-		print "</td>";
-
-		# edit, delete
-		print "<td class='actions'>";
-		print "	<div class='btn-group'>";
-		print "		<button class='btn btn-xs btn-default editGroup'  		data-groupid='$g[g_id]' data-action='edit'   rel='tooltip' data-container='body'  title='"._('edit group details')."'>	<i class='fa fa-pencil'></i></button>";
-		print "		<button class='btn btn-xs btn-default editGroup'  		data-groupid='$g[g_id]' data-action='delete' rel='tooltip' data-container='body'  title='"._('remove group')."'>		<i class='fa fa-times'></i></button>";
-		print "	</div>";
-		print "</td>";
-
-		print '</tr>' . "\n";
-	}
+    foreach ($groups as $g) {
+        //cast
+        $g = (array) $g;
+
+        print '<tr>' . "\n";
+        print '	<td><strong>' . $g['g_name'] . '</strong></td>'. "\n";
+        print '	<td>' . $g['g_desc'] . '</td>'. "\n";
+        # users in group
+        print "	<td>";
+        $u = $Admin->group_fetch_users($g['g_id']);
+        if(sizeof($u)>0) {
+            foreach($u as $name) {
+                # get details
+                $user = $Admin->fetch_object("users", "id", $name);
+                print $user->real_name."<br>";
+            }
+        } else {
+            print "<span class='text-muted'>"._("No users")."</span>";
+        }
+        print "</td>";
+
+        # section permissions
+        print "	<td>";
+        $permissions = $Sections->get_group_section_permissions ($g['g_id']);
+        if(sizeof($permissions)>0) {
+            foreach($permissions as $sec=>$perm) {
+                # reformat permissions
+                $perm = $Subnets->parse_permissions($perm);
+                print $sec." : <span class='badge badge1 badge5'>".$perm."</span><br>";
+            }
+        }
+        print "</td>";
+
+
+        # add/remove users
+        print "	<td class='actions'>";
+        print "	<div class='btn-group'>";
+        print "		<button class='btn btn-xs btn-default addToGroup' 		data-groupid='$g[g_id]' data-action='add'    rel='tooltip' data-container='body'  title='"._('add users to this group')."'>   	<i class='fa fa-plus'></i></button>";
+        print "		<button class='btn btn-xs btn-default removeFromGroup' 	data-groupid='$g[g_id]' data-action='remove' rel='tooltip' data-container='body'  title='"._('remove users from this group')."'><i class='fa fa-minus'></i></button>";
+        print "	</div>";
+        print "</td>";
+
+        # edit, delete
+        print "<td class='actions'>";
+        print "	<div class='btn-group'>";
+        print "		<button class='btn btn-xs btn-default editGroup'  		data-groupid='$g[g_id]' data-action='edit'   rel='tooltip' data-container='body'  title='"._('edit group details')."'>	<i class='fa fa-pencil'></i></button>";
+        print "		<button class='btn btn-xs btn-default editGroup'  		data-groupid='$g[g_id]' data-action='delete' rel='tooltip' data-container='body'  title='"._('remove group')."'>		<i class='fa fa-times'></i></button>";
+        print "	</div>";
+        print "</td>";
+
+        print '</tr>' . "\n";
+    }
 }
 
 ?>

Braces +2 added lines, -1 removed lines

@@ -57,7 +57,8 @@
 			if ($action == "skip") {
 				$msg.= "Duplicate, will skip.";
 			}
-		} else {
+		}
+		else {
 			$msg.="New entry, will be added."; $action = "add";
 		}
 	}

Spacing +35 added lines, -35 removed lines

@@ -5,24 +5,24 @@ 
  *************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all APIs
-$groups = $Admin->fetch_all_objects("userGroups", "g_name");
+$groups = $Admin->fetch_all_objects ("userGroups", "g_name");
 
 # fetch all admin users
-$admins = $Admin->fetch_multiple_objects("users", "role", "Administrator");
+$admins = $Admin->fetch_multiple_objects ("users", "role", "Administrator");
 
 # fetch all auth methods
 $auth_methods = $Admin->fetch_all_objects ("usersAuthMethod");
-if ($auth_methods!==false) {
+if ($auth_methods !== false) {
 	foreach ($auth_methods as $k=>$m) {
-		if (!($m->type=="AD" || $m->type=="LDAP")) {
+		if (!($m->type == "AD" || $m->type == "LDAP")) {
 			unset($auth_methods[$k]);
 		}
 	}
 	// none
-	if (sizeof($auth_methods)==0) {
+	if (sizeof ($auth_methods) == 0) {
 		$auth_methods = false;
 	}
 }
@@ -30,14 +30,14 @@ 
 
 
 <!-- display existing groups -->
-<h4><?php print _('Group management'); ?></h4>
+<h4><?php print _ ('Group management'); ?></h4>
 <hr><br>
 
 <!-- Add new -->
 <div class="btn-group">
-	<button class='btn btn-sm btn-default editGroup' style="margin-bottom:10px;" data-action='add'><i class='fa fa-plus'></i> <?php print _('Create group'); ?></button>
-	<?php if($auth_methods!==false) { ?>
-	<button class='btn btn-sm btn-default adLookup'><i class='fa fa-search'> <?php print _('Search domain groups'); ?></i></button>
+	<button class='btn btn-sm btn-default editGroup' style="margin-bottom:10px;" data-action='add'><i class='fa fa-plus'></i> <?php print _ ('Create group'); ?></button>
+	<?php if ($auth_methods !== false) { ?>
+	<button class='btn btn-sm btn-default adLookup'><i class='fa fa-search'> <?php print _ ('Search domain groups'); ?></i></button>
 	<?php } ?>
 </div>
 
@@ -47,10 +47,10 @@ 
 <!-- Headers -->
 <thead>
 <tr>
-    <th><?php print _('Group name'); ?></th>
-    <th><?php print _('Group description'); ?></th>
-    <th><?php print _('Belonging users'); ?></th>
-    <th><?php print _('Section permissions'); ?></th>
+    <th><?php print _ ('Group name'); ?></th>
+    <th><?php print _ ('Group description'); ?></th>
+    <th><?php print _ ('Belonging users'); ?></th>
+    <th><?php print _ ('Section permissions'); ?></th>
     <th colspan="2"></th>
 </tr>
 </thead>
@@ -58,50 +58,50 @@ 
 <tbody>
 <!-- admins -->
 <tr>
-	<td><strong><?php print _('Administrators'); ?></strong></td>
-	<td><?php print _('Administrator level users'); ?></td>
+	<td><strong><?php print _ ('Administrators'); ?></strong></td>
+	<td><?php print _ ('Administrator level users'); ?></td>
 	<td>
 	<?php
-	foreach($admins as $a) {
+	foreach ($admins as $a) {
 		print $a->real_name."<br>";
 	}
 	?>
 	</td>
-	<td><?php print _('All sections :'); ?> <span class="badge badge1 badge5">Read / Write</span></td>
+	<td><?php print _ ('All sections :'); ?> <span class="badge badge1 badge5">Read / Write</span></td>
 	<td colspan="2"></td>
 </tr>
 
 <?php
 /* print existing sections */
-if($groups) {
+if ($groups) {
 	foreach ($groups as $g) {
 		//cast
 		$g = (array) $g;
 
-		print '<tr>' . "\n";
-		print '	<td><strong>' . $g['g_name'] . '</strong></td>'. "\n";
-		print '	<td>' . $g['g_desc'] . '</td>'. "\n";
+		print '<tr>'."\n";
+		print '	<td><strong>'.$g['g_name'].'</strong></td>'."\n";
+		print '	<td>'.$g['g_desc'].'</td>'."\n";
 		# users in group
 		print "	<td>";
-		$u = $Admin->group_fetch_users($g['g_id']);
-		if(sizeof($u)>0) {
-			foreach($u as $name) {
+		$u = $Admin->group_fetch_users ($g['g_id']);
+		if (sizeof ($u) > 0) {
+			foreach ($u as $name) {
 				# get details
-				$user = $Admin->fetch_object("users", "id", $name);
+				$user = $Admin->fetch_object ("users", "id", $name);
 				print $user->real_name."<br>";
 			}
 		} else {
-			print "<span class='text-muted'>"._("No users")."</span>";
+			print "<span class='text-muted'>"._ ("No users")."</span>";
 		}
 		print "</td>";
 
 		# section permissions
 		print "	<td>";
 		$permissions = $Sections->get_group_section_permissions ($g['g_id']);
-		if(sizeof($permissions)>0) {
-			foreach($permissions as $sec=>$perm) {
+		if (sizeof ($permissions) > 0) {
+			foreach ($permissions as $sec=>$perm) {
 				# reformat permissions
-				$perm = $Subnets->parse_permissions($perm);
+				$perm = $Subnets->parse_permissions ($perm);
 				print $sec." : <span class='badge badge1 badge5'>".$perm."</span><br>";
 			}
 		}
@@ -111,20 +111,20 @@ 
 		# add/remove users
 		print "	<td class='actions'>";
 		print "	<div class='btn-group'>";
-		print "		<button class='btn btn-xs btn-default addToGroup' 		data-groupid='$g[g_id]' data-action='add'    rel='tooltip' data-container='body'  title='"._('add users to this group')."'>   	<i class='fa fa-plus'></i></button>";
-		print "		<button class='btn btn-xs btn-default removeFromGroup' 	data-groupid='$g[g_id]' data-action='remove' rel='tooltip' data-container='body'  title='"._('remove users from this group')."'><i class='fa fa-minus'></i></button>";
+		print "		<button class='btn btn-xs btn-default addToGroup' 		data-groupid='$g[g_id]' data-action='add'    rel='tooltip' data-container='body'  title='"._ ('add users to this group')."'>   	<i class='fa fa-plus'></i></button>";
+		print "		<button class='btn btn-xs btn-default removeFromGroup' 	data-groupid='$g[g_id]' data-action='remove' rel='tooltip' data-container='body'  title='"._ ('remove users from this group')."'><i class='fa fa-minus'></i></button>";
 		print "	</div>";
 		print "</td>";
 
 		# edit, delete
 		print "<td class='actions'>";
 		print "	<div class='btn-group'>";
-		print "		<button class='btn btn-xs btn-default editGroup'  		data-groupid='$g[g_id]' data-action='edit'   rel='tooltip' data-container='body'  title='"._('edit group details')."'>	<i class='fa fa-pencil'></i></button>";
-		print "		<button class='btn btn-xs btn-default editGroup'  		data-groupid='$g[g_id]' data-action='delete' rel='tooltip' data-container='body'  title='"._('remove group')."'>		<i class='fa fa-times'></i></button>";
+		print "		<button class='btn btn-xs btn-default editGroup'  		data-groupid='$g[g_id]' data-action='edit'   rel='tooltip' data-container='body'  title='"._ ('edit group details')."'>	<i class='fa fa-pencil'></i></button>";
+		print "		<button class='btn btn-xs btn-default editGroup'  		data-groupid='$g[g_id]' data-action='delete' rel='tooltip' data-container='body'  title='"._ ('remove group')."'>		<i class='fa fa-times'></i></button>";
 		print "	</div>";
 		print "</td>";
 
-		print '</tr>' . "\n";
+		print '</tr>'."\n";
 	}
 }
 

app/admin/groups/add-users-result.php

Indentation +20 added lines, -20 removed lines

@@ -22,9 +22,9 @@ 
 
 # parse result
 foreach($_POST as $k=>$p) {
-	if(substr($k, 0,4) == "user") {
-		$users[substr($k, 4)] = substr($k, 4);
-	}
+    if(substr($k, 0,4) == "user") {
+        $users[substr($k, 4)] = substr($k, 4);
+    }
 }
 
 
@@ -33,31 +33,31 @@ 
 
 # add each user to group
 if(sizeof($users)>0) {
-	foreach($users as $key=>$u) {
-		if(!$Admin->add_group_to_user($_POST['gid'], $u)) {
-			# get user details
-			$user = $Admin->fetch_object("users", "id", $u);
-			$errors[] = $user->real_name;
-		}
-	}
+    foreach($users as $key=>$u) {
+        if(!$Admin->add_group_to_user($_POST['gid'], $u)) {
+            # get user details
+            $user = $Admin->fetch_object("users", "id", $u);
+            $errors[] = $user->real_name;
+        }
+    }
 }
 else {
-	$errors[] = _("Please select user(s) to add to selected group!");
+    $errors[] = _("Please select user(s) to add to selected group!");
 }
 
 # print result
 if(isset($errors)) {
-	print "<div class='alert alert alert-danger'>";
-	print _("Failed to add users").":<hr>";
-	print "<ul>";
-	foreach($errors as $e) {
-		print "<li>$e</li>";
-	}
-	print "</ul>";
-	print "</div>";
+    print "<div class='alert alert alert-danger'>";
+    print _("Failed to add users").":<hr>";
+    print "<ul>";
+    foreach($errors as $e) {
+        print "<li>$e</li>";
+    }
+    print "</ul>";
+    print "</div>";
 }
 else {
-	$Result->show("success", _('Users added to group'), true);
+    $Result->show("success", _('Users added to group'), true);
 }
 
 ?>
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -5,59 +5,59 @@
  *************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 
 # id must be numeric
-if(!is_numeric($_POST['gid']))		{ $Result->show("danger", _("Invalid ID"), true); }
+if (!is_numeric ($_POST['gid'])) { $Result->show ("danger", _ ("Invalid ID"), true); }
 
 # parse result
-foreach($_POST as $k=>$p) {
-	if(substr($k, 0,4) == "user") {
-		$users[substr($k, 4)] = substr($k, 4);
+foreach ($_POST as $k=>$p) {
+	if (substr ($k, 0, 4) == "user") {
+		$users[substr ($k, 4)] = substr ($k, 4);
 	}
 }
 
 
 # verify that description is present if action != delete
-if(strlen($_POST['gid']==0))		{ $Result->show("danger", _('Error - no group ID'), true); }
+if (strlen ($_POST['gid'] == 0)) { $Result->show ("danger", _ ('Error - no group ID'), true); }
 
 # add each user to group
-if(sizeof($users)>0) {
-	foreach($users as $key=>$u) {
-		if(!$Admin->add_group_to_user($_POST['gid'], $u)) {
+if (sizeof ($users) > 0) {
+	foreach ($users as $key=>$u) {
+		if (!$Admin->add_group_to_user ($_POST['gid'], $u)) {
 			# get user details
-			$user = $Admin->fetch_object("users", "id", $u);
+			$user = $Admin->fetch_object ("users", "id", $u);
 			$errors[] = $user->real_name;
 		}
 	}
 }
 else {
-	$errors[] = _("Please select user(s) to add to selected group!");
+	$errors[] = _ ("Please select user(s) to add to selected group!");
 }
 
 # print result
-if(isset($errors)) {
+if (isset($errors)) {
 	print "<div class='alert alert alert-danger'>";
-	print _("Failed to add users").":<hr>";
+	print _ ("Failed to add users").":<hr>";
 	print "<ul>";
-	foreach($errors as $e) {
+	foreach ($errors as $e) {
 		print "<li>$e</li>";
 	}
 	print "</ul>";
 	print "</div>";
 }
 else {
-	$Result->show("success", _('Users added to group'), true);
+	$Result->show ("success", _ ('Users added to group'), true);
 }
 
 ?>
\ No newline at end of file

app/admin/groups/add-users.php

Indentation +14 added lines, -14 removed lines

@@ -49,24 +49,24 @@
 	</tr>
 
 	<?php
-	# show missing
-	foreach($missing as $k=>$m) {
-		# get user details
-		$u = (array) $Admin->fetch_object("users", "id", $m);
+    # show missing
+    foreach($missing as $k=>$m) {
+        # get user details
+        $u = (array) $Admin->fetch_object("users", "id", $m);
 
-		print "<tr>";
+        print "<tr>";
 
-		print "	<td>";
-		print "	<input type='checkbox' name='user$u[id]'>";
-		print "	</td>";
+        print "	<td>";
+        print "	<input type='checkbox' name='user$u[id]'>";
+        print "	</td>";
 
-		print "	<td>$u[real_name]</td>";
-		print "	<td>$u[username]</td>";
-		print "	<td>$u[email]</td>";
+        print "	<td>$u[real_name]</td>";
+        print "	<td>$u[username]</td>";
+        print "	<td>$u[email]</td>";
 
-		print "</tr>";
-	}
-	?>
+        print "</tr>";
+    }
+    ?>
 
     </table>
     </form>

Braces +2 added lines, -1 removed lines

@@ -71,7 +71,8 @@
     </table>
     </form>
 
-    <?php } else { $Result->show("info", _('No available users to add to group'), false); } ?>
+    <?php }
+else { $Result->show("info", _('No available users to add to group'), false); } ?>
 </div>
 
 

Spacing +15 added lines, -15 removed lines

@@ -5,36 +5,36 @@ 
  *************************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 
 # id must be numeric
-if(!is_numeric($_POST['g_id']))		{ $Result->show("danger", _("Invalid ID"), true, true); }
+if (!is_numeric ($_POST['g_id'])) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 # get group details
-$group   = $Admin->fetch_object("userGroups", "g_id", $_POST['g_id']);
+$group   = $Admin->fetch_object ("userGroups", "g_id", $_POST['g_id']);
 # not in group - array of ids
 $missing = $Admin->group_fetch_missing_users ($_POST['g_id']);
 ?>
 
 
 <!-- header -->
-<div class="pHeader"><?php print _('Add users to group'); ?> <?php print $group->g_name; ?></div>
+<div class="pHeader"><?php print _ ('Add users to group'); ?> <?php print $group->g_name; ?></div>
 
 
 <!-- content -->
 <div class="pContent">
 
-	<?php if(sizeof($missing) > 0) { ?>
+	<?php if (sizeof ($missing) > 0) { ?>
 
 	<form id="groupAddUsers" name="groupAddUsers">
 	<table class="groupEdit table table-condensed table-hover table-top">
@@ -43,16 +43,16 @@ 
 		<th>
 			<input type="hidden" name="gid" value="<?php print $_POST['g_id']; ?>">
 		</th>
-		<th><?php print _('Name'); ?></th>
-		<th><?php print _('Username'); ?></th>
-		<th><?php print _('Email'); ?></th>
+		<th><?php print _ ('Name'); ?></th>
+		<th><?php print _ ('Username'); ?></th>
+		<th><?php print _ ('Email'); ?></th>
 	</tr>
 
 	<?php
 	# show missing
-	foreach($missing as $k=>$m) {
+	foreach ($missing as $k=>$m) {
 		# get user details
-		$u = (array) $Admin->fetch_object("users", "id", $m);
+		$u = (array) $Admin->fetch_object ("users", "id", $m);
 
 		print "<tr>";
 
@@ -71,7 +71,7 @@ 
     </table>
     </form>
 
-    <?php } else { $Result->show("info", _('No available users to add to group'), false); } ?>
+    <?php } else { $Result->show ("info", _ ('No available users to add to group'), false); } ?>
 </div>
 
 
@@ -79,7 +79,7 @@ 
 <div class="pFooter">
 	<div class="btn-group">
 		<button class="btn btn-sm btn-default hidePopups">Cancel</button>
-		<?php if(sizeof($missing) > 0) { ?>
+		<?php if (sizeof ($missing) > 0) { ?>
 		<button class="btn btn-sm btn-default btn-success" id="groupAddUsersSubmit"><i class="fa fa-plus"></i> Add selected users</button>
 		<?php } ?>
 	</div>

app/admin/replace-fields/index.php

Indentation +8 added lines, -8 removed lines

@@ -28,15 +28,15 @@
 			<option value="switch"><?php print _('Device'); ?></option>
 			<option value="port"><?php print _('Port'); ?></option>
 			<?php
-			# fetch custom fields
-			$custom = $Tools->fetch_custom_fields('ipaddresses');
+            # fetch custom fields
+            $custom = $Tools->fetch_custom_fields('ipaddresses');
 
-			if(sizeof($custom) > 0) {
-				foreach($custom as $myField) {
-					print '<option value="'. $myField['name'] .'"> '. $myField['name'] .'</option>';
-				}
-			}
-			?>
+            if(sizeof($custom) > 0) {
+                foreach($custom as $myField) {
+                    print '<option value="'. $myField['name'] .'"> '. $myField['name'] .'</option>';
+                }
+            }
+            ?>
 		</select>
 		</td>
 	</tr>

Spacing +18 added lines, -18 removed lines

@@ -5,35 +5,35 @@ 
  ***********************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "replace_fields");
 ?>
 
-<h4><?php print _('Search and replace fields in IP address list'); ?></h4>
+<h4><?php print _ ('Search and replace fields in IP address list'); ?></h4>
 <hr><br>
 
 <form id="searchReplace">
 <table class="table" style="width:auto">
 
 	<tr>
-		<td><?php print _('Select field to replace'); ?>:</td>
+		<td><?php print _ ('Select field to replace'); ?>:</td>
 		<td>
 		<select name="field" class="form-control input-sm input-w-auto">
-			<option value="description"><?php print _('Description'); ?></option>
-			<option value="dns_name"><?php print _('Hostname'); ?></option>
-			<option value="owner"><?php print _('Owner'); ?></option>
-			<option value="mac"><?php print _('MAC address'); ?></option>
-			<option value="switch"><?php print _('Device'); ?></option>
-			<option value="port"><?php print _('Port'); ?></option>
+			<option value="description"><?php print _ ('Description'); ?></option>
+			<option value="dns_name"><?php print _ ('Hostname'); ?></option>
+			<option value="owner"><?php print _ ('Owner'); ?></option>
+			<option value="mac"><?php print _ ('MAC address'); ?></option>
+			<option value="switch"><?php print _ ('Device'); ?></option>
+			<option value="port"><?php print _ ('Port'); ?></option>
 			<?php
 			# fetch custom fields
-			$custom = $Tools->fetch_custom_fields('ipaddresses');
+			$custom = $Tools->fetch_custom_fields ('ipaddresses');
 
-			if(sizeof($custom) > 0) {
-				foreach($custom as $myField) {
-					print '<option value="'. $myField['name'] .'"> '. $myField['name'] .'</option>';
+			if (sizeof ($custom) > 0) {
+				foreach ($custom as $myField) {
+					print '<option value="'.$myField['name'].'"> '.$myField['name'].'</option>';
 				}
 			}
 			?>
@@ -42,24 +42,24 @@ 
 	</tr>
 
 	<tr>
-		<td><?php print _('Select search string'); ?></td>
+		<td><?php print _ ('Select search string'); ?></td>
 		<td>
-			<input type="text" name="search" class="form-control input-sm" placeholder="<?php print _('search string'); ?>">
+			<input type="text" name="search" class="form-control input-sm" placeholder="<?php print _ ('search string'); ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 		</td>
 	</tr>
 
 	<tr>
-		<td><?php print _('Select replace string'); ?></td>
+		<td><?php print _ ('Select replace string'); ?></td>
 		<td>
-			<input type="text" name="replace" class="form-control input-sm" placeholder="<?php print _('replace string'); ?>">
+			<input type="text" name="replace" class="form-control input-sm" placeholder="<?php print _ ('replace string'); ?>">
 		</td>
 	</tr>
 
 	<tr class="th">
 		<td></td>
 		<td>
-			<button class="btn btn-sm btn-default" id="searchReplaceSave"><i class="fa fa-check"></i> <?php print _('Replace'); ?></button>
+			<button class="btn btn-sm btn-default" id="searchReplaceSave"><i class="fa fa-check"></i> <?php print _ ('Replace'); ?></button>
 		</td>
 	</tr>