phpipam / phpipam

app/admin/custom-fields/edit.php

Braces +8 added lines, -2 removed lines

@@ -114,7 +114,10 @@ 
 	<tr>
 		<td><?php print _('Required field'); ?></td>
 		<td>
-			<input name="NULL" type="checkbox" value="NO" <?php if(@$fieldval['Null']=="NO") print "checked"; ?>>
+			<input name="NULL" type="checkbox" value="NO" <?php if(@$fieldval['Null']=="NO") {
+    print "checked";
+}
+?>>
 		</td>
 	</tr>
 
@@ -127,7 +130,10 @@ 
 <div class="pFooter">
 	<div class="btn-group">
 		<button class="btn btn-sm btn-default hidePopups"><?php print _('Close'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success";} ?>" id="editcustomSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; }
+else { print "btn-success";} ?>" id="editcustomSubmit"><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="customEditResult"></div>

app/admin/devices/index.php

Braces +10 added lines, -7 removed lines

@@ -53,10 +53,12 @@ 
 	print '	<th>'._('IP address').'</th>';
 	print '	<th>'._('Type').'</th>';
 	print '	<th>'._('Description').'</th>';
-    if($User->settings->enableSNMP=="1")
-	print '	<th>'._('SNMP').'</th>';
-    if($User->settings->enableRACK=="1")
-	print '	<th>'._('Rack').'</th>';
+    if($User->settings->enableSNMP=="1") {
+    	print '	<th>'._('SNMP').'</th>';
+    }
+    if($User->settings->enableRACK=="1") {
+    	print '	<th>'._('Rack').'</th>';
+    }
 	print '	<th><i class="icon-gray icon-info-sign" rel="tooltip" title="'._('Shows in which sections device will be visible for selection').'"></i> '._('Sections').'</th>';
 	if(sizeof($custom) > 0) {
 		foreach($custom as $field) {
@@ -133,7 +135,7 @@ 
 					$device[$field['name']] = $Result->create_links ($device[$field['name']], $field['type']);
 
 					//booleans
-					if($field['type']=="tinyint(1)")	{
+					if($field['type']=="tinyint(1)") {
 						if($device[$field['name']] == "0")		{ print _("No"); }
 						elseif($device[$field['name']] == "1")	{ print _("Yes"); }
 					}
@@ -154,8 +156,9 @@ 
 		print '	<td class="actions">'. "\n";
 		print "	<div class='btn-group'>";
 		print "		<button class='btn btn-xs btn-default editSwitch' data-action='edit'   data-switchid='$device[id]'><i class='fa fa-pencil'></i></button>";
-		if($User->settings->enableSNMP=="1")
-		print "		<button class='btn btn-xs btn-default editSwitchSNMP' data-action='edit' data-switchid='$device[id]'><i class='fa fa-cogs'></i></button>";
+		if($User->settings->enableSNMP=="1") {
+				print "		<button class='btn btn-xs btn-default editSwitchSNMP' data-action='edit' data-switchid='$device[id]'><i class='fa fa-cogs'></i></button>";
+		}
 		print "		<button class='btn btn-xs btn-default editSwitch' data-action='delete' data-switchid='$device[id]'><i class='fa fa-times'></i></button>";
 		print "	</div>";
 		print '	</td>'. "\n";

app/admin/devices/edit-snmp.php

Braces +12 added lines, -3 removed lines

@@ -76,9 +76,18 @@
 		<td>
     		<select class="form-control" name="snmp_version">
         		<option value="0"><?php print _("Not used"); ?></option>
-        		<option value="1" <?php if($device->snmp_version=="1") print "selected"; ?>>SNMP v1</option>
-        		<option value="2" <?php if($device->snmp_version=="2") print "selected"; ?>>SNMP v2c</option>
-        		<option value="3" <?php if($device->snmp_version=="3") print "selected"; ?>>SNMP v3</option>
+        		<option value="1" <?php if($device->snmp_version=="1") {
+    print "selected";
+}
+?>>SNMP v1</option>
+        		<option value="2" <?php if($device->snmp_version=="2") {
+    print "selected";
+}
+?>>SNMP v2c</option>
+        		<option value="3" <?php if($device->snmp_version=="3") {
+    print "selected";
+}
+?>>SNMP v3</option>
     		</select>
     		<input type="hidden" name="device_id" value="<?php print $device->id; ?>">
     		<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">

app/admin/devices/edit-result.php

Braces +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 if(!$Admin->object_modify("devices", $_POST['action'], "id", $values))	{}
 else																	{ $Result->show("success", _("Device $device[action] successfull").'!', false); }
 
-if($_POST['action']=="delete"){
+if($_POST['action']=="delete") {
 	# remove all references from subnets and ip addresses
 	$Admin->remove_object_references ("subnets", "device", $values["id"]);
 	$Admin->remove_object_references ("ipaddresses", "switch", $values["id"]);

app/admin/devices/edit.php

Braces +21 added lines, -6 removed lines

@@ -70,7 +70,10 @@ 
 	<tr>
 		<td><?php print _('Name'); ?></td>
 		<td>
-			<input type="text" name="hostname" class="form-control input-sm" placeholder="<?php print _('Hostname'); ?>" value="<?php if(isset($device['hostname'])) print $device['hostname']; ?>" <?php print $readonly; ?>>
+			<input type="text" name="hostname" class="form-control input-sm" placeholder="<?php print _('Hostname'); ?>" value="<?php if(isset($device['hostname'])) {
+    print $device['hostname'];
+}
+?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 
@@ -78,7 +81,10 @@ 
 	<tr>
 		<td><?php print _('IP address'); ?></td>
 		<td>
-			<input type="text" name="ip_addr" class="form-control input-sm" placeholder="<?php print _('IP address'); ?>" value="<?php if(isset($device['ip_addr'])) print $device['ip_addr']; ?>" <?php print $readonly; ?>>
+			<input type="text" name="ip_addr" class="form-control input-sm" placeholder="<?php print _('IP address'); ?>" value="<?php if(isset($device['ip_addr'])) {
+    print $device['ip_addr'];
+}
+?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 
@@ -115,7 +121,7 @@ 
                 <?php
                 foreach ($Racks->all_racks as $r) {
      				if($device['rack'] == $r->id)	{ print "<option value='$r->id' selected='selected'>$r->name</option>"; }
-    				else							{ print "<option value='$r->id' >$r->name</option>"; }
+     				else							{ print "<option value='$r->id' >$r->name</option>"; }
                 }
                 ?>
             </select>
@@ -148,7 +154,10 @@ 
 	<tr>
 		<td><?php print _('SW version'); ?></td>
 		<td>
-			<input type="text" name="version" class="form-control input-sm" placeholder="<?php print _('Software version'); ?>" value="<?php if(isset($device['version'])) print $device['version']; ?>" <?php print $readonly; ?>>
+			<input type="text" name="version" class="form-control input-sm" placeholder="<?php print _('Software version'); ?>" value="<?php if(isset($device['version'])) {
+    print $device['version'];
+}
+?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 
@@ -156,7 +165,10 @@ 
 	<tr>
 		<td><?php print _('Description'); ?></td>
 		<td>
-			<textarea name="description" class="form-control input-sm" placeholder="<?php print _('Description'); ?>" <?php print $readonly; ?>><?php if(isset($device['description'])) print $device['description']; ?></textarea>
+			<textarea name="description" class="form-control input-sm" placeholder="<?php print _('Description'); ?>" <?php print $readonly; ?>><?php if(isset($device['description'])) {
+    print $device['description'];
+}
+?></textarea>
 			<?php
 			if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) {
 				print '<input type="hidden" name="switchId" value="'. $_POST['switchId'] .'">'. "\n";
@@ -303,7 +315,10 @@ 
 <div class="pFooter">
 	<div class="btn-group">
 		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editSwitchsubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; }
+else { print "btn-success"; } ?>" id="editSwitchsubmit"><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/import-export/import-load-data.php

Braces +10 added lines, -5 removed lines

@@ -18,7 +18,8 @@ 
 $reqfields = explode("|",$_GET['reqfields']);
 if (isset($_GET['filetype'])) {
 	$filetype = $_GET['filetype'];
-} else {
+}
+else {
 	$Result->show('danger', _("Error: could not read the uploaded file type!"), true, true);
 }
 
@@ -34,10 +35,12 @@ 
 		$impfield = $_GET['importFields__'.str_replace(" ", "_",$expfield)];
 		if (in_array($expfield,$reqfields) && ($impfield == "-")) {
 			$Result->show('danger', _("Error: missing required field mapping for expected field")." <b>".$expfield."</b>."._("Please check field matching in previous window."), true, true);
-		} else {
+		}
+		else {
 			if ($impfield != "-") { $impfields[$impfield] = $expfield; }
 		}
-	} else {
+	}
+	else {
 		$Result->show('danger', _("Internal error: missing import field mapping."), true, true);
 	}
 	# prepare header row for preview table
@@ -76,7 +79,8 @@ 
 			$col++;
 			if ($col > $hcol) {
 				$Result->show('danger', _("Extra column found on line ").$row._(" in CSV file. CSV delimiter used in value field?"), true);
-			} else {
+			}
+			else {
 				# read each row into a dictionary with expected fields as keys
 				$record[$fieldmap[$col]] = trim($val);
 			}
@@ -105,7 +109,8 @@ 
 			$record++;
 			if ($col > $hcol) {
 					$Result->show('danger', _("Extra column found on line ").$row._(" in XLS file. Please check input file."), true);
-			} else {
+			}
+			else {
 				$record[$fieldmap[$col]] = trim($xls->val($row,$col,$sheet));
 			}
 		}

