fixed import/export problem phpipam#345

Author: phpipam

app/subnets/import-subnet/import-file.php

@@ -64,10 +64,10 @@
 
 			$outFile[$m]  = $data->val($m,'A').','.$data->val($m,'B').','.$data->val($m,'C').','.$data->val($m,'D').',';
 			$outFile[$m] .= $data->val($m,'E').','.$data->val($m,'F').','.$data->val($m,'G').','.$data->val($m,'H').',';
-			$outFile[$m] .= $data->val($m,'I');
+			$outFile[$m] .= $data->val($m,'I').','.$data->val($m,'J');
 			//add custom fields
 			if(sizeof($custom_address_fields) > 0) {
-				$currLett = "J";
+				$currLett = "K";
 				foreach($custom_address_fields as $field) {
 					$outFile[$m] .= ",".$data->val($m,$currLett++);
 				}
@@ -121,11 +121,12 @@
 								"state"=>$Addresses->address_type_type_to_index($lineArr[1]),
 								"description"=>$lineArr[2],
 								"dns_name"=>$lineArr[3],
-								"mac"=>$lineArr[4],
-								"owner"=>$lineArr[5],
-								"switch"=>$lineArr[6],
-								"port"=>$lineArr[7],
-								"note"=>$lineArr[8]
+								"firewallAddressObject"=>$lineArr[4],
+								"mac"=>$lineArr[5],
+								"owner"=>$lineArr[6],
+								"switch"=>$lineArr[7],
+								"port"=>$lineArr[8],
+								"note"=>$lineArr[9]
 								);
 		// add id
 		if ($action=="edit")	{ $address_insert["id"] = $id; }

app/subnets/import-subnet/import-template.php

@@ -36,6 +36,7 @@
 $worksheet->write($lineCount, 1, _('ip state'));
 $worksheet->write($lineCount, 2, _('description'));
 $worksheet->write($lineCount, 3, _('hostname'));
+$worksheet->write($lineCount, 3, _('fw_object'));
 $worksheet->write($lineCount, 4, _('mac'));
 $worksheet->write($lineCount, 5, _('owner'));
 $worksheet->write($lineCount, 6, _('device'));

app/subnets/import-subnet/print-file.php

@@ -52,10 +52,10 @@
 
 			$outFile[$m]  = $data->val($m,'A').','.$data->val($m,'B').','.$data->val($m,'C').','.$data->val($m,'D').',';
 			$outFile[$m] .= $data->val($m,'E').','.$data->val($m,'F').','.$data->val($m,'G').','.$data->val($m,'H').',';
-			$outFile[$m] .= $data->val($m,'I');
+			$outFile[$m] .= $data->val($m,'I').','.$data->val($m,'J');
 			//add custom fields
 			if(sizeof($custom_address_fields) > 0) {
-				$currLett = "J";
+				$currLett = "K";
 				foreach($custom_address_fields as $field) {
 					$outFile[$m] .= ",".$data->val($m,$currLett++);
 				}
@@ -80,6 +80,7 @@
 print '	<th>'._('Status').'</th>';
 print '	<th>'._('Description').'</th>';
 print '	<th>'._('Hostname').'</th>';
+print '	<th>'._('FW object').'</th>';
 print '	<th>'._('MAC').'</th>';
 print '	<th>'._('Owner').'</th>';
 print '	<th>'._('Switch').'</th>';