phpipam / phpipam

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

Indentation +28 added lines, -28 removed lines

@@ -32,34 +32,34 @@
 
 # Update Subnet master
 foreach ($rlist as $sect_id => $sect_check) {
-	# Skip empty sections
-	if (!$edata[$sect_id]) { continue; }
-
-	# Grab a subnet and find its closest master
-	foreach ($edata[$sect_id] as &$c_subnet) {
-		if ($c_subnet['action'] == "edit") {
-
-			# We only need id and new master
-			$values = array("id"=>$c_subnet['id'], "masterSubnetId"=>$c_subnet['new_masterSubnetId']);
-
-			# update
-			$c_subnet['result'] = $Admin->object_modify("subnets", $c_subnet['action'], "id", $values);
-
-			if ($c_subnet['result']) {
-				$trc = $colors[$c_subnet['action']];
-				$msg = "Master ".$c_subnet['action']." successful.";
-			} else {
-				$trc = "danger";
-				$msg = "Master ".$c_subnet['action']." failed.";
-			}
-
-			$rows.="<tr class='".$trc."'><td><i class='fa ".$icons[$c_subnet['action']]."' rel='tooltip' data-placement='bottom' title='"._($msg)."'></i></td>";
-			$rows.="<td>".$sect_names[$sect_id]."</td><td>".$c_subnet['ip']."/".$c_subnet['mask']."</td>";
-			$rows.="<td>".$c_subnet['description']."</td><td>".$vrf_name[$c_subnet['vrfId']]."</td><td>";
-			$rows.=$c_subnet['new_master']."</td><td>"._($msg)."</td></tr>\n";
-
-		}
-	}
+    # Skip empty sections
+    if (!$edata[$sect_id]) { continue; }
+
+    # Grab a subnet and find its closest master
+    foreach ($edata[$sect_id] as &$c_subnet) {
+        if ($c_subnet['action'] == "edit") {
+
+            # We only need id and new master
+            $values = array("id"=>$c_subnet['id'], "masterSubnetId"=>$c_subnet['new_masterSubnetId']);
+
+            # update
+            $c_subnet['result'] = $Admin->object_modify("subnets", $c_subnet['action'], "id", $values);
+
+            if ($c_subnet['result']) {
+                $trc = $colors[$c_subnet['action']];
+                $msg = "Master ".$c_subnet['action']." successful.";
+            } else {
+                $trc = "danger";
+                $msg = "Master ".$c_subnet['action']." failed.";
+            }
+
+            $rows.="<tr class='".$trc."'><td><i class='fa ".$icons[$c_subnet['action']]."' rel='tooltip' data-placement='bottom' title='"._($msg)."'></i></td>";
+            $rows.="<td>".$sect_names[$sect_id]."</td><td>".$c_subnet['ip']."/".$c_subnet['mask']."</td>";
+            $rows.="<td>".$c_subnet['description']."</td><td>".$vrf_name[$c_subnet['vrfId']]."</td><td>";
+            $rows.=$c_subnet['new_master']."</td><td>"._($msg)."</td></tr>\n";
+
+        }
+    }
 }
 
 print "<table class='table table-condensed table-hover' id='resultstable'><tbody>";

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

Indentation +18 added lines, -18 removed lines

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

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

Indentation +41 added lines, -41 removed lines

