phpipam / phpipam

app/admin/firewall-zones/zones.php

Braces +8 added lines, -4 removed lines

@@ -63,10 +63,12 @@ 
 
 					if (!$network->subnetIsFolder) {
 						print '<td><a href="'.create_link("subnets",$network->sectionId,$network->subnetId).'">'.$Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.$network->subnetDescription.'</a></td>';
-					} else {
+					}
+					else {
 						print '<td><a href="'.create_link("subnets",$network->sectionId,$network->subnetId).'">Folder'.$network->subnetDescription.'</a></td>';
 					}
-				} else {
+				}
+				else {
 					print '<td>/</td>';
 				}
 				# display vlan informations
@@ -74,7 +76,8 @@ 
 					// name fix
 					$network->vlanName = strlen($network->vlanName)>0 ? " (".$network->vlanName.")" : "";
 					print '<td><a href="'.create_link('tools','vlan',$network->domainId,$network->vlanId).'">'.$network->vlan.$network->vlanName.'</a></td>';
-				} else {
+				}
+				else {
 					print '<td>/</td>';
 				}
 				// actions
@@ -116,7 +119,8 @@ 
 	}
 	print "</tbody>";
 	print '</table>';
-} else {
+}
+else {
 	# print an info if there are no zones in the database
 	$Result->show("info", _("No firewall zones configured"), false);
 }

app/admin/firewall-zones/zones-edit-network.php

Braces +12 added lines, -6 removed lines

@@ -67,7 +67,8 @@ 
 				$Result->show("warning", "<strong>"._('Warning').":</strong><br>"._("You are about to remove the following Network from the firewall zone:<br>".$network), false); ?>
 				<input type="hidden" name="masterSubnetId" value="<?php print $_POST['subnetId']; ?>">
 			</td>
