phpipam / phpipam

app/admin/users/edit-notify.php

Spacing +43 added lines, -43 removed lines

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

app/admin/users/print-all.php

Spacing +54 added lines, -54 removed lines

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

app/admin/vlans/edit.php

Spacing +65 added lines, -65 removed lines

@@ -5,49 +5,49 @@ 
  ************************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Tools	 	= new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "vlan");
 
 # fetch vlan details
 $vlan = $Admin->fetch_object ("vlans", "vlanId", @$_POST['vlanId']);
-$vlan = $vlan!==false ? (array) $vlan : array();
+$vlan = $vlan !== false ? (array) $vlan : array ();
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('vlans');
+$custom = $Tools->fetch_custom_fields ('vlans');
 
 # set readonly flag
-$readonly = $_POST['action']=="delete" ? "readonly" : "";
+$readonly = $_POST['action'] == "delete" ? "readonly" : "";
 
 # set form name!
-if(isset($_POST['fromSubnet'])) { $formId = "vlanManagementEditFromSubnet"; }
-else 							{ $formId = "vlanManagementEdit"; }
+if (isset($_POST['fromSubnet'])) { $formId = "vlanManagementEditFromSubnet"; }
+else { $formId = "vlanManagementEdit"; }
 
 # domain
-if(!isset($_POST['domain'])) 	{ $_POST['domain']=1; }
+if (!isset($_POST['domain'])) { $_POST['domain'] = 1; }
 
 # fetch l2 domain
