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

Spacing +110 added lines, -110 removed lines

@@ -5,36 +5,36 @@ 
  ************************************/
 
 # include required scripts
-require( dirname(__FILE__) . '/../../../functions/functions.php' );
-require( dirname(__FILE__) . '/../../../functions/PEAR/Spreadsheet/Excel/Writer.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/PEAR/Spreadsheet/Excel/Writer.php');
 
 # initialize user object
 $Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$User = new User ($Database);
 $Admin 		= new Admin ($Database);
 $Tools	    = new Tools ($Database);
 $Subnets	= new Subnets ($Database);
 $Addresses	= new Addresses ($Database);
-$Sections	= new Sections ($Database);
+$Sections = new Sections ($Database);
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # Won't check per subnet/section rights since this is an admin section, where the admin user has full access
 
 # fetch all sections
-$all_sections = $Sections->fetch_all_sections();
+$all_sections = $Sections->fetch_all_sections ();
 
 # Lets do some reordering to show slaves!
-if($all_sections !== false) {
-	foreach($all_sections as $s) {
-		if($s->masterSection=="0") {
+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) {
+			foreach ($all_sections as $ss) {
+				if ($ss->masterSection == $s->id) {
 					$ss->class = "slave";
 					$sectionssorted[] = $ss;
 				}
@@ -47,104 +47,104 @@ 
 
 
 # get all custom fields
-$custom_fields = $Tools->fetch_custom_fields('ipaddresses');
+$custom_fields = $Tools->fetch_custom_fields ('ipaddresses');
 
 # Create a workbook
-$today = date("Ymd");
+$today = date ("Ymd");
 $filename = $today."_phpipam_ip_address_export.xls";
-$workbook = new Spreadsheet_Excel_Writer();
+$workbook = new Spreadsheet_Excel_Writer ();
 
 //formatting headers
-$format_header =& $workbook->addFormat();
-$format_header->setBold();
-$format_header->setColor('black');
-$format_header->setSize(12);
-$format_header->setAlign('left');
+$format_header = & $workbook->addFormat ();
+$format_header->setBold ();
+$format_header->setColor ('black');
+$format_header->setSize (12);
+$format_header->setAlign ('left');
 
 //formatting content
-$format_text =& $workbook->addFormat();
+$format_text = & $workbook->addFormat ();
 
 // Create a worksheet
 $worksheet_name = "IP Addresses";
-$worksheet =& $workbook->addWorksheet($worksheet_name);
+$worksheet = & $workbook->addWorksheet ($worksheet_name);
 
 $lineCount = 0;
 $rowCount = 0;
 
 //write headers
-if( (isset($_GET['section'])) && ($_GET['section'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Section') ,$format_header);
+if ((isset($_GET['section'])) && ($_GET['section'] == "on")) {
+	$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);
+if ((isset($_GET['ip_addr'])) && ($_GET['ip_addr'] == "on")) {
+	$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);
+if ((isset($_GET['dns_name'])) && ($_GET['dns_name'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('Hostname'), $format_header);
 	$rowCount++;
 }
-if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Description') ,$format_header);
+if ((isset($_GET['description'])) && ($_GET['description'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('Description'), $format_header);
 	$rowCount++;
 }
-if( (isset($_GET['vrf'])) && ($_GET['vrf'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('VRF') ,$format_header);
+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(); }
+	$all_vrfs = $Admin->fetch_all_objects ("vrf", "vrfId");
+	if (!$all_vrfs) { $all_vrfs = array (); }
 	# prepare list for easy processing
-	$vrfs = array(); $vrfs[0] = "default";
+	$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);
+if ((isset($_GET['subnet'])) && ($_GET['subnet'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('Subnet'), $format_header);
 	$rowCount++;
 }
-if( (isset($_GET['mac'])) && ($_GET['mac'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('MAC') ,$format_header);
+if ((isset($_GET['mac'])) && ($_GET['mac'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('MAC'), $format_header);
 	$rowCount++;
 }
-if( (isset($_GET['owner'])) && ($_GET['owner'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Owner') ,$format_header);
+if ((isset($_GET['owner'])) && ($_GET['owner'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('Owner'), $format_header);
 	$rowCount++;
 }
-if( (isset($_GET['device'])) && ($_GET['device'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Device') ,$format_header);
+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 = 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);
+if ((isset($_GET['note'])) && ($_GET['note'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('Note'), $format_header);
 	$rowCount++;
 }
-if( (isset($_GET['tag'])) && ($_GET['tag'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Tag') ,$format_header);
+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();
+	$ip_types = $Addresses->addresses_types_fetch ();
 }
-if( (isset($_GET['gateway'])) && ($_GET['gateway'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Gateway') ,$format_header);
+if ((isset($_GET['gateway'])) && ($_GET['gateway'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('Gateway'), $format_header);
 	$rowCount++;
 }
 
 //custom fields
-if(sizeof($custom_fields) > 0) {
-	foreach($custom_fields as $myField) {
+if (sizeof ($custom_fields) > 0) {
+	foreach ($custom_fields as $myField) {
 		//set temp name - replace space with three ___
-		$myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
+		$myField['nameTemp'] = str_replace (" ", "___", $myField['name']);
 
-		if( (isset($_GET[$myField['nameTemp']])) && ($_GET[$myField['nameTemp']] == "on") ) {
-			$worksheet->write($lineCount, $rowCount, $myField['name'] ,$format_header);
+		if ((isset($_GET[$myField['nameTemp']])) && ($_GET[$myField['nameTemp']] == "on")) {
+			$worksheet->write ($lineCount, $rowCount, $myField['name'], $format_header);
 			$rowCount++;
 		}
 	}
@@ -154,28 +154,28 @@ 
 $lineCount++;
 
 //write Subnet entries for the selected sections
-if($all_sections!==false) {
+if ($all_sections !== false) {
 	foreach ($all_sections as $section) {
 		//cast
 		$section = (array) $section;
 
-		if( (isset($_GET['exportSection__'.$section['name']])) && ($_GET['exportSection__'.$section['name']] == "on") ) {
+		if ((isset($_GET['exportSection__'.$section['name']])) && ($_GET['exportSection__'.$section['name']] == "on")) {
 			// get all subnets in section
-			$section_subnets = $Subnets->fetch_section_subnets($section['id']);
+			$section_subnets = $Subnets->fetch_section_subnets ($section['id']);
 
-			if (sizeof($section_subnets)==0) { continue; }
+			if (sizeof ($section_subnets) == 0) { continue; }
 
 			foreach ($section_subnets as $subnet) {
 
 				$subnet = (array) $subnet;
 
 				// ignore folders
-				if($subnet['isFolder']) { continue; }
+				if ($subnet['isFolder']) { continue; }
 
 				// grab IP addresses
 				$ipaddresses = $Addresses->fetch_subnet_addresses ($subnet['id']);
 
-				if (sizeof($ipaddresses)==0) { continue; }
+				if (sizeof ($ipaddresses) == 0) { continue; }
 
 				foreach ($ipaddresses as $ip) {
 
@@ -183,84 +183,84 @@ 
 					$ip = (array) $ip;
 
 
-					if( (isset($_GET['section'])) && ($_GET['section'] == "on") ) {
-						$worksheet->write($lineCount, $rowCount, $section['name'], $format_text);
+					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);
+					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);
+					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);
+					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);
+					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);
+					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);
+					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);
+					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);
+					if ((isset($_GET['owner'])) && ($_GET['owner'] == "on")) {
+						$worksheet->write ($lineCount, $rowCount, $ip['owner'], $format_text);
 						$rowCount++;
 					}
 
-					if( (isset($_GET['device'])) && ($_GET['device'] == "on") ) {
+					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);
+						$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);
+					if ((isset($_GET['note'])) && ($_GET['note'] == "on")) {
+						$worksheet->write ($lineCount, $rowCount, $ip['note'], $format_text);
 						$rowCount++;
 					}
 
-					if( (isset($_GET['tag'])) && ($_GET['tag'] == "on") ) {
+					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);
+						$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);
+					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) {
+					if (sizeof ($custom_fields) > 0) {
+						foreach ($custom_fields as $myField) {
 							//set temp name - replace space with three ___
-							$myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
+							$myField['nameTemp'] = str_replace (" ", "___", $myField['name']);
 
-							if( (isset($_GET[$myField['nameTemp']])) && ($_GET[$myField['nameTemp']] == "on") ) {
-								$worksheet->write($lineCount, $rowCount, $ip[$myField['name']], $format_text);
+							if ((isset($_GET[$myField['nameTemp']])) && ($_GET[$myField['nameTemp']] == "on")) {
+								$worksheet->write ($lineCount, $rowCount, $ip[$myField['name']], $format_text);
 								$rowCount++;
 							}
 						}
@@ -278,19 +278,19 @@ 
 $lineCount++;
 
 //write section sheet
-if( (isset($_GET['exportSections'])) && ($_GET['exportSections'] == "on") ) {
+if ((isset($_GET['exportSections'])) && ($_GET['exportSections'] == "on")) {
 	// Create a worksheet
-	$worksheet_sections =& $workbook->addWorksheet('Sections');
+	$worksheet_sections = & $workbook->addWorksheet ('Sections');
 
 	$lineCount = 0;
 	$rowCount = 0;
 
 	//write headers
-	$worksheet_sections->write($lineCount, $rowCount, _('Name') ,$format_header);
+	$worksheet_sections->write ($lineCount, $rowCount, _ ('Name'), $format_header);
 	$rowCount++;
-	$worksheet_sections->write($lineCount, $rowCount, _('Description') ,$format_header);
+	$worksheet_sections->write ($lineCount, $rowCount, _ ('Description'), $format_header);
 	$rowCount++;
-	$worksheet_sections->write($lineCount, $rowCount, _('Parent') ,$format_header);
+	$worksheet_sections->write ($lineCount, $rowCount, _ ('Parent'), $format_header);
 	$rowCount++;
 
 	$lineCount++;
@@ -300,19 +300,19 @@ 
 		//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);
+		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);
+			$worksheet_sections->write ($lineCount, $rowCount, $section['description'], $format_text);
 			$rowCount++;
 			//master Section
-			if($section['masterSection']!=0) {
+			if ($section['masterSection'] != 0) {
 				# get section details
-				$ssec = $Admin->fetch_object("sections", "id", $section['masterSection']);
-				$worksheet_sections->write($lineCount, $rowCount, $ssec->name, $format_text);
+				$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);
+				$worksheet_sections->write ($lineCount, $rowCount, "/", $format_text);
 				$rowCount++;
 			}
 		}
@@ -323,9 +323,9 @@ 
 }
 
 // sending HTTP headers
-$workbook->send($filename);
+$workbook->send ($filename);
 
 // Let's send the file
-$workbook->close();
+$workbook->close ();
 
 ?>

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'];

-	}

+    }

 }

 

 ?>

Spacing +31 added lines, -31 removed lines

@@ -5,22 +5,22 @@ 
  */

 

 # include required scripts

-require( dirname(__FILE__) . '/../../../functions/functions.php' );

+require(dirname (__FILE__).'/../../../functions/functions.php');

 

 # initialize user object

 $Database 	= new Database_PDO;

-$User 		= new User ($Database);

+$User = new User ($Database);

 $Tools	    = new Tools ($Database);

-$Admin 		= new Admin ($Database);

+$Admin = new Admin ($Database);

 

 # verify that user is logged in

-$User->check_user_session();

+$User->check_user_session ();

 

 $tpl_field_names = "";

 $tpl_field_types = "";

 

 # predefine field list

-$expfields = array ("section","ip_addr","dns_name","description","vrf","subnet","mac","owner","device","note","tag","gateway");

+$expfields = array ("section", "ip_addr", "dns_name", "description", "vrf", "subnet", "mac", "owner", "device", "note", "tag", "gateway");

 //$disfields = array ("Section","IP Address","Hostname","Description","VRF","Subnet","MAC","owner","device","note","TAG");

 $mtable = "ipaddresses"; # main table where to check the fields

 

@@ -56,10 +56,10 @@ 
 $extfields["gateway"]["pname"] = "Gateway";

 

 # required fields without which we will not continue

-$reqfields = array("section","ip_addr","subnet");

+$reqfields = array ("section", "ip_addr", "subnet");

 

 # manually adjust the standard fields

-foreach($expfields as $std_field) {

+foreach ($expfields as $std_field) {

 	# extra table and field

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

 		$cfield = $extfields[$std_field]["field"];

@@ -73,28 +73,28 @@ 
 	}

 

 	# read field attributes

-	$field = $Tools->fetch_full_field_definition($ctable,$cfield);

+	$field = $Tools->fetch_full_field_definition ($ctable, $cfield);

 	$field = (array) $field;

 

 	# mark required fields with *

-	$msgr = in_array($std_field,$reqfields) ? "*" : "";

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

+	$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) {

+$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) ? "*" : "";

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

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

 	}

@@ -103,7 +103,7 @@ 
 ?>

 

 <!-- header -->

-<div class="pHeader"><?php print _("Select IP Addresses file and fields to import"); ?></div>

+<div class="pHeader"><?php print _ ("Select IP Addresses file and fields to import"); ?></div>

 

 <!-- content -->

 <div class="pContent">

@@ -112,21 +112,21 @@ 
 

 # print template form

 print "<form id='selectImportFields'><div id='topmsg'>";

-print '<h4>'._("Template").'</h4><hr>';

-print _("The import XLS/CSV should have the following fields and a <b>header row</b> for a succesful import:");

+print '<h4>'._ ("Template").'</h4><hr>';

+print _ ("The import XLS/CSV should have the following fields and a <b>header row</b> for a succesful import:");

 print "</div>";

-print "<input name='expfields' type='hidden' value='".implode('|',$expfields)."' style='display:none;'>";

-print "<input name='reqfields' type='hidden' value='".implode('|',$reqfields)."' style='display:none;'>";

+print "<input name='expfields' type='hidden' value='".implode ('|', $expfields)."' style='display:none;'>";

+print "<input name='reqfields' type='hidden' value='".implode ('|', $reqfields)."' style='display:none;'>";

 print "<input name='filetype' id='filetype' type='hidden' value='' style='display:none;'>";

 print "<table class='table table-striped table-condensed' id='fieldstable'><tbody>";

-print "<tr>" . $tpl_field_names . "</tr>";

-print "<tr>" . $tpl_field_types . "</tr>";

+print "<tr>".$tpl_field_names."</tr>";

+print "<tr>".$tpl_field_types."</tr>";

 print "</tbody></table>";

-print "<div id='bottommsg'>"._("The fields marked with * are mandatory.")."

-	<br>"._("Providing a subnet is optional, the system will add the IP to the longest match if no subnet is provided.")."

-	<br>"._("The mask can be provided either as a separate field or with the subnet, sparated by \"/\"")."

+print "<div id='bottommsg'>"._ ("The fields marked with * are mandatory.")."

+	<br>"._ ("Providing a subnet is optional, the system will add the IP to the longest match if no subnet is provided.")."

+	<br>"._ ("The mask can be provided either as a separate field or with the subnet, sparated by \"/\"")."

 	</div>";

-print "<div class='checkbox'><label><input name='searchallvrfs' id='searchallvrfs' type='checkbox' unchecked>"._("Search for matching subnet in all VRFs (ignore provided VRF).")."</label></div>";

+print "<div class='checkbox'><label><input name='searchallvrfs' id='searchallvrfs' type='checkbox' unchecked>"._ ("Search for matching subnet in all VRFs (ignore provided VRF).")."</label></div>";

 #TODO# add option to hide php fields

 #print "<div class='checkbox'><label><input name='showspecific' id='showspecific' type='checkbox' unchecked>"._("Show PHPIPAM specific columns.")."</label></div>";

 print "</form>";

@@ -134,7 +134,7 @@ 
 $templatetype = 'ipaddr';

 # print upload section

 print "<div id='uplmsg'>";

-print '<h4>'._("Upload file").'</h4><hr>';

+print '<h4>'._ ("Upload file").'</h4><hr>';

 include 'import-button.php';

 print "</div>";

 ?>

@@ -143,7 +143,7 @@ 
 <!-- footer -->

 <div class="pFooter">

 	<div class="btn-group">

-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>

-		<button class="btn btn-sm btn-default" id="dataImportPreview" data-type="ipaddr" disabled><i class="fa fa-eye"></i> <?php print _('Preview'); ?></button>

+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>

+		<button class="btn btn-sm btn-default" id="dataImportPreview" data-type="ipaddr" disabled><i class="fa fa-eye"></i> <?php print _ ('Preview'); ?></button>

 	</div>

 </div>

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);

Spacing +59 added lines, -59 removed lines

@@ -3,102 +3,102 @@
  *	Generate XLS template
  *********************************/
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
-require( dirname(__FILE__) . '/../../../functions/PEAR/Spreadsheet/Excel/Writer.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/PEAR/Spreadsheet/Excel/Writer.php');
 # classes
 $Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$User = new User ($Database);
 $Tools	 	= new Tools ($Database);
 $Addresses	= new Addresses ($Database);
 $Result 	= new Result;
 $type = $_GET['type'];
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 // Create a workbook
-$filename = "phpipam_template_" . $type . ".xls";
-$workbook = new Spreadsheet_Excel_Writer();
+$filename = "phpipam_template_".$type.".xls";
+$workbook = new Spreadsheet_Excel_Writer ();
 $lineCount = 0;
 
 // Create a worksheet
-$worksheet = $workbook->addWorksheet("template");
+$worksheet = $workbook->addWorksheet ("template");
 
 
-if ($type == 'subnets'){
+if ($type == 'subnets') {
 	//get all custom fields!
-	$custom_address_fields = $Tools->fetch_custom_fields('subnets');
+	$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);
+	$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'){
+elseif ($type == 'ipaddr') {
 	//get all custom fields!
-	$custom_address_fields = $Tools->fetch_custom_fields('ipaddresses');
+	$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);
+	$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'){
+elseif ($type == 'vrf') {
 	//get all custom fields!
-	$custom_address_fields = $Tools->fetch_custom_fields('vrf');
+	$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);
+	$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'){
+elseif ($type == 'vlans') {
 	//get all custom fields!
-	$custom_address_fields = $Tools->fetch_custom_fields('vlans');
+	$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);
+	$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'){
+elseif ($type == 'l2dom') {
 	// set headers
-	$worksheet->write($lineCount, 0, _('Name'));
-	$worksheet->write($lineCount, 1, _('Description'));
-	$fc =2 ;
+	$worksheet->write ($lineCount, 0, _ ('Name'));
+	$worksheet->write ($lineCount, 1, _ ('Description'));
+	$fc = 2;
 }
 // sending HTTP headers
-$workbook->send($filename);
+$workbook->send ($filename);
 // Let's send the file
-$workbook->close();
+$workbook->close ();
 ?>

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

Spacing +19 added lines, -19 removed lines

@@ -5,15 +5,15 @@ 
  ************************************/

 

 # include required scripts

-require( dirname(__FILE__) . '/../../../functions/functions.php' );

+require(dirname (__FILE__).'/../../../functions/functions.php');

 

 # initialize required objects

-$Database 	= new Database_PDO;

-$Result		= new Result;

-$User		= new User ($Database);

+$Database = new Database_PDO;

+$Result = new Result;

+$User = new User ($Database);

 

 # verify that user is logged in

-$User->check_user_session();

+$User->check_user_session ();

 

 # load data from uploaded file

 include 'import-load-data.php';

@@ -23,26 +23,26 @@ 
 ?>

 

 <!-- header -->

-<div class="pHeader"><?php print _("IP Addresses import data preview"); ?></div>

+<div class="pHeader"><?php print _ ("IP Addresses import data preview"); ?></div>

 

 <!-- content -->

 <div class="pContent">

 <?php

 

-print '<h4>'._("Uploaded data").'</h4><hr>';

-print _("The entries marked with ")."<i class='fa ".$icons['add']."'></i>, "._("will be added,

-	the ones marked with ")."<i class='fa ".$icons['edit']."'></i>, "._("will be updated

-	and the ones marked with ")."<i class='fa ".$icons['skip']."'></i> "._("will be skipped.");

+print '<h4>'._ ("Uploaded data").'</h4><hr>';

+print _ ("The entries marked with ")."<i class='fa ".$icons['add']."'></i>, "._ ("will be added,

+	the ones marked with ")."<i class='fa ".$icons['edit']."'></i>, "._ ("will be updated

+	and the ones marked with ")."<i class='fa ".$icons['skip']."'></i> "._ ("will be skipped.");

 	

-print "<b>"._("Summary: ")."</b>".($counters['add'] > 0 ? $counters['add'] : "no")._(" new entries.

-		").($counters['edit'] > 0 ? $counters['edit'] : "no")._(" updated entries.

-		").($counters['error'] > 0 ? $counters['error'] : "no")._(" entries skipped due to errors.

-		").($counters['skip'] > 0 ? $counters['skip'] : "no")._(" duplicate entries.

-		")._("Scroll down for details.");

+print "<b>"._ ("Summary: ")."</b>".($counters['add'] > 0 ? $counters['add'] : "no")._ (" new entries.

+		").($counters['edit'] > 0 ? $counters['edit'] : "no")._ (" updated entries.

+		").($counters['error'] > 0 ? $counters['error'] : "no")._ (" entries skipped due to errors.

+		").($counters['skip'] > 0 ? $counters['skip'] : "no")._ (" duplicate entries.

+		")._ ("Scroll down for details.");

 

 print "<form id='selectImportFields'>";

-print "<input name='expfields' type='hidden' value='".implode('|',$expfields)."' style='display:none;'>";

-print "<input name='reqfields' type='hidden' value='".implode('|',$reqfields)."' style='display:none;'>";

+print "<input name='expfields' type='hidden' value='".implode ('|', $expfields)."' style='display:none;'>";

+print "<input name='reqfields' type='hidden' value='".implode ('|', $reqfields)."' style='display:none;'>";

 print $hiddenfields;

 print "<input name='filetype' id='filetype' type='hidden' value='".$filetype."' style='display:none;'>";

 print "</form>";

@@ -59,8 +59,8 @@ 
 <!-- footer -->

 <div class="pFooter">

 	<div class="btn-group">

-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>

-		<button class="btn btn-sm btn-default" id="dataImportSubmit" data-type="ipaddr" disabled><i class="fa fa-upload"></i> <?php print _('Import'); ?></button>

+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>

+		<button class="btn btn-sm btn-default" id="dataImportSubmit" data-type="ipaddr" disabled><i class="fa fa-upload"></i> <?php print _ ('Import'); ?></button>

 	</div>

 </div>

 

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

 

 }

 

Spacing +74 added lines, -74 removed lines

@@ -5,143 +5,143 @@ 
  *************************************************/

 

 # include required scripts

-require_once( dirname(__FILE__) . '/../../../functions/functions.php' );

+require_once(dirname (__FILE__).'/../../../functions/functions.php');

 

 # initialize user object, if not already set

-if (!isset($Database)) { $Database 	= new Database_PDO; }

+if (!isset($Database)) { $Database = new Database_PDO; }

 if (!isset($User)) { $User = new User ($Database); }

 if (!isset($Admin)) { $Admin = new Admin ($Database); }

 if (!isset($Tools)) { $Tools = new Tools ($Database); }

-if (!isset($Sections)) { $Sections	= new Sections ($Database); }

+if (!isset($Sections)) { $Sections = new Sections ($Database); }

 if (!isset($Addresses)) { $Addresses = new Addresses ($Database); }

 if (!isset($Subnets)) { $Subnets = new Subnets ($Database); }

 

 # verify that user is logged in, to guard against direct access of page and possible exploits

-$User->check_user_session();

+$User->check_user_session ();

 

 # read again the custom fields, if any

-if (!isset($custom_fields)) { $custom_fields = $Tools->fetch_custom_fields("ipaddresses"); }

+if (!isset($custom_fields)) { $custom_fields = $Tools->fetch_custom_fields ("ipaddresses"); }

 

 # check which sections we need to care about

-$used_section = array();

-foreach ($data as &$cdata) { $used_section[strtolower($cdata['section'])]=$cdata['section']; }

+$used_section = array ();

+foreach ($data as &$cdata) { $used_section[strtolower ($cdata['section'])] = $cdata['section']; }

 

 # fetch all VRFs

-$all_vrfs = $Admin->fetch_all_objects("vrf", "vrfId");

-if (!$all_vrfs) { $all_vrfs = array(); }

+$all_vrfs = $Admin->fetch_all_objects ("vrf", "vrfId");

+if (!$all_vrfs) { $all_vrfs = array (); }

 # insert default VRF in the list

-array_splice($all_vrfs,0,0,(object) array(array('vrfId' => '0', 'name' => 'default', 'rd' => '0:0')));

+array_splice ($all_vrfs, 0, 0, (object) array (array ('vrfId' => '0', 'name' => 'default', 'rd' => '0:0')));

 # process for easier later check

-$vrf_data = array();

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

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

-$all_sections = $Sections->fetch_all_sections();

+$all_sections = $Sections->fetch_all_sections ();

 

 # get all addresses in all subnets in all sections 

-$edata = array(); 

-$section_names = array(); 

-$subnet_data = array();

+$edata = array (); 

+$section_names = array (); 

+$subnet_data = array ();

 

 foreach ($all_sections as $section) {

 	$section = (array) $section;

-	$section_names[strtolower($section['name'])] = $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; }

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

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

 	

 	foreach ($section_subnets as $subnet) {

 		$subnet = (array) $subnet;

 

 		# ignore folders

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

+		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']);

+		$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']);

 

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

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

 

 		foreach ($ipaddresses as $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

-$tag_data = array(); $ip_tags = (array) $Addresses->addresses_types_fetch();

+$tag_data = array (); $ip_tags = (array) $Addresses->addresses_types_fetch ();

 foreach ($ip_tags as $c_tag) { $tag_data[$c_tag['type']] = $c_tag; }

 

 # Load available devices

-$device_data = array();

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

-if ($devices!==false) {

-	foreach($devices as $c_dev) {

+$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']);

+		$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 ($c_dev_sections as $c_dev_sect) { $device_data[$c_dev_sect][$c_dev['hostname']] = $c_dev; }

 	}

 }

 

 $rows = "";

-$counters = array();

-$ndata = array(); # store new addresses in a similar format with edata for easier processing

+$counters = array ();

+$ndata = array (); # store new addresses in a similar format with edata for easier processing

 

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

+	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);

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

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

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

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

 	} else {

-		$cdata['sectionId'] = $section_names[strtolower($cdata['section'])]['id'];

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

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

 		} else {

 			$cdata['vrfId'] = $vrf_data[$cdata['vrf']]['vrfId'];

 		}

@@ -153,19 +153,19 @@ 
 	# 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";

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

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

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

 		} else {

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

 		}

@@ -176,7 +176,7 @@ 
 	# 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";

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

 		} else {

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

 		}

@@ -187,22 +187,22 @@ 
 

 	

 	# 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(!$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 (!$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 ("/^([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"; }

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

+		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

@@ -213,25 +213,25 @@ 
 

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

+			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 (sizeof ($custom_fields) > 0) {

+				foreach ($custom_fields as $myField) {

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

-						$msg.= $myField['name']." will be updated."; $action = "edit";

+						$msg .= $myField['name']." will be updated."; $action = "edit";

 					}

 				}

 			}

 

 			if ($action == "skip") {

-				$msg.= "Duplicate, will skip.";

+				$msg .= "Duplicate, will skip.";

 			} else {

 				# set id of matched subnet

 				$cdata['id'] = $cedata['id'];

@@ -242,22 +242,22 @@ 
 // 				$cdata['firewallAddressObject'] = $cedata['firewallAddressObject'];

 			}

 		} else {

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

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

 		}

 	}

 

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

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

 	$cdata['action'] = $action;

 	$counters[$action]++;

 

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

Spacing +14 added lines, -14 removed lines

@@ -4,14 +4,14 @@ 
  ************************************************/
 
 # include required scripts
-require( dirname(__FILE__) . '/../../../functions/functions.php' );
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
+$Database = new Database_PDO;
 $User = new User ($Database);
 
 # verify that user is logged in, to guard against direct access of page and possible exploits
-$User->check_user_session();
+$User->check_user_session ();
 
 # load data from uploaded file
 include 'import-load-data.php';
@@ -21,7 +21,7 @@ 
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _("IP Addresses import"); ?></div>
+<div class="pHeader"><?php print _ ("IP Addresses import"); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -36,8 +36,8 @@ 
 	if (($cdata['action'] == "add") || ($cdata['action'] == "edit")) {
 		// # set update array
 
-		$values = array("id"=>$cdata['id'],
-						"ip_addr"=>$Addresses->transform_address($cdata['ip_addr'],"decimal"),
+		$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'],
@@ -50,14 +50,14 @@ 
 						);
 
 		# add custom fields
-		if(sizeof($custom_fields) > 0) {
-			foreach($custom_fields as $myField) {
-				if(isset($cdata[$myField['name']])) { $values[$myField['name']] = $cdata[$myField['name']]; }
+		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);
+		$cdata['result'] = $Admin->object_modify ("ipaddresses", $cdata['action'], "id", $values);
 
 		if ($cdata['result']) {
 			$trc = $colors[$cdata['action']];
@@ -67,9 +67,9 @@ 
 			$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>";
+		$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>";
 
 	}
 }
@@ -83,5 +83,5 @@ 
 
 <!-- footer -->
 <div class="pFooter">
-	<button class="btn btn-sm btn-default hidePopups"><?php print _('Close'); ?></button>
+	<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Close'); ?></button>
 </div>

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

Spacing +44 added lines, -44 removed lines

@@ -5,33 +5,33 @@ 
  */
 
 # include required scripts
-require( dirname(__FILE__) . '/../../../functions/functions.php' );
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database	= new Database_PDO;
-$User		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin		= new Admin ($Database);
 $Tools		= new Tools ($Database);
-$Sections	= new Sections ($Database);
+$Sections = new Sections ($Database);
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # Won't check per subnet/section rights since this is an admin section, where the admin user has full access
 
 # fetch all sections
-$all_sections = $Sections->fetch_all_sections();
+$all_sections = $Sections->fetch_all_sections ();
 
 # Lets do some reordering to show slaves!
-if($all_sections!==false) {
-	foreach($all_sections as $s) {
-		if($s->masterSection=="0") {
+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) {
+			foreach ($all_sections as $ss) {
+				if ($ss->masterSection == $s->id) {
 					$ss->class = "slave";
 					$sectionssorted[] = $ss;
 				}
@@ -43,24 +43,24 @@ 
 }
 
 # get all custom fields
-$custom_fields = $Tools->fetch_custom_fields('ipaddresses');
+$custom_fields = $Tools->fetch_custom_fields ('ipaddresses');
 # prepare HTML variables
 $custom_fields_names = "";
 $custom_fields_boxes = "";
 
-if(sizeof($custom_fields) > 0) {
-	foreach($custom_fields as $myField) {
+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>";
+		$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>";
 	}
 }
 
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _("Select sections and IP address fields to export"); ?></div>
+<div class="pHeader"><?php print _ ("Select sections and IP address fields to export"); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -74,25 +74,25 @@ 
 print "	<table class='table table-striped table-condensed'>";
 
 print "	<tr>";
-print "	<th>"._('Section')."</th>";
-print "	<th>"._('IP Address')."</th>";
-print "	<th>"._('Hostname')."</th>";
-print "	<th>"._('Description')."</th>";
-print "	<th>"._('VRF')."</th>";
-print "	<th>"._('Subnet')."</th>";
-print "	<th>"._('MAC')."</th>";
-print "	<th>"._('Owner')."</th>";
-print "	<th>"._('Device')."</th>";
-print "	<th>"._('Note')."</th>";
-print "	<th>"._('Tag')."</th>";
-print "	<th>"._('Gateway')."</th>";
+print "	<th>"._ ('Section')."</th>";
+print "	<th>"._ ('IP Address')."</th>";
+print "	<th>"._ ('Hostname')."</th>";
+print "	<th>"._ ('Description')."</th>";
+print "	<th>"._ ('VRF')."</th>";
+print "	<th>"._ ('Subnet')."</th>";
+print "	<th>"._ ('MAC')."</th>";
+print "	<th>"._ ('Owner')."</th>";
+print "	<th>"._ ('Device')."</th>";
+print "	<th>"._ ('Note')."</th>";
+print "	<th>"._ ('Tag')."</th>";
+print "	<th>"._ ('Gateway')."</th>";
 print $custom_fields_names;
 print "	</tr>";
 
 print "	<tr>";
 print "	<td><input type='checkbox' name='section' checked></td>";
-print "	<td><input type='checkbox' name='ip_addr' checked title='"._('Mandatory')."'> </td>";
-print "	<td><input type='checkbox' name='dns_name' checked title='"._('Mandatory')."'></td>";
+print "	<td><input type='checkbox' name='ip_addr' checked title='"._ ('Mandatory')."'> </td>";
+print "	<td><input type='checkbox' name='dns_name' checked title='"._ ('Mandatory')."'></td>";
 print "	<td><input type='checkbox' name='description' checked> </td>";
 print "	<td><input type='checkbox' name='vrf' checked></td>";
 print "	<td><input type='checkbox' name='subnet' checked></td>";
@@ -112,13 +112,13 @@ 
 print '<form id="selectExportSections">';
 
 # show sections
-if($all_sections!==false) {
+if ($all_sections !== false) {
 	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 '	<th><input type="checkbox" id="exportSelectAll" checked> '._ ('Name').'</th>';
+    print "	<th>"._ ('Description')."</th>";
+    print "	<th>"._ ('Parent')."</th>";
     print "	</tr>\n";
 
 	# existing sections
@@ -127,22 +127,22 @@ 
 		$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";
+		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) {
+		if ($section['masterSection'] != 0) {
 			# get section details
-			$ssec = $Admin->fetch_object("sections", "id", $section['masterSection']);
+			$ssec = $Admin->fetch_object ("sections", "id", $section['masterSection']);
 			print "	<td>$ssec->name</td>";
 		} else {
 			print "	<td>/</td>";
 		}
-		print '</tr>'. "\n";
+		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="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>';
 
 }
@@ -154,7 +154,7 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-success" id="dataExportSubmit" data-type="ipaddr"><i class="fa fa-upload"></i> <?php print _('Export'); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-success" id="dataExportSubmit" data-type="ipaddr"><i class="fa fa-upload"></i> <?php print _ ('Export'); ?></button>
 	</div>
 </div>