@@ -27,60 +27,60 @@
 $today = date("Ymd-His");
 
 if (!is_dir($upload_dir) || !is_writable($upload_dir)) {
-	echo '{"status":"error", "error":"Upload directory is not writable, or does not exist."}';
-	exit;
+    echo '{"status":"error", "error":"Upload directory is not writable, or does not exist."}';
+    exit;
 }
 
 /* no errors */
 if(isset($_FILES['file']) && $_FILES['file']['error'] == 0) {
-	//wrong extension
+    //wrong extension
     if(!in_array(strtolower($filetype), $allowed)) {
-		echo '{"status":"error", "error":"Invalid document type"}';
+        echo '{"status":"error", "error":"Invalid document type"}';
         exit;
     }
-	//if cannot move
-	elseif(!move_uploaded_file($_FILES["file"]["tmp_name"], $upload_dir."data_import.".$filetype )) {
-		echo '{"status":"error", "error":"Cannot move file to upload dir"}';
-		exit;
-	}
-	//other errors
-	elseif($_FILES['file']['error'] != 0) {
-		echo '{"status":"error", "error":"Error: '.$_FILES['file']['error'].'" }';
+    //if cannot move
+    elseif(!move_uploaded_file($_FILES["file"]["tmp_name"], $upload_dir."data_import.".$filetype )) {
+        echo '{"status":"error", "error":"Cannot move file to upload dir"}';
         exit;
-	}
-	else {
-	//default - success
+    }
+    //other errors
+    elseif($_FILES['file']['error'] != 0) {
+        echo '{"status":"error", "error":"Error: '.$_FILES['file']['error'].'" }';
+        exit;
+    }
+    else {
+    //default - success
 
-	// grab first row from CSV
-	if (strtolower($filetype) == "csv") {
-		/* get file to string */
-		$filehdl = fopen('upload/data_import.csv', 'r');
-		$data = fgets($filehdl);
-		fclose($filehdl);
+    // grab first row from CSV
+    if (strtolower($filetype) == "csv") {
+        /* get file to string */
+        $filehdl = fopen('upload/data_import.csv', 'r');
+        $data = fgets($filehdl);
+        fclose($filehdl);
 
-		/* format file */
-		$data = str_replace( array("\r\n","\r") , "" , $data);	//remove line break
-		$data = preg_split("/[;,]/", $data); //split by comma or semi-colon
+        /* format file */
+        $data = str_replace( array("\r\n","\r") , "" , $data);	//remove line break
+        $data = preg_split("/[;,]/", $data); //split by comma or semi-colon
 
-		foreach ($data as $col) {
-			$firstrow[] = $col;
-		}
-	}
-	// grab first row from XLS
-	elseif(strtolower($filetype) == "xls") {
-		# get excel object
-		require_once(dirname(__FILE__) . '/../../../functions/php-excel-reader/excel_reader2.php');				//excel reader 2.21
-		$data = new Spreadsheet_Excel_Reader('upload/data_import.xls', false);
-		$sheet = 0; $row = 1;
+        foreach ($data as $col) {
+            $firstrow[] = $col;
+        }
+    }
+    // grab first row from XLS
+    elseif(strtolower($filetype) == "xls") {
+        # get excel object
+        require_once(dirname(__FILE__) . '/../../../functions/php-excel-reader/excel_reader2.php');				//excel reader 2.21
+        $data = new Spreadsheet_Excel_Reader('upload/data_import.xls', false);
+        $sheet = 0; $row = 1;
 
-		for($col=1;$col<=$data->colcount($sheet);$col++) {
-			$firstrow[] = $data->val($row,$col,$sheet);
-		}
-	}
+        for($col=1;$col<=$data->colcount($sheet);$col++) {
+            $firstrow[] = $data->val($row,$col,$sheet);
+        }
+    }
 
-	echo '{"status":"success","expfields":'.json_encode($expfields,true).',"impfields":'.json_encode($firstrow,true).',"filetype":'.json_encode($filetype,true).'}';
-	exit;
-	}
+    echo '{"status":"success","expfields":'.json_encode($expfields,true).',"impfields":'.json_encode($firstrow,true).',"filetype":'.json_encode($filetype,true).'}';
+    exit;
+    }
 }
 
 /* default - error */

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

Indentation +22 added lines, -22 removed lines

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

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

Indentation +18 added lines, -18 removed lines

@@ -45,32 +45,32 @@
 
 //write headers
 if( (isset($_GET['name'])) && ($_GET['name'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Name') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('Name') ,$format_header);
+    $rowCount++;
 }
 if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Description') ,$format_header);
-	$rowCount++;
+    $worksheet->write($lineCount, $rowCount, _('Description') ,$format_header);
+    $rowCount++;
 }
 
 $lineCount++;
 $rowCount = 0;
 
 foreach ($vlan_domains as $vlan_domain) {
-	//cast
-	$vlan_domain = (array) $vlan_domain;
-
-	if( (isset($_GET['name'])) && ($_GET['name'] == "on") ) {
-		$worksheet->write($lineCount, $rowCount, $vlan_domain['name'], $format_text);
-		$rowCount++;
-	}
-	if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
-		$worksheet->write($lineCount, $rowCount, $vlan_domain['description'], $format_text);
-		$rowCount++;
-	}
-
-	$lineCount++;
-	$rowCount = 0;
+    //cast
+    $vlan_domain = (array) $vlan_domain;
+
+    if( (isset($_GET['name'])) && ($_GET['name'] == "on") ) {
+        $worksheet->write($lineCount, $rowCount, $vlan_domain['name'], $format_text);
+        $rowCount++;
+    }
+    if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
+        $worksheet->write($lineCount, $rowCount, $vlan_domain['description'], $format_text);
+        $rowCount++;
+    }
+
+    $lineCount++;
+    $rowCount = 0;
 }
 
 

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