app/admin/import-export/import-recompute.php

Braces +2 added lines, -1 removed lines

@@ -48,7 +48,8 @@
 			if ($c_subnet['result']) {
 				$trc = $colors[$c_subnet['action']];
 				$msg = "Master ".$c_subnet['action']." successful.";
-			} else {
+			}
+			else {
 				$trc = "danger";
 				$msg = "Master ".$c_subnet['action']." failed.";
 			}

app/admin/import-export/generate-xls.php

Braces +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 			}
 
 		}
-			else {
+		else {
 				$worksheet->write($lineCount, 0, _('No hosts'));
 				$lineCount++;
 			}

app/admin/import-export/import-vlan-check.php

Braces +6 added lines, -3 removed lines

@@ -52,12 +52,14 @@ 
 	$msg = ""; $action = ""; $cfieldtds = "";
 
 	# set a default domain if none specified
-	if ($cdata['domain'] != "") { $cdom = $cdata['domain']; } else { $cdom = "default"; }
+	if ($cdata['domain'] != "") { $cdom = $cdata['domain']; }
+	else { $cdom = "default"; }
 
 	# check if domain exists and link ID, otherwise issue error
 	if (!in_array($cdom,$vdom)) {
 		$msg.= "Missing VLAN domain. Please add/import VLAN domain first."; $action = "error";
-	} else {
+	}
+	else {
 		$cdata['domainId'] = $vdomid[$cdom];
 	}
 
@@ -100,7 +102,8 @@ 
 			if ($action == "skip") {
 				$msg.= "Duplicate, will skip.";
 			}
-		} else {
+		}
+		else {
 			$msg.="New entry, will be added."; $action = "add";
 		}
 	}