phpipam / phpipam

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

Indentation +167 added lines, -167 removed lines

@@ -30,23 +30,23 @@ 
 # load VLANs and process for easier later check
 $vlan_data = array();
 foreach ($vlan_domains as $vlan_domain) {
-	//cast
-	$vlan_domain = (array) $vlan_domain;
-	// read vlans
-	$all_vlans = $Admin->fetch_multiple_objects("vlans", "domainId", $vlan_domain['id'], "number");
-	$all_vlans = (array) $all_vlans;
-	// skip empty domains
-	if (sizeof($all_vlans)==0) {
-		# create entry for domain check
-		$vlan_data[$vlan_domain['name']] = array();
-		continue;
-	}
-	//write all VLAN entries
-	foreach ($all_vlans as $vlan) {
-		//cast
-		$vlan = (array) $vlan;
-		$vlan_data[$vlan_domain['name']][$vlan['number']] = $vlan;
-	}
+    //cast
+    $vlan_domain = (array) $vlan_domain;
+    // read vlans
+    $all_vlans = $Admin->fetch_multiple_objects("vlans", "domainId", $vlan_domain['id'], "number");
+    $all_vlans = (array) $all_vlans;
+    // skip empty domains
+    if (sizeof($all_vlans)==0) {
+        # create entry for domain check
+        $vlan_data[$vlan_domain['name']] = array();
+        continue;
+    }
+    //write all VLAN entries
+    foreach ($all_vlans as $vlan) {
+        //cast
+        $vlan = (array) $vlan;
+        $vlan_data[$vlan_domain['name']][$vlan['number']] = $vlan;
+    }
 }
 
 # fetch all VRFs
@@ -57,10 +57,10 @@ 
 # process for easier later check
 $vrf_data = array();
 foreach ($all_vrfs as $vrf) {
-	//cast
-	$vrf = (array) $vrf;
-	$vrf_data[$vrf['name']] = $vrf;
-	$vrf_data[$vrf['rd']] = $vrf;	# add also RD as VRF name, will allow matches against both name and RD
+    //cast
+    $vrf = (array) $vrf;
+    $vrf_data[$vrf['name']] = $vrf;
+    $vrf_data[$vrf['rd']] = $vrf;	# add also RD as VRF name, will allow matches against both name and RD
 }
 
 # fetch all sections and load all subnets
@@ -70,18 +70,18 @@ 
 $edata = array(); $section_names = array();
 
 foreach ($all_sections as $section) {
-	$section = (array) $section;
-	$section_names[$section['name']] = $section;
-	$section_subnets = $Subnets->fetch_section_subnets($section['id']);
-	# skip empty sections
-	if (sizeof($section_subnets)==0) { continue; }
-
-	foreach ($section_subnets as $subnet) {
-		$subnet = (array) $subnet;
-		# load whole record in array
-		$edata[$section['id']][$subnet['vrfId']][$subnet['ip']][$subnet['mask']] = $subnet;
-		$edata[$section['id']][$subnet['vrfId']][$subnet['ip']][$subnet['mask']]['type'] = $Subnets->identify_address($subnet['ip']);
-	}
+    $section = (array) $section;
+    $section_names[$section['name']] = $section;
+    $section_subnets = $Subnets->fetch_section_subnets($section['id']);
+    # skip empty sections
+    if (sizeof($section_subnets)==0) { continue; }
+
+    foreach ($section_subnets as $subnet) {
+        $subnet = (array) $subnet;
+        # load whole record in array
+        $edata[$section['id']][$subnet['vrfId']][$subnet['ip']][$subnet['mask']] = $subnet;
+        $edata[$section['id']][$subnet['vrfId']][$subnet['ip']][$subnet['mask']]['type'] = $Subnets->identify_address($subnet['ip']);
+    }
 }
 
 #print_r($vlan_data);