Indentation +24 added lines, -24 removed lines

@@ -25,35 +25,35 @@
 
 # manually adjust the standard fields
 foreach($expfields as $std_field) {
-	if (in_array($std_field,$reqfields)) {
-		$msgr = "*";
-	} else {
-		$msgr = "";
-	}
-
-	$field = $Tools->fetch_full_field_definition("vrf",$std_field);
-	$field = (array) $field;
-
-	$res[$field['Field']]['name'] 	 = $field['Field'];
-	$res[$field['Field']]['type'] 	 = $field['Type'];
-	$res[$field['Field']]['Comment'] = $field['Comment'];
-	$res[$field['Field']]['Null'] 	 = $field['Null'];
-	$res[$field['Field']]['Default'] = $field['Default'];
-
-	#prebuild template table rows to avoid useless foreach loops
-	$tpl_field_names.= "<th>".$field['Field'].$msgr."</th>";
-	$tpl_field_types.= "<td><small>". wordwrap($field['Type'],18,"<br>\n",true) ."</small></td>";
+    if (in_array($std_field,$reqfields)) {
+        $msgr = "*";
+    } else {
+        $msgr = "";
+    }
+
+    $field = $Tools->fetch_full_field_definition("vrf",$std_field);
+    $field = (array) $field;
+
+    $res[$field['Field']]['name'] 	 = $field['Field'];
+    $res[$field['Field']]['type'] 	 = $field['Type'];
+    $res[$field['Field']]['Comment'] = $field['Comment'];
+    $res[$field['Field']]['Null'] 	 = $field['Null'];
+    $res[$field['Field']]['Default'] = $field['Default'];
+
+    #prebuild template table rows to avoid useless foreach loops
+    $tpl_field_names.= "<th>".$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("vrf");
 if(sizeof($custom_fields) > 0) {
-	$res[] = $custom_fields;
-	foreach($custom_fields as $myField) {
-		$tpl_field_names.= "<th>". $myField['name'] ."</th>";
-		$tpl_field_types.= "<td><small>". wordwrap($myField['type'],18,"<br>\n",true) ."</small></td>";
-		$expfields[] = $myField['name'];
-	}
+    $res[] = $custom_fields;
+    foreach($custom_fields as $myField) {
+        $tpl_field_names.= "<th>". $myField['name'] ."</th>";
+        $tpl_field_types.= "<td><small>". wordwrap($myField['type'],18,"<br>\n",true) ."</small></td>";
+        $expfields[] = $myField['name'];
+    }
 }
 
 ?>

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

Indentation +25 added lines, -25 removed lines

@@ -33,39 +33,39 @@
 
 # import VLANs
 foreach ($data as &$cdata) {
-	if (($cdata['action'] == "add") || ($cdata['action'] == "edit")) {
-		# set update array
-		$values = array("vlanId"=>$cdata['vlanId'],
-						"number"=>$cdata['number'],
-						"name"=>$cdata['name'],
-						"description"=>$cdata['description'],
-						"domainId"=>$cdata['domainId']
-						);
-		# 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 (($cdata['action'] == "add") || ($cdata['action'] == "edit")) {
+        # set update array
+        $values = array("vlanId"=>$cdata['vlanId'],
+                        "number"=>$cdata['number'],
+                        "name"=>$cdata['name'],
+                        "description"=>$cdata['description'],
+                        "domainId"=>$cdata['domainId']
+                        );
+        # 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("vlans", $cdata['action'], "vlanId", $values);
+        # update
+        $cdata['result'] = $Admin->object_modify("vlans", $cdata['action'], "vlanId", $values);
 
-		if ($cdata['result']) {
-			$trc = $colors[$cdata['action']];
-			$msg = "VLAN ".$cdata['action']." successful.";
-		} else {
-			$trc = "danger";
-			$msg = "VLAN ".$cdata['action']." failed.";
-		}
-		$rows.="<tr class='".$trc."'><td><i class='fa ".$icons[$cdata['action']]."' rel='tooltip' data-placement='bottom' title='"._($msg)."'></i></td>
+        if ($cdata['result']) {
+            $trc = $colors[$cdata['action']];
+            $msg = "VLAN ".$cdata['action']." successful.";
+        } else {
+            $trc = "danger";
+            $msg = "VLAN ".$cdata['action']." failed.";
+        }
+        $rows.="<tr class='".$trc."'><td><i class='fa ".$icons[$cdata['action']]."' rel='tooltip' data-placement='bottom' title='"._($msg)."'></i></td>
 			<td>".$cdata['name']."</td>
 			<td>".$cdata['number']."</td>
 			<td>".$cdata['description']."</td>
 			<td>".$cdata['domain']."</td>
 			".$cfieldtds."
 			<td>"._($msg)."</td></tr>";
-	}
+    }
 }
 
 print "<table class='table table-condensed table-hover' id='resultstable'><tbody>";

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

