phpipam / phpipam

app/admin/tags/index.php

Spacing +25 added lines, -25 removed lines

@@ -5,34 +5,34 @@ 
  ************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all vrfs
-$all_types = $Admin->fetch_all_objects("ipTags");
+$all_types = $Admin->fetch_all_objects ("ipTags");
 ?>
 
-<h4><?php print _('Manage Address Tags'); ?></h4>
+<h4><?php print _ ('Manage Address Tags'); ?></h4>
 <hr><br>
 
-<button class='btn btn-sm btn-default editType' data-action='add' data-vrfid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _('Add Tag'); ?></button>
+<button class='btn btn-sm btn-default editType' data-action='add' data-vrfid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _ ('Add Tag'); ?></button>
 
 <!-- vrfs -->
 <?php
-print '<table class="table table-striped table-top table-auto">'. "\n";
+print '<table class="table table-striped table-top table-auto">'."\n";
 
 # headers
-print '<tr>'. "\n";
-print '	<th>'._('type').'</th>'. "\n";
-print '	<th>'._('Show Tag').'</th>'. "\n";
-print '	<th>'._('BG color').'</th>'. "\n";
-print '	<th>'._('FG color').'</th>'. "\n";
-print '	<th>'._('Compress range').'</th>'. "\n";
-print '	<th>'._('Locked').'</th>'. "\n";
-print '	<th></th>'. "\n";
-print '</tr>'. "\n";
+print '<tr>'."\n";
+print '	<th>'._ ('type').'</th>'."\n";
+print '	<th>'._ ('Show Tag').'</th>'."\n";
+print '	<th>'._ ('BG color').'</th>'."\n";
+print '	<th>'._ ('FG color').'</th>'."\n";
+print '	<th>'._ ('Compress range').'</th>'."\n";
+print '	<th>'._ ('Locked').'</th>'."\n";
+print '	<th></th>'."\n";
+print '</tr>'."\n";
 
 # loop
-if ($all_types!==false) {
+if ($all_types !== false) {
 	// cast
 	$all_types = (array) $all_types;
 	// loop
@@ -41,16 +41,16 @@ 
 		$type = (array) $type;
 
 		//format type
-		$showtag = $type['showtag']==1 ? "Yes" : "No";
+		$showtag = $type['showtag'] == 1 ? "Yes" : "No";
 
 		//print details
-		print '<tr>'. "\n";
-		print '	<td>'. $type['type'] .'</td>'. "\n";
-		print '	<td>'.$showtag.'</td>'. "\n";
-		print '	<td style="background-color:'.$type['bgcolor'].'">'. $type['bgcolor'] .'</td>'. "\n";
-		print '	<td style="background-color:'.$type['fgcolor'].'">'. $type['fgcolor'] .'</td>'. "\n";
-		print '	<td>'. $type['compress'] .'</td>'. "\n";
-		print '	<td>'. $type['locked'] .'</td>'. "\n";
+		print '<tr>'."\n";
+		print '	<td>'.$type['type'].'</td>'."\n";
+		print '	<td>'.$showtag.'</td>'."\n";
+		print '	<td style="background-color:'.$type['bgcolor'].'">'.$type['bgcolor'].'</td>'."\n";
+		print '	<td style="background-color:'.$type['fgcolor'].'">'.$type['fgcolor'].'</td>'."\n";
+		print '	<td>'.$type['compress'].'</td>'."\n";
+		print '	<td>'.$type['locked'].'</td>'."\n";
 
 		print "	<td class='actions'>";
 		print "	<div class='btn-group'>";
@@ -58,10 +58,10 @@ 
 		print "		<button class='btn btn-xs btn-default editType' data-action='delete' data-id='$type[id]'><i class='fa fa-times'></i></button>";
 		print "	</div>";
 		print "	</td>";
-		print '</tr>'. "\n";
+		print '</tr>'."\n";
 	}
 }
