phpipam / phpipam

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

Spacing +29 added lines, -29 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","subnet","mask","description","vlan","domain","vrf");
+$expfields = array ("section", "subnet", "mask", "description", "vlan", "domain", "vrf");
 // we don't want to support importing of special fields yet, like master, requests, ping, permissions, etc.
 // $expfields = array ("section","subnet","mask","description","vlan","domain","vrf","master_subnet","master_mask","allowRequests","pingSubnet","discoverSubnet");
 $mtable = "subnets"; # main table where to check the fields
@@ -44,10 +44,10 @@ 
 // $extfields["master_mask"]["field"] = "mask";
 // $extfields["master_mask"]["pname"] = "master";
 # required fields without which we will not continue, vrf is optional - if not set we check against default VRF
-$reqfields = array("section","subnet");
+$reqfields = array ("section", "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"];
@@ -61,28 +61,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.$field['Field'].$msgr."</th>";
-	$tpl_field_types.= "<td><small>". wordwrap($field['Type'],18,"<br>\n",true) ."</small></td>";
+	$tpl_field_names .= "<th>".$pname.$field['Field'].$msgr."</th>";
+	$tpl_field_types .= "<td><small>".wordwrap ($field['Type'], 18, "<br>\n", true)."</small></td>";
 }
 
 # append the custom fields, if any
-$custom_fields = $Tools->fetch_custom_fields($mtable);
-if(sizeof($custom_fields) > 0) {
-	foreach($custom_fields as $myField) {
+$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'];
 	}
 }
@@ -90,7 +90,7 @@ 
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _("Select Subnets file and fields to import"); ?></div>
+<div class="pHeader"><?php print _ ("Select Subnets file and fields to import"); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -99,18 +99,18 @@ 
 
 # 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>"._("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>"._ ("The mask can be provided either as a separate field or with the subnet, sparated by \"/\"")."
 	</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>";
@@ -119,7 +119,7 @@ 
 $templatetype = 'subnets';
 # 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>";
 ?>
@@ -128,7 +128,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="subnets" 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="subnets" disabled><i class="fa fa-eye"></i> <?php print _ ('Preview'); ?></button>
 	</div>
 </div>

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

