phpipam / phpipam

app/folder/folder-details.php

Braces +41 added lines, -25 removed lines

@@ -22,7 +22,7 @@ 
 $rowSpan = 10 + sizeof($cfields);
 
 # verify that is it displayed in proper section, otherwise warn!
-if($folder['sectionId']!=$_GET['section'])	{
+if($folder['sectionId']!=$_GET['section']) {
 	$sd = $Sections->fetch_section ("id", $folder['sectionId']);
 									{ $Result->show("warning", "Folder is in section <a href='".create_link("folder",$sd->id,$folder['id'])."'>$sd->name</a>!", false); }
 }
@@ -58,7 +58,7 @@ 
 			print "	<th>$key</th>";
 			print "	<td>";
 				# booleans
-				if($field['type']=="tinyint(1)")	{
+				if($field['type']=="tinyint(1)") {
 					if($folder[$field['name']] == 0)		{ print _("No"); }
 					elseif($folder[$field['name']] == 1)	{ print _("Yes"); }
 				}
@@ -112,26 +112,36 @@ 
 	print "<div class='btn-group'>";
 
 		//warning
-		if($folder_permission == 1)
-		print "<button class='btn btn-xs btn-default btn-danger' 	data-container='body' rel='tooltip' title='"._('You do not have permissions to edit subnet or IP addresses')."'><i class='fa fa-lock'></i></button> ";
+		if($folder_permission == 1) {
+				print "<button class='btn btn-xs btn-default btn-danger' 	data-container='body' rel='tooltip' title='"._('You do not have permissions to edit subnet or IP addresses')."'><i class='fa fa-lock'></i></button> ";
+		}
 
 		// edit subnet
-		if($sp['editsubnet'])
-		print "<a class='add_folder btn btn-xs btn-default' href='' rel='tooltip' data-container='body' title='"._('Edit folder')."' data-action='edit' data-subnetId='$folder[id]' data-sectionId='$folder[sectionId]'><i class='fa fa-pencil'></i></a>";		//edit subnet
-		else
-		print "<a class='btn btn-xs btn-default disabled'   href='' rel='tooltip' data-container='body' title='"._('Edit folder')."' >																					<i class='fa fa-pencil'></i></a>";		//edit subnet
+		if($sp['editsubnet']) {
+				print "<a class='add_folder btn btn-xs btn-default' href='' rel='tooltip' data-container='body' title='"._('Edit folder')."' data-action='edit' data-subnetId='$folder[id]' data-sectionId='$folder[sectionId]'><i class='fa fa-pencil'></i></a>";
+		}
+		//edit subnet
+		else {
+				print "<a class='btn btn-xs btn-default disabled'   href='' rel='tooltip' data-container='body' title='"._('Edit folder')."' >																					<i class='fa fa-pencil'></i></a>";
+		}
+		//edit subnet
 
 		//permissions
-		if($sp['editperm'])
-		print "<a class='showSubnetPerm btn btn-xs btn-default' href='' rel='tooltip' data-container='body' title='"._('Manage folder permissions')."'	data-subnetId='$folder[id]' data-sectionId='$folder[sectionId]' data-action='show'>	<i class='fa fa-tasks'></i></a>";			//edit subnet
-		else
-		print "<a class='btn btn-xs btn-default disabled' 		href='' rel='tooltip' data-container='body' title='"._('Manage folder permissions')."'>																						<i class='fa fa-tasks'></i></a>";			//edit subnet
+		if($sp['editperm']) {
+				print "<a class='showSubnetPerm btn btn-xs btn-default' href='' rel='tooltip' data-container='body' title='"._('Manage folder permissions')."'	data-subnetId='$folder[id]' data-sectionId='$folder[sectionId]' data-action='show'>	<i class='fa fa-tasks'></i></a>";
+		}
+		//edit subnet
+		else {
+				print "<a class='btn btn-xs btn-default disabled' 		href='' rel='tooltip' data-container='body' title='"._('Manage folder permissions')."'>																						<i class='fa fa-tasks'></i></a>";
+		}
+		//edit subnet
 
 		// add nested subnet
 		if($folder_permission_section == 3) {
 		print "<a class='edit_subnet btn btn-xs btn-default '	href='' data-container='body' rel='tooltip' title='"._('Add new nested subnet')."' 		data-subnetId='$folder[id]' data-action='add' data-id='' data-sectionId='$folder[sectionId]'> <i class='fa fa-plus-circle'></i></a> ";
 		print "<a class='add_folder btn btn-xs btn-default '	href='' rel='tooltip' data-container='body' title='"._('Add new nested folder')."' 		data-subnetId='$folder[id]' data-action='add' data-id='' data-sectionId='$folder[sectionId]'> <i class='fa fa-folder-close-o'></i></a> ";		//add new child subnet
-		} else {
+		}
+		else {
 		print "<a class='btn btn-xs btn-default disabled' 		href=''> <i class='fa fa-plus-circle'></i></a> ";
 		print "<a class='btn btn-xs btn-default disabled'		href=''> <i class='fa fa-folder-close-o'></i></a> ";		//add new child subnet
 		}
@@ -149,10 +159,12 @@ 
 	# export / import
 	print "<div class='btn-group'>";
 		//import
-		if($sp['import'])
-		print "<a class='csvImport btn btn-xs btn-default'  href='' data-container='body' rel='tooltip' title='"._('Import IP addresses')."' data-subnetId='$folder[id]'>		<i class='fa fa-download'></i></a>";
-		else
-		print "<a class='btn btn-xs btn-default disabled'  	href='' data-container='body' rel='tooltip' title='"._('Import IP addresses')."'>									<i class='fa fa-download'></i></a>";
+		if($sp['import']) {
+				print "<a class='csvImport btn btn-xs btn-default'  href='' data-container='body' rel='tooltip' title='"._('Import IP addresses')."' data-subnetId='$folder[id]'>		<i class='fa fa-download'></i></a>";
+		}
+		else {
+				print "<a class='btn btn-xs btn-default disabled'  	href='' data-container='body' rel='tooltip' title='"._('Import IP addresses')."'>									<i class='fa fa-download'></i></a>";
+		}
 		//export
 		print "<a class='csvExport btn btn-xs btn-default'  href='' data-container='body' rel='tooltip' title='"._('Export IP addresses')."' data-subnetId='$folder[id]'>		<i class='fa fa-upload'></i></a>";
 	print "</div>";
@@ -160,16 +172,20 @@ 
 	# favourites / changelog
 	print "<div class='btn-group'>";
 		#favourite
-		if($User->is_folder_favourite ($folder['id']))
-		print "<a class='btn btn-xs btn-default btn-info editFavourite favourite-$folder[id]' href='' data-container='body' rel='tooltip' title='"._('Click to remove from favourites')."' data-subnetId='$folder[id]' data-action='remove'><i class='fa fa-star'></i></a> ";
-		else
-		print "<a class='btn btn-xs btn-default editFavourite favourite-$folder[id]' 		 href='' data-container='body' rel='tooltip' title='"._('Click to add to favourites')."' data-subnetId='$folder[id]' data-action='add'>	<i class='fa fa-star fa-star-o' ></i></a> ";
+		if($User->is_folder_favourite ($folder['id'])) {
+				print "<a class='btn btn-xs btn-default btn-info editFavourite favourite-$folder[id]' href='' data-container='body' rel='tooltip' title='"._('Click to remove from favourites')."' data-subnetId='$folder[id]' data-action='remove'><i class='fa fa-star'></i></a> ";
+		}
+		else {
+				print "<a class='btn btn-xs btn-default editFavourite favourite-$folder[id]' 		 href='' data-container='body' rel='tooltip' title='"._('Click to add to favourites')."' data-subnetId='$folder[id]' data-action='add'>	<i class='fa fa-star fa-star-o' ></i></a> ";
+		}
 		# changelog
 		if($User->settings->enableChangelog==1) {
-		if($sp['changelog'])
-		print "<a class='sChangelog btn btn-xs btn-default' href='".create_link("subnets",$folder['sectionId'],$folder['id'],"changelog")."' data-container='body' rel='tooltip' title='"._('Changelog')."'><i class='fa fa-clock-o'></i></a>";
-		else
-		print "<a class='btn btn-xs btn-default disabled'   href='' 																		 data-container='body' rel='tooltip' title='"._('Changelog')."'><i class='fa fa-clock-o'></i></a>";
+		if($sp['changelog']) {
+				print "<a class='sChangelog btn btn-xs btn-default' href='".create_link("subnets",$folder['sectionId'],$folder['id'],"changelog")."' data-container='body' rel='tooltip' title='"._('Changelog')."'><i class='fa fa-clock-o'></i></a>";
+		}
+		else {
+				print "<a class='btn btn-xs btn-default disabled'   href='' 																		 data-container='body' rel='tooltip' title='"._('Changelog')."'><i class='fa fa-clock-o'></i></a>";
+		}
 		}
 	print "</div>";
 

app/tools/search/search-results-export.php

Braces +3 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 elseif(strlen($search_term)==17 && substr_count($search_term, ":") == 5) {
     $type = "mac"; //count : -> must be 5
 }
-else if(strlen($search_term) == 12 && (substr_count($search_term, ":") == 0) && (substr_count($search_term, ".") == 0)){
+else if(strlen($search_term) == 12 && (substr_count($search_term, ":") == 0) && (substr_count($search_term, ".") == 0)) {
     $type = "mac"; //no dots or : -> mac without :
 }
 else {
@@ -167,7 +167,8 @@ 
 							$vlanText .= ")";
 					}
 				}
-			} else {
+			}
+			else {
 				$vlanText = "";
 			}
 

app/tools/search/search-results.php

Braces +7 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
 elseif(strlen($search_term)==17 && substr_count($search_term, ":") == 5) {
     $type = "mac"; //count : -> must be 5
 }
-else if(strlen($search_term) == 12 && (substr_count($search_term, ":") == 0) && (substr_count($search_term, ".") == 0)){
+else if(strlen($search_term) == 12 && (substr_count($search_term, ":") == 0) && (substr_count($search_term, ".") == 0)) {
     $type = "mac"; //no dots or : -> mac without :
 }
 else {
@@ -189,7 +189,8 @@ 
 				//folder?
 				if($line['isFolder']==1) {
 				print '	<td><a href="'.create_link("subnets",$line['sectionId'],$line['id']).'"><i class="fa fa-folder-o fa fa-gray"></i> '.$line['description'].'</a></td>'. "\n";
-				} else {
+				}
+				else {
 				print '	<td><a href="'.create_link("subnets",$line['sectionId'],$line['id']).'">'. $Subnets->transform_to_dotted($line['subnet']) . '/'.$line['mask'].'</a></td>'. "\n";
 				}
 				print ' <td><a href="'.create_link("subnets",$line['sectionId'],$line['id']).'">'. $line['description'] .'</a></td>' . "\n";
@@ -214,7 +215,8 @@ 
 				if($subnet_permission > 1) {
 					if(@$master_subnet['isFolder']==1) {
 						print "	<td><button class='btn btn-xs btn-default add_folder' data-action='edit'  data-subnetId='$line[id]' data-sectionId='$line[sectionId]' href='#' rel='tooltip' data-container='body'  title='"._('Edit folder details')."'>		<i class='fa fa-gray fa fa-pencil'>  </i></a>";
-					} else {
+					}
+					else {
 						print "	<td><button class='btn btn-xs btn-default edit_subnet' data-action='edit' data-subnetId='$line[id]' data-sectionId='$line[sectionId]' href='#' rel='tooltip' data-container='body'  title='"._('Edit subnet details')."'>		<i class='fa fa-gray fa fa-pencil'>  </i></a>";
 					}
 				}
@@ -324,7 +326,7 @@ 
 				print '	</td>'. "\n";
 			}
 			//device
-			if(in_array('switch', $selected_ip_fields)) 										{
+			if(in_array('switch', $selected_ip_fields)) {
 				if(strlen($line['switch'])>0 && $line['switch']!="0") {
 					# get switch
 					$switch = (array) $Tools->fetch_object("devices", "id", $line['switch']);
@@ -362,7 +364,7 @@ 
 			//custom fields
 			if(sizeof($custom_address_fields) > 0) {
 				foreach($custom_address_fields as $field) {
-					if(!in_array($field['name'], $hidden_address_fields)){
+					if(!in_array($field['name'], $hidden_address_fields)) {
 						$line[$field['name']] = $Result->create_links ($line[$field['name']], $field['type']);
 						print '<td class="customField hidden-sm hidden-xs hidden-md">'. $line[$field['name']] .'</td>'. "\n";
 					}

app/tools/subnet-masks/print-table.php

Braces +10 added lines, -1 removed lines

@@ -14,7 +14,16 @@
 }
 ?>
 
-<table class="<?php if(!$popup) print "subnet-mask-table sorted-left";?> table table-striped <?php if($popup) print 'table-condensed'; ?> table-top <?php if(!$popup) print 'table-auto'; ?>">
+<table class="<?php if(!$popup) {
+    print "subnet-mask-table sorted-left";
+}
+?> table table-striped <?php if($popup) {
+    print 'table-condensed';
+}
+?> table-top <?php if(!$popup) {
+    print 'table-auto';
+}
+?>">
 
 <!-- headers -->
 <thead>

app/tools/changelog/changelog-print.php

Braces +6 added lines, -6 removed lines

@@ -64,7 +64,7 @@ 
 		else							{ $permission = 0; }
 
 		# printout
-		if($permission > 0)	{
+		if($permission > 0) {
 			# format diff
 			$l['cdiff'] = str_replace("\n", "<br>", $l['cdiff']);
 
@@ -72,7 +72,7 @@ 
 			switch($l['ctype']) {
 				case "ip_addr":	$l['ctype'] = "IP address";	break;
 				case "subnet":  if($l['isFolder']==1) 	{ $l['ctype'] = "Folder"; }
-								else 					{ $l['ctype'] = "Subnet"; }
+				else 					{ $l['ctype'] = "Subnet"; }
 				break;
 
 				case "section":	$l['ctype'] = "Section";	break;
@@ -83,16 +83,16 @@ 
 			print "	<td>$l[ctype]</td>";
 
 			# subnet, section or ip address
-			if($l['ctype']=="IP address")	{
+			if($l['ctype']=="IP address") {
 				print "	<td><a href='".create_link("subnets",$l['sectionId'],$l['subnetId'],"address-details",$l['tid'])."'>".$Subnets->transform_address($l['ip_addr'],"dotted")."</a></td>";
 			}
-			elseif($l['ctype']=="Subnet")   {
+			elseif($l['ctype']=="Subnet") {
 				print "	<td><a href='".create_link("subnets",$l['sectionId'],$l['tid'])."'>".$Subnets->transform_address($l['ip_addr'],"dotted")."/$l[mask]</a></td>";
 			}
-			elseif($l['ctype']=="Folder")   {
+			elseif($l['ctype']=="Folder") {
 				print "	<td><a href='".create_link("folder",$l['sectionId'],$l['tid'])."'>$l[sDescription]</a></td>";
 			}
-			elseif($l['ctype']=="Section")   {
+			elseif($l['ctype']=="Section") {
 				print "	<td><a href='".create_link("subnets",$l['tid'])."'>".$l['ip_addr']."</a></td>";
 			}
 			else {

app/tools/powerDNS/domains-print.php

Braces +3 added lines, -1 removed lines

@@ -134,7 +134,9 @@
 		foreach ($split as $d) {
 			// nulls
 			foreach($d as $k=>$v) {
-				if (strlen($v)==0)	$d->$k = "<span class='muted'>/</span>";
+				if (strlen($v)==0) {
+				    $d->$k = "<span class='muted'>/</span>";
+				}
 			}
 			// cont records
 			$cnt = $PowerDNS->count_domain_records ($d->id);

app/tools/powerDNS/index.php

Braces +4 added lines, -2 removed lines

@@ -60,7 +60,8 @@ 
         $pdns_section = $_GET['subnetId'];
         if (preg_match("/reverse_/", $pdns_section)) {
         	$filename = 'domains.php';
-        } else {
+        }
+        else {
         	$filename = "$_GET[subnetId].php";
         }
 
@@ -71,7 +72,8 @@ 
         </div>
 
     <?php
-    } else {
+    }
+    else {
     	$Result->show("info", _('Please enable powerDNS module under server management'), false);
     }
     ?>

app/tools/multicast-networks/index.php

Braces +18 added lines, -13 removed lines

@@ -102,18 +102,22 @@ 
         	$subnet_usage  = $Subnets->calculate_subnet_usage ($addresses_cnt, $subnet->mask, $subnet->subnet, $subnet->isFull );		//Calculate free/used etc
 
             // description
-            if($subnet->isFolder=="1")
-            $subnet->description = strlen($subnet->description)>0 ? $subnet->description : "";
-            else
-            $subnet->description = strlen($subnet->description)>0 ? "[".$subnet->description."]" : "";
+            if($subnet->isFolder=="1") {
+                        $subnet->description = strlen($subnet->description)>0 ? $subnet->description : "";
+            }
+            else {
+                        $subnet->description = strlen($subnet->description)>0 ? "[".$subnet->description."]" : "";
+            }
 
 			# section names
 			print "	<tr class='subnets-title'>";
 			print "		<td colspan='$colSpan' style='padding-top:20px;'>";
-			if($subnet->isFolder=="1")
-			print "     <h4><i class='fa fa-folder-o fa-gray'></i> $subnet->description</h4>";
-			else
-			print "     <h4>".$Subnets->transform_address($subnet->subnet, "dotted")."/$subnet->mask $subnet->description</h4>";
+			if($subnet->isFolder=="1") {
+						print "     <h4><i class='fa fa-folder-o fa-gray'></i> $subnet->description</h4>";
+			}
+			else {
+						print "     <h4>".$Subnets->transform_address($subnet->subnet, "dotted")."/$subnet->mask $subnet->description</h4>";
+			}
 
 			print " </td>";
 			print "</tr>";
@@ -164,7 +168,7 @@ 
                         }
     					// multicast ?
     					if ($User->settings->enableMulticast=="1" && $Subnets->is_multicast ($address->ip_addr))          { print "<td class='$mclass' style='white-space:nowrap;'>".$address->mac." $minfo</td>"; }
-						elseif(!empty($address->mac)) 				{ print "<td class='narrow'><i class='info fa fa-gray fa-sitemap' rel='tooltip' data-container='body' title='"._('MAC').": ".$address->mac."'></i></td>"; }
+    					elseif(!empty($address->mac)) 				{ print "<td class='narrow'><i class='info fa fa-gray fa-sitemap' rel='tooltip' data-container='body' title='"._('MAC').": ".$address->mac."'></i></td>"; }
 						else 												{ print "<td class='narrow'></td>"; }
 					}
 
@@ -191,14 +195,14 @@ 
 					# print custom fields
 					if(sizeof($custom_fields) > 0) {
 						foreach($custom_fields as $myField) 					{
-							if(!in_array($myField['name'], $hidden_cfields)) 	{
+							if(!in_array($myField['name'], $hidden_cfields)) {
 								print "<td class='customField hidden-xs hidden-sm hidden-md'>";
 
 								// create html links
 								$address->$myField['name'] = $Result->create_links($address->$myField['name'], $myField['type']);
 
 								//booleans
-								if($myField['type']=="tinyint(1)")	{
+								if($myField['type']=="tinyint(1)") {
 									if($address->$myField['name'] == "0")		{ print _("No"); }
 									elseif($address->$myField['name'] == "1")	{ print _("Yes"); }
 								}
@@ -246,8 +250,9 @@ 
             print "<tr>";
             print " <td colspan='$colSpan'>";
             // if full prevent new
-    		if($subnet_usage['freehosts']>0 && $sp['addip'])
-    		print "     <a class='modIPaddr btn btn-sm btn-default pull-right' 	href='' data-subnetId='$subnet->id' data-action='add' data-id=''>	<i class='fa fa-plus'> "._("Add new address")."</i></a> ";
+    		if($subnet_usage['freehosts']>0 && $sp['addip']) {
+    		    		print "     <a class='modIPaddr btn btn-sm btn-default pull-right' 	href='' data-subnetId='$subnet->id' data-action='add' data-id=''>	<i class='fa fa-plus'> "._("Add new address")."</i></a> ";
+    		}
             print " <span class='clearfix'></span><hr>";
             print " </td>";
             print "</tr>";

app/tools/request-ip/index.php

Braces +3 added lines, -2 removed lines

@@ -31,9 +31,10 @@
 		<td>
 			<?php
 			require_once('../../../functions/functions.php');
-			if(isset($_POST['ip_addr'])){
+			if(isset($_POST['ip_addr'])) {
 				$first = $_POST['ip_addr'];
-			}else{
+			}
+			else {
 				# get first IP address
 				$first  = $Subnets->transform_to_dotted($Addresses->get_first_available_address ($_POST['subnetId'], $Subnets));
 			}