Indentation +77 added lines, -77 removed lines

@@ -26,21 +26,21 @@ 
 $edata = array(); $vdom = array(); $vdomid = array();
 # process for easier later check
 foreach ($vlan_domains as $vlan_domain) {
-	//cast
-	$vlan_domain = (array) $vlan_domain;
-	$vdom[] = $vlan_domain['name'];
-	$vdomid[$vlan_domain['name']] = $vlan_domain['id'];
-	// read vlans
-	$all_vlans = $Admin->fetch_multiple_objects("vlans", "domainId", $vlan_domain['id'], "number");
-	$all_vlans = (array) $all_vlans;
-	// skip empty domains
-	if (sizeof($all_vlans)==0) { continue; }
-	//write all VLAN entries
-	foreach ($all_vlans as $vlan) {
-		//cast
-		$vlan = (array) $vlan;
-		$edata[$vlan_domain['name']][$vlan['number']] = $vlan;
-	}
+    //cast
+    $vlan_domain = (array) $vlan_domain;
+    $vdom[] = $vlan_domain['name'];
+    $vdomid[$vlan_domain['name']] = $vlan_domain['id'];
+    // read vlans
+    $all_vlans = $Admin->fetch_multiple_objects("vlans", "domainId", $vlan_domain['id'], "number");
+    $all_vlans = (array) $all_vlans;
+    // skip empty domains
+    if (sizeof($all_vlans)==0) { continue; }
+    //write all VLAN entries
+    foreach ($all_vlans as $vlan) {
+        //cast
+        $vlan = (array) $vlan;
+        $edata[$vlan_domain['name']][$vlan['number']] = $vlan;
+    }
 }
 
 $rows = "";
