phpipam / phpipam

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

Braces +10 added lines, -5 removed lines

@@ -151,7 +151,8 @@ 
 					$subnet_text = '';
                                         if ($subnet['isFolder']) {
 						$subnet_text = $subnet['description']." (folder)";	
-					} else {
+					}
+					else {
 						$subnet_text = $subnet['ip']."/".$subnet['mask'];
 					}
 					$worksheet->write($lineCount, $rowCount, $subnet_text, $format_text);
@@ -182,7 +183,8 @@ 
 					if (!empty($subnet['vrfId'])) {
 						$vrf = (array) $Tools->fetch_vrf(null, $subnet['vrfId']);
 						$worksheet->write($lineCount, $rowCount, $vrf['name'], $format_text);
-					} else {
+					}
+					else {
 						$worksheet->write($lineCount, $rowCount, '', $format_text);
 					}
 					$rowCount++;
@@ -196,10 +198,12 @@ 
 						$master = (array) $Subnets->fetch_subnet (null, $subnet['masterSubnetId']);
 						if($master['isFolder']) {
 							$worksheet->write($lineCount, $rowCount, $master['description']." [folder]", $format_text);
-						} else {
+						}
+						else {
 							$worksheet->write($lineCount, $rowCount, $master['ip']."/".$master['mask'], $format_text);
 						}
-					} else {
+					}
+					else {
 						$worksheet->write($lineCount, $rowCount, "/", $format_text);
 					}
 					$rowCount++;
@@ -278,7 +282,8 @@ 
 				$ssec = $Admin->fetch_object("sections", "id", $section['masterSection']);
 				$worksheet_sections->write($lineCount, $rowCount, $ssec->name, $format_text);
 				$rowCount++;
-			} else {
+			}
+			else {
 				$worksheet_sections->write($lineCount, $rowCount, "/", $format_text);
 				$rowCount++;
 			}

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

Braces +25 added lines, -12 removed lines

@@ -105,12 +105,15 @@ 
 			list($caddr,$cmask) = explode("/",$cdata['subnet'],2);
 			$cdata['mask'] = $cmask;
 			$cdata['subnet'] = $caddr;
-		} else { # check that mask is provided
+		}
+		else {
+# check that mask is provided
 			if ((!isset($cdata['mask'])) or ($cdata['mask'] == "")) { $msg.= "Required field mask missing or empty."; $action = "error"; }
 		}
 		if ((!empty($cdata['mask'])) && (!preg_match("/^([0-9]+|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)$/", $cdata['mask']))) {
 			$msg.="Invalid network mask format."; $action = "error";
-		} else {
+		}
+		else {
 			$cdata['type'] = $Subnets->identify_address($cdata['subnet']);
 			if (($cdata['type'] == "IPv6") && (($cdata['mask']<0) || ($cdata['mask']>128))) { $msg.="Invalid IPv6 network mask."; $action = "error"; }
 		}
@@ -119,7 +122,8 @@ 
 	# Check if section is provided and valid and link it if it is
 	if (!isset($section_names[$cdata['section']])) {
 		$msg.= "Invalid section."; $action = "error";
-	} else {
+	}
+	else {
 		$cdata['sectionId'] = $section_names[$cdata['section']]['id'];
 	}
 
@@ -127,29 +131,35 @@ 
 	if (!empty($cdata['vrf'])) {
 		if (!isset($vrf_data[$cdata['vrf']])) {
 			$msg.= "Invalid VRF."; $action = "error";
-		} else {
+		}
+		else {
 			$cdata['vrfId'] = $vrf_data[$cdata['vrf']]['vrfId'];
 		}
-	} else {
+	}
+	else {
 		# no VRF provided
 		$cdata['vrfId'] = 0;
 	}
 
 	# Check if VLAN Domain and VLAN are valid, and link them if they are
