phpipam / phpipam

app/admin/groups/index.php

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/ad-search-group-result.php

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/add-users-result.php

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/ad-search-group-form.php

Spacing +12 added lines, -12 removed lines

@@ -5,32 +5,32 @@ 
  *************************************/
 
 /* 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 ();
 
 # fetch all available LDAP servers
 $servers = $Admin->fetch_all_objects ("usersAuthMethod");
-foreach($servers as $k=>$s) {
-	if($s->type!="AD" && $s->type!="LDAP" && $s->type!="NetIQ") {
+foreach ($servers as $k=>$s) {
+	if ($s->type != "AD" && $s->type != "LDAP" && $s->type != "NetIQ") {
 		unset($servers[$k]);
 	}
 }
 
 # die if no servers
-if(sizeof($servers)==0) 	{ $Result->show("danger", _("No servers available"), true, true); }
+if (sizeof ($servers) == 0) { $Result->show ("danger", _ ("No servers available"), true, true); }
 ?>
 
 
 <!-- header -->
-<div class="pHeader"><?php print _('Search domains in AD'); ?></div>
+<div class="pHeader"><?php print _ ('Search domains in AD'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -42,7 +42,7 @@ 
 		<td>
 			<select name="server" id="adserver" class="form-control input-w-auto">
 			<?php
-			foreach($servers as $s) {
+			foreach ($servers as $s) {
 				print "<option value='$s->id'>$s->description</option>";
 			}
 			?>
@@ -52,7 +52,7 @@ 
 
 	<tr>
 		<td style="width:150px;">Filter</td>
-		<td><input type="text" class="form-control input-sm" id='dfilter' name="dfilter" placeholder="<?php print _('Enter search filter'); ?>"></td>
+		<td><input type="text" class="form-control input-sm" id='dfilter' name="dfilter" placeholder="<?php print _ ('Enter search filter'); ?>"></td>
 	</tr>
 
 
@@ -62,7 +62,7 @@ 
 
 	<tr>
 		<td></td>
-		<td><button class='btn btn-sm btn-default pull-right' class="form-control input-sm" id="adsearchgroupsubmit"><?php print _('Search'); ?></button></td>
+		<td><button class='btn btn-sm btn-default pull-right' class="form-control input-sm" id="adsearchgroupsubmit"><?php print _ ('Search'); ?></button></td>
 	</tr>
 
 	</table>
@@ -73,6 +73,6 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopupsReload"><?php print _('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default hidePopupsReload"><?php print _ ('Cancel'); ?></button>
 	</div>
 </div>
\ No newline at end of file

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

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/remove-users.php

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/filter-fields/index.php

Spacing +13 added lines, -13 removed lines

@@ -5,16 +5,16 @@ 
  ****************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 
 # get all fields in IP table
-foreach($Tools->fetch_standard_fields("ipaddresses") as $s) {
+foreach ($Tools->fetch_standard_fields ("ipaddresses") as $s) {
 	$standard_fields[$s] = $s;
 }
 
 # get all selected fields and put them to array
-$selected_fields = explode(";", $User->settings->IPfilter);
+$selected_fields = explode (";", $User->settings->IPfilter);
 
 /* unset mandatory fields -> id,subnetid,ip_addr */
 unset($standard_fields['id'], $standard_fields['state'], $standard_fields['subnetId'],
@@ -25,10 +25,10 @@ 
 ?>
 
 
-<h4><?php print _('Filter which fields to display in IP list'); ?></h4>
+<h4><?php print _ ('Filter which fields to display in IP list'); ?></h4>
 <hr>
 
-<div class="alert alert-info alert-absolute"><?php print _('You can select which fields are actually being used for IP management, so you dont show any overhead if not used. IP, hostname and description are mandatory'); ?>.</div>
+<div class="alert alert-info alert-absolute"><?php print _ ('You can select which fields are actually being used for IP management, so you dont show any overhead if not used. IP, hostname and description are mandatory'); ?>.</div>
 
 
 <form id="filterIP" style="margin-top:50px;clear:both;">
@@ -36,21 +36,21 @@ 
 
 <!-- headers -->
 <tr>
-	<th colspan="2"><?php print _('Check which fields to use for IP addresses'); ?>:</th>
+	<th colspan="2"><?php print _ ('Check which fields to use for IP addresses'); ?>:</th>
 </tr>
 
 <!-- fields -->
 <?php
-foreach($standard_fields as $field) {
+foreach ($standard_fields as $field) {
 	# set active
-	$checked = in_array($field, $selected_fields) ? "checked" : "";
+	$checked = in_array ($field, $selected_fields) ? "checked" : "";
 
 	# replace switch
-	$field_print = $field=="switch" ? "device" : $field;
+	$field_print = $field == "switch" ? "device" : $field;
 
-	print '<tr>'. "\n";
-	print '	<td style="width:10px;padding-left:10px;"><input type="checkbox" class="input-switch" name="'. $field .'" value="'. $field .'" '. $checked .'></td>';
-	print '	<td>'. ucfirst($field_print) .'</td>';
+	print '<tr>'."\n";
+	print '	<td style="width:10px;padding-left:10px;"><input type="checkbox" class="input-switch" name="'.$field.'" value="'.$field.'" '.$checked.'></td>';
+	print '	<td>'.ucfirst ($field_print).'</td>';
 	print '</tr>';
 }
 ?>
@@ -59,7 +59,7 @@ 
 <tr>
 	<td></td>
 	<td>
-		<button class="btn btn-sm btn-default" id="filterIPSave"><i class="fa fa-check"></i> <?php print _('Save'); ?></button>
+		<button class="btn btn-sm btn-default" id="filterIPSave"><i class="fa fa-check"></i> <?php print _ ('Save'); ?></button>
 	</td>
 </tr>
 

app/admin/filter-fields/filter-result.php

Spacing +8 added lines, -8 removed lines

@@ -6,23 +6,23 @@
 
 
 /* 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 ();
 
 # set fields to update
-$values = array("id"=>1,
-				"IPfilter"=>implode(';', $_POST));
+$values = array ("id"=>1,
+				"IPfilter"=>implode (';', $_POST));
 
 # update
-if(!$Admin->object_modify("settings", "edit", "id", $values))   { $Result->show("danger alert-absolute",  _("Update failed"), true); }
-else															{ $Result->show("success alert-absolute", _('Update successfull'), true); }
+if (!$Admin->object_modify ("settings", "edit", "id", $values)) { $Result->show ("danger alert-absolute", _ ("Update failed"), true); }
+else { $Result->show ("success alert-absolute", _ ('Update successfull'), true); }
 
 ?>
\ No newline at end of file

app/admin/powerDNS/domain-edit.php

Spacing +41 added lines, -41 removed lines

@@ -5,18 +5,18 @@ 
  ************************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Tools	 	= new Tools ($Database);
 $Result 	= new Result ();
-$PowerDNS 	= new PowerDNS ($Database);
+$PowerDNS = new PowerDNS ($Database);
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "domain");
@@ -25,18 +25,18 @@ 
 $pdns = $PowerDNS->db_settings;
 
 # get VRF
-if($_POST['action']!="add") {
+if ($_POST['action'] != "add") {
 	$domain = $PowerDNS->fetch_domain ($_POST['id']);
-	$domain!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+	$domain !== false ? : $Result->show ("danger", _ ("Invalid ID"), true, true);
 }
 
 # disable edit on delete
-$readonly = $_POST['action']=="delete" ? "readonly" : "";
+$readonly = $_POST['action'] == "delete" ? "readonly" : "";
 ?>
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('domain'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('domain'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -46,9 +46,9 @@ 
 
 	<!-- name  -->
 	<tr>
-		<td style="width:150px;"><?php print _('Name'); ?></td>
+		<td style="width:150px;"><?php print _ ('Name'); ?></td>
 		<td>
-			<input type="text" class="name form-control input-sm" name="name" placeholder="<?php print _('FQDN domain name'); ?>" value="<?php print $domain->name; ?>" <?php print $readonly; ?> <?php if($_POST['action']!="add") { print "disabled='disabled'"; } ?>>
+			<input type="text" class="name form-control input-sm" name="name" placeholder="<?php print _ ('FQDN domain name'); ?>" value="<?php print $domain->name; ?>" <?php print $readonly; ?> <?php if ($_POST['action'] != "add") { print "disabled='disabled'"; } ?>>
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="id" value="<?php print @$_POST['id']; ?>">
             <input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
@@ -57,23 +57,23 @@ 
 
 	<!-- master -->
 	<tr>
-		<td><?php print _('Master NS'); ?></td>
+		<td><?php print _ ('Master NS'); ?></td>
 		<td>
-			<input type="text" class="name form-control input-sm" name="master" placeholder="<?php print _('NULL'); ?>" value="<?php print $domain->master; ?>" <?php print $readonly; ?>>
+			<input type="text" class="name form-control input-sm" name="master" placeholder="<?php print _ ('NULL'); ?>" value="<?php print $domain->master; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 
 	<!-- type -->
 	<tr>
-		<td><?php print _('Domain type'); ?></td>
+		<td><?php print _ ('Domain type'); ?></td>
 		<td>
 			<select name="type" class="form-control input-w-auto" <?php print $readonly; ?>>
 			<?php
 			// loop
-			foreach($PowerDNS->domain_types as $type) {
+			foreach ($PowerDNS->domain_types as $type) {
 				// active
-				if ($type == @$domain->type)	{ $selected = "selected"; }
-				else							{ $selected = ""; }
+				if ($type == @$domain->type) { $selected = "selected"; }
+				else { $selected = ""; }
 				// print
 				print "<option value='$type' $selected>$type</option>";
 			}
@@ -84,43 +84,43 @@ 
 
 	<?php
 	// we need default parameters only if we create new domain !
-	if($_POST['action']=="add") {
+	if ($_POST['action'] == "add") {
 	?>
 
 	<tbody class="defaults">
 
 	<!-- hr -->
 	<tr>
-		<td colspan="2"><hr><strong><?php print _("Default record values (SOA, NS)"); ?></strong><br><br></td>
+		<td colspan="2"><hr><strong><?php print _ ("Default record values (SOA, NS)"); ?></strong><br><br></td>
 	</tr>
 
 	<!-- defualt values for SOA and NS records -->
 
 	<!-- ns -->
 	<tr>
-		<td><?php print _('Name servers'); ?></th>
+		<td><?php print _ ('Name servers'); ?></th>
 		<td>
 			<input type="text" class="form-control input-sm" name="ns" value="<?php print $pdns->ns; ?>">
 		</td>
 	</tr>
 	<!-- mail -->
 	<tr>
-		<td><?php print _('Hostmaster'); ?></th>
+		<td><?php print _ ('Hostmaster'); ?></th>
 		<td>
 			<input type="text" class="form-control input-sm" name="hostmaster" value="<?php print $pdns->hostmaster; ?>">
 		</td>
 	</tr>
 	<!-- ttl -->
 	<tr>
-		<td><?php print _('TTL'); ?></th>
+		<td><?php print _ ('TTL'); ?></th>
 		<td>
 		<select name="ttl" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
 		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
+		foreach ($PowerDNS->ttl as $k=>$ttl) {
 			// active
-			if ($k == @$pdns->ttl)	{ $selected = "selected"; }
-			else					{ $selected = ""; }
+			if ($k == @$pdns->ttl) { $selected = "selected"; }
+			else { $selected = ""; }
 			// print
 			print "<option value='$k' $selected>$ttl ($k)</option>";
 		}
@@ -130,15 +130,15 @@ 
 	</tr>
 	<!-- refresh -->
 	<tr>
-		<td><?php print _('Refresh'); ?></th>
+		<td><?php print _ ('Refresh'); ?></th>
 		<td>
 		<select name="refresh" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
 		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
+		foreach ($PowerDNS->ttl as $k=>$ttl) {
 			// active
-			if ($k == @$pdns->refresh)	{ $selected = "selected"; }
-			else						{ $selected = ""; }
+			if ($k == @$pdns->refresh) { $selected = "selected"; }
+			else { $selected = ""; }
 			// print
 			print "<option value='$k' $selected>$ttl ($k)</option>";
 		}
@@ -148,15 +148,15 @@ 
 	</tr>
 	<!-- ttl -->
 	<tr>
-		<td><?php print _('Retry'); ?></th>
+		<td><?php print _ ('Retry'); ?></th>
 		<td>
 		<select name="retry" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
 		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
+		foreach ($PowerDNS->ttl as $k=>$ttl) {
 			// active
-			if ($k == @$pdns->retry)	{ $selected = "selected"; }
-			else						{ $selected = ""; }
+			if ($k == @$pdns->retry) { $selected = "selected"; }
+			else { $selected = ""; }
 			// print
 			print "<option value='$k' $selected>$ttl ($k)</option>";
 		}
@@ -165,15 +165,15 @@ 
 	</tr>
 	<!-- ttl -->
 	<tr>
-		<td><?php print _('NXDOMAIN ttl'); ?></th>
+		<td><?php print _ ('NXDOMAIN ttl'); ?></th>
 		<td>
 		<select name="nxdomain_ttl" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
 		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
+		foreach ($PowerDNS->ttl as $k=>$ttl) {
 			// active
-			if ($k == @$pdns->nxdomain_ttl)	{ $selected = "selected"; }
-			else							{ $selected = ""; }
+			if ($k == @$pdns->nxdomain_ttl) { $selected = "selected"; }
+			else { $selected = ""; }
 			// print
 			print "<option value='$k' $selected>$ttl ($k)</option>";
 		}
@@ -186,7 +186,7 @@ 
 	<tr>
 		<td></td>
 		<td>
-			<input type="checkbox" class="hideDefaults" value="1" name="manual"> <?php print _("Dont create default records (SOA, NS)"); ?>
+			<input type="checkbox" class="hideDefaults" value="1" name="manual"> <?php print _ ("Dont create default records (SOA, NS)"); ?>
 		</td>
 	</tr>
 	<?php } ?>
@@ -196,7 +196,7 @@ 
 
 	<?php
 	//print delete warning
-	if($_POST['action'] == "delete")	{ $Result->show("warning", "<strong>"._('Warning').":</strong> "._("removing Domain will also remove all referenced entries!"), false);}
+	if ($_POST['action'] == "delete") { $Result->show ("warning", "<strong>"._ ('Warning').":</strong> "._ ("removing Domain will also remove all referenced entries!"), false); }
 	?>
 </div>
 
@@ -204,8 +204,8 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default <?php if(@$_POST['secondary']=="true") { print "hidePopup2"; } else { print "hidePopups"; } ?>"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?> <?php if(@$_POST['secondary']=="true") { print "editDomainSubmit2"; } ?>" id="editDomainSubmit"><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['secondary'] == "true") { print "hidePopup2"; } else { print "hidePopups"; } ?>"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default <?php if ($_POST['action'] == "delete") { print "btn-danger"; } else { print "btn-success"; } ?> <?php if (@$_POST['secondary'] == "true") { print "editDomainSubmit2"; } ?>" id="editDomainSubmit"><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 -->
 	<div class="domain-edit-result"></div>