@@ -49,68 +49,68 @@ 
 
 # check the fields
 foreach ($data as &$cdata) {
-	$msg = ""; $action = ""; $cfieldtds = "";
-
-	# set a default domain if none specified
-	if ($cdata['domain'] != "") { $cdom = $cdata['domain']; } else { $cdom = "default"; }
-
-	# check if domain exists and link ID, otherwise issue error
-	if (!in_array($cdom,$vdom)) {
-		$msg.= "Missing VLAN domain. Please add/import VLAN domain first."; $action = "error";
-	} else {
-		$cdata['domainId'] = $vdomid[$cdom];
-	}
-
-	# check if required fields are present and not empty
-	foreach($reqfields as $creq) {
-		if ((!isset($cdata[$creq])) or ($cdata[$creq] == "")) { $msg.= "Required field ".$creq." missing or empty."; $action = "error"; }
-	}
-
-	# check data format
-	if ($action != "error") {
-		if (!preg_match("/^[a-zA-Z0-9-_]+$/", $cdata['name'])) { $msg.="Invalid name format."; $action = "error"; }
-		if (!preg_match("/^[0-9]+$/", $cdata['number'])) { $msg.="Invalid number format."; $action = "error"; }
-		if (preg_match("/[;'\"]/", $cdata['description'])) { $msg.="Invalid characters in description."; $action = "error"; }
-		if (!preg_match("/^[a-zA-Z0-9-_ ]+$/", $cdata['domain'])) { $msg.="Invalid domain format."; $action = "error"; }
-		if ($action != "error") { if ($cdata['number']>$User->settings->vlanMax) { $msg.= _('Highest possible VLAN number is ').$User->settings->vlanMax.'!'; $action = "error"; } }
-	}
-
-	# Generate the custom fields columns
-	if(sizeof($custom_fields) > 0) { foreach($custom_fields as $myField) { $cfieldtds.= "<td>".$cdata[$myField['name']]."</td>"; } }
-
-	# check if duplicate VLAN
-	if (isset($unique[$cdom][$cdata['number']])) { $msg.= "Duplicate VLAN domain and number not supported. Please check import file."; $action = "error"; }
-
-	# check if existing
-	if ($action != "error") {
-		if (isset($edata[$cdom][$cdata['number']])) {
-			$cdata['vlanId'] = $edata[$cdom][$cdata['number']]['vlanId'];
-			$action = "skip"; # skip duplicate fields if identical, update if different
-			if ($cdata['name'] != $edata[$cdom][$cdata['number']]['name']) { $msg.= "VLAN name will be updated."; $action = "edit"; }
-			if ($cdata['description'] != $edata[$cdom][$cdata['number']]['description']) { $msg.= "VLAN description 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']] != $edata[$cdom][$cdata['number']][$myField['name']]) {
-						$msg.= "VLAN ".$myField['name']." will be updated."; $action = "edit";
-					}
-				}
-			}
-
-			if ($action == "skip") {
-				$msg.= "Duplicate, will skip.";
-			}
-		} else {
-			$msg.="New entry, will be added."; $action = "add";
-		}
-	}
-
-	$cdata['msg'].= $msg;
-	$cdata['action'] = $action;
-	$counters[$action]++;
-	if (!isset($unique[$cdom][$cdata['number']])) { $unique[$cdom][$cdata['number']] = $cdata['name']; }
-
-	$rows.="<tr class='".$colors[$action]."'><td><i class='fa ".$icons[$action]."' rel='tooltip' data-placement='bottom' title='"._($msg)."'></i></td>
+    $msg = ""; $action = ""; $cfieldtds = "";
+
+    # set a default domain if none specified
+    if ($cdata['domain'] != "") { $cdom = $cdata['domain']; } else { $cdom = "default"; }
+
+    # check if domain exists and link ID, otherwise issue error
+    if (!in_array($cdom,$vdom)) {
+        $msg.= "Missing VLAN domain. Please add/import VLAN domain first."; $action = "error";
+    } else {
+        $cdata['domainId'] = $vdomid[$cdom];
+    }
+
+    # check if required fields are present and not empty
+    foreach($reqfields as $creq) {
+        if ((!isset($cdata[$creq])) or ($cdata[$creq] == "")) { $msg.= "Required field ".$creq." missing or empty."; $action = "error"; }
+    }
+
+    # check data format
+    if ($action != "error") {
+        if (!preg_match("/^[a-zA-Z0-9-_]+$/", $cdata['name'])) { $msg.="Invalid name format."; $action = "error"; }
+        if (!preg_match("/^[0-9]+$/", $cdata['number'])) { $msg.="Invalid number format."; $action = "error"; }
+        if (preg_match("/[;'\"]/", $cdata['description'])) { $msg.="Invalid characters in description."; $action = "error"; }
+        if (!preg_match("/^[a-zA-Z0-9-_ ]+$/", $cdata['domain'])) { $msg.="Invalid domain format."; $action = "error"; }
+        if ($action != "error") { if ($cdata['number']>$User->settings->vlanMax) { $msg.= _('Highest possible VLAN number is ').$User->settings->vlanMax.'!'; $action = "error"; } }
+    }
+
+    # Generate the custom fields columns
+    if(sizeof($custom_fields) > 0) { foreach($custom_fields as $myField) { $cfieldtds.= "<td>".$cdata[$myField['name']]."</td>"; } }
+
+    # check if duplicate VLAN
+    if (isset($unique[$cdom][$cdata['number']])) { $msg.= "Duplicate VLAN domain and number not supported. Please check import file."; $action = "error"; }
+
+    # check if existing
+    if ($action != "error") {
+        if (isset($edata[$cdom][$cdata['number']])) {
+            $cdata['vlanId'] = $edata[$cdom][$cdata['number']]['vlanId'];
+            $action = "skip"; # skip duplicate fields if identical, update if different
+            if ($cdata['name'] != $edata[$cdom][$cdata['number']]['name']) { $msg.= "VLAN name will be updated."; $action = "edit"; }
+            if ($cdata['description'] != $edata[$cdom][$cdata['number']]['description']) { $msg.= "VLAN description 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']] != $edata[$cdom][$cdata['number']][$myField['name']]) {
+                        $msg.= "VLAN ".$myField['name']." will be updated."; $action = "edit";
+                    }
+                }
+            }
+
+            if ($action == "skip") {
+                $msg.= "Duplicate, will skip.";
+            }
+        } else {
+            $msg.="New entry, will be added."; $action = "add";
+        }
+    }
+
+    $cdata['msg'].= $msg;
+    $cdata['action'] = $action;
+    $counters[$action]++;
+    if (!isset($unique[$cdom][$cdata['number']])) { $unique[$cdom][$cdata['number']] = $cdata['name']; }
+
+    $rows.="<tr class='".$colors[$action]."'><td><i class='fa ".$icons[$action]."' rel='tooltip' data-placement='bottom' title='"._($msg)."'></i></td>
 		<td>".$cdata['name']."</td>
 		<td>".$cdata['number']."</td>
 		<td>".$cdata['description']."</td>

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