-if($_POST['action']=="add") {
+if ($_POST['action'] == "add") {
 	# all
-	if (@$_POST['domain']=="all") {
-		$vlan_domains = $Admin->fetch_all_objects("vlanDomains");
+	if (@$_POST['domain'] == "all") {
+		$vlan_domains = $Admin->fetch_all_objects ("vlanDomains");
 	} else {
-		$vlan_domain = $Admin->fetch_object("vlanDomains", "id", $_POST['domain']);
+		$vlan_domain = $Admin->fetch_object ("vlanDomains", "id", $_POST['domain']);
 	}
 } else {
-		$vlan_domain = $Admin->fetch_object("vlanDomains", "id", $vlan['domainId']);
+		$vlan_domain = $Admin->fetch_object ("vlanDomains", "id", $vlan['domainId']);
 }
-if($vlan_domain===false)			{ $Result->show("danger", _("Invalid ID"), true, true); }
+if ($vlan_domain === false) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 ?>
 
 <script type="text/javascript">
@@ -58,7 +58,7 @@ 
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('VLAN'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('VLAN'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -67,11 +67,11 @@ 
 	<table id="vlanManagementEdit2" class="table table-noborder table-condensed">
 	<!-- domain -->
 	<tr>
-		<td><?php print _('l2 domain'); ?></td>
+		<td><?php print _ ('l2 domain'); ?></td>
 		<th>
 		<?php
 		# not all
-		if (@$_POST['domain']!="all") {
+		if (@$_POST['domain'] != "all") {
 			print $vlan_domain->name." (".$vlan_domain->description.")";
 		} else {
 			print "<select name='domainId' class='form-control input-sm'>";
@@ -88,27 +88,27 @@ 
 	</tr>
 	<!-- number -->
 	<tr>
-		<td><?php print _('Number'); ?></td>
+		<td><?php print _ ('Number'); ?></td>
 		<td>
-			<input type="text" class="number form-control input-sm" name="number" placeholder="<?php print _('VLAN number'); ?>" value="<?php print @$vlan['number']; ?><?php print @$_POST['vlanNum']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="number form-control input-sm" name="number" placeholder="<?php print _ ('VLAN number'); ?>" value="<?php print @$vlan['number']; ?><?php print @$_POST['vlanNum']; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 
 	<!-- hostname  -->
 	<tr>
-		<td><?php print _('Name'); ?></td>
+		<td><?php print _ ('Name'); ?></td>
 		<td>
-			<input type="text" class="name form-control input-sm" name="name" placeholder="<?php print _('VLAN name'); ?>" value="<?php print @$vlan['name']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="name form-control input-sm" name="name" placeholder="<?php print _ ('VLAN name'); ?>" value="<?php print @$vlan['name']; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 
 	<!-- Description -->
 	<tr>
-		<td><?php print _('Description'); ?></td>
+		<td><?php print _ ('Description'); ?></td>
 		<td>
-			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _('Description'); ?>" value="<?php print @$vlan['description']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _ ('Description'); ?>" value="<?php print @$vlan['description']; ?>" <?php print $readonly; ?>>
 			<input type="hidden" name="vlanId" value="<?php print @$_POST['vlanId']; ?>">
-			<?php if(@$_POST['domain']!=="all") { ?>
+			<?php if (@$_POST['domain'] !== "all") { ?>
 			<input type="hidden" name="domainId" value="<?php print $vlan_domain->id; ?>">
 			<?php } ?>
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
@@ -116,63 +116,63 @@ 
 		</td>
 	</tr>
 
-	<?php if($_POST['action']=="add" || $_POST['action']=="edit") { ?>
+	<?php if ($_POST['action'] == "add" || $_POST['action'] == "edit") { ?>
     <!-- require unique -->
     <tr>
 	    <td colspan="2"><hr></td>
     </tr>
     <tr>
-    	<td><?php print _('Unique VLAN'); ?></td>
+    	<td><?php print _ ('Unique VLAN'); ?></td>
     	<td>
 	    	<input type="checkbox" name="unique" value="on">
-	    	<span class="text-muted"><?php print _('Require unique vlan accross domains'); ?></span>
+	    	<span class="text-muted"><?php print _ ('Require unique vlan accross domains'); ?></span>
 	    </td>
     </tr>
 	<?php } ?>
 
 	<!-- Custom -->
 	<?php
-	if(sizeof($custom) > 0) {
+	if (sizeof ($custom) > 0) {
 
 		print '<tr>';
 		print '	<td colspan="2"><hr></td>';
 		print '</tr>';
 
-		foreach($custom as $field) {
+		foreach ($custom as $field) {
 
 			# replace spaces
-		    $field['nameNew'] = str_replace(" ", "___", $field['name']);
+		    $field['nameNew'] = str_replace (" ", "___", $field['name']);
 
 			# required
-			if($field['Null']=="NO")	{ $required = "*"; }
-			else						{ $required = ""; }
+			if ($field['Null'] == "NO") { $required = "*"; }
+			else { $required = ""; }
 
 			# set default value !
-			if ($_POST['action']=="add")	{ $vlan[$field['name']] = $field['Default']; }
+			if ($_POST['action'] == "add") { $vlan[$field['name']] = $field['Default']; }
 
-			print '<tr>'. "\n";
-			print '	<td>'. $field['name'] .' '.$required.'</td>'. "\n";
-			print '	<td>'. "\n";
+			print '<tr>'."\n";
+			print '	<td>'.$field['name'].' '.$required.'</td>'."\n";
+			print '	<td>'."\n";
 
 			//set type
-			if(substr($field['type'], 0,3) == "set" || substr($field['type'], 0,4) == "enum") {
+			if (substr ($field['type'], 0, 3) == "set" || substr ($field['type'], 0, 4) == "enum") {
 				//parse values
-				$tmp = substr($field['type'], 0,3)=="set" ? explode(",", str_replace(array("set(", ")", "'"), "", $field['type'])) : explode(",", str_replace(array("enum(", ")", "'"), "", $field['type']));
+				$tmp = substr ($field['type'], 0, 3) == "set" ? explode (",", str_replace (array ("set(", ")", "'"), "", $field['type'])) : explode (",", str_replace (array ("enum(", ")", "'"), "", $field['type']));
 
 				//null
-				if($field['Null']!="NO") { array_unshift($tmp, ""); }
+				if ($field['Null'] != "NO") { array_unshift ($tmp, ""); }
 
 				print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
-				foreach($tmp as $v) {
-					if($v==$vlan[$field['name']])	{ print "<option value='$v' selected='selected'>$v</option>"; }
-					else								{ print "<option value='$v'>$v</option>"; }
+				foreach ($tmp as $v) {
+					if ($v == $vlan[$field['name']]) { print "<option value='$v' selected='selected'>$v</option>"; }
+					else { print "<option value='$v'>$v</option>"; }
 				}
 				print "</select>";
 			}
 			//date and time picker
-			elseif($field['type'] == "date" || $field['type'] == "datetime") {
+			elseif ($field['type'] == "date" || $field['type'] == "datetime") {
 				// just for first
-				if($timeP==0) {
+				if ($timeP == 0) {
 					print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
 					print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
 					print '<script type="text/javascript">';
@@ -188,38 +188,38 @@ 
 				$timeP++;
 
 				//set size
-				if($field['type'] == "date")	{ $size = 10; $class='datepicker';		$format = "yyyy-MM-dd"; }
-				else							{ $size = 19; $class='datetimepicker';	$format = "yyyy-MM-dd"; }
+				if ($field['type'] == "date") { $size = 10; $class = 'datepicker'; $format = "yyyy-MM-dd"; }
+				else { $size = 19; $class = 'datetimepicker'; $format = "yyyy-MM-dd"; }
 
 				//field
-				if(!isset($vlan[$field['name']]))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
-				else								{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" value="'. $vlan[$field['name']]. '" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+				if (!isset($vlan[$field['name']])) { print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'.$field['nameNew'].'" maxlength="'.$size.'" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'."\n"; }
+				else { print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'.$field['nameNew'].'" maxlength="'.$size.'" value="'.$vlan[$field['name']].'" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'."\n"; }
 			}
 			//boolean
-			elseif($field['type'] == "tinyint(1)") {
+			elseif ($field['type'] == "tinyint(1)") {
 				print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
-				$tmp = array(0=>"No",1=>"Yes");
+				$tmp = array (0=>"No", 1=>"Yes");
 				//null
-				if($field['Null']!="NO") { $tmp[2] = ""; }
+				if ($field['Null'] != "NO") { $tmp[2] = ""; }
 
-				foreach($tmp as $k=>$v) {
-					if(strlen($vlan[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					elseif($k==$vlan[$field['name']])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					else												{ print "<option value='$k'>"._($v)."</option>"; }
+				foreach ($tmp as $k=>$v) {
+					if (strlen ($vlan[$field['name']]) == 0 && $k == 2) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+					elseif ($k == $vlan[$field['name']]) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+					else { print "<option value='$k'>"._ ($v)."</option>"; }
 				}
 				print "</select>";
 			}
 			//text
-			elseif($field['type'] == "text") {
-				print ' <textarea class="form-control input-sm" name="'. $field['nameNew'] .'" placeholder="'. $field['name'] .'" '.$readonly.' rowspan=3 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. $vlan[$field['name']]. '</textarea>'. "\n";
+			elseif ($field['type'] == "text") {
+				print ' <textarea class="form-control input-sm" name="'.$field['nameNew'].'" placeholder="'.$field['name'].'" '.$readonly.' rowspan=3 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'.$vlan[$field['name']].'</textarea>'."\n";
 			}
 			//default - input field
 			else {
-				print ' <input type="text" class="ip_addr form-control input-sm" name="'. $field['nameNew'] .'" placeholder="'. $field['name'] .'" value="'. @$vlan[$field['name']]. '" size="30" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
+				print ' <input type="text" class="ip_addr form-control input-sm" name="'.$field['nameNew'].'" placeholder="'.$field['name'].'" value="'.@$vlan[$field['name']].'" size="30" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'."\n";
 			}
 
-			print '	</td>'. "\n";
-			print '</tr>'. "\n";
+			print '	</td>'."\n";
+			print '</tr>'."\n";
 		}
 	}
 	?>
@@ -229,7 +229,7 @@ 
 
 	<?php
 	//print delete warning
-	if($_POST['action'] == "delete")	{ $Result->show("warning", _('Warning').':</strong> '._('removing VLAN will also remove VLAN reference from belonging subnets')."!", false);  }
+	if ($_POST['action'] == "delete") { $Result->show ("warning", _ ('Warning').':</strong> '._ ('removing VLAN will also remove VLAN reference from belonging subnets')."!", false); }
 	?>
 </div>
 
@@ -237,8 +237,8 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default <?php if(isset($_POST['fromSubnet'])) { 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"; } ?> vlanManagementEditFromSubnetButton" id="editVLANsubmit"><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 (isset($_POST['fromSubnet'])) { 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"; } ?> vlanManagementEditFromSubnetButton" id="editVLANsubmit"><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/vlans/move-vlan.php

Spacing +17 added lines, -17 removed lines

@@ -5,29 +5,29 @@ 
  ************************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Tools	 	= new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 
 # fetch vlan details
 $vlan = $Admin->fetch_object ("vlans", "vlanId", @$_POST['vlanId']);
-if($vlan===false)					{ $Result->show("danger", _("Invalid ID"), true, true); }
+if ($vlan === false) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 # fetch current domain
-$vlan_domain = $Admin->fetch_object("vlanDomains", "id", $vlan->domainId);
-if($vlan_domain===false)			{ $Result->show("danger", _("Invalid ID"), true, true); }
+$vlan_domain = $Admin->fetch_object ("vlanDomains", "id", $vlan->domainId);
+if ($vlan_domain === false) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 # fetch all l2 domains
-$vlan_domains = $Admin->fetch_all_objects("vlanDomains", "id");
+$vlan_domains = $Admin->fetch_all_objects ("vlanDomains", "id");
 ?>
 
 <script type="text/javascript">
@@ -37,7 +37,7 @@ 
 </script>
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords("Move VLAN to new domain"); ?></div>
+<div class="pHeader"><?php print ucwords ("Move VLAN to new domain"); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -46,7 +46,7 @@ 
 	<table class="table table-noborder table-condensed">
 	<!-- domain -->
 	<tr>
-		<td><?php print _('Current l2 domain'); ?></td>
+		<td><?php print _ ('Current l2 domain'); ?></td>
 		<th><?php print $vlan_domain->name." (".$vlan_domain->description.")"; ?></th>
 	</tr>
 	<tr>
@@ -54,14 +54,14 @@ 
 	</tr>
 	<!-- new domain -->
 	<tr>
-		<td><?php print _('New domain'); ?></td>
+		<td><?php print _ ('New domain'); ?></td>
 		<td>
 		<input type="hidden" name="vlanId" value="<?php print $vlan->vlanId; ?>">
 		<select name="newDomainId" class="form-control input-w-auto input-sm">
 		<?php
-		$m=0;
-		foreach($vlan_domains as $d) {
-			if($d->id!=$vlan_domain->id) {
+		$m = 0;
+		foreach ($vlan_domains as $d) {
+			if ($d->id != $vlan_domain->id) {
 				print "<option value='$d->id'>$d->name ($d->description)</option>";
 				$m++;
 			}
@@ -74,15 +74,15 @@ 
 	</table>
 	</form>
 
-	<?php if($m==0)	$Result->show("warning", _("No domains available!"), false); ?>
+	<?php if ($m == 0)	$Result->show ("warning", _ ("No domains available!"), false); ?>
 
 </div>
 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<?php if($m>0) { ?>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<?php if ($m > 0) { ?>
 		<button class="btn btn-sm btn-default btn-success" id="moveVLANsubmit"><?php print ("Move"); ?></button>
 		<?php } ?>
 	</div>

app/admin/vlans/vlans-scan.php

Spacing +14 added lines, -14 removed lines

@@ -5,50 +5,50 @@ 
  *************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Tools	 	= new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # scan disabled
-if ($User->settings->enableSNMP!="1")           { $Result->show("danger", _("SNMP module disbled"), true, true); }
+if ($User->settings->enableSNMP != "1") { $Result->show ("danger", _ ("SNMP module disbled"), true, true); }
 # admin check
-if($User->is_admin()!==true) 	                { $Result->show("danger", _('Admin privileges required'), true, true); }
+if ($User->is_admin () !== true) { $Result->show ("danger", _ ('Admin privileges required'), true, true); }
 
 # domain Id must be int
-if (!is_numeric($_POST['domainId']))            { $Result->show("danger", _("Invalid domain Id"), true, true); }
+if (!is_numeric ($_POST['domainId'])) { $Result->show ("danger", _ ("Invalid domain Id"), true, true); }
 # fetch domain
 $domain = $Tools->fetch_object ("vlanDomains", "id", $_POST['domainId']);
-if ($domain===false)                            { $Result->show("danger", _("Invalid domain Id"), true, true); }
+if ($domain === false) { $Result->show ("danger", _ ("Invalid domain Id"), true, true); }
 
 # fetch devices that use get_routing_table query
 $scan_devices = $Tools->fetch_multiple_objects ("devices", "snmp_queries", "%get_vlan_table%", "id", true, true);
 
 // if none set die
-if ($scan_devices===false)                      { $Result->show("danger", _("No devices for SNMP VLAN query available"), true, true); }
+if ($scan_devices === false) { $Result->show ("danger", _ ("No devices for SNMP VLAN query available"), true, true); }
 
 ?>
 
 <!-- header -->
-<div class='pHeader'><?php print _("Select devices"); ?></div>
+<div class='pHeader'><?php print _ ("Select devices"); ?></div>
 
 <!-- content -->
 <div class='pContent'>
-    <h4><?php print _("Select devices to query VLAN table from"); ?></h4><hr>
+    <h4><?php print _ ("Select devices to query VLAN table from"); ?></h4><hr>
 
     <div style="padding: 20px;">
         <form name="select-devices" id="select-devices-vlan-scan">
         <?php
         // loop
         foreach ($scan_devices as $d) {
-            $description = strlen($d->description)>0 ? "<span class='text-muted'>$d->description</span>" : "";
+            $description = strlen ($d->description) > 0 ? "<span class='text-muted'>$d->description</span>" : "";
             print " <input type='checkbox' name='device-$d->id' checked> $d->hostname ($d->ip_addr) $description<br>";
         }
         ?>
@@ -64,8 +64,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-success show-vlan-scan-result"><?php print _('Scan'); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-success show-vlan-scan-result"><?php print _ ('Scan'); ?></button>
 
 	</div>
 </div>
\ No newline at end of file

app/admin/vlans/vlans-scan-execute.php

Spacing +55 added lines, -55 removed lines

@@ -5,51 +5,51 @@ 
  *******************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Tools	 	= new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fake error
 print "<div class='alert-danger hidden'></div>";
 
 # scan disabled
-if ($User->settings->enableSNMP!="1")           { $Result->show("danger", _("SNMP module disbled"), true); }
+if ($User->settings->enableSNMP != "1") { $Result->show ("danger", _ ("SNMP module disbled"), true); }
 # admin check
-if($User->is_admin()!==true) 	                { $Result->show("danger", _('Admin privileges required'), true); }
+if ($User->is_admin () !== true) { $Result->show ("danger", _ ('Admin privileges required'), true); }
 
 # set class
 $Snmp = new phpipamSNMP ();
 
 # domain Id must be int
-if (!is_numeric($_POST['domainId']))            { $Result->show("danger", _("Invalid domain Id"), true); }
+if (!is_numeric ($_POST['domainId'])) { $Result->show ("danger", _ ("Invalid domain Id"), true); }
 # fetch domain
 $domain = $Tools->fetch_object ("vlanDomains", "id", $_POST['domainId']);
-if ($domain===false)                            { $Result->show("danger", _("Invalid domain Id"), true); }
+if ($domain === false) { $Result->show ("danger", _ ("Invalid domain Id"), true); }
 
 # get existing vlans
 $existing_vlans = $Tools->fetch_multiple_objects ("vlans", "domainId", $domain->id, "vlanId");
-if ($existing_vlans!==false) {
+if ($existing_vlans !== false) {
     foreach ($existing_vlans as $v) {
         $ex_vlans[$v->number] = $name;
     }
 }
 
 // no errors
-error_reporting(E_ERROR);
+error_reporting (E_ERROR);
 
 # set devices
 foreach ($_POST as $k=>$p) {
-    if (strpos($k, "device-")!==false) {
+    if (strpos ($k, "device-") !== false) {
         # fetch device
-        $device = $Tools->fetch_object ("devices", "id", str_replace("device-", "", $k));
+        $device = $Tools->fetch_object ("devices", "id", str_replace ("device-", "", $k));
         if ($device !== false) {
             $scan_devices[] = $device;
         }
@@ -57,10 +57,10 @@ 
 }
 
 // if none set die
-if (!isset($scan_devices))                      { $Result->show("danger", _("No devices for SNMP VLAN query available"), true); }
+if (!isset($scan_devices)) { $Result->show ("danger", _ ("No devices for SNMP VLAN query available"), true); }
 
 // init result array
-$new_vlans = array();
+$new_vlans = array ();
 
 // ok, we have devices, connect to each device and do query
 foreach ($scan_devices as $d) {
@@ -68,14 +68,14 @@ 
     $Snmp->set_snmp_device ($d);
     // fetch arp table
     try {
-        $res = $Snmp->get_query("get_vlan_table");
+        $res = $Snmp->get_query ("get_vlan_table");
         // remove those not in subnet
-        if (sizeof($res)>0) {
+        if (sizeof ($res) > 0) {
            // save for debug
            $debug[$d->hostname]["get_vlan_table"] = $res;
            // loop and save
            foreach ($res as $k=>$r) {
-               if (!array_key_exists($k, $new_vlans) && !array_key_exists($k, $ex_vlans) ) {
+               if (!array_key_exists ($k, $new_vlans) && !array_key_exists ($k, $ex_vlans)) {
                    $new_vlans[$k] = $r;
                }
            }
@@ -83,31 +83,31 @@ 
      } catch (Exception $e) {
        // save for debug
        $debug[$d->hostname]["get_vlan_table"] = $res;
-       $errors[] = $e->getMessage();
+       $errors[] = $e->getMessage ();
 	}
 }
 
 # none and errors
-if(sizeof($new_vlans)==0 && isset($errors)) {
-    $Result->show("info", _("No VLANS found"), false);
-    $Result->show("warning", implode("<hr>", $errors), false);
+if (sizeof ($new_vlans) == 0 && isset($errors)) {
+    $Result->show ("info", _ ("No VLANS found"), false);
+    $Result->show ("warning", implode ("<hr>", $errors), false);
 }
 # none
-elseif(sizeof($new_vlans)==0) 	                     { $Result->show("info", _("No VLANS found")."!", false); }
+elseif (sizeof ($new_vlans) == 0) { $Result->show ("info", _ ("No VLANS found")."!", false); }
 # ok
 else {
     // fetch custom fields and check for required
     $required_fields = $Tools->fetch_custom_fields ('vlans');
-    if($required_fields!==false) {
+    if ($required_fields !== false) {
         foreach ($required_fields as $k=>$f) {
-            if ($f['Null']!="NO") {
+            if ($f['Null'] != "NO") {
                 unset($required_fields[$k]);
             }
         }
     }
 
     // calculate colspan
-	$colspan = 4 + sizeof(@$required_fields);
+	$colspan = 4 + sizeof (@$required_fields);
 
 
 	//form
@@ -116,21 +116,21 @@ 
 
 	// titles
 	print "<tr>";
-	print "	<th>"._("Number")."</th>";
-	print "	<th>"._("Name")."</th>";
-	print "	<th>"._("Description")."</th>";
+	print "	<th>"._ ("Number")."</th>";
+	print "	<th>"._ ("Name")."</th>";
+	print "	<th>"._ ("Description")."</th>";
     // custom
 	if (isset($required_fields)) {
 		foreach ($required_fields as $field) {
-            print "<th>"._($field['name'])."</th>";
+            print "<th>"._ ($field['name'])."</th>";
 		}
     }
 	print "	<th></th>";
 	print "</tr>";
 
 	// alive
-	$m=0;
-	foreach ($new_vlans as $number=>$name ) {
+	$m = 0;
+	foreach ($new_vlans as $number=>$name) {
         print "<tr class='result$m'>";
 		//number
 		print "<td>$number</td>";
@@ -149,28 +149,28 @@ 
 		if (isset($required_fields)) {
     		foreach ($required_fields as $field) {
     			# replace spaces with |
-    			$field['nameNew'] = str_replace(" ", "___", $field['name']);
+    			$field['nameNew'] = str_replace (" ", "___", $field['name']);
 
-    			print '	<td>'. "\n";
+    			print '	<td>'."\n";
 
     			//set type
-    			if(substr($field['type'], 0,3) == "set" || substr($field['type'], 0,4) == "enum") {
+    			if (substr ($field['type'], 0, 3) == "set" || substr ($field['type'], 0, 4) == "enum") {
     				//parse values
-    				$tmp = substr($field['type'], 0,3)=="set" ? explode(",", str_replace(array("set(", ")", "'"), "", $field['type'])) : explode(",", str_replace(array("enum(", ")", "'"), "", $field['type']));
+    				$tmp = substr ($field['type'], 0, 3) == "set" ? explode (",", str_replace (array ("set(", ")", "'"), "", $field['type'])) : explode (",", str_replace (array ("enum(", ")", "'"), "", $field['type']));
     				//null
-    				if($field['Null']!="NO") { array_unshift($tmp, ""); }
+    				if ($field['Null'] != "NO") { array_unshift ($tmp, ""); }
 
     				print "<select name='$field[nameNew]$m' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
-    				foreach($tmp as $v) {
-    					if($v==@$address[$field['name']])	{ print "<option value='$v' selected='selected'>$v</option>"; }
-    					else								{ print "<option value='$v'>$v</option>"; }
+    				foreach ($tmp as $v) {
+    					if ($v == @$address[$field['name']]) { print "<option value='$v' selected='selected'>$v</option>"; }
+    					else { print "<option value='$v'>$v</option>"; }
     				}
     				print "</select>";
     			}
     			//date and time picker
-    			elseif($field['type'] == "date" || $field['type'] == "datetime") {
+    			elseif ($field['type'] == "date" || $field['type'] == "datetime") {
     				// just for first
-    				if($timeP==0) {
+    				if ($timeP == 0) {
     					print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
     					print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
     					print '<script type="text/javascript">';
@@ -186,30 +186,30 @@ 
     				$timeP++;
 
     				//set size
-    				if($field['type'] == "date")	{ $size = 10; $class='datepicker';		$format = "yyyy-MM-dd"; }
-    				else							{ $size = 19; $class='datetimepicker';	$format = "yyyy-MM-dd"; }
+    				if ($field['type'] == "date") { $size = 10; $class = 'datepicker'; $format = "yyyy-MM-dd"; }
+    				else { $size = 19; $class = 'datetimepicker'; $format = "yyyy-MM-dd"; }
 
     				//field
-    				if(!isset($address[$field['name']]))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'].$m .'" maxlength="'.$size.'" '.$delete.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
-    				else									{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'].$m .'" maxlength="'.$size.'" value="'. $address[$field['name']]. '" '.$delete.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+    				if (!isset($address[$field['name']])) { print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'.$field['nameNew'].$m.'" maxlength="'.$size.'" '.$delete.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'."\n"; }
+    				else { print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'.$field['nameNew'].$m.'" maxlength="'.$size.'" value="'.$address[$field['name']].'" '.$delete.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'."\n"; }
     			}
     			//boolean
-    			elseif($field['type'] == "tinyint(1)") {
+    			elseif ($field['type'] == "tinyint(1)") {
     				print "<select name='$field[nameNew]$m' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
-    				$tmp = array(0=>"No",1=>"Yes");
+    				$tmp = array (0=>"No", 1=>"Yes");
     				//null
-    				if($field['Null']!="NO") { $tmp[2] = ""; }
+    				if ($field['Null'] != "NO") { $tmp[2] = ""; }
 
-    				foreach($tmp as $k=>$v) {
-    					if(strlen(@$address[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-    					elseif($k==@$address[$field['name']])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-    					else												{ print "<option value='$k'>"._($v)."</option>"; }
+    				foreach ($tmp as $k=>$v) {
+    					if (strlen (@$address[$field['name']]) == 0 && $k == 2) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+    					elseif ($k == @$address[$field['name']]) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+    					else { print "<option value='$k'>"._ ($v)."</option>"; }
     				}
     				print "</select>";
     			}
     			//default - input field
     			else {
-    				print ' <input type="text" class="ip_addr form-control input-sm" name="'. $field['nameNew'].$m .'" placeholder="'. $field['name'] .'" value="'. @$address[$field['name']]. '" size="30" '.$delete.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
+    				print ' <input type="text" class="ip_addr form-control input-sm" name="'.$field['nameNew'].$m.'" placeholder="'.$field['name'].'" value="'.@$address[$field['name']].'" size="30" '.$delete.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'."\n";
     			}
 
                 print " </td>";
@@ -226,7 +226,7 @@ 
 	print "<tr>";
 	print "	<td colspan='$colspan'>";
 	print " <div id='vlanScanAddResult'></div>";
-	print "		<a href='' class='btn btn-sm btn-success pull-right' id='saveVlanScanResults' data-script='vlans-scan' data-subnetId='".$_POST['subnetId']."'><i class='fa fa-plus'></i> "._("Add discovered VLANS")."</a>";
+	print "		<a href='' class='btn btn-sm btn-success pull-right' id='saveVlanScanResults' data-script='vlans-scan' data-subnetId='".$_POST['subnetId']."'><i class='fa fa-plus'></i> "._ ("Add discovered VLANS")."</a>";
 	print "	</td>";
 	print "</tr>";
 
@@ -254,5 +254,5 @@ 
 print "</div>";
 
 # show debug?
-if($_POST['debug']==1) 				{ print "<pre>"; print_r($debug); print "</pre>"; }
+if ($_POST['debug'] == 1) { print "<pre>"; print_r ($debug); print "</pre>"; }
 ?>
\ No newline at end of file

app/admin/vlans/edit-result.php

Spacing +28 added lines, -28 removed lines

@@ -5,34 +5,34 @@ 
  *******************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Tools	 	= new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # strip input tags
-$_POST = $Admin->strip_input_tags($_POST);
+$_POST = $Admin->strip_input_tags ($_POST);
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "vlan", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "vlan", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('vlans');
+$custom = $Tools->fetch_custom_fields ('vlans');
 
 //if it already exist die
-if($User->settings->vlanDuplicate==0 && $_POST['action']=="add") {
+if ($User->settings->vlanDuplicate == 0 && $_POST['action'] == "add") {
 	$check_vlan = $Admin->fetch_multiple_objects ("vlans", "domainId", $_POST['domainId'], "vlanId");
-	if($check_vlan!==false) {
-		foreach($check_vlan as $v) {
-			if($v->number == $_POST['number']) {
-																			{ $Result->show("danger", _("VLAN already exists"), true); }
+	if ($check_vlan !== false) {
+		foreach ($check_vlan as $v) {
+			if ($v->number == $_POST['number']) {
+																			{ $Result->show ("danger", _ ("VLAN already exists"), true); }
 			}
 		}
 	}
@@ -40,45 +40,45 @@ 
 
 // if unique required
 if (isset($_POST['unique'])) {
-	if ($_POST['unique']=="on") {
-		if ($Tools->fetch_object ("vlans", "number", $_POST['number'])!==false) { $Result->show("danger", _("VLAN already exists in another domain!"), true); }
+	if ($_POST['unique'] == "on") {
+		if ($Tools->fetch_object ("vlans", "number", $_POST['number']) !== false) { $Result->show ("danger", _ ("VLAN already exists in another domain!"), true); }
 	}
 }
 
 //if number too high
-if($_POST['number']>$User->settings->vlanMax && $_POST['action']!="delete")	{ $Result->show("danger", _('Highest possible VLAN number is ').$settings['vlanMax'].'!', true); }
-if($_POST['action']=="add") {
-	if($_POST['number']<0)													{ $Result->show("danger", _('VLAN number cannot be negative').'!', true); }
-	elseif(!is_numeric($_POST['number']))									{ $Result->show("danger", _('Not number').'!', true); }
+if ($_POST['number'] > $User->settings->vlanMax && $_POST['action'] != "delete") { $Result->show ("danger", _ ('Highest possible VLAN number is ').$settings['vlanMax'].'!', true); }
+if ($_POST['action'] == "add") {
+	if ($_POST['number'] < 0) { $Result->show ("danger", _ ('VLAN number cannot be negative').'!', true); }
+	elseif (!is_numeric ($_POST['number'])) { $Result->show ("danger", _ ('Not number').'!', true); }
 }
-if(strlen($_POST['name'])==0)												{ $Result->show("danger", _('Name is required').'!', true); }
+if (strlen ($_POST['name']) == 0) { $Result->show ("danger", _ ('Name is required').'!', true); }
 
 
 # formulate update query
-$values = array("vlanId"=>@$_POST['vlanId'],
+$values = array ("vlanId"=>@$_POST['vlanId'],
 				"number"=>$_POST['number'],
 				"name"=>$_POST['name'],
 				"description"=>@$_POST['description'],
 				"domainId"=>$_POST['domainId']
 				);
 # append custom
-if(sizeof($custom) > 0) {
-	foreach($custom as $myField) {
+if (sizeof ($custom) > 0) {
+	foreach ($custom as $myField) {
 		# replace possible ___ back to spaces!
-		$myField['nameTest']      = str_replace(" ", "___", $myField['name']);
-		if(isset($_POST[$myField['nameTest']])) { $values[$myField['name']] = @$_POST[$myField['nameTest']];}
+		$myField['nameTest'] = str_replace (" ", "___", $myField['name']);
+		if (isset($_POST[$myField['nameTest']])) { $values[$myField['name']] = @$_POST[$myField['nameTest']]; }
 	}
 }
 
 
 # update
-if(!$Admin->object_modify("vlans", $_POST['action'], "vlanId", $values))	{ $Result->show("danger",  _("Failed to $_POST[action] VLAN").'!', true); }
-else																		{ $Result->show("success", _("VLAN $_POST[action] successfull").'!', false); }
+if (!$Admin->object_modify ("vlans", $_POST['action'], "vlanId", $values)) { $Result->show ("danger", _ ("Failed to $_POST[action] VLAN").'!', true); }
+else { $Result->show ("success", _ ("VLAN $_POST[action] successfull").'!', false); }
 
 # remove all references if delete
-if($_POST['action']=="delete") { $Admin->remove_object_references ("subnets", "vlanId", $_POST['vlanId']); }
+if ($_POST['action'] == "delete") { $Admin->remove_object_references ("subnets", "vlanId", $_POST['vlanId']); }
 
 # print value for on the fly
-if($_POST['action']=="add")	   { print '<p id="vlanidforonthefly"    style="display:none">'.$Admin->lastId.'</p>'; }
+if ($_POST['action'] == "add") { print '<p id="vlanidforonthefly"    style="display:none">'.$Admin->lastId.'</p>'; }
 
 ?>
\ No newline at end of file

app/admin/vlans/edit-domain.php

Spacing +23 added lines, -23 removed lines

@@ -5,28 +5,28 @@ 
  ************************************************/
 
 /* 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);
-$Sections	= new Sections ($Database);
+$Sections = new Sections ($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", "vlan_domain");
 
 # fetch vlan details
 $l2_domain = $Admin->fetch_object ("vlanDomains", "id", @$_POST['id']);
-$l2_domain = $l2_domain!==false ? (array) $l2_domain : array();
+$l2_domain = $l2_domain !== false ? (array) $l2_domain : array ();
 
 # set readonly flag
-$readonly = $_POST['action']=="delete" ? "readonly" : "";
+$readonly = $_POST['action'] == "delete" ? "readonly" : "";
 
 ?>
 
@@ -38,7 +38,7 @@ 
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('l2 domain'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('l2 domain'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -47,16 +47,16 @@ 
 	<table class="table table-noborder table-condensed">
 	<!-- number -->
 	<tr>
-		<td><?php print _('Name'); ?></td>
+		<td><?php print _ ('Name'); ?></td>
 		<td>
-			<input type="text" class="number form-control input-sm" name="name" placeholder="<?php print _('domain name'); ?>" value="<?php print @$l2_domain['name']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="number form-control input-sm" name="name" placeholder="<?php print _ ('domain name'); ?>" value="<?php print @$l2_domain['name']; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 	<!-- Description -->
 	<tr>
-		<td><?php print _('Description'); ?></td>
+		<td><?php print _ ('Description'); ?></td>
 		<td>
-			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _('Description'); ?>" value="<?php print @$l2_domain['description']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _ ('Description'); ?>" value="<?php print @$l2_domain['description']; ?>" <?php print $readonly; ?>>
 			<input type="hidden" name="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; ?>">
@@ -67,19 +67,19 @@ 
 	</tr>
 	<!-- sections -->
 	<tr>
-		<td style="vertical-align: top !important"><?php print _('Sections to display domain in'); ?>:</td>
+		<td style="vertical-align: top !important"><?php print _ ('Sections to display domain in'); ?>:</td>
 		<td>
 		<?php
 		# select sections
-		$sections = $Sections->fetch_all_sections();
+		$sections = $Sections->fetch_all_sections ();
 		# reformat domains sections to array
-		$domain_sections = explode(";", @$l2_domain['permissions']);
-		$domain_sections = is_array($domain_sections) ? $domain_sections : array();
+		$domain_sections = explode (";", @$l2_domain['permissions']);
+		$domain_sections = is_array ($domain_sections) ? $domain_sections : array ();
 		// loop
-		if($sections!==false) {
-			foreach($sections as $section) {
-				if(in_array($section->id, @$domain_sections) || @$l2_domain['id']=="1") 	{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on" checked> '. $section->name .'</div>'. "\n"; }
-				else 																		{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on">'. $section->name .'</span></div>'. "\n"; }
+		if ($sections !== false) {
+			foreach ($sections as $section) {
+				if (in_array ($section->id, @$domain_sections) || @$l2_domain['id'] == "1") { print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'.$section->id.'" value="on" checked> '.$section->name.'</div>'."\n"; }
+				else { print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'.$section->id.'" value="on">'.$section->name.'</span></div>'."\n"; }
 			}
 		}
 		?>
@@ -91,7 +91,7 @@ 
 
 	<?php
 	//print delete warning
-	if($_POST['action'] == "delete")	{ $Result->show("warning", _('Warning').':</strong> '._('removing vlan domain will move all belonging vlans to default domain')."!", false);  }
+	if ($_POST['action'] == "delete") { $Result->show ("warning", _ ('Warning').':</strong> '._ ('removing vlan domain will move all belonging vlans to default domain')."!", false); }
 	?>
 </div>
 
@@ -99,8 +99,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"; } ?> editVLANdomainsubmit" id="editVLANdomainsubmit"><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"; } ?> editVLANdomainsubmit" id="editVLANdomainsubmit"><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/vlans/index.php

Spacing +1 added lines, -1 removed lines

@@ -4,6 +4,6 @@
  * Script to display available VLANs
  */
 
-include(dirname(__FILE__) . "/../../tools/vlan/index.php");
+include(dirname (__FILE__)."/../../tools/vlan/index.php");
 
 ?>
\ No newline at end of file