-print '</table>'. "\n";
+print '</table>'."\n";
 ?>
 
 <!-- edit result holder -->

app/admin/vrfs/edit.php

Spacing +61 added lines, -61 removed lines

@@ -5,39 +5,39 @@ 
  ************************************************/
 
 /* 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", "vrf");
 
 # get VRF
-if($_POST['action']!="add") {
+if ($_POST['action'] != "add") {
 	$vrf = $Admin->fetch_object ("vrf", "vrfId", $_POST['vrfId']);
-	$vrf!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+	$vrf !== false ? : $Result->show ("danger", _ ("Invalid ID"), true, true);
 	$vrf = (array) $vrf;
 }
 
 # disable edit on delete
-$readonly = $_POST['action']=="delete" ? "readonly" : "";
+$readonly = $_POST['action'] == "delete" ? "readonly" : "";
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('vrf');
+$custom = $Tools->fetch_custom_fields ('vrf');
 ?>
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('VRF'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('VRF'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -47,28 +47,28 @@ 
 
 	<!-- name  -->
 	<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 _('VRF name'); ?>" value="<?php print @$vrf['name']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="name form-control input-sm" name="name" placeholder="<?php print _ ('VRF name'); ?>" value="<?php print @$vrf['name']; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 	<!-- RD -->
 	<tr>
-		<td><?php print _('RD'); ?></td>
+		<td><?php print _ ('RD'); ?></td>
 		<td>
-			<input type="text" class="rd form-control input-sm" name="rd" placeholder="<?php print _('Route distinguisher'); ?>" value="<?php print @$vrf['rd']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="rd form-control input-sm" name="rd" placeholder="<?php print _ ('Route distinguisher'); ?>" value="<?php print @$vrf['rd']; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 	<!-- Description -->
 	<tr>
-		<td><?php print _('Description'); ?></td>
+		<td><?php print _ ('Description'); ?></td>
 		<td>
 			<?php
-			if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) { print '<input type="hidden" name="vrfId" value="'. $_POST['vrfId'] .'">'. "\n";}
+			if (($_POST['action'] == "edit") || ($_POST['action'] == "delete")) { print '<input type="hidden" name="vrfId" value="'.$_POST['vrfId'].'">'."\n"; }
 			?>
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
-			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _('Description'); ?>" value="<?php print @$vrf['description']; ?>" <?php print $readonly; ?>>
+			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _ ('Description'); ?>" value="<?php print @$vrf['description']; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 	<tr>
@@ -76,19 +76,19 @@ 
 	</tr>
 	<!-- sections -->
 	<tr>
-		<td style="vertical-align: top !important"><?php print _('Sections'); ?>:</td>
+		<td style="vertical-align: top !important"><?php print _ ('Sections'); ?>:</td>
 		<td>
 		<?php
 		# select sections
-		$sections = $Sections->fetch_all_sections();
+		$sections = $Sections->fetch_all_sections ();
 		# reformat domains sections to array
-		$vrf_sections = explode(";", @$vrf['sections']);
-		$vrf_sections = is_array($vrf_sections) ? $vrf_sections : array();
+		$vrf_sections = explode (";", @$vrf['sections']);
+		$vrf_sections = is_array ($vrf_sections) ? $vrf_sections : array ();
 		// loop
-		if($sections!==false) {
-			foreach($sections as $section) {
-				if(in_array($section->id, @$vrf_sections)) 	{ 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, @$vrf_sections)) { 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"; }
 			}
 		}
 		?>
@@ -97,46 +97,46 @@ 
 
 	<!-- 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")	{ $vrf[$field['name']] = $field['Default']; }
+			if ($_POST['action'] == "add") { $vrf[$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==$vrf[$field['name']])	{ print "<option value='$v' selected='selected'>$v</option>"; }
-					else								{ print "<option value='$v'>$v</option>"; }
+				foreach ($tmp as $v) {
+					if ($v == $vrf[$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">';
@@ -152,38 +152,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($vrf[$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="'. $vrf[$field['name']]. '" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+				if (!isset($vrf[$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="'.$vrf[$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($vrf[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					elseif($k==$vrf[$field['name']])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					else												{ print "<option value='$k'>"._($v)."</option>"; }
+				foreach ($tmp as $k=>$v) {
+					if (strlen ($vrf[$field['name']]) == 0 && $k == 2) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+					elseif ($k == $vrf[$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'].'">'. $vrf[$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'].'">'.$vrf[$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="'. @$vrf[$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="'.@$vrf[$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";
 		}
 	}
 	?>
@@ -194,7 +194,7 @@ 
 
 	<?php
 	//print delete warning
-	if($_POST['action'] == "delete")	{ $Result->show("warning", "<strong>"._('Warning').":</strong> "._("removing VRF will also remove VRF reference from belonging subnets!"), false);}
+	if ($_POST['action'] == "delete") { $Result->show ("warning", "<strong>"._ ('Warning').":</strong> "._ ("removing VRF will also remove VRF reference from belonging subnets!"), false); }
 	?>
 </div>
 
@@ -202,8 +202,8 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editVRF"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default <?php if ($_POST['action'] == "delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editVRF"><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="vrfManagementEditResult"></div>

app/admin/vrfs/edit-result.php

Spacing +20 added lines, -20 removed lines

@@ -5,65 +5,65 @@
  ***************************/
 
 /* 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", "vrf", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "vrf", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('vrf');
+$custom = $Tools->fetch_custom_fields ('vrf');
 
 
 # Hostname must be present!
-if($_POST['name'] == "") { $Result->show("danger", _("Name is mandatory"), true); }
+if ($_POST['name'] == "") { $Result->show ("danger", _ ("Name is mandatory"), true); }
 
 // set sections
-foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"section-"))>0) {
-		$key2 = str_replace("section-", "", $key);
+foreach ($_POST as $key=>$line) {
+	if (strlen (strstr ($key, "section-")) > 0) {
+		$key2 = str_replace ("section-", "", $key);
 		$temp[] = $key2;
 		unset($_POST[$key]);
 	}
 }
 # glue sections together
-$_POST['sections'] = sizeof($temp)>0 ? implode(";", $temp) : null;
+$_POST['sections'] = sizeof ($temp) > 0 ? implode (";", $temp) : null;
 
 
 
 # set update array
-$values = array("vrfId"=>@$_POST['vrfId'],
+$values = array ("vrfId"=>@$_POST['vrfId'],
 				"name"=>$_POST['name'],
 				"rd"=>$_POST['rd'],
 				"sections"=>$_POST['sections'],
 				"description"=>$_POST['description']
 				);
 # 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("vrf", $_POST['action'], "vrfId", $values))	{ $Result->show("danger",  _("Failed to $_POST[action] VRF").'!', true); }
-else																	{ $Result->show("success", _("VRF $_POST[action] successfull").'!', false); }
+if (!$Admin->object_modify ("vrf", $_POST['action'], "vrfId", $values)) { $Result->show ("danger", _ ("Failed to $_POST[action] VRF").'!', true); }
+else { $Result->show ("success", _ ("VRF $_POST[action] successfull").'!', false); }
 
 
 # remove all references if delete
-if($_POST['action']=="delete") { $Admin->remove_object_references ("subnets", "vrfId", $_POST['vrfId']); }
+if ($_POST['action'] == "delete") { $Admin->remove_object_references ("subnets", "vrfId", $_POST['vrfId']); }
 ?>

app/admin/vrfs/index.php

Spacing +42 added lines, -42 removed lines

@@ -5,31 +5,31 @@ 
  ************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all vrfs
-$all_vrfs = $Admin->fetch_all_objects("vrf", "name");
+$all_vrfs = $Admin->fetch_all_objects ("vrf", "name");
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('vrf');
+$custom = $Tools->fetch_custom_fields ('vrf');
 
 # set hidden fields
-$hidden_fields = json_decode($User->settings->hiddenCustomFields, true);
-$hidden_fields = is_array(@$hidden_fields['vrf']) ? $hidden_fields['vrf'] : array();
+$hidden_fields = json_decode ($User->settings->hiddenCustomFields, true);
+$hidden_fields = is_array (@$hidden_fields['vrf']) ? $hidden_fields['vrf'] : array ();
 
 # set size of custom fields
-$custom_size = sizeof($custom) - sizeof($hidden_fields);
+$custom_size = sizeof ($custom) - sizeof ($hidden_fields);
 ?>
 
-<h4><?php print _('Manage VRF'); ?></h4>
+<h4><?php print _ ('Manage VRF'); ?></h4>
 <hr><br>
 
 <div class="btn-group">
-    <button class='btn btn-sm btn-default vrfManagement' data-action='add' data-vrfid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _('Add VRF'); ?></button>
+    <button class='btn btn-sm btn-default vrfManagement' data-action='add' data-vrfid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _ ('Add VRF'); ?></button>
     <?php
     // snmp
-    if($User->is_admin()===true && $User->settings->enableSNMP==1) { ?>
-	<button class="btn btn-sm btn-default" id="snmp-vrf" data-action="add"><i class="fa fa-cogs"></i> <?php print _('Scan for VRFs'); ?></button>
+    if ($User->is_admin () === true && $User->settings->enableSNMP == 1) { ?>
+	<button class="btn btn-sm btn-default" id="snmp-vrf" data-action="add"><i class="fa fa-cogs"></i> <?php print _ ('Scan for VRFs'); ?></button>
 	<?php } ?>
 
 </div>
@@ -38,26 +38,26 @@ 
 <?php
 
 # first check if they exist!
-if($all_vrfs===false) { $Result->show("info", _("No VRFs configured")."!", false);}
+if ($all_vrfs === false) { $Result->show ("info", _ ("No VRFs configured")."!", false); }
 else {
-	print '<table id="vrfManagement" class="table sorted table-striped table-top table-hover">'. "\n";
+	print '<table id="vrfManagement" class="table sorted table-striped table-top table-hover">'."\n";
 
 	# headers
 	print "<thead>";
-	print '<tr>'. "\n";
-	print '	<th>'._('Name').'</th>'. "\n";
-	print '	<th>'._('RD').'</th>'. "\n";
-	print '	<th>'._('Sections').'</th>'. "\n";
-	print '	<th>'._('Description').'</th>'. "\n";
-	if(sizeof($custom) > 0) {
-		foreach($custom as $field) {
-			if(!in_array($field['name'], $hidden_fields)) {
+	print '<tr>'."\n";
+	print '	<th>'._ ('Name').'</th>'."\n";
+	print '	<th>'._ ('RD').'</th>'."\n";
+	print '	<th>'._ ('Sections').'</th>'."\n";
+	print '	<th>'._ ('Description').'</th>'."\n";
+	if (sizeof ($custom) > 0) {
+		foreach ($custom as $field) {
+			if (!in_array ($field['name'], $hidden_fields)) {
 				print "<th class='customField hidden-xs hidden-sm'>$field[name]</th>";
 			}
 		}
 	}
-	print '	<th></th>'. "\n";
-	print '</tr>'. "\n";
+	print '	<th></th>'."\n";
+	print '</tr>'."\n";
 	print "</thead>";
 
     print "<tbody>";
@@ -67,33 +67,33 @@ 
 		$vrf = (array) $vrf;
 
     	// format sections
-    	if(strlen($vrf['sections'])==0) {
+    	if (strlen ($vrf['sections']) == 0) {
     		$sections = "All sections";
     	}
     	else {
     		//explode
     		unset($sec);
-    		$sections_tmp = explode(";", $vrf['sections']);
-    		foreach($sections_tmp as $t) {
+    		$sections_tmp = explode (";", $vrf['sections']);
+    		foreach ($sections_tmp as $t) {
     			//fetch section
-    			$tmp_section = $Sections->fetch_section(null, $t);
+    			$tmp_section = $Sections->fetch_section (null, $t);
     			$sec[] = " &middot; ".$tmp_section->name;
     		}
     		//implode
-    		$sections = implode("<br>", $sec);
+    		$sections = implode ("<br>", $sec);
     	}
 
 		//print details
-		print '<tr class="text-top">'. "\n";
-		print '	<td class="name">'. $vrf['name'] .'</td>'. "\n";
-		print '	<td class="rd">'. $vrf['rd'] .'</td>'. "\n";
+		print '<tr class="text-top">'."\n";
+		print '	<td class="name">'.$vrf['name'].'</td>'."\n";
+		print '	<td class="rd">'.$vrf['rd'].'</td>'."\n";
 		print "	<td><span class='text-muted'>$sections</span></td>";
-		print '	<td class="description">'. $vrf['description'] .'</td>'. "\n";
+		print '	<td class="description">'.$vrf['description'].'</td>'."\n";
 
 		// custom fields
-		if(sizeof($custom) > 0) {
-			foreach($custom as $field) {
-				if(!in_array($field['name'], $hidden_fields)) {
+		if (sizeof ($custom) > 0) {
+			foreach ($custom as $field) {
+				if (!in_array ($field['name'], $hidden_fields)) {
 
 					print "<td class='customField hidden-xs hidden-sm'>";
 
@@ -101,14 +101,14 @@ 
 					$vrf[$field['name']] = $Result->create_links ($vrf[$field['name']], $field['type']);
 
 					//booleans
-					if($field['type']=="tinyint(1)")	{
-						if($vrf[$field['name']] == "0")		{ print _("No"); }
-						elseif($vrf[$field['name']] == "1")	{ print _("Yes"); }
+					if ($field['type'] == "tinyint(1)") {
+						if ($vrf[$field['name']] == "0") { print _ ("No"); }
+						elseif ($vrf[$field['name']] == "1") { print _ ("Yes"); }
 					}
 					//text
-					elseif($field['type']=="text") {
-						if(strlen($vrf[$field['name']])>0)	{ print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $vrf[$field['name']])."'>"; }
-						else											{ print ""; }
+					elseif ($field['type'] == "text") {
+						if (strlen ($vrf[$field['name']]) > 0) { print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace ("\n", "<br>", $vrf[$field['name']])."'>"; }
+						else { print ""; }
 					}
 					else {
 						print $vrf[$field['name']];
@@ -125,10 +125,10 @@ 
 		print "		<button class='btn btn-xs btn-default vrfManagement' data-action='delete' data-vrfid='$vrf[vrfId]'><i class='fa fa-times'></i></button>";
 		print "	</div>";
 		print "	</td>";
-		print '</tr>'. "\n";
+		print '</tr>'."\n";
 	}
 	print "</tbody>";
-	print '</table>'. "\n";
+	print '</table>'."\n";
 }
 ?>
 

app/admin/vrfs/vrf-scan-execute.php

Spacing +53 added lines, -53 removed lines

@@ -5,45 +5,45 @@ 
  *******************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Tools	 	= new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # 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 ();
 
 # get existing vrfs
 $existing_vrfs = $Tools->fetch_all_objects ("vrf", "vrfId");
-if ($existing_vrfs!==false) {
+if ($existing_vrfs !== false) {
     foreach ($existing_vrfs as $v) {
         $ex_vrfs[$v->name] = $v->rd;
     }
 }
 
 // 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;
         }
@@ -51,10 +51,10 @@ 
 }
 
 // if none set die
-if (!isset($scan_devices))                      { $Result->show("danger", _("No devices for SNMP VRF query available"), true); }
+if (!isset($scan_devices)) { $Result->show ("danger", _ ("No devices for SNMP VRF query available"), true); }
 
 // init result array
-$new_vrfs = array();
+$new_vrfs = array ();
 
 // ok, we have devices, connect to each device and do query
 foreach ($scan_devices as $d) {
@@ -62,14 +62,14 @@ 
     $Snmp->set_snmp_device ($d);
     // fetch arp table
     try {
-        $res = $Snmp->get_query("get_vrf_table");
+        $res = $Snmp->get_query ("get_vrf_table");
         // remove those not in subnet
-        if (sizeof($res)>0) {
+        if (sizeof ($res) > 0) {
            // save for debug
            $debug[$d->hostname]["get_vrf_table"] = $res;
            // loop and save
            foreach ($res as $k=>$r) {
-               if (!array_key_exists($k, $new_vrfs) && !array_key_exists($k, $ex_vrfs) ) {
+               if (!array_key_exists ($k, $new_vrfs) && !array_key_exists ($k, $ex_vrfs)) {
                    $new_vrfs[$k] = $r;
                }
            }
@@ -77,31 +77,31 @@ 
      } catch (Exception $e) {
        // save for debug
        $debug[$d->hostname]["get_vrf_table"] = $res;
-       $errors[] = $e->getMessage();
+       $errors[] = $e->getMessage ();
 	}
 }
 
 # none and errors
-if(sizeof($new_vrfs)==0 && isset($errors)) {
-    $Result->show("info", _("No vrfs found"), false);
-    $Result->show("warning", implode("<hr>", $errors), false);
+if (sizeof ($new_vrfs) == 0 && isset($errors)) {
+    $Result->show ("info", _ ("No vrfs found"), false);
+    $Result->show ("warning", implode ("<hr>", $errors), false);
 }
 # none
-elseif(sizeof($new_vrfs)==0) 	                     { $Result->show("info", _("No vrfs found")."!", false); }
+elseif (sizeof ($new_vrfs) == 0) { $Result->show ("info", _ ("No vrfs found")."!", false); }
 # ok
 else {
     // fetch custom fields and check for required
     $required_fields = $Tools->fetch_custom_fields ('vrf');
-    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
@@ -110,21 +110,21 @@ 
 
 	// titles
 	print "<tr>";
-	print "	<th>"._("Name")."</th>";
-	print "	<th>"._("RD")."</th>";
-	print "	<th>"._("Description")."</th>";
+	print "	<th>"._ ("Name")."</th>";
+	print "	<th>"._ ("RD")."</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_vrfs as $name=>$rd ) {
+	$m = 0;
+	foreach ($new_vrfs as $name=>$rd) {
         print "<tr class='result$m'>";
 		//name
 		print "<td>$name</td>";
@@ -141,28 +141,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">';
@@ -178,30 +178,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>";
@@ -218,7 +218,7 @@ 
 	print "<tr>";
 	print "	<td colspan='$colspan'>";
 	print " <div id='vrfScanAddResult'></div>";
-	print "		<a href='' class='btn btn-sm btn-success pull-right' id='saveVrfScanResults'><i class='fa fa-plus'></i> "._("Add discovered vrfs")."</a>";
+	print "		<a href='' class='btn btn-sm btn-success pull-right' id='saveVrfScanResults'><i class='fa fa-plus'></i> "._ ("Add discovered vrfs")."</a>";
 	print "	</td>";
 	print "</tr>";
 
@@ -246,5 +246,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/vrfs/vrf-scan-result.php

Spacing +22 added lines, -22 removed lines

@@ -4,58 +4,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);
 $Subnets	= new Subnets ($Database);
-$Addresses	= new Addresses ($Database);
-$Tools      = new Tools ($Database);
+$Addresses = new Addresses ($Database);
+$Tools = new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # check for number of input values
-$max = ini_get("max_input_vars");
-if(sizeof($_POST)>=ini_get("max_input_vars")) 							{ $Result->show("danger", _("Number of discovered hosts exceed maximum possible defined by php.ini - set to ")." $max <hr>"._("Please adjust your php.ini settings for value `max_input_vars`"), true); }
+$max = ini_get ("max_input_vars");
+if (sizeof ($_POST) >= ini_get ("max_input_vars")) { $Result->show ("danger", _ ("Number of discovered hosts exceed maximum possible defined by php.ini - set to ")." $max <hr>"._ ("Please adjust your php.ini settings for value `max_input_vars`"), true); }
 
 // fetch custom fields and check for required
 $required_fields = $Tools->fetch_custom_fields ('vrf');
-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]);
         }
     }
 }
 
 # ok, lets get results form post array!
-foreach($_POST as $key=>$line) {
+foreach ($_POST as $key=>$line) {
 	// IP address
-	if(substr($key, 0,2)=="rd") 			    { $res[substr($key, 2)]['rd']  	        = $line; }
+	if (substr ($key, 0, 2) == "rd") { $res[substr ($key, 2)]['rd'] = $line; }
 	// mac
-	elseif(substr($key, 0,4)=="name") 		    { $res[substr($key, 4)]['name']  	    = $line; }
+	elseif (substr ($key, 0, 4) == "name") { $res[substr ($key, 4)]['name'] = $line; }
 	// description
-	elseif(substr($key, 0,11)=="description") 	{ $res[substr($key, 11)]['description'] = $line; }
+	elseif (substr ($key, 0, 11) == "description") { $res[substr ($key, 11)]['description'] = $line; }
 	// custom fields
 	elseif (isset($required_fields)) {
     	foreach ($required_fields as $k=>$f) {
-        	if((strpos($key, $f['name'])) !== false) {
-                                                { $res[substr($key, strlen($f['name']))][$f['name']] = $line; }
+        	if ((strpos ($key, $f['name'])) !== false) {
+                                                { $res[substr ($key, strlen ($f['name']))][$f['name']] = $line; }
         	}
     	}
 	}
 }
 
 # insert entries
-if(sizeof($res)>0) {
+if (sizeof ($res) > 0) {
 	$errors = 0;
-	foreach($res as $r) {
+	foreach ($res as $r) {
 		# set insert values
-		$values = array("rd"=>$r['rd'],
+		$values = array ("rd"=>$r['rd'],
 						"name"=>$r['name'],
 						"description"=>$r['description']
 						);
@@ -66,12 +66,12 @@ 
 			}
 		}
         # insert vrfs
-        if(!$Admin->object_modify("vrf", "add", "vrfId", $values))	{ $Result->show("danger", _("Failed to import entry")." ".$r['number']." ".$r['name'], false); $errors++; }
+        if (!$Admin->object_modify ("vrf", "add", "vrfId", $values)) { $Result->show ("danger", _ ("Failed to import entry")." ".$r['number']." ".$r['name'], false); $errors++; }
 	}
 
 	# success if no errors
-	if($errors==0) {  $Result->show("success", _("Scan results added to database")."!", true); }
+	if ($errors == 0) {  $Result->show ("success", _ ("Scan results added to database")."!", true); }
 }
 # error
-else { $Result->show("danger", _("No entries available"), true); }
+else { $Result->show ("danger", _ ("No entries available"), true); }
 ?>
\ No newline at end of file

app/admin/vrfs/vrf-scan.php

Spacing +12 added lines, -12 removed lines

@@ -5,44 +5,44 @@ 
  *************************************/
 
 /* 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); }
 
 # fetch devices that use get_routing_table query
 $scan_devices = $Tools->fetch_multiple_objects ("devices", "snmp_queries", "%get_vrf_table%", "id", true, true);
 
 // if none set die
-if ($scan_devices===false)                      { $Result->show("danger", _("No devices for SNMP VRF query available"), true, true); }
+if ($scan_devices === false) { $Result->show ("danger", _ ("No devices for SNMP VRF 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 VRF table from"); ?></h4><hr>
+    <h4><?php print _ ("Select devices to query VRF table from"); ?></h4><hr>
 
     <div style="padding: 20px;">
         <form name="select-devices" id="select-devices-vrf-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>";
         }
         ?>
@@ -57,8 +57,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-vrf-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-vrf-scan-result"><?php print _ ('Scan'); ?></button>
 
 	</div>
 </div>
\ No newline at end of file

app/admin/mail/edit.php

Spacing +8 added lines, -8 removed lines

@@ -5,22 +5,22 @@ 
  **************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "mail", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "mail", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # set update query
-$values = array("id"=>1,
+$values = array ("id"=>1,
 				"mtype"=>$_POST['mtype'],
 				"msecure"=>@$_POST['msecure'],
 				"mauth"=>@$_POST['mauth'],
@@ -33,6 +33,6 @@ 
 				);
 
 # update
-if(!$Admin->object_modify("settingsMail", "edit", "id", $values))	{ $Result->show("danger",  _('Cannot update settings').'!', true); }
-else																{ $Result->show("success", _('Settings updated successfully')."!", true); }
+if (!$Admin->object_modify ("settingsMail", "edit", "id", $values)) { $Result->show ("danger", _ ('Cannot update settings').'!', true); }
+else { $Result->show ("success", _ ('Settings updated successfully')."!", true); }
 ?>
\ No newline at end of file

app/admin/mail/test-mail.php

Spacing +20 added lines, -20 removed lines

@@ -5,56 +5,56 @@
  **************************/
 
 /* 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 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", _("Mail settings are missing. Please set admin mail and name!"), true);
+if (strlen ($mail_settings->mAdminMail) == 0 || strlen ($mail_settings->mAdminName) == 0) {
+	$Result->show ("danger", _ ("Mail settings are missing. Please set admin mail and name!"), true);
 }
 
 
 # initialize mailer
-$phpipam_mail = new phpipam_mail($User->settings, $mail_settings);
+$phpipam_mail = new phpipam_mail ($User->settings, $mail_settings);
 //override settings
-$phpipam_mail->override_settings($_POST);
+$phpipam_mail->override_settings ($_POST);
 //create object
-$phpipam_mail->initialize_mailer();
+$phpipam_mail->initialize_mailer ();
 //debugging
-$phpipam_mail->set_debugging(2);
+$phpipam_mail->set_debugging (2);
 
 
 # set content
-$content 		= $phpipam_mail->generate_message ("phpIPAM test HTML message");
-$content_plain 	= "phpIPAM test text message";
+$content = $phpipam_mail->generate_message ("phpIPAM test HTML message");
+$content_plain = "phpIPAM test text message";
 
 
 # try to send
 try {
-	$phpipam_mail->Php_mailer->setFrom($_POST['mAdminMail'], $_POST['mAdminName']);
-	$phpipam_mail->Php_mailer->addAddress($User->settings->siteAdminMail, $User->settings->siteAdminName);
+	$phpipam_mail->Php_mailer->setFrom ($_POST['mAdminMail'], $_POST['mAdminName']);
+	$phpipam_mail->Php_mailer->addAddress ($User->settings->siteAdminMail, $User->settings->siteAdminName);
 	$phpipam_mail->Php_mailer->Subject = 'phpIPAM localhost mail test';
-	$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 alert-absolute", "Message sent to site admin (".$User->settings->siteAdminMail.")!", true);
+$Result->show ("success alert-absolute", "Message sent to site admin (".$User->settings->siteAdminMail.")!", true);
 ?>
\ No newline at end of file