Indentation +70 added lines, -70 removed lines

@@ -30,36 +30,36 @@ 
 # Pear IPv6 ip2Bin, local copy
 function my_ip2Bin($pi6,$ip)
 {
-	$binstr = '';
+    $binstr = '';
 
-	$ip = $pi6->removeNetmaskSpec($ip);
-	$ip = $pi6->Uncompress($ip);
+    $ip = $pi6->removeNetmaskSpec($ip);
+    $ip = $pi6->Uncompress($ip);
 
-	$parts = explode(':', $ip);
+    $parts = explode(':', $ip);
 
-	foreach ( $parts as $v ) {
+    foreach ( $parts as $v ) {
 
-		$str     = base_convert($v, 16, 2);
-		$binstr .= str_pad($str, 16, '0', STR_PAD_LEFT);
+        $str     = base_convert($v, 16, 2);
+        $binstr .= str_pad($str, 16, '0', STR_PAD_LEFT);
 
-	}
+    }
 
-	return $binstr;
+    return $binstr;
 }
 
 # Read selected fields and pass them to the save form
 foreach($_GET as $key => $value) {
-	if (preg_match("/recomputeSection_(\d+)$/",$key,$matches) && ($value == "on")) {
-		# Grab provided values
-		$rlist[$matches[1]]["IPv4"] = ($_GET['recomputeSectionIPv4_'.$matches[1]] == "on" ? true : false);
-		$rlist[$matches[1]]["IPv6"] = ($_GET['recomputeSectionIPv6_'.$matches[1]] == "on" ? true : false);
-		$rlist[$matches[1]]["CVRF"] = ($_GET['recomputeSectionCVRF_'.$matches[1]] == "on" ? true : false);
-		# Build hidden form inputs
-		$pass_inputs.="<input name='".$key."' type='hidden' value='".$value."' style='display:none;'>";
-		$pass_inputs.="<input name='recomputeSectionIPv4_".$matches[1]."' type='hidden' value='".$_GET['recomputeSectionIPv4_'.$matches[1]]."' style='display:none;'>";
-		$pass_inputs.="<input name='recomputeSectionIPv6_".$matches[1]."' type='hidden' value='".$_GET['recomputeSectionIPv6_'.$matches[1]]."' style='display:none;'>";
-		$pass_inputs.="<input name='recomputeSectionCVRF_".$matches[1]."' type='hidden' value='".$_GET['recomputeSectionCVRF_'.$matches[1]]."' style='display:none;'>";
-	}
+    if (preg_match("/recomputeSection_(\d+)$/",$key,$matches) && ($value == "on")) {
+        # Grab provided values
+        $rlist[$matches[1]]["IPv4"] = ($_GET['recomputeSectionIPv4_'.$matches[1]] == "on" ? true : false);
+        $rlist[$matches[1]]["IPv6"] = ($_GET['recomputeSectionIPv6_'.$matches[1]] == "on" ? true : false);
+        $rlist[$matches[1]]["CVRF"] = ($_GET['recomputeSectionCVRF_'.$matches[1]] == "on" ? true : false);
+        # Build hidden form inputs
+        $pass_inputs.="<input name='".$key."' type='hidden' value='".$value."' style='display:none;'>";
+        $pass_inputs.="<input name='recomputeSectionIPv4_".$matches[1]."' type='hidden' value='".$_GET['recomputeSectionIPv4_'.$matches[1]]."' style='display:none;'>";
+        $pass_inputs.="<input name='recomputeSectionIPv6_".$matches[1]."' type='hidden' value='".$_GET['recomputeSectionIPv6_'.$matches[1]]."' style='display:none;'>";
+        $pass_inputs.="<input name='recomputeSectionCVRF_".$matches[1]."' type='hidden' value='".$_GET['recomputeSectionCVRF_'.$matches[1]]."' style='display:none;'>";
+    }
 }
 
 #print "<pre>";print_r($rlist);print "</pre>";