-	<?php } else {
+	<?php }
+else {
 		# add a network to the zone
 		?>
 	<tr>
@@ -83,7 +84,7 @@ 
 		<td>
 			<select name="sectionId" class="firewallZoneSection form-control input-sm input-w-auto input-max-200">
 			<?php
-			if(sizeof($sections)>1){
+			if(sizeof($sections)>1) {
 				print '<option value="0">'._('No section selected').'</option>';
 			}
 			foreach ($sections as $section) {
@@ -104,13 +105,15 @@ 
 				print '<td><div class="sectionSubnets">';
 				print $Subnets->print_mastersubnet_dropdown_menu($firewallZone->sectionId,$firewallZone->subnetId);
 				print '</div></td>';
-			} else {
+			}
+			else {
 				# if there is only one section, fetch the subnets of that section
-				if(sizeof($sections)<=1){
+				if(sizeof($sections)<=1) {
 					print '<td>';
 					print $Subnets->print_mastersubnet_dropdown_menu($sections[0]->id,$firewallZone->subnetId);
 					print '</td>';
-				} else {
+				}
+				else {
 					# if there are more than one section, use ajax to fetch the subnets of the selected section
 					print '<td><div class="sectionSubnets"></div></td>';
 				}
@@ -139,7 +142,10 @@ 
 <div class="pFooter">
 	<div class="btn-group">
 		<button class="btn btn-sm btn-default hidePopup2"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editNetworkSubmit"><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="editNetworkSubmit"><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="zones-edit-network-result"></div>

app/admin/firewall-zones/mapping-edit-result.php

Braces +5 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 $User->check_user_session();
 
 # validate the action type
-if($_POST['action'] != 'add' && $_POST['action'] != 'delete' && $_POST['action'] != 'edit'){
+if($_POST['action'] != 'add' && $_POST['action'] != 'delete' && $_POST['action'] != 'edit') {
 	$Result->show("danger", _("Invalid action."), true);
 }
 # check the zone alias. valid values are alphanumeric characters and special characters like ".-_ "
@@ -33,13 +33,15 @@ 
 	# check the zone  ID. valid value: integer
 	if(!preg_match('/^[0-9]+$/i',$_POST['zoneId'])) {
 		$Result->show("danger", _("Invalid zone ID."), true);
-	} elseif (preg_match('/^0$/i',$_POST['zoneId'])) {
+	}
+	elseif (preg_match('/^0$/i',$_POST['zoneId'])) {
 		$Result->show("danger", _("Invalid zone ID."), true);
 	}
 	# check the device ID. valid value: integer
 	if(!preg_match('/^[0-9]+$/i',$_POST['deviceId'])) {
 		$Result->show("danger", _("Invalid device ID."), true);
-	} elseif (preg_match('/^0$/i',$_POST['deviceId'])) {
+	}
+	elseif (preg_match('/^0$/i',$_POST['deviceId'])) {
 		$Result->show("danger", _("Please select a device."), true);
 	}
 	# check the mapping ID. valid value: integer

app/admin/firewall-zones/zones-edit-result.php

Braces +11 added lines, -8 removed lines

@@ -22,7 +22,7 @@ 
 
 # validations
 # validate the action type
-if($_POST['action'] != 'add' && $_POST['action'] != 'delete' && $_POST['action'] != 'edit'){
+if($_POST['action'] != 'add' && $_POST['action'] != 'delete' && $_POST['action'] != 'edit') {
 	$Result->show("danger", _("Invalid action."), true);
 }
 
@@ -31,10 +31,11 @@ 
 	$Result->show("danger", _("Invalid zone name value."), true);
 }
 
-if($firewallZoneSettings['zoneGenerator']=="2")
-if(strlen(@$_POST['zone']) < 1 || strlen(@$_POST['zone'])>$firewallZoneSettings['zoneLength']) {
+if($firewallZoneSettings['zoneGenerator']=="2") {
+    if(strlen(@$_POST['zone']) < 1 || strlen(@$_POST['zone'])>$firewallZoneSettings['zoneLength']) {
 	$Result->show("danger", _("Invalid zone name length."), true);
 }
+}
 
 # check the zone indicator ID. valid values are 0 or 1.
 if($_POST['indicator'] && !preg_match('/^[0-1]$/i',$_POST['indicator'])) {
@@ -55,7 +56,8 @@ 
 if($_POST['generator'] != 2) {
 	if($_POST['padding']) {
 		$padding = 1;
-	} else {
+	}
+	else {
 		$padding = 0;
 	}
 }
@@ -64,18 +66,19 @@ 
 $description = trim(htmlspecialchars($_POST['description']));
 
 # generate a unique zone name if the generator is set to decimal or hex
-if (!$_POST['zone'] && $_POST['action'] == 'add')  {
-	if(!$zone=$Zones->generate_zone_name()){
+if (!$_POST['zone'] && $_POST['action'] == 'add') {
+	if(!$zone=$Zones->generate_zone_name()) {
 		$Result->show("danger",  _("Cannot generate zone name"), true);
 	}
-} else {
+}
+else {
 	$zone = $_POST['zone'];
 }
 
 # validate the zone name if text mode is enabled
 if ($_POST['generator'] == 2 ) {
 	$textSettings = array ( $_POST['zone'],$_POST['id']);
-	if(!$zone=$Zones->generate_zone_name($textSettings)){
+	if(!$zone=$Zones->generate_zone_name($textSettings)) {
 		$Result->show("danger",  _("Cannot validate zone name"), true);
 	}
 }

app/admin/firewall-zones/settings.php

Braces +10 added lines, -5 removed lines

@@ -133,7 +133,8 @@ 
 				<?php foreach ($firewallZoneSettings['zoneGeneratorType'] as $key => $generator) {
 					if ($firewallZoneSettings['zoneGenerator'] == $key) {
 						print '<option value='.$key.' selected>'.$generator.'</option>';
-					} else {
+					}
+					else {
 						print '<option value='.$key.'>'.$generator.'</option>';
 					}
 				}?>
@@ -171,7 +172,8 @@ 
 				<?php foreach ($deviceTypes as $deviceType) {
 					if ($firewallZoneSettings['deviceType'] == $deviceType->tid) {
 						print '<option value='.$deviceType->tid.' selected>'.$deviceType->tname.'</option>';
-					} else {
+					}
+					else {
 						print '<option value='.$deviceType->tid.'>'.$deviceType->tname.'</option>';
 					}
 				}?>
@@ -260,9 +262,11 @@ 
 						if (preg_match('/patternSeparator/i',$settingsPattern)) {
 							$patternCount++;
 
-						} elseif (!$firewallZoneSettings['pattern']) {
+						}
+						elseif (!$firewallZoneSettings['pattern']) {
 							print $pattern;
-						} elseif (!in_array($key,$firewallZoneSettings['pattern'])) {
+						}
+						elseif (!in_array($key,$firewallZoneSettings['pattern'])) {
 							print $pattern;
 						}
 					}
@@ -303,7 +307,8 @@ 
 				<?php foreach ($firewallZoneSettings['subnetPatternValues'] as $key => $subnetObjectPattern) {
 					if ($firewallZoneSettings['subnetPattern'] == $key) {
 						print '<option value='.$key.' selected>'.$subnetObjectPattern.'</option>';
-					} else {
+					}
+					else {
 						print '<option value='.$key.'>'.$subnetObjectPattern.'</option>';
 					}
 				}?>

app/admin/firewall-zones/subnet-to-zone-save.php

Braces +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 	if(!$Zones->modify_mapping('add',$values)) 	{ $Result->show("danger",  _("Cannot add mapping"), true); }
 }
 # check and then add the network to the zone if possible
-if($Zones->check_zone_network($_POST['subnetId']))	{ 
+if($Zones->check_zone_network($_POST['subnetId'])) {
 	if (!$Zones->add_zone_network($_POST['zoneId'],$_POST['subnetId']))	{ 	$Result->show("danger",  _("Cannot add this network to a zone."), true); }
 	else 																{	$Result->show("success", _("Zone modified successfully"), true); }
 }

app/admin/firewall-zones/zones-edit-network-result.php

Braces +7 added lines, -4 removed lines

@@ -17,13 +17,14 @@ 
 $User->check_user_session();
 
 # validate the action type
-if($_POST['action'] != 'add' && $_POST['action'] != 'delete'){
+if($_POST['action'] != 'add' && $_POST['action'] != 'delete') {
 	$Result->show("danger", _("Invalid action."), true);
 }
 # check the mastersubnet  ID. valid value: integer
 if($_POST['masterSubnetId'] && !preg_match('/^[0-9]+$/i',$_POST['masterSubnetId'])) {
 	$Result->show("danger", _("Invalid subnet ID."), true);
-} elseif (!$_POST['masterSubnetId']) {
+}
+elseif (!$_POST['masterSubnetId']) {
 	$Result->show("danger", _("Please choose a appropriate network to bind to the firewall zone."), true);
 }
 
@@ -46,12 +47,14 @@ 
 # check the zone ID. valid value: integer
 if($_POST['netZoneId'] && !preg_match('/^[0-9]+$/i',$_POST['netZoneId'])) {
 	$Result->show("danger", _("Invalid zone ID."), true);
-} else {
+}
+else {
 	# update
 	if ($_POST['action'] == 'add') {
 		if(!$Zones->add_zone_network($_POST['netZoneId'],$_POST['masterSubnetId']))		{ $Result->show("danger",  _("Cannot add the network to the zone."), true); }
 		else 																			{ $Result->show("success", _("Network successfully added."), true);  }
-	} elseif ($_POST['action'] == 'delete') {
+	}
+	elseif ($_POST['action'] == 'delete') {
 		if(!$Zones->delete_zone_network($_POST['netZoneId'],$_POST['masterSubnetId']))	{ $Result->show("danger",  _("Cannot delete the network mapping."), true); }
 		else 																			{ $Result->show("success", _("Successfully deleted the networt mapping."), true);  }
 	}

app/admin/version-check/index.php

Braces +6 added lines, -4 removed lines

@@ -20,10 +20,12 @@
 # release and commit logs
 print "<ul class='nav nav-tabs log-tabs'>";
 print "<li role='presentation' class='active'><a href='' data-target='changelog'>Change log</a></li>";
-if(!is_null($Tools->phpipam_releases))
-print "<li role='presentation'>				  <a href='' data-target='releaselog'>Release log</a></li>";
-if ($User->settings->version > $version)
-print "<li role='presentation'>				  <a href='' data-target='gitlog'>Commit log (local)</a></li>";
+if(!is_null($Tools->phpipam_releases)) {
+    print "<li role='presentation'>				  <a href='' data-target='releaselog'>Release log</a></li>";
+}
+if ($User->settings->version > $version) {
+    print "<li role='presentation'>				  <a href='' data-target='gitlog'>Commit log (local)</a></li>";
+}
 print "</ul>";
 
 

app/admin/mail/index.php

Braces +20 added lines, -5 removed lines

@@ -32,7 +32,10 @@ 
 		<td>
 			<select name="mtype" class="form-control input-sm input-w-auto" id="mtype">
 				<option value="localhost"><?php print _("Localhost"); ?></option>
-				<option value="smtp" <?php if($mail_settings->mtype=="smtp") print "selected='selected'"; ?>><?php print _("SMTP"); ?></option>
+				<option value="smtp" <?php if($mail_settings->mtype=="smtp") {
+    print "selected='selected'";
+}
+?>><?php print _("SMTP"); ?></option>
 			</select>
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 		</td>
@@ -40,7 +43,10 @@ 
 	</tr>
 
 	<!-- smtp -->
-	<tbody id="smtp" <?php if($mail_settings->mtype=="localhost") print "style='display:none;'"; ?>>
+	<tbody id="smtp" <?php if($mail_settings->mtype=="localhost") {
+    print "style='display:none;'";
+}
+?>>
 
 	<!-- Server settings -->
 	<tr class="settings-title">
@@ -70,8 +76,14 @@ 
 		<td>
 			<select name="msecure" class="smtp form-control input-sm input-w-auto">
 				<option value="none"><?php print _('None'); ?></option>
-				<option value="ssl" <?php if($mail_settings->msecure=="ssl") print "selected='selected'"; ?>><?php print _('SSL'); ?></option>
-				<option value="tls" <?php if($mail_settings->msecure=="tls") print "selected='selected'"; ?>><?php print _('TLS'); ?></option>
+				<option value="ssl" <?php if($mail_settings->msecure=="ssl") {
+    print "selected='selected'";
+}
+?>><?php print _('SSL'); ?></option>
+				<option value="tls" <?php if($mail_settings->msecure=="tls") {
+    print "selected='selected'";
+}
+?>><?php print _('TLS'); ?></option>
 			</select>
 		</td>
 		<td class="info2"><?php print _('Select yes if authentication is required'); ?></td>
@@ -83,7 +95,10 @@ 
 		<td>
 			<select name="mauth" class="smtp form-control input-sm input-w-auto">
 				<option value="no"><?php print _('No'); ?></option>
-				<option value="yes" <?php if($mail_settings->mauth=="yes") print "selected='selected'"; ?>><?php print _('Yes'); ?></option>
+				<option value="yes" <?php if($mail_settings->mauth=="yes") {
+    print "selected='selected'";
+}
+?>><?php print _('Yes'); ?></option>
 			</select>
 		</td>
 		<td class="info2"><?php print _('Select yes if authentication is required'); ?></td>