-	if (!empty($cdata['domain'])) { $cdom = $cdata['domain']; } else { $cdom = "default"; }
+	if (!empty($cdata['domain'])) { $cdom = $cdata['domain']; }
+	else { $cdom = "default"; }
 	if (!isset($vlan_data[$cdom])) {
 		# the default domain is always there, so if anything is missing we return an error
 		$msg.= "Invalid VLAN domain."; $action = "error";
-	} else {
+	}
+	else {
 		if (!empty($cdata['vlan'])) {
 		        if (in_array(strtolower($cdata['vlan']),array("na","n/a","nan"))) { $cdata['vlan'] = ""; }
 			if ((!empty($cdata['vlan'])) && (strtolower($cdata['vlan']) != "na")) {
 				if (!isset($vlan_data[$cdom][$cdata['vlan']])) {
 					$msg.= "VLAN not found in provided domain."; $action = "error";
-				} else {
+				}
+				else {
 					$cdata['vlanId'] = $vlan_data[$cdom][$cdata['vlan']]['vlanId'];
 				}
-			} else {
+			}
+			else {
 				# no VLAN provided
 				$cdata['vlanId'] = 0;
 			}
@@ -162,7 +172,8 @@ 
 			$cdata['mask'] = $net['bitmask'];
 			$cidr_check = $Subnets->verify_cidr_address($cdata['subnet']."/".$cdata['mask']);
 			if (strlen($cidr_check)>5) { $msg.=$cidr_check; $action = "error"; }
-		} else { $msg.=$net['message']; $action = "error"; }
+		}
+		else { $msg.=$net['message']; $action = "error"; }
 		if (preg_match("/[;'\"]/", $cdata['description'])) { $msg.="Invalid characters in description."; $action = "error"; }
 		if ((!empty($cdata['vrf'])) && (!preg_match("/^[a-zA-Z0-9-:]+$/", $cdata['vrf']))) { $msg.="Invalid VRF name format."; $action = "error"; }
 		if ((!empty($cdata['vlan'])) && (!preg_match("/^[0-9]+$/", $cdata['vlan']))) { $msg.="Invalid VLAN number format."; $action = "error"; }
@@ -195,7 +206,8 @@ 
 
 			if ($action == "skip") {
 				$msg.= "Duplicate, will skip.";
-			} else {
+			}
+			else {
 				# set id of matched subnet
 				$cdata['id'] = $cedata['id'];
 				# copy some fields which we don't import, but need to set
@@ -204,7 +216,8 @@ 
 				// $cdata['allowRequests'] = $cedata['allowRequests'];			$cdata['showName'] = $cedata['showName'];
 				// $cdata['pingSubnet'] = $cedata['pingSubnet'];				$cdata['discoverSubnet'] = $cedata['discoverSubnet'];
 			}
-		} else {
+		}
+		else {
 			$msg.="New entry, will be added."; $action = "add";
 			# Set master to 0 for now, will figure that after we add it, with the recompute function
 			$cdata['masterSubnetId'] = "0";

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

Braces +4 added lines, -2 removed lines

@@ -56,7 +56,8 @@ 
 		//master Section
 		if (($section['masterSection']!=0) && ($section['masterSection']==$last_master)) {
 			$sect_prefix = " - ";
-		} else {
+		}
+		else {
 			$sect_prefix = "";
 			$last_master = $section['id'];
 		}
@@ -67,7 +68,8 @@ 
 		$section_rows.= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeCVRFCheck' name='recomputeSectionCVRF_".$section['id']."' checked></label></div></td>";
 		$section_rows.="</tr>\n";
 	}
-} else {
+}
+else {
 	$section_rows = "<td colspan='3'>No sections found!</td>";
 }
 

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

Braces +2 added lines, -1 removed lines

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

app/admin/import-export/import-subnets-select.php

Braces +2 added lines, -1 removed lines

@@ -53,7 +53,8 @@
 		$cfield = $extfields[$std_field]["field"];
 		$ctable = $extfields[$std_field]["table"];
 		$pname  = $extfields[$std_field]["pname"]." ";
-	} else {
+	}
+	else {
 		# default table and field
 		$cfield = $std_field;
 		$ctable = $mtable;

app/admin/sections/index.php

Braces +4 added lines, -2 removed lines

@@ -74,7 +74,8 @@ 
 			# get section details
 			$ssec = $Admin->fetch_object("sections", "id", $section['masterSection']);
 		    print "	<td>$ssec->name</td>";
-	    } else {
+	    }
+	    else {
 		    print "	<td>/</td>";
 	    }
 	    //strictMode
@@ -127,7 +128,8 @@ 
 </table>	<!-- end table -->
 
 <!-- show no configured -->
-<?php } else { ?>
+<?php }
+else { ?>
 <div class="alert alert-warn alert-absolute"><?php print _('No sections configured'); ?>!</div>
 <?php } ?>
 

app/admin/sections/edit.php

Braces +32 added lines, -8 removed lines

@@ -63,7 +63,10 @@ 
 		<tr>
 			<td><?php print _('Parent'); ?></td>
 			<td colspan="2">