@@ -82,64 +82,64 @@ 
 
 # Read IPs for the sections we need to order
 foreach ($rlist as $sect_id => $sect_check) {
-	$section_subnets = $Subnets->fetch_section_subnets($sect_id);
-	# skip empty sections
-	if (sizeof($section_subnets)==0) { continue; }
+    $section_subnets = $Subnets->fetch_section_subnets($sect_id);
+    # skip empty sections
+    if (sizeof($section_subnets)==0) { continue; }
 
-	$isFolder[$sect_id] = array();
+    $isFolder[$sect_id] = array();
 	
-	foreach ($section_subnets as &$subnet) {
-		$subnet = (array) $subnet;
-		$subnet['ip'] = $Subnets->transform_to_dotted($subnet['subnet']);
-		$subnet['type'] = $Subnets->identify_address($subnet['ip']);
-		# Precompute subnet in AND format (long for IPv4 and bin str for IPv6)
-		$subnet['andip'] = ($subnet['type'] == "IPv4") ? $subnet['subnet'] : my_ip2Bin($pi6,$subnet['ip']);
-		# Add to array
-		$edata[$sect_id][] = $subnet;
-		$isFolder[$sect_id][$subnet['id']] = $subnet['isFolder'];
-	}
+    foreach ($section_subnets as &$subnet) {
+        $subnet = (array) $subnet;
+        $subnet['ip'] = $Subnets->transform_to_dotted($subnet['subnet']);
+        $subnet['type'] = $Subnets->identify_address($subnet['ip']);
+        # Precompute subnet in AND format (long for IPv4 and bin str for IPv6)
+        $subnet['andip'] = ($subnet['type'] == "IPv4") ? $subnet['subnet'] : my_ip2Bin($pi6,$subnet['ip']);
+        # Add to array
+        $edata[$sect_id][] = $subnet;
+        $isFolder[$sect_id][$subnet['id']] = $subnet['isFolder'];
+    }
 }
 
 $rows = ""; $counters = array();
 
 # Recompute master/nested relations for the selected sections and address families
 foreach ($rlist as $sect_id => $sect_check) {
-	# Skip empty sections
-	if (!$edata[$sect_id]) { continue; }
-
-	# Grab a subnet and find its closest master
-	foreach ($edata[$sect_id] as &$c_subnet) {
-		if (!$sect_check[$c_subnet['type']]) { continue; }	# Skip the IP version we don't want to reorder
-		if ($c_subnet['isFolder']) { continue; } # Skip folders
-		if ($isFolder[$sect_id][$c_subnet['masterSubnetId']]) { continue; } # Skip changing subne with folder masters
-
-		$c_master_id = "0"; $c_master_ip = ""; $c_master_mask = "";
-
-		# Check against all other subnets in section
-		foreach ($edata[$sect_id] as $m_subnet) {
-			if ($c_subnet['type'] != $m_subnet['type']) { continue; }	# Skip if current IP version doesn't match master IP version
-			if ((!$sect_check["CVRF"]) && ($c_subnet['vrfId'] != $m_subnet['vrfId'])) { continue; }	# Skip IPs from other VRFs if cross VRF reordering is not wanted (default is on)
-			# Main logic here - check if subnet within subnet
-			if ((($c_subnet['andip'] & $masks[$c_subnet['type']][$m_subnet['mask']]) == $m_subnet['andip']) && ($c_subnet['mask'] > $m_subnet['mask'])) {	# We have a match
-				if ($m_subnet['mask'] > $c_master_mask) {	# If new master is more specific than old master, record the data
-					$c_master_id = $m_subnet['id']; $c_master_mask = $m_subnet['mask']; $c_master_ip = $m_subnet['ip'];
-				}
-			}
-		}
-
-		# At the end, save the new master
-		$c_subnet['new_masterSubnetId'] = $c_master_id;
-		$c_subnet['new_master'] = (($c_master_id === "0") ? _("Root") : $c_master_ip."/".$c_master_mask);
-		$c_subnet['action'] = ($c_subnet['masterSubnetId'] == $c_subnet['new_masterSubnetId'] ? "skip" : "edit");
-		$c_subnet['msg'] = ($c_subnet['masterSubnetId'] == $c_subnet['new_masterSubnetId'] ? _("No change, skip") : _("New master, update"));
-
-		$rows.="<tr class='".$colors[$c_subnet['action']]."'><td><i class='fa ".$icons[$c_subnet['action']]."' rel='tooltip' data-placement='bottom' title='"._($c_subnet['msg'])."'></i></td>";
-		$rows.="<td>".$sect_names[$sect_id]."</td><td>".$c_subnet['ip']."/".$c_subnet['mask']."</td>";
-		$rows.="<td>".$c_subnet['description']."</td><td>".$vrf_name[$c_subnet['vrfId']]."</td><td>";
-		$rows.=$c_subnet['new_master']."</td><td>".$c_subnet['msg']."</td></tr>\n";
-
-		$counters[$c_subnet['action']]++;
-	}
+    # Skip empty sections
+    if (!$edata[$sect_id]) { continue; }
+
+    # Grab a subnet and find its closest master
+    foreach ($edata[$sect_id] as &$c_subnet) {
+        if (!$sect_check[$c_subnet['type']]) { continue; }	# Skip the IP version we don't want to reorder
+        if ($c_subnet['isFolder']) { continue; } # Skip folders
+        if ($isFolder[$sect_id][$c_subnet['masterSubnetId']]) { continue; } # Skip changing subne with folder masters
+
+        $c_master_id = "0"; $c_master_ip = ""; $c_master_mask = "";
+
+        # Check against all other subnets in section
+        foreach ($edata[$sect_id] as $m_subnet) {
+            if ($c_subnet['type'] != $m_subnet['type']) { continue; }	# Skip if current IP version doesn't match master IP version
+            if ((!$sect_check["CVRF"]) && ($c_subnet['vrfId'] != $m_subnet['vrfId'])) { continue; }	# Skip IPs from other VRFs if cross VRF reordering is not wanted (default is on)
+            # Main logic here - check if subnet within subnet
+            if ((($c_subnet['andip'] & $masks[$c_subnet['type']][$m_subnet['mask']]) == $m_subnet['andip']) && ($c_subnet['mask'] > $m_subnet['mask'])) {	# We have a match
+                if ($m_subnet['mask'] > $c_master_mask) {	# If new master is more specific than old master, record the data
+                    $c_master_id = $m_subnet['id']; $c_master_mask = $m_subnet['mask']; $c_master_ip = $m_subnet['ip'];
+                }
+            }
+        }
+
+        # At the end, save the new master
+        $c_subnet['new_masterSubnetId'] = $c_master_id;
+        $c_subnet['new_master'] = (($c_master_id === "0") ? _("Root") : $c_master_ip."/".$c_master_mask);
+        $c_subnet['action'] = ($c_subnet['masterSubnetId'] == $c_subnet['new_masterSubnetId'] ? "skip" : "edit");
+        $c_subnet['msg'] = ($c_subnet['masterSubnetId'] == $c_subnet['new_masterSubnetId'] ? _("No change, skip") : _("New master, update"));
+
+        $rows.="<tr class='".$colors[$c_subnet['action']]."'><td><i class='fa ".$icons[$c_subnet['action']]."' rel='tooltip' data-placement='bottom' title='"._($c_subnet['msg'])."'></i></td>";
+        $rows.="<td>".$sect_names[$sect_id]."</td><td>".$c_subnet['ip']."/".$c_subnet['mask']."</td>";
+        $rows.="<td>".$c_subnet['description']."</td><td>".$vrf_name[$c_subnet['vrfId']]."</td><td>";
+        $rows.=$c_subnet['new_master']."</td><td>".$c_subnet['msg']."</td></tr>\n";
+
+        $counters[$c_subnet['action']]++;
+    }
 }
 
 ?>