@@ -92,140 +92,140 @@ 
 
 # check the fields
 foreach ($data as &$cdata) {
-	$msg = ""; $action = ""; $cfieldtds = "";
-
-	# check if required fields are present and not empty
-	foreach($reqfields as $creq) {
-		if ((!isset($cdata[$creq])) or ($cdata[$creq] == "")) { $msg.= "Required field ".$creq." missing or empty."; $action = "error"; }
-	}
-
-	# if the subnet contains "/", split it in network and mask
-	if ($action != "error") {
-		if (preg_match("/\//", $cdata['subnet'])) {
-			list($caddr,$cmask) = explode("/",$cdata['subnet'],2);
-			$cdata['mask'] = $cmask;
-			$cdata['subnet'] = $caddr;
-		} 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 {
-			$cdata['type'] = $Subnets->identify_address($cdata['subnet']);
-			if (($cdata['type'] == "IPv6") && (($cdata['mask']<0) || ($cdata['mask']>128))) { $msg.="Invalid IPv6 network mask."; $action = "error"; }
-		}
-	}
-
-	# 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 {
-		$cdata['sectionId'] = $section_names[$cdata['section']]['id'];
-	}
-
-	# Check if VRF is provided and valid and link it if it is
-	if (!empty($cdata['vrf'])) {
-		if (!isset($vrf_data[$cdata['vrf']])) {
-			$msg.= "Invalid VRF."; $action = "error";
-		} else {
-			$cdata['vrfId'] = $vrf_data[$cdata['vrf']]['vrfId'];
-		}
-	} 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 (!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 {
-		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 {
-					$cdata['vlanId'] = $vlan_data[$cdom][$cdata['vlan']]['vlanId'];
-				}
-			} else {
-				# no VLAN provided
-				$cdata['vlanId'] = 0;
-			}
-		}
-	}
-
-	# check data format
-	if ($action != "error") {
-		if ($net = $Subnets->get_network_boundaries($cdata['subnet'],$cdata['mask'])) {
-			$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"; }
-		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"; }
-		if ((!empty($cdata['domain'])) && (!preg_match("/^[a-zA-Z0-9-_ ]+$/", $cdata['domain']))) { $msg.="Invalid VLAN domain format."; $action = "error"; }
-	}
-
-	# check if duplicate in the import data
-	if ($action != "error") {
-		if (isset($ndata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']])) { $msg.="Duplicate entry in imported data."; $action = "error"; }
-	}
-
-	# check if existing in database
-	if ($action != "error") {
-		if (isset($edata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']])) {
-			# copy content to a variable for easier checks
-			$cedata = $edata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']];
-
-			# Check if we need to change any fields
-			$action = "skip"; # skip duplicate fields if identical, update if different
-			if ($cdata['description'] != $cedata['description']) { $msg.= "Subnet description will be updated."; $action = "edit"; }
-			if ($cdata['vlanId'] != $cedata['vlanId']) { $msg.= "VLAN ID will be updated."; $action = "edit"; }
-			# Check if the values of the custom fields have changed
-			if(sizeof($custom_fields) > 0) {
-				foreach($custom_fields as $myField) {
-					if ($cdata[$myField['name']] != $cedata[$myField['name']]) {
-						$msg.= $myField['name']." will be updated."; $action = "edit";
-					}
-				}
-			}
-
-			if ($action == "skip") {
-				$msg.= "Duplicate, will skip.";
-			} else {
-				# set id of matched subnet
-				$cdata['id'] = $cedata['id'];
-				# copy some fields which we don't import, but need to set
-				$cdata['masterSubnetId'] = $cedata['masterSubnetId'];
-				$cdata['permissions'] = $cedata['permissions'];
-				// $cdata['allowRequests'] = $cedata['allowRequests'];			$cdata['showName'] = $cedata['showName'];
-				// $cdata['pingSubnet'] = $cedata['pingSubnet'];				$cdata['discoverSubnet'] = $cedata['discoverSubnet'];
-			}
-		} 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";
-			# Inherit section permissions for new subnets
-			$cdata['permissions'] = $section_names[$cdata['section']]['permissions'];
-
-			# No overlap checking, smaller subnets will be considered nested, larger ones will be masters
-			# Master ID is set later, with the recompute functions
-
-			# Add it to ndata for duplicate check
-			$ndata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']] = $cdata;
-		}
-	}
-
-	$cdata['msg'].= $msg;
-	$cdata['action'] = $action;
-	$counters[$action]++;
-
-	$rows.="<tr class='".$colors[$action]."'><td><i class='fa ".$icons[$action]."' rel='tooltip' data-placement='bottom' title='"._($msg)."'></i></td>";
-	foreach ($expfields as $cfield) { $rows.= "<td>".$cdata[$cfield]."</td>"; }
-	$rows.= "<td>"._($cdata['msg'])."</td></tr>";
+    $msg = ""; $action = ""; $cfieldtds = "";
+
+    # check if required fields are present and not empty
+    foreach($reqfields as $creq) {
+        if ((!isset($cdata[$creq])) or ($cdata[$creq] == "")) { $msg.= "Required field ".$creq." missing or empty."; $action = "error"; }
+    }
+
+    # if the subnet contains "/", split it in network and mask
+    if ($action != "error") {
+        if (preg_match("/\//", $cdata['subnet'])) {
+            list($caddr,$cmask) = explode("/",$cdata['subnet'],2);
+            $cdata['mask'] = $cmask;
+            $cdata['subnet'] = $caddr;
+        } 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 {
+            $cdata['type'] = $Subnets->identify_address($cdata['subnet']);
+            if (($cdata['type'] == "IPv6") && (($cdata['mask']<0) || ($cdata['mask']>128))) { $msg.="Invalid IPv6 network mask."; $action = "error"; }
+        }
+    }
+
+    # 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 {
+        $cdata['sectionId'] = $section_names[$cdata['section']]['id'];
+    }
+
+    # Check if VRF is provided and valid and link it if it is
+    if (!empty($cdata['vrf'])) {
+        if (!isset($vrf_data[$cdata['vrf']])) {
+            $msg.= "Invalid VRF."; $action = "error";
+        } else {
+            $cdata['vrfId'] = $vrf_data[$cdata['vrf']]['vrfId'];
+        }
+    } 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 (!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 {
+        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 {
+                    $cdata['vlanId'] = $vlan_data[$cdom][$cdata['vlan']]['vlanId'];
+                }
+            } else {
+                # no VLAN provided
+                $cdata['vlanId'] = 0;
+            }
+        }
+    }
+
+    # check data format
+    if ($action != "error") {
+        if ($net = $Subnets->get_network_boundaries($cdata['subnet'],$cdata['mask'])) {
+            $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"; }
+        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"; }
+        if ((!empty($cdata['domain'])) && (!preg_match("/^[a-zA-Z0-9-_ ]+$/", $cdata['domain']))) { $msg.="Invalid VLAN domain format."; $action = "error"; }
+    }
+
+    # check if duplicate in the import data
+    if ($action != "error") {
+        if (isset($ndata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']])) { $msg.="Duplicate entry in imported data."; $action = "error"; }
+    }
+
+    # check if existing in database
+    if ($action != "error") {
+        if (isset($edata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']])) {
+            # copy content to a variable for easier checks
+            $cedata = $edata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']];
+
+            # Check if we need to change any fields
+            $action = "skip"; # skip duplicate fields if identical, update if different
+            if ($cdata['description'] != $cedata['description']) { $msg.= "Subnet description will be updated."; $action = "edit"; }
+            if ($cdata['vlanId'] != $cedata['vlanId']) { $msg.= "VLAN ID will be updated."; $action = "edit"; }
+            # Check if the values of the custom fields have changed
+            if(sizeof($custom_fields) > 0) {
+                foreach($custom_fields as $myField) {
+                    if ($cdata[$myField['name']] != $cedata[$myField['name']]) {
+                        $msg.= $myField['name']." will be updated."; $action = "edit";
+                    }
+                }
+            }
+
+            if ($action == "skip") {
+                $msg.= "Duplicate, will skip.";
+            } else {
+                # set id of matched subnet
+                $cdata['id'] = $cedata['id'];
+                # copy some fields which we don't import, but need to set
+                $cdata['masterSubnetId'] = $cedata['masterSubnetId'];
+                $cdata['permissions'] = $cedata['permissions'];
+                // $cdata['allowRequests'] = $cedata['allowRequests'];			$cdata['showName'] = $cedata['showName'];
+                // $cdata['pingSubnet'] = $cedata['pingSubnet'];				$cdata['discoverSubnet'] = $cedata['discoverSubnet'];
+            }
+        } 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";
+            # Inherit section permissions for new subnets
+            $cdata['permissions'] = $section_names[$cdata['section']]['permissions'];
+
+            # No overlap checking, smaller subnets will be considered nested, larger ones will be masters
+            # Master ID is set later, with the recompute functions
+
+            # Add it to ndata for duplicate check
+            $ndata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']] = $cdata;
+        }
+    }
+
+    $cdata['msg'].= $msg;
+    $cdata['action'] = $action;
+    $counters[$action]++;
+
+    $rows.="<tr class='".$colors[$action]."'><td><i class='fa ".$icons[$action]."' rel='tooltip' data-placement='bottom' title='"._($msg)."'></i></td>";
+    foreach ($expfields as $cfield) { $rows.= "<td>".$cdata[$cfield]."</td>"; }
+    $rows.= "<td>"._($cdata['msg'])."</td></tr>";
 
 }
 

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

Indentation +32 added lines, -32 removed lines

@@ -29,18 +29,18 @@ 
 
 # Lets do some reordering to show slaves!
 foreach($all_sections as $s) {
-	if($s->masterSection=="0") {
-		# it is master
-		$s->class = "master";
-		$sectionssorted[] = $s;
-		# check for slaves
-		foreach($all_sections as $ss) {
-			if($ss->masterSection==$s->id) {
-				$ss->class = "slave";
-				$sectionssorted[] = $ss;
-			}
-		}
-	}
+    if($s->masterSection=="0") {
+        # it is master
+        $s->class = "master";
+        $sectionssorted[] = $s;
+        # check for slaves
+        foreach($all_sections as $ss) {
+            if($ss->masterSection==$s->id) {
+                $ss->class = "slave";
+                $sectionssorted[] = $ss;
+            }
+        }
+    }
 }
 
 # set new array
@@ -48,27 +48,27 @@ 
 
 # show sections
 if(sizeof($all_sections) > 0) {
-	$section_rows = ""; $last_master = 0;
-	# existing sections
-	foreach ($sections_sorted as $section) {
-		//cast
-		$section = (array) $section;
-		//master Section
-		if (($section['masterSection']!=0) && ($section['masterSection']==$last_master)) {
-			$sect_prefix = " - ";
-		} else {
-			$sect_prefix = "";
-			$last_master = $section['id'];
-		}
-		$section_rows.= "<tr>";
-		$section_rows.= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeSectionCheck' name='recomputeSection_".$section['id']."' checked>".$sect_prefix.str_replace('_', ' ', $section['name'])."</label></div></td>";
-		$section_rows.= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeIPv4Check' name='recomputeSectionIPv4_".$section['id']."' checked></label></div></td>";
-		$section_rows.= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeIPv6Check' name='recomputeSectionIPv6_".$section['id']."' checked></label></div></td>";
-		$section_rows.= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeCVRFCheck' name='recomputeSectionCVRF_".$section['id']."' checked></label></div></td>";
-		$section_rows.="</tr>\n";
-	}
+    $section_rows = ""; $last_master = 0;
+    # existing sections
+    foreach ($sections_sorted as $section) {
+        //cast
+        $section = (array) $section;
+        //master Section
+        if (($section['masterSection']!=0) && ($section['masterSection']==$last_master)) {
+            $sect_prefix = " - ";
+        } else {
+            $sect_prefix = "";
+            $last_master = $section['id'];
+        }
+        $section_rows.= "<tr>";
+        $section_rows.= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeSectionCheck' name='recomputeSection_".$section['id']."' checked>".$sect_prefix.str_replace('_', ' ', $section['name'])."</label></div></td>";
+        $section_rows.= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeIPv4Check' name='recomputeSectionIPv4_".$section['id']."' checked></label></div></td>";
+        $section_rows.= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeIPv6Check' name='recomputeSectionIPv6_".$section['id']."' checked></label></div></td>";
+        $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 {
-	$section_rows = "<td colspan='3'>No sections found!</td>";
+    $section_rows = "<td colspan='3'>No sections found!</td>";
 }
 
 ?>

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

Indentation +17 added lines, -17 removed lines

@@ -33,28 +33,28 @@
 
 # import L2 Domains
 foreach ($data as &$cdata) {
-	if (($cdata['action'] == "add") || ($cdata['action'] == "edit")) {
-		# set update array
-		$values = array("id"=>$cdata['id'],
-						"name"=>$cdata['name'],
-						"description"=>$cdata['description']
-						);
+    if (($cdata['action'] == "add") || ($cdata['action'] == "edit")) {
+        # set update array
+        $values = array("id"=>$cdata['id'],
+                        "name"=>$cdata['name'],
+                        "description"=>$cdata['description']
+                        );
 
-		# update
-		$cdata['result'] = $Admin->object_modify("vlanDomains", $cdata['action'], "id", $values);
+        # update
+        $cdata['result'] = $Admin->object_modify("vlanDomains", $cdata['action'], "id", $values);
 
-		if ($cdata['result']) {
-			$trc = $colors[$cdata['action']];
-			$msg = "L2 Domain ".$cdata['action']." successful.";
-		} else {
-			$trc = "danger";
-			$msg = "L2 Domain ".$cdata['action']." failed.";
-		}
-		$rows.="<tr class='".$trc."'><td><i class='fa ".$icons[$cdata['action']]."' rel='tooltip' data-placement='bottom' title='"._($msg)."'></i></td>
+        if ($cdata['result']) {
+            $trc = $colors[$cdata['action']];
+            $msg = "L2 Domain ".$cdata['action']." successful.";
+        } else {
+            $trc = "danger";
+            $msg = "L2 Domain ".$cdata['action']." failed.";
+        }
+        $rows.="<tr class='".$trc."'><td><i class='fa ".$icons[$cdata['action']]."' rel='tooltip' data-placement='bottom' title='"._($msg)."'></i></td>
 			<td>".$cdata['name']."</td>
 			<td>".$cdata['description']."</td>
 			<td>"._($msg)."</td></tr>";
-	}
+    }
 }
 
 print "<table class='table table-condensed table-hover' id='resultstable'><tbody>";

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

Indentation +25 added lines, -25 removed lines

@@ -29,31 +29,31 @@
 
 //loop
 if(sizeof($hosts)>0) {
-	//details
-	$m=0;
-	foreach($hosts as $host) {
-		//fetch subnet and section details on change!
-		if(@$hosts[$m-1]->subnetId!=$hosts[$m]->subnetId) {
-			$subnet  = (array) $Subnets->fetch_subnet(null, $host->subnetId);
-			$section = (array) $Sections->fetch_section(null, $subnet['sectionId']);
-
-			//first print subnet and section details
-			$res[] = "# $subnet[description] (".$Subnets->transform_to_dotted($subnet['subnet'])."/$subnet[mask]) - $section[description]";
-		}
-
-		//than address details
-		$diff = 17 - strlen($Subnets->transform_to_dotted($host->ip_addr));	//for print offset
-		$diff>0 ? : $diff = 3;												//IPv6 print offset
-
-		$res[] = $Subnets->transform_to_dotted($host->ip_addr).str_repeat(" ", $diff)."$host->dns_name";
-
-		//break
-		if($hosts[$m]->subnetId!=@$hosts[$m+1]->subnetId) {
-		$res[] = "";
-		}
-
-		$m++;		//next index
-	}
+    //details
+    $m=0;
+    foreach($hosts as $host) {
+        //fetch subnet and section details on change!
+        if(@$hosts[$m-1]->subnetId!=$hosts[$m]->subnetId) {
+            $subnet  = (array) $Subnets->fetch_subnet(null, $host->subnetId);
+            $section = (array) $Sections->fetch_section(null, $subnet['sectionId']);
+
+            //first print subnet and section details
+            $res[] = "# $subnet[description] (".$Subnets->transform_to_dotted($subnet['subnet'])."/$subnet[mask]) - $section[description]";
+        }
+
+        //than address details
+        $diff = 17 - strlen($Subnets->transform_to_dotted($host->ip_addr));	//for print offset
+        $diff>0 ? : $diff = 3;												//IPv6 print offset
+
+        $res[] = $Subnets->transform_to_dotted($host->ip_addr).str_repeat(" ", $diff)."$host->dns_name";
+
+        //break
+        if($hosts[$m]->subnetId!=@$hosts[$m+1]->subnetId) {
+        $res[] = "";
+        }
+
+        $m++;		//next index
+    }
 }
 
 # join content

app/admin/import-export/export-vlan-field-select.php

Indentation +17 added lines, -17 removed lines

@@ -27,12 +27,12 @@ 
 
 
 if(sizeof($custom_fields) > 0) {
-	foreach($custom_fields as $myField) {
-		//change spaces to "___" so it can be used as element id
-		$myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
-		$custom_fields_names.= "	<th>$myField[name]</th>";
-		$custom_fields_boxes.= "	<td><input type='checkbox' name='$myField[nameTemp]' checked> </td>";
-	}
+    foreach($custom_fields as $myField) {
+        //change spaces to "___" so it can be used as element id
+        $myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
+        $custom_fields_names.= "	<th>$myField[name]</th>";
+        $custom_fields_boxes.= "	<td><input type='checkbox' name='$myField[nameTemp]' checked> </td>";
+    }
 }
 
 ?>
@@ -74,23 +74,23 @@ 
 print '<form id="selectExportDomains">';
 
 if(sizeof($vlan_domains) > 0) {
-	print '<h4>L2 Domains</h4>';
-	print "	<table class='table table-striped table-condensed'>";
-	print "	<tr>";
+    print '<h4>L2 Domains</h4>';
+    print "	<table class='table table-striped table-condensed'>";
+    print "	<tr>";
     print "	<th>"._('Name')."</th>";
     print "	<th>"._('Description')."</th>";
     print "	<th>"._('Export')."</th>";
     print "	</tr>\n";
 
-	foreach($vlan_domains as $domain) {
-		$domain = (array) $domain;
+    foreach($vlan_domains as $domain) {
+        $domain = (array) $domain;
 
-		print "	<tr>";
-		print "	<td>".$domain['name']."</th>";
-		print "	<td>".$domain['description']."</th>";
-		print "	<td><input type='checkbox' name='exportDomain__".str_replace(" ", "_",$domain['name'])."' checked> </td>";
-		print "	</tr>\n";
-	}
+        print "	<tr>";
+        print "	<td>".$domain['name']."</th>";
+        print "	<td>".$domain['description']."</th>";
+        print "	<td><input type='checkbox' name='exportDomain__".str_replace(" ", "_",$domain['name'])."' checked> </td>";
+        print "	</tr>\n";
+    }
 }
 
 print '</table>';

app/admin/import-export/export-ipaddr-field-select.php

Indentation +47 added lines, -47 removed lines

@@ -24,22 +24,22 @@ 
 
 # Lets do some reordering to show slaves!
 if($all_sections!==false) {
-	foreach($all_sections as $s) {
-		if($s->masterSection=="0") {
-			# it is master
-			$s->class = "master";
-			$sectionssorted[] = $s;
-			# check for slaves
-			foreach($all_sections as $ss) {
-				if($ss->masterSection==$s->id) {
-					$ss->class = "slave";
-					$sectionssorted[] = $ss;
-				}
-			}
-		}
-	}
-	# set new array
-	$sections_sorted = @$sectionssorted;
+    foreach($all_sections as $s) {
+        if($s->masterSection=="0") {
+            # it is master
+            $s->class = "master";
+            $sectionssorted[] = $s;
+            # check for slaves
+            foreach($all_sections as $ss) {
+                if($ss->masterSection==$s->id) {
+                    $ss->class = "slave";
+                    $sectionssorted[] = $ss;
+                }
+            }
+        }
+    }
+    # set new array
+    $sections_sorted = @$sectionssorted;
 }
 
 # get all custom fields
@@ -49,12 +49,12 @@ 
 $custom_fields_boxes = "";
 
 if(sizeof($custom_fields) > 0) {
-	foreach($custom_fields as $myField) {
-		//change spaces to "___" so it can be used as element id
-		$myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
-		$custom_fields_names.= "	<th>$myField[name]</th>";
-		$custom_fields_boxes.= "	<td><input type='checkbox' name='$myField[nameTemp]' checked> </td>";
-	}
+    foreach($custom_fields as $myField) {
+        //change spaces to "___" so it can be used as element id
+        $myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
+        $custom_fields_names.= "	<th>$myField[name]</th>";
+        $custom_fields_boxes.= "	<td><input type='checkbox' name='$myField[nameTemp]' checked> </td>";
+    }
 }
 
 ?>
@@ -111,36 +111,36 @@ 
 
 # show sections
 if($all_sections!==false) {
-	print '<h4>Sections</h4>';
-	print "	<table class='table table-striped table-condensed'>";
-	print "	<tr>";
+    print '<h4>Sections</h4>';
+    print "	<table class='table table-striped table-condensed'>";
+    print "	<tr>";
     print '	<th><input type="checkbox" id="exportSelectAll" checked> '._('Name').'</th>';
     print "	<th>"._('Description')."</th>";
     print "	<th>"._('Parent')."</th>";
     print "	</tr>\n";
 
-	# existing sections
-	foreach ($sections_sorted as $section) {
-		//cast
-		$section = (array) $section;
-
-		print '<tr>';
-		print '	<td><div class="checkbox"><label><input type="checkbox" id="exportCheck" name="exportSection__'.str_replace(" ", "_", $section['name']).'" checked>'.str_replace("_", " ", $section['name']).'</label></div></td>';
-		print '	<td>'. $section['description'] .'</td>'. "\n";
-		//master Section
-		if($section['masterSection']!=0) {
-			# get section details
-			$ssec = $Admin->fetch_object("sections", "id", $section['masterSection']);
-			print "	<td>$ssec->name</td>";
-		} else {
-			print "	<td>/</td>";
-		}
-		print '</tr>'. "\n";
-	}
-
-	print '</table>';
-
-	print '<div class="checkbox"><label><input type="checkbox" name="exportSections" checked>'._("Include the sections in a separate sheet.").'</label></div>';
+    # existing sections
+    foreach ($sections_sorted as $section) {
+        //cast
+        $section = (array) $section;
+
+        print '<tr>';
+        print '	<td><div class="checkbox"><label><input type="checkbox" id="exportCheck" name="exportSection__'.str_replace(" ", "_", $section['name']).'" checked>'.str_replace("_", " ", $section['name']).'</label></div></td>';
+        print '	<td>'. $section['description'] .'</td>'. "\n";
+        //master Section
+        if($section['masterSection']!=0) {
+            # get section details
+            $ssec = $Admin->fetch_object("sections", "id", $section['masterSection']);
+            print "	<td>$ssec->name</td>";
+        } else {
+            print "	<td>/</td>";
+        }
+        print '</tr>'. "\n";
+    }
+
+    print '</table>';
+
+    print '<div class="checkbox"><label><input type="checkbox" name="exportSections" checked>'._("Include the sections in a separate sheet.").'</label></div>';
 //	print '<div class="checkbox"><label><input type="checkbox" name="separateSheets">'._("Export each section in a separate sheet.").'</label></div>';
 
 }

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

Indentation +38 added lines, -38 removed lines

@@ -22,9 +22,9 @@ 
 $edata = array();
 # process for easier later check
 foreach ($all_vrfs as $vrf) {
-	//cast
-	$vrf = (array) $vrf;
-	$edata[$vrf['rd']] = $vrf;
+    //cast
+    $vrf = (array) $vrf;
+    $edata[$vrf['rd']] = $vrf;
 }
 
 $rows = "";
@@ -32,41 +32,41 @@ 
 
 # check the fields
 foreach ($data as &$cdata) {
-	$msg = ""; $action = "";
-
-	# check if required fields are present and not empty
-	foreach($reqfields as $creq) {
-		if ((!isset($cdata[$creq])) or ($cdata[$creq] == "")) { $msg.= "Required field ".$creq." missing or empty."; $action = "error"; }
-	}
-
-	# check data format
-	if ($action != "error") {
-		if (!preg_match("/^[a-zA-Z0-9-]+$/", $cdata['name'])) { $msg.="Invalid name format."; $action = "error"; }
-		if (!preg_match("/^[0-9:]+$/", $cdata['rd'])) { $msg.="Invalid RD format."; $action = "error"; }
-		if (preg_match("/[;'\"]/", $cdata['description'])) { $msg.="Invalid characters in description."; $action = "error"; }
-	}
-
-	# check if existing
-	if ($action != "error") {
-		if (isset($edata[$cdata['rd']])) {
-			$cdata['vrfId'] = $edata[$cdata['rd']]['vrfId'];
-			$action = "skip"; # skip duplicate fields if identical, update if different
-			if ($cdata['name'] != $edata[$cdata['rd']]['name']) { $msg.= "VRF name will be updated."; $action = "edit"; }
-			if ($cdata['description'] != $edata[$cdata['rd']]['description']) { $msg.= "VRF description will be updated."; $action = "edit"; }
-
-			if ($action == "skip") {
-				$msg.= "Duplicate, will skip.";
-			}
-		} else {
-			$msg.="New entry, will be added."; $action = "add";
-		}
-	}
-
-	$cdata['msg'].= $msg;
-	$cdata['action'] = $action;
-	$counters[$action]++;
-
-	$rows.="<tr class='".$colors[$action]."'><td><i class='fa ".$icons[$action]."' rel='tooltip' data-placement='bottom' title='"._($msg)."'></i></td>
+    $msg = ""; $action = "";
+
+    # check if required fields are present and not empty
+    foreach($reqfields as $creq) {
+        if ((!isset($cdata[$creq])) or ($cdata[$creq] == "")) { $msg.= "Required field ".$creq." missing or empty."; $action = "error"; }
+    }
+
+    # check data format
+    if ($action != "error") {
+        if (!preg_match("/^[a-zA-Z0-9-]+$/", $cdata['name'])) { $msg.="Invalid name format."; $action = "error"; }
+        if (!preg_match("/^[0-9:]+$/", $cdata['rd'])) { $msg.="Invalid RD format."; $action = "error"; }
+        if (preg_match("/[;'\"]/", $cdata['description'])) { $msg.="Invalid characters in description."; $action = "error"; }
+    }
+
+    # check if existing
+    if ($action != "error") {
+        if (isset($edata[$cdata['rd']])) {
+            $cdata['vrfId'] = $edata[$cdata['rd']]['vrfId'];
+            $action = "skip"; # skip duplicate fields if identical, update if different
+            if ($cdata['name'] != $edata[$cdata['rd']]['name']) { $msg.= "VRF name will be updated."; $action = "edit"; }
+            if ($cdata['description'] != $edata[$cdata['rd']]['description']) { $msg.= "VRF description will be updated."; $action = "edit"; }
+
+            if ($action == "skip") {
+                $msg.= "Duplicate, will skip.";
+            }
+        } else {
+            $msg.="New entry, will be added."; $action = "add";
+        }
+    }
+
+    $cdata['msg'].= $msg;
+    $cdata['action'] = $action;
+    $counters[$action]++;
+
+    $rows.="<tr class='".$colors[$action]."'><td><i class='fa ".$icons[$action]."' rel='tooltip' data-placement='bottom' title='"._($msg)."'></i></td>
 		<td>".$cdata['name']."</td>
 		<td>".$cdata['rd']."</td>
 		<td>".$cdata['description']."</td>

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

Indentation +26 added lines, -26 removed lines

@@ -45,42 +45,42 @@
 
 //write headers
 if( (isset($_GET['name'])) && ($_GET['name'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Name') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('Name') ,$format_header);
+    $rowCount++;
 }
 if( (isset($_GET['rd'])) && ($_GET['rd'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('RD') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('RD') ,$format_header);
+    $rowCount++;
 }
 if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Description') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('Description') ,$format_header);
+    $rowCount++;
 }
 
 $lineCount++;
 
 //write all VRF entries
 foreach ($all_vrfs as $vrf) {
-	//cast
-	$vrf = (array) $vrf;
-
-	//reset row count
-	$rowCount = 0;
-
-	if( (isset($_GET['name'])) && ($_GET['name'] == "on") ) {
-		$worksheet->write($lineCount, $rowCount, $vrf['name'], $format_text);
-		$rowCount++;
-	}
-	if( (isset($_GET['rd'])) && ($_GET['rd'] == "on") ) {
-		$worksheet->write($lineCount, $rowCount, $vrf['rd'], $format_text);
-		$rowCount++;
-	}
-	if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
-		$worksheet->write($lineCount, $rowCount, $vrf['description'], $format_text);
-		$rowCount++;
-	}
-
-	$lineCount++;
+    //cast
+    $vrf = (array) $vrf;
+
+    //reset row count
+    $rowCount = 0;
+
+    if( (isset($_GET['name'])) && ($_GET['name'] == "on") ) {
+        $worksheet->write($lineCount, $rowCount, $vrf['name'], $format_text);
+        $rowCount++;
+    }
+    if( (isset($_GET['rd'])) && ($_GET['rd'] == "on") ) {
+        $worksheet->write($lineCount, $rowCount, $vrf['rd'], $format_text);
+        $rowCount++;
+    }
+    if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
+        $worksheet->write($lineCount, $rowCount, $vrf['description'], $format_text);
+        $rowCount++;
+    }
+
+    $lineCount++;
 }
 
 //new line

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

Indentation +32 added lines, -32 removed lines

@@ -48,43 +48,43 @@
 
 # manually adjust the standard fields
 foreach($expfields as $std_field) {
-	# extra table and field
-	if (isset($extfields[$std_field])) {
-		$cfield = $extfields[$std_field]["field"];
-		$ctable = $extfields[$std_field]["table"];
-		$pname  = $extfields[$std_field]["pname"]." ";
-	} else {
-		# default table and field
-		$cfield = $std_field;
-		$ctable = $mtable;
-		$pname = "";
-	}
-
-	# read field attributes
-	$field = $Tools->fetch_full_field_definition($ctable,$cfield);
-	$field = (array) $field;
-
-	# mark required fields with *
-	$msgr = in_array($std_field,$reqfields) ? "*" : "";
-
-	#prebuild template table rows to avoid useless foreach loops
-	$tpl_field_names.= "<th>".$pname.$field['Field'].$msgr."</th>";
-	$tpl_field_types.= "<td><small>". wordwrap($field['Type'],18,"<br>\n",true) ."</small></td>";
+    # extra table and field
+    if (isset($extfields[$std_field])) {
+        $cfield = $extfields[$std_field]["field"];
+        $ctable = $extfields[$std_field]["table"];
+        $pname  = $extfields[$std_field]["pname"]." ";
+    } else {
+        # default table and field
+        $cfield = $std_field;
+        $ctable = $mtable;
+        $pname = "";
+    }
+
+    # read field attributes
+    $field = $Tools->fetch_full_field_definition($ctable,$cfield);
+    $field = (array) $field;
+
+    # mark required fields with *
+    $msgr = in_array($std_field,$reqfields) ? "*" : "";
+
+    #prebuild template table rows to avoid useless foreach loops
+    $tpl_field_names.= "<th>".$pname.$field['Field'].$msgr."</th>";
+    $tpl_field_types.= "<td><small>". wordwrap($field['Type'],18,"<br>\n",true) ."</small></td>";
 }
 
 # append the custom fields, if any
 $custom_fields = $Tools->fetch_custom_fields($mtable);
 if(sizeof($custom_fields) > 0) {
-	foreach($custom_fields as $myField) {
-		# add field to required fields if needed
-		if ($myField['Null'] == "NO") { $reqfields[] = $myField['name']; }
-		# mark required fields with *
-		$msgr = in_array($myField['name'],$reqfields) ? "*" : "";
-
-		$tpl_field_names.= "<th>".$myField['name'].$msgr."</th>";
-		$tpl_field_types.= "<td><small>". wordwrap($myField['type'],18,"<br>\n",true) ."</small></td>";
-		$expfields[] = $myField['name'];
-	}
+    foreach($custom_fields as $myField) {
+        # add field to required fields if needed
+        if ($myField['Null'] == "NO") { $reqfields[] = $myField['name']; }
+        # mark required fields with *
+        $msgr = in_array($myField['name'],$reqfields) ? "*" : "";
+
+        $tpl_field_names.= "<th>".$myField['name'].$msgr."</th>";
+        $tpl_field_types.= "<td><small>". wordwrap($myField['type'],18,"<br>\n",true) ."</small></td>";
+        $expfields[] = $myField['name'];
+    }
 }
 
 ?>