Spacing +9 added lines, -9 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 _("VRF import"); ?></div>
+<div class="pHeader"><?php print _ ("VRF import"); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -35,13 +35,13 @@ 
 foreach ($data as &$cdata) {
 	if (($cdata['action'] == "add") || ($cdata['action'] == "edit")) {
 		# set update array
-		$values = array("vrfId"=>$cdata['vrfId'],
+		$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);
+		$cdata['result'] = $Admin->object_modify ("vrf", $cdata['action'], "vrfId", $values);
 
 		if ($cdata['result']) {
 			$trc = $colors[$cdata['action']];
@@ -50,11 +50,11 @@ 
 			$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>
+		$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>";
+			<td>"._ ($msg)."</td></tr>";
 	}
 }
 
@@ -68,5 +68,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/import-load-data.php

Spacing +39 added lines, -39 removed lines

@@ -4,61 +4,61 @@ 
  *************************************************/
 
 # 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($Result)) { $Result = new Result; }
 
 # verify that user is logged in, to guard against direct access of page and possible exploits
-$User->check_user_session();
+$User->check_user_session ();
 
-$expfields = explode("|",$_GET['expfields']);
-$reqfields = explode("|",$_GET['reqfields']);
+$expfields = explode ("|", $_GET['expfields']);
+$reqfields = explode ("|", $_GET['reqfields']);
 if (isset($_GET['filetype'])) {
 	$filetype = $_GET['filetype'];
 } else {
-	$Result->show('danger', _("Error: could not read the uploaded file type!"), true, true);
+	$Result->show ('danger', _ ("Error: could not read the uploaded file type!"), true, true);
 }
 
 # Load colors and icons
 include 'import-constants.php';
 
 $hrow = "<td></td>";
-$hiddenfields="";
+$hiddenfields = "";
 
 # read field mapping from previous window
 foreach ($expfields as $expfield) {
-	if (isset($_GET['importFields__'.str_replace(" ", "_",$expfield)])) {
-		$impfield = $_GET['importFields__'.str_replace(" ", "_",$expfield)];
-		if (in_array($expfield,$reqfields) && ($impfield == "-")) {
-			$Result->show('danger', _("Error: missing required field mapping for expected field")." <b>".$expfield."</b>."._("Please check field matching in previous window."), true, true);
+	if (isset($_GET['importFields__'.str_replace (" ", "_", $expfield)])) {
+		$impfield = $_GET['importFields__'.str_replace (" ", "_", $expfield)];
+		if (in_array ($expfield, $reqfields) && ($impfield == "-")) {
+			$Result->show ('danger', _ ("Error: missing required field mapping for expected field")." <b>".$expfield."</b>."._ ("Please check field matching in previous window."), true, true);
 		} else {
 			if ($impfield != "-") { $impfields[$impfield] = $expfield; }
 		}
 	} else {
-		$Result->show('danger', _("Internal error: missing import field mapping."), true, true);
+		$Result->show ('danger', _ ("Internal error: missing import field mapping."), true, true);
 	}
 	# prepare header row for preview table
-	$hrow.="<th>".$expfield."</th>";
+	$hrow .= "<th>".$expfield."</th>";
 	# prepare select field to transfer to actual import file
-	$hiddenfields.="<input name='importFields__".str_replace(" ", "_",$expfield)."' type='hidden' value='".$impfield."' style='display:none;'>";
+	$hiddenfields .= "<input name='importFields__".str_replace (" ", "_", $expfield)."' type='hidden' value='".$impfield."' style='display:none;'>";
 }
 
-$data = array();
+$data = array ();
 
 # read first row from CSV
-if (strtolower($filetype) == "csv") {
+if (strtolower ($filetype) == "csv") {
 	# open CSV file
-	$filehdl = fopen('upload/data_import.csv', 'r');
+	$filehdl = fopen ('upload/data_import.csv', 'r');
 
 	# read header row
-	$row = 0;$col = 0;
-	$line = fgets($filehdl);
+	$row = 0; $col = 0;
+	$line = fgets ($filehdl);
 	$row++;
-	$line = str_replace( array("\r\n","\r") , "" , $line);	//remove line break
-	$cols = preg_split("/[;]/", $line); //split by comma or semi-colon
+	$line = str_replace (array ("\r\n", "\r"), "", $line); //remove line break
+	$cols = preg_split ("/[;]/", $line); //split by comma or semi-colon
 	foreach ($cols as $val) {
 		$col++;
 		# map import columns to expected fields as per previous window
@@ -67,46 +67,46 @@ 
 	}
 
 	# read each remaining row into a dictionary with expected fields as keys
-	while (($line = fgets($filehdl)) !== false) {
-		$row++;$col = 0;
-		$line = str_replace( array("\r\n","\r") , "" , $line);	//remove line break
-		$cols = preg_split("/[;]/", $line); //split by comma or semi-colon
-		$record = array();
+	while (($line = fgets ($filehdl)) !== false) {
+		$row++; $col = 0;
+		$line = str_replace (array ("\r\n", "\r"), "", $line); //remove line break
+		$cols = preg_split ("/[;]/", $line); //split by comma or semi-colon
+		$record = array ();
 		foreach ($cols as $val) {
 			$col++;
 			if ($col > $hcol) {
-				$Result->show('danger', _("Extra column found on line ").$row._(" in CSV file. CSV delimiter used in value field?"), true);
+				$Result->show ('danger', _ ("Extra column found on line ").$row._ (" in CSV file. CSV delimiter used in value field?"), true);
 			} else {
 				# read each row into a dictionary with expected fields as keys
-				$record[$fieldmap[$col]] = trim($val);
+				$record[$fieldmap[$col]] = trim ($val);
 			}
 		}
 		$data[] = $record;
 	}
-	fclose($filehdl);
+	fclose ($filehdl);
 }
 # read first row from XLS
-elseif(strtolower($filetype) == "xls") {
+elseif (strtolower ($filetype) == "xls") {
 	# get excel object
-	require_once(dirname(__FILE__) . '/../../../functions/php-excel-reader/excel_reader2.php');				//excel reader 2.21
-	$xls = new Spreadsheet_Excel_Reader('upload/data_import.xls', false);
+	require_once(dirname (__FILE__).'/../../../functions/php-excel-reader/excel_reader2.php'); //excel reader 2.21
+	$xls = new Spreadsheet_Excel_Reader ('upload/data_import.xls', false);
 	$sheet = 0; $row = 1;
 
 	# map import columns to expected fields as per previous window
-	for($col=1;$col<=$xls->colcount($sheet);$col++) {
-		$fieldmap[$col] = $impfields[$xls->val($row,$col,$sheet)];
+	for ($col = 1; $col <= $xls->colcount ($sheet); $col++) {
+		$fieldmap[$col] = $impfields[$xls->val ($row, $col, $sheet)];
 		$hcol = $col;
 	}
 
 	# read each remaining row into a dictionary with expected fields as keys
-	for($row=2;$row<=$xls->rowcount($sheet);$row++) {
-		$record = array();
-		for($col=1;$col<=$xls->colcount($sheet);$col++) {
+	for ($row = 2; $row <= $xls->rowcount ($sheet); $row++) {
+		$record = array ();
+		for ($col = 1; $col <= $xls->colcount ($sheet); $col++) {
 			$record++;
 			if ($col > $hcol) {
-					$Result->show('danger', _("Extra column found on line ").$row._(" in XLS file. Please check input file."), true);
+					$Result->show ('danger', _ ("Extra column found on line ").$row._ (" in XLS file. Please check input file."), true);
 			} else {
-				$record[$fieldmap[$col]] = trim($xls->val($row,$col,$sheet));
+				$record[$fieldmap[$col]] = trim ($xls->val ($row, $col, $sheet));
 			}
 		}
 		$data[] = $record;

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

Spacing +19 added lines, -19 removed lines

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

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

Spacing +97 added lines, -97 removed lines

@@ -5,35 +5,35 @@ 
  ************************************/
 
 # 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);
-$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;
 				}
@@ -46,78 +46,78 @@ 
 
 
 # get all custom fields
-$custom_fields = $Tools->fetch_custom_fields('subnets');
+$custom_fields = $Tools->fetch_custom_fields ('subnets');
 
 # Create a workbook
-$today = date("Ymd");
+$today = date ("Ymd");
 $filename = $today."_phpipam_subnets_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 = "Subnets";
-$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['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['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['VLAN'])) && ($_GET['VLAN'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('VLAN') ,$format_header);
+if ((isset($_GET['VLAN'])) && ($_GET['VLAN'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('VLAN'), $format_header);
 	$rowCount++;
-	$worksheet->write($lineCount, $rowCount, _('VLAN Domain') ,$format_header);
+	$worksheet->write ($lineCount, $rowCount, _ ('VLAN Domain'), $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++;
 }
-if( (isset($_GET['master'])) && ($_GET['master'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Master Subnet') ,$format_header);
+if ((isset($_GET['master'])) && ($_GET['master'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('Master Subnet'), $format_header);
 	$rowCount++;
 }
-if( (isset($_GET['requests'])) && ($_GET['requests'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Requests') ,$format_header);
+if ((isset($_GET['requests'])) && ($_GET['requests'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('Requests'), $format_header);
 	$rowCount++;
 }
-if( (isset($_GET['hostscheck'])) && ($_GET['hostscheck'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Host check') ,$format_header);
+if ((isset($_GET['hostscheck'])) && ($_GET['hostscheck'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('Host check'), $format_header);
 	$rowCount++;
 }
-if( (isset($_GET['discover'])) && ($_GET['discover'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Discover') ,$format_header);
+if ((isset($_GET['discover'])) && ($_GET['discover'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('Discover'), $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++;
 		}
 	}
@@ -127,107 +127,107 @@ 
 $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;
 
-				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['subnet'])) && ($_GET['subnet'] == "on") ) {
+				if ((isset($_GET['subnet'])) && ($_GET['subnet'] == "on")) {
 					$subnet_text = '';
                                         if ($subnet['isFolder']) {
 						$subnet_text = $subnet['description']." (folder)";
 					} else {
 						$subnet_text = $subnet['ip']."/".$subnet['mask'];
 					}
-					$worksheet->write($lineCount, $rowCount, $subnet_text, $format_text);
+					$worksheet->write ($lineCount, $rowCount, $subnet_text, $format_text);
 					$rowCount++;
 				}
 
-				if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
-					$worksheet->write($lineCount, $rowCount, $subnet['description'], $format_text);
+				if ((isset($_GET['description'])) && ($_GET['description'] == "on")) {
+					$worksheet->write ($lineCount, $rowCount, $subnet['description'], $format_text);
 					$rowCount++;
 				}
 
-				if( (isset($_GET['VLAN'])) && ($_GET['VLAN'] == "on") ) {
+				if ((isset($_GET['VLAN'])) && ($_GET['VLAN'] == "on")) {
 					// get VLAN
-					$vlan = (array) $Tools->fetch_object("vlans", "vlanId", $subnet['vlanId']);
+					$vlan = (array) $Tools->fetch_object ("vlans", "vlanId", $subnet['vlanId']);
 					/* if(@$vlan[0]===false) 	{ $vlan['number'] = "NA"; $vlan['name'] = "NA"; }			# no VLAN
 					$worksheet->write($lineCount, $rowCount, $vlan['number']." [".$vlan['name']."]", $format_text); */
-					if(@$vlan[0]===false) 	{ $vlan['number'] = "NA"; }			# no VLAN
-					$worksheet->write($lineCount, $rowCount, $vlan['number'], $format_text);
+					if (@$vlan[0] === false) { $vlan['number'] = "NA"; }			# no VLAN
+					$worksheet->write ($lineCount, $rowCount, $vlan['number'], $format_text);
 					$rowCount++;
 					// VLAN Domain
-					$vlan_domain = (array) $Tools->fetch_object("vlanDomains", "id", $vlan['domainId']);
-					$worksheet->write($lineCount, $rowCount, $vlan_domain['name'], $format_text);
+					$vlan_domain = (array) $Tools->fetch_object ("vlanDomains", "id", $vlan['domainId']);
+					$worksheet->write ($lineCount, $rowCount, $vlan_domain['name'], $format_text);
 					$rowCount++;
 				}
 
-				if( (isset($_GET['VRF'])) && ($_GET['VRF'] == "on") ) {
+				if ((isset($_GET['VRF'])) && ($_GET['VRF'] == "on")) {
 					// get vrf
 					if (!empty($subnet['vrfId'])) {
-						$vrf = (array) $Tools->fetch_object("vrf", "vrfId", $subnet['vrfId']);
-						$worksheet->write($lineCount, $rowCount, $vrf['name'], $format_text);
+						$vrf = (array) $Tools->fetch_object ("vrf", "vrfId", $subnet['vrfId']);
+						$worksheet->write ($lineCount, $rowCount, $vrf['name'], $format_text);
 					} else {
-						$worksheet->write($lineCount, $rowCount, '', $format_text);
+						$worksheet->write ($lineCount, $rowCount, '', $format_text);
 					}
 					$rowCount++;
 				}
 
-				if( (isset($_GET['master'])) && ($_GET['master'] == "on") ) {
+				if ((isset($_GET['master'])) && ($_GET['master'] == "on")) {
 					// get master subnet
 					// zet - could optimize here and reference the already loaded subnets, with the help of a dictionary variable
-					$masterSubnet = ( $subnet['masterSubnetId']==0 || empty($subnet['masterSubnetId']) ) ? false : true;
-					if($masterSubnet) {
+					$masterSubnet = ($subnet['masterSubnetId'] == 0 || empty($subnet['masterSubnetId'])) ? false : true;
+					if ($masterSubnet) {
 						$master = (array) $Subnets->fetch_subnet (null, $subnet['masterSubnetId']);
-						if($master['isFolder']) {
-							$worksheet->write($lineCount, $rowCount, $master['description']." [folder]", $format_text);
+						if ($master['isFolder']) {
+							$worksheet->write ($lineCount, $rowCount, $master['description']." [folder]", $format_text);
 						} else {
-							$worksheet->write($lineCount, $rowCount, $master['ip']."/".$master['mask'], $format_text);
+							$worksheet->write ($lineCount, $rowCount, $master['ip']."/".$master['mask'], $format_text);
 						}
 					} else {
-						$worksheet->write($lineCount, $rowCount, "/", $format_text);
+						$worksheet->write ($lineCount, $rowCount, "/", $format_text);
 					}
 					$rowCount++;
 				}
 
-				if( (isset($_GET['requests'])) && ($_GET['requests'] == "on") ) {
-					$worksheet->write($lineCount, $rowCount, $subnet['allowRequests'], $format_text);
+				if ((isset($_GET['requests'])) && ($_GET['requests'] == "on")) {
+					$worksheet->write ($lineCount, $rowCount, $subnet['allowRequests'], $format_text);
 					$rowCount++;
 				}
 
-				if( (isset($_GET['hostscheck'])) && ($_GET['hostscheck'] == "on") ) {
-					$worksheet->write($lineCount, $rowCount, $subnet['pingSubnet'], $format_text);
+				if ((isset($_GET['hostscheck'])) && ($_GET['hostscheck'] == "on")) {
+					$worksheet->write ($lineCount, $rowCount, $subnet['pingSubnet'], $format_text);
 					$rowCount++;
 				}
 
-				if( (isset($_GET['discover'])) && ($_GET['discover'] == "on") ) {
-					$worksheet->write($lineCount, $rowCount, $subnet['discoverSubnet'], $format_text);
+				if ((isset($_GET['discover'])) && ($_GET['discover'] == "on")) {
+					$worksheet->write ($lineCount, $rowCount, $subnet['discoverSubnet'], $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, $subnet[$myField['name']], $format_text);
+						if ((isset($_GET[$myField['nameTemp']])) && ($_GET[$myField['nameTemp']] == "on")) {
+							$worksheet->write ($lineCount, $rowCount, $subnet[$myField['name']], $format_text);
 							$rowCount++;
 						}
 					}
@@ -245,19 +245,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++;
@@ -267,19 +267,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++;
 			}
 		}
@@ -290,9 +290,9 @@ 
 }
 
 // sending HTTP headers
-$workbook->send($filename);
+$workbook->send ($filename);
 
 // Let's send the file
-$workbook->close();
+$workbook->close ();
 
 ?>

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

Spacing +15 added lines, -15 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 _("Subnets import"); ?></div>
+<div class="pHeader"><?php print _ ("Subnets import"); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -36,9 +36,9 @@ 
 	if (($cdata['action'] == "add") || ($cdata['action'] == "edit")) {
 		// # set update array
 
-		$values = array("id"=>$cdata['id'],
+		$values = array ("id"=>$cdata['id'],
 						"sectionId"=>$cdata['sectionId'],
-						"subnet"=>$Subnets->transform_to_decimal($cdata['subnet']),
+						"subnet"=>$Subnets->transform_to_decimal ($cdata['subnet']),
 						"mask"=>$cdata['mask'],
 						"description"=>@$cdata['description'],
 						"vlanId"=>$cdata['vlanId'],
@@ -49,14 +49,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("subnets", $cdata['action'], "id", $values);
+		$cdata['result'] = $Admin->object_modify ("subnets", $cdata['action'], "id", $values);
 
 		if ($cdata['result']) {
 			$trc = $colors[$cdata['action']];
@@ -66,13 +66,13 @@ 
 			$msg = "Subnets ".$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>";
 
 	}
 }
-print _("After the import you should perform an automatic recomputation of the master/nested relations using the Recompute button after you close this window.");
+print _ ("After the import you should perform an automatic recomputation of the master/nested relations using the Recompute button after you close this window.");
 print "<table class='table table-condensed table-hover' id='resultstable'><tbody>";
 print "<tr class='active'>".$hrow."<th>Result</th></tr>";
 print $rows;
@@ -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/import-vlan-select.php

Spacing +27 added lines, -27 removed lines

@@ -5,31 +5,31 @@ 
  */
 
 # 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);
 
 # 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 ("name","number","description","domain");
+$expfields = array ("name", "number", "description", "domain");
 $mtable = "vlans"; # main table where to check the fields
 # extra fields
 $extfields["domain"]["table"] = "vlanDomains";
 $extfields["domain"]["field"] = "name";
 $extfields["domain"]["pname"] = "domain"; # name prefix for fields from other tables
 # required fields without which we will not continue
-$reqfields = array("number","name");
+$reqfields = array ("number", "name");
 
 # 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"];
@@ -43,28 +43,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.$field['Field'].$msgr."</th>";
-	$tpl_field_types.= "<td><small>". wordwrap($field['Type'],18,"<br>\n",true) ."</small></td>";
+	$tpl_field_names .= "<th>".$pname.$field['Field'].$msgr."</th>";
+	$tpl_field_types .= "<td><small>".wordwrap ($field['Type'], 18, "<br>\n", true)."</small></td>";
 }
 
 # append the custom fields, if any
-$custom_fields = $Tools->fetch_custom_fields($mtable);
-if(sizeof($custom_fields) > 0) {
-	foreach($custom_fields as $myField) {
+$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'];
 	}
 }
@@ -72,7 +72,7 @@ 
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _("Select VLAN file and fields to import"); ?></div>
+<div class="pHeader"><?php print _ ("Select VLAN file and fields to import"); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -81,24 +81,24 @@ 
 
 # 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>"._("If no VLAN domain is specified the VLAN is added/changed in the default domain.")."</div>";
+print "<div id='bottommsg'>"._ ("The fields marked with * are mandatory.")."<br>"._ ("If no VLAN domain is specified the VLAN is added/changed in the default domain.")."</div>";
 ##print "<div class='checkbox'><label><input name='adddomain' type='checkbox' checked>"._("Add missing VLAN domains")."</label></div>";
 print "</form>";
 
 $templatetype = 'vlans';
 # 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>";
 
@@ -109,7 +109,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="vlan" 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="vlan" disabled><i class="fa fa-eye"></i> <?php print _ ('Preview'); ?></button>
 	</div>
 </div>

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

Spacing +12 added lines, -12 removed lines

@@ -4,15 +4,15 @@ 
  ****************************************/
 
 # 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);
-$Admin 		= new Admin ($Database);
+$Admin = new Admin ($Database);
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # Load subnets and recompute the master/nested relations
 include 'import-recompute-logic.php';
@@ -20,7 +20,7 @@ 
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _("Subnets master/nested recompute save"); ?></div>
+<div class="pHeader"><?php print _ ("Subnets master/nested recompute save"); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -40,10 +40,10 @@ 
 		if ($c_subnet['action'] == "edit") {
 
 			# We only need id and new master
-			$values = array("id"=>$c_subnet['id'], "masterSubnetId"=>$c_subnet['new_masterSubnetId']);
+			$values = array ("id"=>$c_subnet['id'], "masterSubnetId"=>$c_subnet['new_masterSubnetId']);
 
 			# update
-			$c_subnet['result'] = $Admin->object_modify("subnets", $c_subnet['action'], "id", $values);
+			$c_subnet['result'] = $Admin->object_modify ("subnets", $c_subnet['action'], "id", $values);
 
 			if ($c_subnet['result']) {
 				$trc = $colors[$c_subnet['action']];
@@ -53,10 +53,10 @@ 
 				$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";
+			$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";
 
 		}
 	}
@@ -72,5 +72,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/import-vlan-check.php

Spacing +31 added lines, -31 removed lines

@@ -5,25 +5,25 @@ 
  *************************************************/
 
 # 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); }
 
 # verify that user is logged in, to guard against direct access of page and possible exploits
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all l2 domains
-$vlan_domains = $Admin->fetch_all_objects("vlanDomains", "id");
+$vlan_domains = $Admin->fetch_all_objects ("vlanDomains", "id");
 
 # read again the custom fields, if any
-if (!isset($custom_fields)) { $custom_fields = $Tools->fetch_custom_fields("vlans"); }
+if (!isset($custom_fields)) { $custom_fields = $Tools->fetch_custom_fields ("vlans"); }
 
 # Load existing data
-$edata = array(); $vdom = array(); $vdomid = array();
+$edata = array (); $vdom = array (); $vdomid = array ();
 # process for easier later check
 foreach ($vlan_domains as $vlan_domain) {
 	//cast
@@ -31,10 +31,10 @@ 
 	$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 = $Admin->fetch_multiple_objects ("vlans", "domainId", $vlan_domain['id'], "number");
 	$all_vlans = (array) $all_vlans;
 	// skip empty domains
-	if (sizeof($all_vlans)==0) { continue; }
+	if (sizeof ($all_vlans) == 0) { continue; }
 	//write all VLAN entries
 	foreach ($all_vlans as $vlan) {
 		//cast
@@ -44,8 +44,8 @@ 
 }
 
 $rows = "";
-$counters = array();
-$unique = array();
+$counters = array ();
+$unique = array ();
 
 # check the fields
 foreach ($data as &$cdata) {
@@ -55,68 +55,68 @@ 
 	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";
+	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"; }
+	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"; } }
+		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>"; } }
+	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"; }
+	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"; }
+			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 (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";
+						$msg .= "VLAN ".$myField['name']." will be updated."; $action = "edit";
 					}
 				}
 			}
 
 			if ($action == "skip") {
-				$msg.= "Duplicate, will skip.";
+				$msg .= "Duplicate, will skip.";
 			}
 		} else {
-			$msg.="New entry, will be added."; $action = "add";
+			$msg .= "New entry, will be added."; $action = "add";
 		}
 	}
 
-	$cdata['msg'].= $msg;
+	$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>
+	$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>
 		<td>".$cdata['domain']."</td>
 		".$cfieldtds."
-		<td>"._($cdata['msg'])."</td></tr>";
+		<td>"._ ($cdata['msg'])."</td></tr>";
 
 }