phpipam / phpipam

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

Indentation +224 added lines, -224 removed lines

@@ -27,22 +27,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;
 }
 
 
@@ -73,81 +73,81 @@ 
 
 //write headers
 if( (isset($_GET['section'])) && ($_GET['section'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Section') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('Section') ,$format_header);
+    $rowCount++;
 }
 if( (isset($_GET['ip_addr'])) && ($_GET['ip_addr'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('IP Address') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('IP Address') ,$format_header);
+    $rowCount++;
 }
 if( (isset($_GET['dns_name'])) && ($_GET['dns_name'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Hostname') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('Hostname') ,$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++;
 }
 if( (isset($_GET['vrf'])) && ($_GET['vrf'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('VRF') ,$format_header);
-	$rowCount++;
-	# fetch all VRFs
-	$all_vrfs = $Admin->fetch_all_objects("vrf", "vrfId");
-	if (!$all_vrfs) { $all_vrfs = array(); }
-	# prepare list for easy processing
-	$vrfs = array(); $vrfs[0] = "default";
-	foreach ($all_vrfs as $vrf) { $vrf = (array) $vrf; $vrfs[$vrf['vrfId']] = $vrf['name']; }
+    $worksheet->write($lineCount, $rowCount, _('VRF') ,$format_header);
+    $rowCount++;
+    # fetch all VRFs
+    $all_vrfs = $Admin->fetch_all_objects("vrf", "vrfId");
+    if (!$all_vrfs) { $all_vrfs = array(); }
+    # prepare list for easy processing
+    $vrfs = array(); $vrfs[0] = "default";
+    foreach ($all_vrfs as $vrf) { $vrf = (array) $vrf; $vrfs[$vrf['vrfId']] = $vrf['name']; }
 }
 if( (isset($_GET['subnet'])) && ($_GET['subnet'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Subnet') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('Subnet') ,$format_header);
+    $rowCount++;
 }
 if( (isset($_GET['mac'])) && ($_GET['mac'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('MAC') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('MAC') ,$format_header);
+    $rowCount++;
 }
 if( (isset($_GET['owner'])) && ($_GET['owner'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Owner') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('Owner') ,$format_header);
+    $rowCount++;
 }
 if( (isset($_GET['device'])) && ($_GET['device'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Device') ,$format_header);
-	$rowCount++;
-	# get Devices and reorder
-	$devices = $Tools->fetch_all_objects ("devices", "hostname");
-	$devices_indexed = array();
-	if ($devices!==false) {
-	foreach($devices as $d) {
-    		$devices_indexed[$d->id] = $d;
-    	}
-	}
+    $worksheet->write($lineCount, $rowCount, _('Device') ,$format_header);
+    $rowCount++;
+    # get Devices and reorder
+    $devices = $Tools->fetch_all_objects ("devices", "hostname");
+    $devices_indexed = array();
+    if ($devices!==false) {
+    foreach($devices as $d) {
+            $devices_indexed[$d->id] = $d;
+        }
+    }
 }
 if( (isset($_GET['note'])) && ($_GET['note'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Note') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('Note') ,$format_header);
+    $rowCount++;
 }
 if( (isset($_GET['tag'])) && ($_GET['tag'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Tag') ,$format_header);
-	$rowCount++;
-	# get IP address types
-	$ip_types = $Addresses->addresses_types_fetch();
+    $worksheet->write($lineCount, $rowCount, _('Tag') ,$format_header);
+    $rowCount++;
+    # get IP address types
+    $ip_types = $Addresses->addresses_types_fetch();
 }
 if( (isset($_GET['gateway'])) && ($_GET['gateway'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Gateway') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('Gateway') ,$format_header);
+    $rowCount++;
 }
 
 //custom fields
 if(sizeof($custom_fields) > 0) {
-	foreach($custom_fields as $myField) {
-		//set temp name - replace space with three ___
-		$myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
-
-		if( (isset($_GET[$myField['nameTemp']])) && ($_GET[$myField['nameTemp']] == "on") ) {
-			$worksheet->write($lineCount, $rowCount, $myField['name'] ,$format_header);
-			$rowCount++;
-		}
-	}
+    foreach($custom_fields as $myField) {
+        //set temp name - replace space with three ___
+        $myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
+
+        if( (isset($_GET[$myField['nameTemp']])) && ($_GET[$myField['nameTemp']] == "on") ) {
+            $worksheet->write($lineCount, $rowCount, $myField['name'] ,$format_header);
+            $rowCount++;
+        }
+    }
 }
 
 $rowCount = 0;
@@ -155,171 +155,171 @@ 
 
 //write Subnet entries for the selected sections
 if($all_sections!==false) {
-	foreach ($all_sections as $section) {
-		//cast
-		$section = (array) $section;
-
-		if( (isset($_GET['exportSection__'.$section['name']])) && ($_GET['exportSection__'.$section['name']] == "on") ) {
-			// get all subnets in section
-			$section_subnets = $Subnets->fetch_section_subnets($section['id']);
-
-			if (sizeof($section_subnets)==0) { continue; }
-
-			foreach ($section_subnets as $subnet) {
-
-				$subnet = (array) $subnet;
-
-				// ignore folders
-				if($subnet['isFolder']) { continue; }
-
-				// grab IP addresses
-				$ipaddresses = $Addresses->fetch_subnet_addresses ($subnet['id']);
-
-				if (sizeof($ipaddresses)==0) { continue; }
-
-				foreach ($ipaddresses as $ip) {
-
-					//cast
-					$ip = (array) $ip;
-
-
-					if( (isset($_GET['section'])) && ($_GET['section'] == "on") ) {
-						$worksheet->write($lineCount, $rowCount, $section['name'], $format_text);
-						$rowCount++;
-					}
-
-					if( (isset($_GET['ip_addr'])) && ($_GET['ip_addr'] == "on") ) {
-						$worksheet->write($lineCount, $rowCount, $Subnets->transform_to_dotted($ip['ip_addr']), $format_text);
-						$rowCount++;
-					}
-
-					if( (isset($_GET['dns_name'])) && ($_GET['dns_name'] == "on") ) {
-						$worksheet->write($lineCount, $rowCount, $ip['dns_name'], $format_text);
-						$rowCount++;
-					}
-
-					if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
-						$worksheet->write($lineCount, $rowCount, $ip['description'], $format_text);
-						$rowCount++;
-					}
-
-					if( (isset($_GET['vrf'])) && ($_GET['vrf'] == "on") ) {
-						$worksheet->write($lineCount, $rowCount, $vrfs[$subnet['vrfId']], $format_text);
-						$rowCount++;
-					}
-
-					if( (isset($_GET['subnet'])) && ($_GET['subnet'] == "on") ) {
-						$worksheet->write($lineCount, $rowCount, $subnet['ip']."/".$subnet['mask'], $format_text);
-						$rowCount++;
-					}
-
-					if( (isset($_GET['state'])) && ($_GET['state'] == "on") ) {
-						$worksheet->write($lineCount, $rowCount, $ip['state'], $format_text);
-						$rowCount++;
-					}
-
-					if( (isset($_GET['mac'])) && ($_GET['mac'] == "on") ) {
-						$worksheet->write($lineCount, $rowCount, $ip['mac'], $format_text);
-						$rowCount++;
-					}
-
-					if( (isset($_GET['owner'])) && ($_GET['owner'] == "on") ) {
-						$worksheet->write($lineCount, $rowCount, $ip['owner'], $format_text);
-						$rowCount++;
-					}
-
-					if( (isset($_GET['device'])) && ($_GET['device'] == "on") ) {
-						//change device to name
-						$ip['device'] = is_null($ip['switch'])||strlen($ip['switch'])==0||$ip['switch']==0 ? "" : $devices_indexed[$ip['switch']]->hostname;
-						$worksheet->write($lineCount, $rowCount, $ip['device'], $format_text);
-						$rowCount++;
-					}
-
-					if( (isset($_GET['note'])) && ($_GET['note'] == "on") ) {
-						$worksheet->write($lineCount, $rowCount, $ip['note'], $format_text);
-						$rowCount++;
-					}
-
-					if( (isset($_GET['tag'])) && ($_GET['tag'] == "on") ) {
-						//reformat tag
-						$ip['tag'] = (@$ip_types[$ip['state']]['showtag']) ? $ip_types[$ip['state']]['type'] : "";
-						$worksheet->write($lineCount, $rowCount, $ip['tag'], $format_text);
-						$rowCount++;
-					}
-
-					if( (isset($_GET['gateway'])) && ($_GET['gateway'] == "on") ) {
-						$ip['gateway'] = ($ip['is_gateway']) ? _("Yes") : _("No");
-						$worksheet->write($lineCount, $rowCount, $ip['gateway'], $format_text);
-						$rowCount++;
-					}
-
-					//custom fields, per subnet
-					if(sizeof($custom_fields) > 0) {
-						foreach($custom_fields as $myField) {
-							//set temp name - replace space with three ___
-							$myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
-
-							if( (isset($_GET[$myField['nameTemp']])) && ($_GET[$myField['nameTemp']] == "on") ) {
-								$worksheet->write($lineCount, $rowCount, $ip[$myField['name']], $format_text);
-								$rowCount++;
-							}
-						}
-					}
-
-				//reset row count
-				$rowCount = 0;
-				$lineCount++;
-				}
-			}
-		}
-	}
+    foreach ($all_sections as $section) {
+        //cast
+        $section = (array) $section;
+
+        if( (isset($_GET['exportSection__'.$section['name']])) && ($_GET['exportSection__'.$section['name']] == "on") ) {
+            // get all subnets in section
+            $section_subnets = $Subnets->fetch_section_subnets($section['id']);
+
+            if (sizeof($section_subnets)==0) { continue; }
+
+            foreach ($section_subnets as $subnet) {
+
+                $subnet = (array) $subnet;
+
+                // ignore folders
+                if($subnet['isFolder']) { continue; }
+
+                // grab IP addresses
+                $ipaddresses = $Addresses->fetch_subnet_addresses ($subnet['id']);
+
+                if (sizeof($ipaddresses)==0) { continue; }
+
+                foreach ($ipaddresses as $ip) {
+
+                    //cast
+                    $ip = (array) $ip;
+
+
+                    if( (isset($_GET['section'])) && ($_GET['section'] == "on") ) {
+                        $worksheet->write($lineCount, $rowCount, $section['name'], $format_text);
+                        $rowCount++;
+                    }
+
+                    if( (isset($_GET['ip_addr'])) && ($_GET['ip_addr'] == "on") ) {
+                        $worksheet->write($lineCount, $rowCount, $Subnets->transform_to_dotted($ip['ip_addr']), $format_text);
+                        $rowCount++;
+                    }
+
+                    if( (isset($_GET['dns_name'])) && ($_GET['dns_name'] == "on") ) {
+                        $worksheet->write($lineCount, $rowCount, $ip['dns_name'], $format_text);
+                        $rowCount++;
+                    }
+
+                    if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
+                        $worksheet->write($lineCount, $rowCount, $ip['description'], $format_text);
+                        $rowCount++;
+                    }
+
+                    if( (isset($_GET['vrf'])) && ($_GET['vrf'] == "on") ) {
+                        $worksheet->write($lineCount, $rowCount, $vrfs[$subnet['vrfId']], $format_text);
+                        $rowCount++;
+                    }
+
+                    if( (isset($_GET['subnet'])) && ($_GET['subnet'] == "on") ) {
+                        $worksheet->write($lineCount, $rowCount, $subnet['ip']."/".$subnet['mask'], $format_text);
+                        $rowCount++;
+                    }
+
+                    if( (isset($_GET['state'])) && ($_GET['state'] == "on") ) {
+                        $worksheet->write($lineCount, $rowCount, $ip['state'], $format_text);
+                        $rowCount++;
+                    }
+
+                    if( (isset($_GET['mac'])) && ($_GET['mac'] == "on") ) {
+                        $worksheet->write($lineCount, $rowCount, $ip['mac'], $format_text);
+                        $rowCount++;
+                    }
+
+                    if( (isset($_GET['owner'])) && ($_GET['owner'] == "on") ) {
+                        $worksheet->write($lineCount, $rowCount, $ip['owner'], $format_text);
+                        $rowCount++;
+                    }
+
+                    if( (isset($_GET['device'])) && ($_GET['device'] == "on") ) {
+                        //change device to name
+                        $ip['device'] = is_null($ip['switch'])||strlen($ip['switch'])==0||$ip['switch']==0 ? "" : $devices_indexed[$ip['switch']]->hostname;
+                        $worksheet->write($lineCount, $rowCount, $ip['device'], $format_text);
+                        $rowCount++;
+                    }
+
+                    if( (isset($_GET['note'])) && ($_GET['note'] == "on") ) {
+                        $worksheet->write($lineCount, $rowCount, $ip['note'], $format_text);
+                        $rowCount++;
+                    }
+
+                    if( (isset($_GET['tag'])) && ($_GET['tag'] == "on") ) {
+                        //reformat tag
+                        $ip['tag'] = (@$ip_types[$ip['state']]['showtag']) ? $ip_types[$ip['state']]['type'] : "";
+                        $worksheet->write($lineCount, $rowCount, $ip['tag'], $format_text);
+                        $rowCount++;
+                    }
+
+                    if( (isset($_GET['gateway'])) && ($_GET['gateway'] == "on") ) {
+                        $ip['gateway'] = ($ip['is_gateway']) ? _("Yes") : _("No");
+                        $worksheet->write($lineCount, $rowCount, $ip['gateway'], $format_text);
+                        $rowCount++;
+                    }
+
+                    //custom fields, per subnet
+                    if(sizeof($custom_fields) > 0) {
+                        foreach($custom_fields as $myField) {
+                            //set temp name - replace space with three ___
+                            $myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
+
+                            if( (isset($_GET[$myField['nameTemp']])) && ($_GET[$myField['nameTemp']] == "on") ) {
+                                $worksheet->write($lineCount, $rowCount, $ip[$myField['name']], $format_text);
+                                $rowCount++;
+                            }
+                        }
+                    }
+
+                //reset row count
+                $rowCount = 0;
+                $lineCount++;
+                }
+            }
+        }
+    }
 }
 //new line
 $lineCount++;
 
 //write section sheet
 if( (isset($_GET['exportSections'])) && ($_GET['exportSections'] == "on") ) {
-	// Create a worksheet
-	$worksheet_sections =& $workbook->addWorksheet('Sections');
-
-	$lineCount = 0;
-	$rowCount = 0;
-
-	//write headers
-	$worksheet_sections->write($lineCount, $rowCount, _('Name') ,$format_header);
-	$rowCount++;
-	$worksheet_sections->write($lineCount, $rowCount, _('Description') ,$format_header);
-	$rowCount++;
-	$worksheet_sections->write($lineCount, $rowCount, _('Parent') ,$format_header);
-	$rowCount++;
-
-	$lineCount++;
-	$rowCount = 0;
-
-	foreach ($sections_sorted as $section) {
-		//cast
-		$section = (array) $section;
-
-		if( (isset($_GET['exportSection__'.str_replace(" ", "_", $section['name'])])) && ($_GET['exportSection__'.str_replace(" ", "_", $section['name'])] == "on") ) {
-			$worksheet_sections->write($lineCount, $rowCount, $section['name'], $format_text);
-			$rowCount++;
-			$worksheet_sections->write($lineCount, $rowCount, $section['description'], $format_text);
-			$rowCount++;
-			//master Section
-			if($section['masterSection']!=0) {
-				# get section details
-				$ssec = $Admin->fetch_object("sections", "id", $section['masterSection']);
-				$worksheet_sections->write($lineCount, $rowCount, $ssec->name, $format_text);
-				$rowCount++;
-			} else {
-				$worksheet_sections->write($lineCount, $rowCount, "/", $format_text);
-				$rowCount++;
-			}
-		}
-
-		$lineCount++;
-		$rowCount = 0;
-	}
+    // Create a worksheet
+    $worksheet_sections =& $workbook->addWorksheet('Sections');
+
+    $lineCount = 0;
+    $rowCount = 0;
+
+    //write headers
+    $worksheet_sections->write($lineCount, $rowCount, _('Name') ,$format_header);
+    $rowCount++;
+    $worksheet_sections->write($lineCount, $rowCount, _('Description') ,$format_header);
+    $rowCount++;
+    $worksheet_sections->write($lineCount, $rowCount, _('Parent') ,$format_header);
+    $rowCount++;
+
+    $lineCount++;
+    $rowCount = 0;
+
+    foreach ($sections_sorted as $section) {
+        //cast
+        $section = (array) $section;
+
+        if( (isset($_GET['exportSection__'.str_replace(" ", "_", $section['name'])])) && ($_GET['exportSection__'.str_replace(" ", "_", $section['name'])] == "on") ) {
+            $worksheet_sections->write($lineCount, $rowCount, $section['name'], $format_text);
+            $rowCount++;
+            $worksheet_sections->write($lineCount, $rowCount, $section['description'], $format_text);
+            $rowCount++;
+            //master Section
+            if($section['masterSection']!=0) {
+                # get section details
+                $ssec = $Admin->fetch_object("sections", "id", $section['masterSection']);
+                $worksheet_sections->write($lineCount, $rowCount, $ssec->name, $format_text);
+                $rowCount++;
+            } else {
+                $worksheet_sections->write($lineCount, $rowCount, "/", $format_text);
+                $rowCount++;
+            }
+        }
+
+        $lineCount++;
+        $rowCount = 0;
+    }
 }
 
 // sending HTTP headers

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

Indentation +32 added lines, -32 removed lines

@@ -60,44 +60,44 @@
 

 # 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 ? $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 ? $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'];

 //		$disfields[] = $myField['name'];

-	}

+    }

 }

 

 ?>

Braces +4 added lines, -3 removed lines

@@ -61,11 +61,12 @@ 
 # manually adjust the standard fields

 foreach($expfields as $std_field) {

 	# extra table and field

-	if (isset($extfields[$std_field])) {

+	if (isset($extfields[$std_field])) {
 		$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;

@@ -86,7 +87,7 @@ 
 

 # append the custom fields, if any

 $custom_fields = $Tools->fetch_custom_fields($mtable);

-if(sizeof($custom_fields) > 0) {

+if(sizeof($custom_fields) > 0) {
 	foreach($custom_fields as $myField) {

 		# add field to required fields if needed

 		if ($myField['Null'] == "NO") { $reqfields[] = $myField['name']; }

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

Indentation +63 added lines, -63 removed lines

@@ -25,77 +25,77 @@
 
 
 if ($type == 'subnets'){
-	//get all custom fields!
-	$custom_address_fields = $Tools->fetch_custom_fields('subnets');
-	// set headers
-	$worksheet->write($lineCount, 0, _('Section'));
-	$worksheet->write($lineCount, 1, _('Subnet'));
-	$worksheet->write($lineCount, 2, _('Mask'));
-	$worksheet->write($lineCount, 3, _('Description'));
-	$worksheet->write($lineCount, 4, _('VLAN'));
-	$worksheet->write($lineCount, 5, _('VLAN Domain'));
-	$worksheet->write($lineCount, 6, _('VRF'));
-	$fc =7 ;
-	foreach($custom_address_fields as $k=>$f) {
-		$worksheet->write($lineCount, $fc, $k);
-		$fc++;
-	}
+    //get all custom fields!
+    $custom_address_fields = $Tools->fetch_custom_fields('subnets');
+    // set headers
+    $worksheet->write($lineCount, 0, _('Section'));
+    $worksheet->write($lineCount, 1, _('Subnet'));
+    $worksheet->write($lineCount, 2, _('Mask'));
+    $worksheet->write($lineCount, 3, _('Description'));
+    $worksheet->write($lineCount, 4, _('VLAN'));
+    $worksheet->write($lineCount, 5, _('VLAN Domain'));
+    $worksheet->write($lineCount, 6, _('VRF'));
+    $fc =7 ;
+    foreach($custom_address_fields as $k=>$f) {
+        $worksheet->write($lineCount, $fc, $k);
+        $fc++;
+    }
 }
 elseif ($type == 'ipaddr'){
-	//get all custom fields!
-	$custom_address_fields = $Tools->fetch_custom_fields('ipaddresses');
-	// set headers
-	// "section","ip_addr","dns_name","description","vrf","subnet","mac","owner","device","note","tag","gateway"
-	$worksheet->write($lineCount, 0, _('Section'));
-	$worksheet->write($lineCount, 1, _('IP address'));
-	$worksheet->write($lineCount, 2, _('DNS Hostname'));
-	$worksheet->write($lineCount, 3, _('Description'));
-	$worksheet->write($lineCount, 4, _('VRF'));
-	$worksheet->write($lineCount, 4, _('Subnet'));
-	$worksheet->write($lineCount, 5, _('MAC'));
-	$worksheet->write($lineCount, 6, _('Owner'));
-	$worksheet->write($lineCount, 7, _('Device'));
-	$worksheet->write($lineCount, 8, _('Note'));
-	$worksheet->write($lineCount, 9, _('Tag'));
-	$worksheet->write($lineCount, 10, _('Gateway'));
-	$fc =7 ;
-	foreach($custom_address_fields as $k=>$f) {
-		$worksheet->write($lineCount, $fc, $k);
-		$fc++;
-	}
+    //get all custom fields!
+    $custom_address_fields = $Tools->fetch_custom_fields('ipaddresses');
+    // set headers
+    // "section","ip_addr","dns_name","description","vrf","subnet","mac","owner","device","note","tag","gateway"
+    $worksheet->write($lineCount, 0, _('Section'));
+    $worksheet->write($lineCount, 1, _('IP address'));
+    $worksheet->write($lineCount, 2, _('DNS Hostname'));
+    $worksheet->write($lineCount, 3, _('Description'));
+    $worksheet->write($lineCount, 4, _('VRF'));
+    $worksheet->write($lineCount, 4, _('Subnet'));
+    $worksheet->write($lineCount, 5, _('MAC'));
+    $worksheet->write($lineCount, 6, _('Owner'));
+    $worksheet->write($lineCount, 7, _('Device'));
+    $worksheet->write($lineCount, 8, _('Note'));
+    $worksheet->write($lineCount, 9, _('Tag'));
+    $worksheet->write($lineCount, 10, _('Gateway'));
+    $fc =7 ;
+    foreach($custom_address_fields as $k=>$f) {
+        $worksheet->write($lineCount, $fc, $k);
+        $fc++;
+    }
 }
 elseif ($type == 'vrf'){
-	//get all custom fields!
-	$custom_address_fields = $Tools->fetch_custom_fields('vrf');
-	// set headers
-	$worksheet->write($lineCount, 0, _('Name'));
-	$worksheet->write($lineCount, 1, _('RD'));
-	$worksheet->write($lineCount, 2, _('Description'));
-	$fc =3 ;
-	foreach($custom_address_fields as $k=>$f) {
-		$worksheet->write($lineCount, $fc, $k);
-		$fc++;
-	}
+    //get all custom fields!
+    $custom_address_fields = $Tools->fetch_custom_fields('vrf');
+    // set headers
+    $worksheet->write($lineCount, 0, _('Name'));
+    $worksheet->write($lineCount, 1, _('RD'));
+    $worksheet->write($lineCount, 2, _('Description'));
+    $fc =3 ;
+    foreach($custom_address_fields as $k=>$f) {
+        $worksheet->write($lineCount, $fc, $k);
+        $fc++;
+    }
 }
 elseif ($type == 'vlans'){
-	//get all custom fields!
-	$custom_address_fields = $Tools->fetch_custom_fields('vlans');
-	// set headers
-	$worksheet->write($lineCount, 0, _('Name'));
-	$worksheet->write($lineCount, 1, _('Number'));
-	$worksheet->write($lineCount, 2, _('Description'));
-	$worksheet->write($lineCount, 3, _('Domain name'));
-	$fc =4 ;
-	foreach($custom_address_fields as $k=>$f) {
-		$worksheet->write($lineCount, $fc, $k);
-		$fc++;
-	}
+    //get all custom fields!
+    $custom_address_fields = $Tools->fetch_custom_fields('vlans');
+    // set headers
+    $worksheet->write($lineCount, 0, _('Name'));
+    $worksheet->write($lineCount, 1, _('Number'));
+    $worksheet->write($lineCount, 2, _('Description'));
+    $worksheet->write($lineCount, 3, _('Domain name'));
+    $fc =4 ;
+    foreach($custom_address_fields as $k=>$f) {
+        $worksheet->write($lineCount, $fc, $k);
+        $fc++;
+    }
 }
 elseif ($type == 'l2dom'){
-	// set headers
-	$worksheet->write($lineCount, 0, _('Name'));
-	$worksheet->write($lineCount, 1, _('Description'));
-	$fc =2 ;
+    // set headers
+    $worksheet->write($lineCount, 0, _('Name'));
+    $worksheet->write($lineCount, 1, _('Description'));
+    $fc =2 ;
 }
 // sending HTTP headers
 $workbook->send($filename);

Braces +5 added lines, -5 removed lines

@@ -24,7 +24,7 @@ 
 $worksheet = $workbook->addWorksheet("template");
 
 
-if ($type == 'subnets'){
+if ($type == 'subnets') {
 	//get all custom fields!
 	$custom_address_fields = $Tools->fetch_custom_fields('subnets');
 	// set headers
@@ -41,7 +41,7 @@ 
 		$fc++;
 	}
 }
-elseif ($type == 'ipaddr'){
+elseif ($type == 'ipaddr') {
 	//get all custom fields!
 	$custom_address_fields = $Tools->fetch_custom_fields('ipaddresses');
 	// set headers
@@ -64,7 +64,7 @@ 
 		$fc++;
 	}
 }
-elseif ($type == 'vrf'){
+elseif ($type == 'vrf') {
 	//get all custom fields!
 	$custom_address_fields = $Tools->fetch_custom_fields('vrf');
 	// set headers
@@ -77,7 +77,7 @@ 
 		$fc++;
 	}
 }
-elseif ($type == 'vlans'){
+elseif ($type == 'vlans') {
 	//get all custom fields!
 	$custom_address_fields = $Tools->fetch_custom_fields('vlans');
 	// set headers
@@ -91,7 +91,7 @@ 
 		$fc++;
 	}
 }
-elseif ($type == 'l2dom'){
+elseif ($type == 'l2dom') {
 	// set headers
 	$worksheet->write($lineCount, 0, _('Name'));
 	$worksheet->write($lineCount, 1, _('Description'));

app/admin/import-export/import-ipaddr-preview.php

Braces +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 </div>

 

 <?php

-if (($counters['add'] > 0) || ($counters['edit'] > 0)) {

+if (($counters['add'] > 0) || ($counters['edit'] > 0)) {
 ?>

 

 	<script type="text/javascript">

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

Indentation +172 added lines, -172 removed lines

@@ -34,10 +34,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

@@ -49,41 +49,41 @@ 
 $subnet_data = array();

 

 foreach ($all_sections as $section) {

-	$section = (array) $section;

-	$section_names[strtolower($section['name'])] = $section;

+    $section = (array) $section;

+    $section_names[strtolower($section['name'])] = $section;

 

-	# skip sections we're not importing for, so we save cpu time and memory

-	if (!isset($used_section[strtolower($section['name'])])) { continue; }

+    # skip sections we're not importing for, so we save cpu time and memory

+    if (!isset($used_section[strtolower($section['name'])])) { continue; }

 

-	$section_subnets = $Subnets->fetch_section_subnets($section['id']);

+    $section_subnets = $Subnets->fetch_section_subnets($section['id']);

 

-	# skip empty sections

-	if (sizeof($section_subnets)==0) { continue; }

+    # skip empty sections

+    if (sizeof($section_subnets)==0) { continue; }

 	

-	foreach ($section_subnets as $subnet) {

-		$subnet = (array) $subnet;

+    foreach ($section_subnets as $subnet) {

+        $subnet = (array) $subnet;

 

-		# ignore folders

-		if($subnet['isFolder']) { continue; }

+        # ignore folders

+        if($subnet['isFolder']) { continue; }

 

-		# store needed subnet information

-		$subnet_data[$section['id']][$subnet['vrfId']][$subnet['ip']][$subnet['mask']] = $subnet;

-		$subnet_data[$section['id']][$subnet['vrfId']][$subnet['ip']][$subnet['mask']]['type'] = $Subnets->identify_address($subnet['ip']);

+        # store needed subnet information

+        $subnet_data[$section['id']][$subnet['vrfId']][$subnet['ip']][$subnet['mask']] = $subnet;

+        $subnet_data[$section['id']][$subnet['vrfId']][$subnet['ip']][$subnet['mask']]['type'] = $Subnets->identify_address($subnet['ip']);

 		

-		# grab IP addresses

-		$ipaddresses = $Addresses->fetch_subnet_addresses ($subnet['id']);

+        # grab IP addresses

+        $ipaddresses = $Addresses->fetch_subnet_addresses ($subnet['id']);

 

-		if (sizeof($ipaddresses)==0) { continue; }

+        if (sizeof($ipaddresses)==0) { continue; }

 

-		foreach ($ipaddresses as $ip) {

+        foreach ($ipaddresses as $ip) {

 

-			//cast

-			$ip = (array) $ip;

+            //cast

+            $ip = (array) $ip;

 

-			$edata[$section['id']][$subnet['vrfId']][$subnet['ip']][$subnet['mask']][$Subnets->transform_address($ip['ip_addr'], "dotted")] = $ip;

+            $edata[$section['id']][$subnet['vrfId']][$subnet['ip']][$subnet['mask']][$Subnets->transform_address($ip['ip_addr'], "dotted")] = $ip;

 

-		}

-	}

+        }

+    }

 }

 

 # Load available tags

@@ -94,12 +94,12 @@ 
 $device_data = array();

 $devices = $Tools->fetch_all_objects("devices", "hostname");

 if ($devices!==false) {

-	foreach($devices as $c_dev) {

-		$c_dev = (array) $c_dev;

-		$c_dev_sections=explode(";", $c_dev['sections']);

-		# Populate each section with the devices it has

-		foreach($c_dev_sections as $c_dev_sect) { $device_data[$c_dev_sect][$c_dev['hostname']] = $c_dev;}

-	}

+    foreach($devices as $c_dev) {

+        $c_dev = (array) $c_dev;

+        $c_dev_sections=explode(";", $c_dev['sections']);

+        # Populate each section with the devices it has

+        foreach($c_dev_sections as $c_dev_sect) { $device_data[$c_dev_sect][$c_dev['hostname']] = $c_dev;}

+    }

 }

 

 $rows = "";

@@ -108,156 +108,156 @@ 
 

 # 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 { $msg.= "The subnet needs to have the mask defined as /BM (Bit Mask)"; $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[strtolower($cdata['section'])])) {

-		$msg.= "Invalid section."; $action = "error";

-	} else {

-		$cdata['sectionId'] = $section_names[strtolower($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, using default

-		$cdata['vrfId'] = 0;

-	}

-

-	# Check if Subnet is provided and valid and link it if it is

-	if ((!empty($cdata['subnet'])) and (!empty($cdata['mask']))) {

-		if (!isset($subnet_data[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']])) {

-			$msg.= "Invalid Subnet."; $action = "error";

-		} else {

-			$cdata['subnetId'] = $subnet_data[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']]['id'];

-		}

-	} else {

-		# no subnet provided, search not implemented yet, giving out error.

-		$msg.= "Subnet/Mask not provided."; $action = "error";

-	}

-

-	# Match device name against device IDs

-	if (!empty($cdata['device'])) {

-		if (!isset($device_data[$cdata['sectionId']][$cdata['device']])) {

-			$msg.= "Invalid device hostname."; $action = "error";

-		} else {

-			$cdata['switch'] = $device_data[$cdata['sectionId']][$cdata['device']]['id'];

-		}

-	} else {

-		$cdata['switch'] = 0;

-	}

-

-	# Check if a tag is provided and valid and link it if it is

-	if (!empty($cdata['tag'])) {

-		if (!isset($tag_data[$cdata['tag']])) {

-			$msg.= "Invalid tag."; $action = "error";

-		} else {

-			$cdata['state'] = $tag_data[$cdata['tag']]['id'];

-		}

-	} else {

-		# no tag provided, using default

-		$cdata['state'] = 2;

-	}

+    $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 { $msg.= "The subnet needs to have the mask defined as /BM (Bit Mask)"; $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[strtolower($cdata['section'])])) {

+        $msg.= "Invalid section."; $action = "error";

+    } else {

+        $cdata['sectionId'] = $section_names[strtolower($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, using default

+        $cdata['vrfId'] = 0;

+    }

+

+    # Check if Subnet is provided and valid and link it if it is

+    if ((!empty($cdata['subnet'])) and (!empty($cdata['mask']))) {

+        if (!isset($subnet_data[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']])) {

+            $msg.= "Invalid Subnet."; $action = "error";

+        } else {

+            $cdata['subnetId'] = $subnet_data[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']]['id'];

+        }

+    } else {

+        # no subnet provided, search not implemented yet, giving out error.

+        $msg.= "Subnet/Mask not provided."; $action = "error";

+    }

+

+    # Match device name against device IDs

+    if (!empty($cdata['device'])) {

+        if (!isset($device_data[$cdata['sectionId']][$cdata['device']])) {

+            $msg.= "Invalid device hostname."; $action = "error";

+        } else {

+            $cdata['switch'] = $device_data[$cdata['sectionId']][$cdata['device']]['id'];

+        }

+    } else {

+        $cdata['switch'] = 0;

+    }

+

+    # Check if a tag is provided and valid and link it if it is

+    if (!empty($cdata['tag'])) {

+        if (!isset($tag_data[$cdata['tag']])) {

+            $msg.= "Invalid tag."; $action = "error";

+        } else {

+            $cdata['state'] = $tag_data[$cdata['tag']]['id'];

+        }

+    } else {

+        # no tag provided, using default

+        $cdata['state'] = 2;

+    }

 

 	

-	# Verify gateway

-	if (in_array(strtolower($cdata['is_gateway']),array("yes","true","1"))) { $cdata['is_gateway'] = 1; } else { $cdata['is_gateway'] = 0; }

+    # Verify gateway

+    if (in_array(strtolower($cdata['is_gateway']),array("yes","true","1"))) { $cdata['is_gateway'] = 1; } else { $cdata['is_gateway'] = 0; }

 	

-	if ($action != "error") {

-    	if(!$Addresses->validate_ip($cdata['ip_addr'])) { $msg.="Invalid IP address."; $action = "error"; }

-		if ((!empty($cdata['dns_name'])) and (!preg_match("/^(?=.{1,255}$)[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?(?:\.[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?)*\.?$/", $cdata['dns_name']))) { $msg.="Invalid DNS name."; $action = "error"; }

-		if (preg_match("/[;'\"]/", $cdata['description'])) { $msg.="Invalid characters in description."; $action = "error"; }

-		if ($cdata['mac']) {

-			if (!preg_match("/^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/", $cdata['mac'])) { $msg.="Invalid MAC address."; $action = "error"; }

-		}

-		if (preg_match("/[;'\"]/", $cdata['owner'])) { $msg.="Invalid characters in owner name."; $action = "error"; }

-		if (preg_match("/[;'\"]/", $cdata['note'])) { $msg.="Invalid characters in note."; $action = "error"; }

-	}

-

-	# check if duplicate in the import data

-	if ($action != "error") {

-		if (isset($ndata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']][$cdata['ip_addr']])) { $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']][$cdata['ip_addr']])) {

-			# copy content to a variable for easier checks

-			$cedata = $edata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']][$cdata['ip_addr']];

-

-			# Check if we need to change any fields

-			$action = "skip"; # skip duplicate fields if identical, update if different

-			if ($cdata['dns_name'] != $cedata['dns_name']) { $msg.= "Address DNS name will be updated."; $action = "edit"; }

-			if ($cdata['description'] != $cedata['description']) { $msg.= "Address description will be updated."; $action = "edit"; }

-			if ($cdata['mac'] != $cedata['mac']) { $msg.= "Address MAC address will be updated."; $action = "edit"; }

-			if ($cdata['owner'] != $cedata['owner']) { $msg.= "Address owner will be updated."; $action = "edit"; }

-			if ($cdata['switch'] != $cedata['switch']) { $msg.= "Device will be updated."; $action = "edit"; }

-			if ($cdata['note'] != $cedata['note']) { $msg.= "Address note will be updated."; $action = "edit"; }

-			if ($cdata['state'] != $cedata['state']) { $msg.= "Address tag (state) 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

+    if ($action != "error") {

+        if(!$Addresses->validate_ip($cdata['ip_addr'])) { $msg.="Invalid IP address."; $action = "error"; }

+        if ((!empty($cdata['dns_name'])) and (!preg_match("/^(?=.{1,255}$)[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?(?:\.[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?)*\.?$/", $cdata['dns_name']))) { $msg.="Invalid DNS name."; $action = "error"; }

+        if (preg_match("/[;'\"]/", $cdata['description'])) { $msg.="Invalid characters in description."; $action = "error"; }

+        if ($cdata['mac']) {

+            if (!preg_match("/^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/", $cdata['mac'])) { $msg.="Invalid MAC address."; $action = "error"; }

+        }

+        if (preg_match("/[;'\"]/", $cdata['owner'])) { $msg.="Invalid characters in owner name."; $action = "error"; }

+        if (preg_match("/[;'\"]/", $cdata['note'])) { $msg.="Invalid characters in note."; $action = "error"; }

+    }

+

+    # check if duplicate in the import data

+    if ($action != "error") {

+        if (isset($ndata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']][$cdata['ip_addr']])) { $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']][$cdata['ip_addr']])) {

+            # copy content to a variable for easier checks

+            $cedata = $edata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']][$cdata['ip_addr']];

+

+            # Check if we need to change any fields

+            $action = "skip"; # skip duplicate fields if identical, update if different

+            if ($cdata['dns_name'] != $cedata['dns_name']) { $msg.= "Address DNS name will be updated."; $action = "edit"; }

+            if ($cdata['description'] != $cedata['description']) { $msg.= "Address description will be updated."; $action = "edit"; }

+            if ($cdata['mac'] != $cedata['mac']) { $msg.= "Address MAC address will be updated."; $action = "edit"; }

+            if ($cdata['owner'] != $cedata['owner']) { $msg.= "Address owner will be updated."; $action = "edit"; }

+            if ($cdata['switch'] != $cedata['switch']) { $msg.= "Device will be updated."; $action = "edit"; }

+            if ($cdata['note'] != $cedata['note']) { $msg.= "Address note will be updated."; $action = "edit"; }

+            if ($cdata['state'] != $cedata['state']) { $msg.= "Address tag (state) 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['port'] = $cedata['port'];		$cdata['lastseen'] = $cedata['lastseen'];

 // 				$cdata['excludePing'] = $cedata['excludePing'];

 // 				$cdata['PTRignore'] = $cedata['PTRignore']; $cdata['PTR'] = $cedata['PTR']; $cdata['NAT'] = $cedata['NAT'];

 // 				$cdata['firewallAddressObject'] = $cedata['firewallAddressObject'];

-			}

-		} else {

-			$msg.="New entry, will be added."; $action = "add";

+            }

+        } else {

+            $msg.="New entry, will be added."; $action = "add";

 

-			# Add it to ndata for duplicate check

-			$ndata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']][$cdata['ip_addr']] = $cdata;

-		}

-	}

+            # Add it to ndata for duplicate check

+            $ndata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']][$cdata['ip_addr']] = $cdata;

+        }

+    }

 

-	$cdata['msg'].= $msg;

-	$cdata['action'] = $action;

-	$counters[$action]++;

+    $cdata['msg'].= $msg;

+    $cdata['action'] = $action;

+    $counters[$action]++;

 

-	$cdata['subnet'] = $cdata['subnet']."/".$cdata['mask'];

+    $cdata['subnet'] = $cdata['subnet']."/".$cdata['mask'];

 

-	$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>";

+    $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>";

 

 }

 

Braces +48 added lines, -35 removed lines

@@ -93,7 +93,7 @@ 
 # Load available devices

 $device_data = array();

 $devices = $Tools->fetch_all_objects("devices", "hostname");

-if ($devices!==false) {

+if ($devices!==false) {
 	foreach($devices as $c_dev) {

 		$c_dev = (array) $c_dev;

 		$c_dev_sections=explode(";", $c_dev['sections']);

@@ -116,84 +116,95 @@ 
 	}

 

 	# if the subnet contains "/", split it in network and mask

-	if ($action != "error") {

-		if (preg_match("/\//", $cdata['subnet'])) {

+	if ($action != "error") {
+		if (preg_match("/\//", $cdata['subnet'])) {
 			list($caddr,$cmask) = explode("/",$cdata['subnet'],2);

 			$cdata['mask'] = $cmask;

 			$cdata['subnet'] = $caddr;

-		} 

+		}
 		else { $msg.= "The subnet needs to have the mask defined as /BM (Bit Mask)"; $action = "error"; }

-		if ((!empty($cdata['mask'])) && (!preg_match("/^([0-9]+|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)$/", $cdata['mask']))) {

+		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"; }

 		}

 	}

 

 	# Check if section is provided and valid and link it if it is

-	if (!isset($section_names[strtolower($cdata['section'])])) {

+	if (!isset($section_names[strtolower($cdata['section'])])) {
 		$msg.= "Invalid section."; $action = "error";

-	} else {

+	}
+	else {
 		$cdata['sectionId'] = $section_names[strtolower($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']])) {

+	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, using default

 		$cdata['vrfId'] = 0;

 	}

 

 	# Check if Subnet is provided and valid and link it if it is

-	if ((!empty($cdata['subnet'])) and (!empty($cdata['mask']))) {

-		if (!isset($subnet_data[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']])) {

+	if ((!empty($cdata['subnet'])) and (!empty($cdata['mask']))) {
+		if (!isset($subnet_data[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']])) {
 			$msg.= "Invalid Subnet."; $action = "error";

-		} else {

+		}
+		else {
 			$cdata['subnetId'] = $subnet_data[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']]['id'];

 		}

-	} else {

+	}
+	else {
 		# no subnet provided, search not implemented yet, giving out error.

 		$msg.= "Subnet/Mask not provided."; $action = "error";

 	}

 

 	# Match device name against device IDs

-	if (!empty($cdata['device'])) {

-		if (!isset($device_data[$cdata['sectionId']][$cdata['device']])) {

+	if (!empty($cdata['device'])) {
+		if (!isset($device_data[$cdata['sectionId']][$cdata['device']])) {
 			$msg.= "Invalid device hostname."; $action = "error";

-		} else {

+		}
+		else {
 			$cdata['switch'] = $device_data[$cdata['sectionId']][$cdata['device']]['id'];

 		}

-	} else {

+	}
+	else {
 		$cdata['switch'] = 0;

 	}

 

 	# Check if a tag is provided and valid and link it if it is

-	if (!empty($cdata['tag'])) {

-		if (!isset($tag_data[$cdata['tag']])) {

+	if (!empty($cdata['tag'])) {
+		if (!isset($tag_data[$cdata['tag']])) {
 			$msg.= "Invalid tag."; $action = "error";

-		} else {

+		}
+		else {
 			$cdata['state'] = $tag_data[$cdata['tag']]['id'];

 		}

-	} else {

+	}
+	else {
 		# no tag provided, using default

 		$cdata['state'] = 2;

 	}

 

 	

 	# Verify gateway

-	if (in_array(strtolower($cdata['is_gateway']),array("yes","true","1"))) { $cdata['is_gateway'] = 1; } else { $cdata['is_gateway'] = 0; }

+	if (in_array(strtolower($cdata['is_gateway']),array("yes","true","1"))) { $cdata['is_gateway'] = 1; }
+	else { $cdata['is_gateway'] = 0; }

 	

-	if ($action != "error") {

+	if ($action != "error") {
     	if(!$Addresses->validate_ip($cdata['ip_addr'])) { $msg.="Invalid IP address."; $action = "error"; }

 		if ((!empty($cdata['dns_name'])) and (!preg_match("/^(?=.{1,255}$)[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?(?:\.[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?)*\.?$/", $cdata['dns_name']))) { $msg.="Invalid DNS name."; $action = "error"; }

 		if (preg_match("/[;'\"]/", $cdata['description'])) { $msg.="Invalid characters in description."; $action = "error"; }

-		if ($cdata['mac']) {

+		if ($cdata['mac']) {
 			if (!preg_match("/^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/", $cdata['mac'])) { $msg.="Invalid MAC address."; $action = "error"; }

 		}

 		if (preg_match("/[;'\"]/", $cdata['owner'])) { $msg.="Invalid characters in owner name."; $action = "error"; }

@@ -201,13 +212,13 @@ 
 	}

 

 	# check if duplicate in the import data

-	if ($action != "error") {

+	if ($action != "error") {
 		if (isset($ndata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']][$cdata['ip_addr']])) { $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']][$cdata['ip_addr']])) {

+	if ($action != "error") {
+		if (isset($edata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']][$cdata['ip_addr']])) {
 			# copy content to a variable for easier checks

 			$cedata = $edata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']][$cdata['ip_addr']];

 

@@ -222,17 +233,18 @@ 
 			if ($cdata['state'] != $cedata['state']) { $msg.= "Address tag (state) will be updated."; $action = "edit"; }

 

 			# Check if the values of the custom fields have changed

-			if(sizeof($custom_fields) > 0) {

+			if(sizeof($custom_fields) > 0) {
 				foreach($custom_fields as $myField) {

-					if ($cdata[$myField['name']] != $cedata[$myField['name']]) {

+					if ($cdata[$myField['name']] != $cedata[$myField['name']]) {
 						$msg.= $myField['name']." will be updated."; $action = "edit";

 					}

 				}

 			}

 

-			if ($action == "skip") {

+			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

@@ -241,7 +253,8 @@ 
 // 				$cdata['PTRignore'] = $cedata['PTRignore']; $cdata['PTR'] = $cedata['PTR']; $cdata['NAT'] = $cedata['NAT'];

 // 				$cdata['firewallAddressObject'] = $cedata['firewallAddressObject'];

 			}

-		} else {

+		}
+		else {
 			$msg.="New entry, will be added."; $action = "add";

 

 			# Add it to ndata for duplicate check

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

Indentation +39 added lines, -39 removed lines

@@ -33,45 +33,45 @@
 
 # import IP Addresses
 foreach ($data as &$cdata) {
-	if (($cdata['action'] == "add") || ($cdata['action'] == "edit")) {
-		// # set update array
-
-		$values = array("id"=>$cdata['id'],
-						"ip_addr"=>$Addresses->transform_address($cdata['ip_addr'],"decimal"),
-						"subnetId"=>$cdata['subnetId'],
-						"dns_name"=>$cdata['dns_name'],
-						"description"=>$cdata['description'],
-						"mac"=>$cdata['mac'],
-						"owner"=>$cdata['owner'],
-						"switch"=>$cdata['switch'],
-						"state"=>$cdata['state'],
-						"note"=>$cdata['note'],
-						"is_gateway"=>$cdata['is_gateway']
-						);
-
-		# add custom fields
-		if(sizeof($custom_fields) > 0) {
-			foreach($custom_fields as $myField) {
-				if(isset($cdata[$myField['name']])) { $values[$myField['name']] = $cdata[$myField['name']]; }
-			}
-		}
-
-		# update
-		$cdata['result'] = $Admin->object_modify("ipaddresses", $cdata['action'], "id", $values);
-
-		if ($cdata['result']) {
-			$trc = $colors[$cdata['action']];
-			$msg = "IP Address ".$cdata['action']." successful.";
-		} else {
-			$trc = "danger";
-			$msg = "IP Address ".$cdata['action']." failed.";
-		}
-
-		$rows.="<tr class='".$trc."'><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>"._($msg)."</td></tr>";
-
-	}
+    if (($cdata['action'] == "add") || ($cdata['action'] == "edit")) {
+        // # set update array
+
+        $values = array("id"=>$cdata['id'],
+                        "ip_addr"=>$Addresses->transform_address($cdata['ip_addr'],"decimal"),
+                        "subnetId"=>$cdata['subnetId'],
+                        "dns_name"=>$cdata['dns_name'],
+                        "description"=>$cdata['description'],
+                        "mac"=>$cdata['mac'],
+                        "owner"=>$cdata['owner'],
+                        "switch"=>$cdata['switch'],
+                        "state"=>$cdata['state'],
+                        "note"=>$cdata['note'],
+                        "is_gateway"=>$cdata['is_gateway']
+                        );
+
+        # add custom fields
+        if(sizeof($custom_fields) > 0) {
+            foreach($custom_fields as $myField) {
+                if(isset($cdata[$myField['name']])) { $values[$myField['name']] = $cdata[$myField['name']]; }
+            }
+        }
+
+        # update
+        $cdata['result'] = $Admin->object_modify("ipaddresses", $cdata['action'], "id", $values);
+
+        if ($cdata['result']) {
+            $trc = $colors[$cdata['action']];
+            $msg = "IP Address ".$cdata['action']." successful.";
+        } else {
+            $trc = "danger";
+            $msg = "IP Address ".$cdata['action']." failed.";
+        }
+
+        $rows.="<tr class='".$trc."'><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>"._($msg)."</td></tr>";
+
+    }
 }
 print "<table class='table table-condensed table-hover' id='resultstable'><tbody>";
 print "<tr class='active'>".$hrow."<th>Result</th></tr>";