-				<select name="masterSection" class="form-control input-sm input-w-auto pull-left" <?php if($_POST['action']=="delete") print 'disabled="disabled"'; ?>>
+				<select name="masterSection" class="form-control input-sm input-w-auto pull-left" <?php if($_POST['action']=="delete") {
+    print 'disabled="disabled"';
+}
+?>>
 					<option value="0">Root</option>
 					<?php
 					if($sections!==false) {
@@ -85,9 +88,15 @@ 
 		<tr>
 			<td><?php print _('Strict Mode'); ?></td>
 			<td colspan="2">
-				<select name="strictMode" class="input-small form-control input-sm input-w-auto pull-left" <?php if($_POST['action']=="delete") print 'disabled="disabled"'; ?>>
+				<select name="strictMode" class="input-small form-control input-sm input-w-auto pull-left" <?php if($_POST['action']=="delete") {
+    print 'disabled="disabled"';
+}
+?>>
 					<option value="1"><?php print _('Yes'); ?></option>
-					<option value="0" <?php if(@$section['strictMode'] == "0") print "selected='selected'"; ?>><?php print _('No'); ?></option>
+					<option value="0" <?php if(@$section['strictMode'] == "0") {
+    print "selected='selected'";
+}
+?>><?php print _('No'); ?></option>
 				</select>
 				<span class="help-inline info2"><?php print _('No disables overlapping subnet checks. Subnets can be nested/created randomly. Anarchy.'); ?></span>
 			</td>
@@ -97,9 +106,15 @@ 
 		<tr>
 			<td><?php print _('Show VLANs'); ?></td>
 			<td colspan="2">
-				<select name="showVLAN" class="input-small form-control input-sm input-w-auto  pull-left" <?php if($_POST['action']=="delete") print 'disabled="disabled"'; ?>>
+				<select name="showVLAN" class="input-small form-control input-sm input-w-auto  pull-left" <?php if($_POST['action']=="delete") {
+    print 'disabled="disabled"';
+}
+?>>
 					<option value="1"><?php print _('Yes'); ?></option>
-					<option value="0" <?php if(@$section['showVLAN'] == "0") print "selected='selected'"; ?>><?php print _('No'); ?></option>
+					<option value="0" <?php if(@$section['showVLAN'] == "0") {
+    print "selected='selected'";
+}
+?>><?php print _('No'); ?></option>
 				</select>
 				<span class="help-inline info2"><?php print _('Show list of VLANs and belonging subnets in subnet list'); ?></span>
 			</td>
@@ -109,9 +124,15 @@ 
 		<tr>
 			<td><?php print _('Show VRFs'); ?></td>
 			<td colspan="2">
-				<select name="showVRF" class="input-small form-control input-sm input-w-auto  pull-left" <?php if($_POST['action']=="delete") print 'disabled="disabled"'; ?>>
+				<select name="showVRF" class="input-small form-control input-sm input-w-auto  pull-left" <?php if($_POST['action']=="delete") {
+    print 'disabled="disabled"';
+}
+?>>
 					<option value="1"><?php print _('Yes'); ?></option>
-					<option value="0" <?php if(@$section['showVRF'] == "0") print "selected='selected'"; ?>><?php print _('No'); ?></option>
+					<option value="0" <?php if(@$section['showVRF'] == "0") {
+    print "selected='selected'";
+}
+?>><?php print _('No'); ?></option>
 				</select>
 				<span class="help-inline info2"><?php print _('Show list of VRFs and belonging subnets in subnet list'); ?></span>
 			</td>
@@ -229,7 +250,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="editSectionSubmit"><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="editSectionSubmit"><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 holder -->
 	<div class="sectionEditResult"></div>

app/admin/verify-database/index.php

Braces +4 added lines, -2 removed lines

@@ -25,7 +25,8 @@ 
 			//get fix
 			if(!$fix = $Tools->get_table_fix($table)) {
 				$Result->show("danger", _("Cannot get fix for table")." $table!", true);
-			} else {
+			}
+			else {
 				print "<a class='btn btn-xs btn-default btn-tablefix' style='margin-left:8px;' href='' data-tableid='$table' data-fieldid='' data-type='table'><i class='fa fa-magic fa-pad-right'></i>"._("Fix table")."</a>";
 				print "<div id='fix-result-$table' style='display:none'></div>";
 			}
@@ -50,7 +51,8 @@ 
 			//get fix
 			if(!$fix = $Tools->get_field_fix($table, $field)) {
 				$Result->show("danger", _("Cannot get fix for table field ")." `$table` `$field`!", true);
-			} else {
+			}
+			else {
 				print "<a class='btn btn-xs btn-default btn-tablefix' style='margin-left:8px;'  href='' data-tableid='$table' data-fieldid='$field' data-type='field'><i class='fa fa-magic fa-pad-right'></i>"._("Fix field")."</a>";
 				print "<div id='fix-result-$table$field' style='display:none'></div>";
 			}

app/admin/device-types/edit.php

Braces +4 added lines, -1 removed lines

@@ -75,7 +75,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="editDevTypeSubmit"><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="editDevTypeSubmit"><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 -->