phpipam / phpipam

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

Spacing +18 added lines, -18 removed lines

@@ -5,22 +5,22 @@ 
  *************************************************/
 
 # 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");
 
 # Load existing data
-$edata = array();
+$edata = array ();
 # process for easier later check
 foreach ($vlan_domains as $vlan_domain) {
 	//cast
@@ -29,51 +29,51 @@ 
 }
 
 $rows = "";
-$counters = array();
-$unique = array();
+$counters = array ();
+$unique = array ();
 
 # 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"; }
 	}
 
 	# check data format
 	if ($action != "error") {
-		if (!preg_match("/^[a-zA-Z0-9-_ ]+$/", $cdata['name'])) { $msg.="Invalid name 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 ("/[;'\"]/", $cdata['description'])) { $msg .= "Invalid characters in description."; $action = "error"; }
 	}
 
 	# check if duplicate L2 domain
-	if (isset($unique[$cdata['name']])) { $msg.= "Duplicate VLAN domain found. Please check import file."; $action = "error"; }
+	if (isset($unique[$cdata['name']])) { $msg .= "Duplicate VLAN domain found. Please check import file."; $action = "error"; }
 
 	# check if existing
 	if ($action != "error") {
 		if (isset($edata[$cdata['name']])) {
 			$cdata['id'] = $edata[$cdata['name']]['id'];
 			$action = "skip"; # skip duplicate fields if identical, update if different
-			if ($cdata['description'] != $edata[$cdata['name']]['description']) { $msg.= "L2 Domain description will be updated."; $action = "edit"; }
+			if ($cdata['description'] != $edata[$cdata['name']]['description']) { $msg .= "L2 Domain 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]++;
 	if (!isset($unique[$cdata['name']])) { $unique[$cdata['name']] = $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['description']."</td>
-		<td>"._($cdata['msg'])."</td></tr>";
+		<td>"._ ($cdata['msg'])."</td></tr>";
 
 }
 

app/admin/import-export/import-l2dom.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 _("L2 Domain import"); ?></div>
+<div class="pHeader"><?php print _ ("L2 Domain 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("id"=>$cdata['id'],
+		$values = array ("id"=>$cdata['id'],
 						"name"=>$cdata['name'],
 						"description"=>$cdata['description']
 						);
 
 		# update
-		$cdata['result'] = $Admin->object_modify("vlanDomains", $cdata['action'], "id", $values);
+		$cdata['result'] = $Admin->object_modify ("vlanDomains", $cdata['action'], "id", $values);
 
 		if ($cdata['result']) {
 			$trc = $colors[$cdata['action']];
@@ -50,10 +50,10 @@ 
 			$trc = "danger";
 			$msg = "L2 Domain ".$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['description']."</td>
-			<td>"._($msg)."</td></tr>";
+			<td>"._ ($msg)."</td></tr>";
 	}
 }
 
@@ -67,5 +67,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-subnets-check.php

Spacing +58 added lines, -58 removed lines

@@ -5,40 +5,40 @@ 
  *************************************************/
 
 # 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($Subnets)) { $Subnets	= new Subnets ($Database); }
+if (!isset($Sections)) { $Sections = new Sections ($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 ();
 
 # Get mask check
 #automated $cidrformat = isset($_GET['cidrformat']) ? $_GET['cidrformat'] : "off";
 #separate option $rebuildmnr = isset($_GET['rebuildmnr']) ? $_GET['rebuildmnr'] : "off";
 
 # read again the custom fields, if any
-if (!isset($custom_fields)) { $custom_fields = $Tools->fetch_custom_fields("subnets"); }
+if (!isset($custom_fields)) { $custom_fields = $Tools->fetch_custom_fields ("subnets"); }
 
 # fetch all l2 domains
-$vlan_domains = $Admin->fetch_all_objects("vlanDomains", "id");
+$vlan_domains = $Admin->fetch_all_objects ("vlanDomains", "id");
 # load VLANs and process for easier later check
-$vlan_data = array();
+$vlan_data = array ();
 foreach ($vlan_domains as $vlan_domain) {
 	//cast
 	$vlan_domain = (array) $vlan_domain;
 	// 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) {
+	if (sizeof ($all_vlans) == 0) {
 		# create entry for domain check
-		$vlan_data[$vlan_domain['name']] = array();
+		$vlan_data[$vlan_domain['name']] = array ();
 		continue;
 	}
 	//write all VLAN entries
@@ -50,75 +50,75 @@ 
 }
 
 # 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 subnets in all sections
-$edata = array(); $section_names = array();
+$edata = array (); $section_names = array ();
 
 foreach ($all_sections as $section) {
 	$section = (array) $section;
 	$section_names[$section['name']] = $section;
-	$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;
 		# load whole record in array
 		$edata[$section['id']][$subnet['vrfId']][$subnet['ip']][$subnet['mask']] = $subnet;
-		$edata[$section['id']][$subnet['vrfId']][$subnet['ip']][$subnet['mask']]['type'] = $Subnets->identify_address($subnet['ip']);
+		$edata[$section['id']][$subnet['vrfId']][$subnet['ip']][$subnet['mask']]['type'] = $Subnets->identify_address ($subnet['ip']);
 	}
 }
 
 #print_r($vlan_data);
 
 $rows = "";
-$counters = array();
-$ndata = array(); # store new networks in a similar format with edata for easier processing
+$counters = array ();
+$ndata = array (); # store new networks 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 { # check that mask is provided
-			if ((!isset($cdata['mask'])) or ($cdata['mask'] == "")) { $msg.= "Required field mask missing or empty."; $action = "error"; }
+			if ((!isset($cdata['mask'])) or ($cdata['mask'] == "")) { $msg .= "Required field mask missing or empty."; $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";
+		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[$cdata['section']])) {
-		$msg.= "Invalid section."; $action = "error";
+		$msg .= "Invalid section."; $action = "error";
 	} else {
 		$cdata['sectionId'] = $section_names[$cdata['section']]['id'];
 	}
@@ -126,7 +126,7 @@ 
 	# 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'];
 		}
@@ -139,13 +139,13 @@ 
 	if (!empty($cdata['domain'])) { $cdom = $cdata['domain']; } else { $cdom = "default"; }
 	if (!isset($vlan_data[$cdom])) {
 		# the default domain is always there, so if anything is missing we return an error
-		$msg.= "Invalid VLAN domain."; $action = "error";
+		$msg .= "Invalid VLAN domain."; $action = "error";
 	} else {
 		if (!empty($cdata['vlan'])) {
-		        if (in_array(strtolower($cdata['vlan']),array("na","n/a","nan"))) { $cdata['vlan'] = ""; }
-			if ((!empty($cdata['vlan'])) && (strtolower($cdata['vlan']) != "na")) {
+		        if (in_array (strtolower ($cdata['vlan']), array ("na", "n/a", "nan"))) { $cdata['vlan'] = ""; }
+			if ((!empty($cdata['vlan'])) && (strtolower ($cdata['vlan']) != "na")) {
 				if (!isset($vlan_data[$cdom][$cdata['vlan']])) {
-					$msg.= "VLAN not found in provided domain."; $action = "error";
+					$msg .= "VLAN not found in provided domain."; $action = "error";
 				} else {
 					$cdata['vlanId'] = $vlan_data[$cdom][$cdata['vlan']]['vlanId'];
 				}
@@ -158,20 +158,20 @@ 
 
 	# check data format
 	if ($action != "error") {
-		if ($net = $Subnets->get_network_boundaries($cdata['subnet'],$cdata['mask'])) {
+		if ($net = $Subnets->get_network_boundaries ($cdata['subnet'], $cdata['mask'])) {
 			$cdata['mask'] = $net['bitmask'];
-			$cidr_check = $Subnets->verify_cidr_address($cdata['subnet']."/".$cdata['mask']);
-			if (strlen($cidr_check)>5) { $msg.=$cidr_check; $action = "error"; }
-		} else { $msg.=$net['message']; $action = "error"; }
-		if (preg_match("/[;'\"]/", $cdata['description'])) { $msg.="Invalid characters in description."; $action = "error"; }
-		if ((!empty($cdata['vrf'])) && (!preg_match("/^[a-zA-Z0-9-:]+$/", $cdata['vrf']))) { $msg.="Invalid VRF name format."; $action = "error"; }
-		if ((!empty($cdata['vlan'])) && (!preg_match("/^[0-9]+$/", $cdata['vlan']))) { $msg.="Invalid VLAN number format."; $action = "error"; }
-		if ((!empty($cdata['domain'])) && (!preg_match("/^[a-zA-Z0-9-_ ]+$/", $cdata['domain']))) { $msg.="Invalid VLAN domain format."; $action = "error"; }
+			$cidr_check = $Subnets->verify_cidr_address ($cdata['subnet']."/".$cdata['mask']);
+			if (strlen ($cidr_check) > 5) { $msg .= $cidr_check; $action = "error"; }
+		} else { $msg .= $net['message']; $action = "error"; }
+		if (preg_match ("/[;'\"]/", $cdata['description'])) { $msg .= "Invalid characters in description."; $action = "error"; }
+		if ((!empty($cdata['vrf'])) && (!preg_match ("/^[a-zA-Z0-9-:]+$/", $cdata['vrf']))) { $msg .= "Invalid VRF name format."; $action = "error"; }
+		if ((!empty($cdata['vlan'])) && (!preg_match ("/^[0-9]+$/", $cdata['vlan']))) { $msg .= "Invalid VLAN number format."; $action = "error"; }
+		if ((!empty($cdata['domain'])) && (!preg_match ("/^[a-zA-Z0-9-_ ]+$/", $cdata['domain']))) { $msg .= "Invalid VLAN domain format."; $action = "error"; }
 	}
 
 	# check if duplicate in the import data
 	if ($action != "error") {
-		if (isset($ndata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']])) { $msg.="Duplicate entry in imported data."; $action = "error"; }
+		if (isset($ndata[$cdata['sectionId']][$cdata['vrfId']][$cdata['subnet']][$cdata['mask']])) { $msg .= "Duplicate entry in imported data."; $action = "error"; }
 	}
 
 	# check if existing in database
@@ -182,19 +182,19 @@ 
 
 			# Check if we need to change any fields
 			$action = "skip"; # skip duplicate fields if identical, update if different
-			if ($cdata['description'] != $cedata['description']) { $msg.= "Subnet description will be updated."; $action = "edit"; }
-			if ($cdata['vlanId'] != $cedata['vlanId']) { $msg.= "VLAN ID will be updated."; $action = "edit"; }
+			if ($cdata['description'] != $cedata['description']) { $msg .= "Subnet description will be updated."; $action = "edit"; }
+			if ($cdata['vlanId'] != $cedata['vlanId']) { $msg .= "VLAN ID 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'];
@@ -205,7 +205,7 @@ 
 				// $cdata['pingSubnet'] = $cedata['pingSubnet'];				$cdata['discoverSubnet'] = $cedata['discoverSubnet'];
 			}
 		} else {
-			$msg.="New entry, will be added."; $action = "add";
+			$msg .= "New entry, will be added."; $action = "add";
 			# Set master to 0 for now, will figure that after we add it, with the recompute function
 			$cdata['masterSubnetId'] = "0";
 			# Inherit section permissions for new subnets
@@ -219,13 +219,13 @@ 
 		}
 	}
 
-	$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>";
-	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>";
 
 }
 

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

Spacing +30 added lines, -30 removed lines

@@ -5,55 +5,55 @@ 
  *********************************/
 
 # 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 required objects
-$Database 	= new Database_PDO;
+$Database = new Database_PDO;
 $Result		= new Result;
-$User		= new User ($Database);
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # 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 (); }
 
 # Create a workbook
-$today = date("Ymd");
+$today = date ("Ymd");
 $filename = $today."_phpipam_VRF_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 = "VRFs";
-$worksheet =& $workbook->addWorksheet($worksheet_name);
+$worksheet = & $workbook->addWorksheet ($worksheet_name);
 
 $lineCount = 0;
 $rowCount = 0;
 
 //write headers
-if( (isset($_GET['name'])) && ($_GET['name'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Name') ,$format_header);
+if ((isset($_GET['name'])) && ($_GET['name'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('Name'), $format_header);
 	$rowCount++;
 }
-if( (isset($_GET['rd'])) && ($_GET['rd'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('RD') ,$format_header);
+if ((isset($_GET['rd'])) && ($_GET['rd'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('RD'), $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++;
 }
 
@@ -67,16 +67,16 @@ 
 	//reset row count
 	$rowCount = 0;
 
-	if( (isset($_GET['name'])) && ($_GET['name'] == "on") ) {
-		$worksheet->write($lineCount, $rowCount, $vrf['name'], $format_text);
+	if ((isset($_GET['name'])) && ($_GET['name'] == "on")) {
+		$worksheet->write ($lineCount, $rowCount, $vrf['name'], $format_text);
 		$rowCount++;
 	}
-	if( (isset($_GET['rd'])) && ($_GET['rd'] == "on") ) {
-		$worksheet->write($lineCount, $rowCount, $vrf['rd'], $format_text);
+	if ((isset($_GET['rd'])) && ($_GET['rd'] == "on")) {
+		$worksheet->write ($lineCount, $rowCount, $vrf['rd'], $format_text);
 		$rowCount++;
 	}
-	if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
-		$worksheet->write($lineCount, $rowCount, $vrf['description'], $format_text);
+	if ((isset($_GET['description'])) && ($_GET['description'] == "on")) {
+		$worksheet->write ($lineCount, $rowCount, $vrf['description'], $format_text);
 		$rowCount++;
 	}
 
@@ -87,9 +87,9 @@ 
 $lineCount++;
 
 // sending HTTP headers
-$workbook->send($filename);
+$workbook->send ($filename);
 
 // Let's send the file
-$workbook->close();
+$workbook->close ();
 
 ?>
\ No newline at end of file

app/admin/import-export/import-vlan-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 _("VLAN import data preview"); ?></div>
+<div class="pHeader"><?php print _ ("VLAN 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>";
@@ -57,8 +57,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="vlan" disabled><i class="fa fa-download"></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="vlan" disabled><i class="fa fa-download"></i> <?php print _ ('Import'); ?></button>
 	</div>
 </div>
 

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

Spacing +10 added lines, -10 removed lines

@@ -5,16 +5,16 @@ 
  */
 
 # 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);
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # prepare HTML variables
 $custom_fields_names = "";
@@ -23,7 +23,7 @@ 
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _("Select L2 Domain fields to export"); ?></div>
+<div class="pHeader"><?php print _ ("Select L2 Domain fields to export"); ?></div>
 
 <!-- content -->
 <div class="pContent" style="overflow:auto;">
@@ -37,12 +37,12 @@ 
 print "	<table class='table table-striped table-condensed'>";
 
 print "	<tr>";
-print "	<th>"._('Name')."</th>";
-print "	<th>"._('Description')."</th>";
+print "	<th>"._ ('Name')."</th>";
+print "	<th>"._ ('Description')."</th>";
 print "	</tr>";
 
 print "	<tr>";
-print "	<td><input type='checkbox' name='name' checked title='"._('Mandatory')."'></td>";
+print "	<td><input type='checkbox' name='name' checked title='"._ ('Mandatory')."'></td>";
 print "	<td><input type='checkbox' name='description' checked> </td>";
 print "	</tr>";
 
@@ -56,7 +56,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="l2dom"><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="l2dom"><i class="fa fa-upload"></i> <?php print _ ('Export'); ?></button>
 	</div>
 </div>

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

Spacing +10 added lines, -10 removed lines

@@ -5,16 +5,16 @@ 
  ************************************/
 
 # include required scripts
-require_once( dirname(__FILE__) . '/../../../functions/functions.php' );
+require_once(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize required objects
-$Database 	= new Database_PDO;
+$Database = new Database_PDO;
 $Result		= new Result;
-$User		= new User ($Database);
+$User = new User ($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';
@@ -22,15 +22,15 @@ 
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _("Subnets master/nested recompute data preview"); ?></div>
+<div class="pHeader"><?php print _ ("Subnets master/nested recompute data preview"); ?></div>
 
 <!-- content -->
 <div class="pContent">
 <?php
 
-print '<h4>'._("Recomputed data").'</h4><hr>';
-print _("The entries marked with ")."<i class='fa ".$icons['edit']."'></i>, "._("have new masters and will be updated,
-	the ones marked with ")."<i class='fa ".$icons['skip']."'></i>, "._("didn't change the master.");
+print '<h4>'._ ("Recomputed data").'</h4><hr>';
+print _ ("The entries marked with ")."<i class='fa ".$icons['edit']."'></i>, "._ ("have new masters and will be updated,
+	the ones marked with ")."<i class='fa ".$icons['skip']."'></i>, "._ ("didn't change the master.");
 
 print "<form id='selectImportFields'>".$pass_inputs."</form>";
 print "<table class='table table-condensed table-hover' id='previewtable'><tbody>";
@@ -46,8 +46,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="recompute" disabled><i class="fa fa-magic"></i> <?php print _('Save'); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default" id="dataImportSubmit" data-type="recompute" disabled><i class="fa fa-magic"></i> <?php print _ ('Save'); ?></button>
 	</div>
 </div>
 

app/admin/import-export/generate-xls.php

Spacing +80 added lines, -80 removed lines

@@ -5,39 +5,39 @@ 
  *********************************/
 
 /* 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');
 
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
-$Sections	= new Sections ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
+$Sections = new Sections ($Database);
 $Subnets	= new Subnets ($Database);
-$Addresses	= new Addresses ($Database);
-$Tools		= new Tools ($Database);
+$Addresses = new Addresses ($Database);
+$Tools = new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 
 
 // Create a workbook
-$filename = "phpipam_IP_adress_export_". date("Y-m-d") .".xls";
-$workbook = new Spreadsheet_Excel_Writer();
-$workbook->setVersion(8);
+$filename = "phpipam_IP_adress_export_".date ("Y-m-d").".xls";
+$workbook = new Spreadsheet_Excel_Writer ();
+$workbook->setVersion (8);
 
 //fetch sections, and for each section write new tab, inside tab write all values!
-$sections = $Sections->fetch_sections();
+$sections = $Sections->fetch_sections ();
 
 //we need to reformat state!
-$ip_types = $Addresses->addresses_types_fetch();
+$ip_types = $Addresses->addresses_types_fetch ();
 //fetch devices and reorder
-$devices = $Tools->fetch_all_objects("devices", "hostname");
-$devices_indexed = array();
-if ($devices!==false) {
-    foreach($devices as $d) {
+$devices = $Tools->fetch_all_objects ("devices", "hostname");
+$devices_indexed = array ();
+if ($devices !== false) {
+    foreach ($devices as $d) {
     	$devices_indexed[$d->id] = $d;
     }
 }
@@ -46,43 +46,43 @@ 
 
 //get all custom fields!
 # fetch custom fields
-$myFields = $Tools->fetch_custom_fields('ipaddresses');
-$myFieldsSize = sizeof($myFields);
+$myFields = $Tools->fetch_custom_fields ('ipaddresses');
+$myFieldsSize = sizeof ($myFields);
 
 $colSize = 8 + $myFieldsSize;
 
 //formatting headers
-$format_header = $workbook->addFormat();
-$format_header->setBold();
-$format_header->setColor('white');
-$format_header->setFgColor('black');
+$format_header = $workbook->addFormat ();
+$format_header->setBold ();
+$format_header->setColor ('white');
+$format_header->setFgColor ('black');
 
 //formatting titles
-$format_title = $workbook->addFormat();
-$format_title->setColor('black');
-$format_title->setFgColor(22);			//light gray
-$format_title->setBottom(2);
-$format_title->setLeft(1);
-$format_title->setRight(1);
-$format_title->setTop(1);
-$format_title->setAlign('left');
+$format_title = $workbook->addFormat ();
+$format_title->setColor ('black');
+$format_title->setFgColor (22); //light gray
+$format_title->setBottom (2);
+$format_title->setLeft (1);
+$format_title->setRight (1);
+$format_title->setTop (1);
+$format_title->setAlign ('left');
 
 //formatting content - borders around IP addresses
-$format_right = $workbook->addFormat();
-$format_right->setRight(1);
-$format_left = $workbook->addFormat();
-$format_left->setLeft(1);
-$format_top = $workbook->addFormat();
-$format_top->setTop(1);
+$format_right = $workbook->addFormat ();
+$format_right->setRight (1);
+$format_left = $workbook->addFormat ();
+$format_left->setLeft (1);
+$format_top = $workbook->addFormat ();
+$format_top->setTop (1);
 
 
 foreach ($sections as $section) {
 	//cast
 	$section = (array) $section;
 	// Create a worksheet
-	$worksheet_name = strlen($section['name']) > 30 ? substr($section['name'],0,27).'...' : $section['name'];
-	$worksheet =& $workbook->addWorksheet($worksheet_name);
-	$worksheet->setInputEncoding("utf-8");
+	$worksheet_name = strlen ($section['name']) > 30 ? substr ($section['name'], 0, 27).'...' : $section['name'];
+	$worksheet = & $workbook->addWorksheet ($worksheet_name);
+	$worksheet->setInputEncoding ("utf-8");
 
 	//get all subnets in this section
 	$subnets = $Subnets->fetch_section_subnets ($section['id']);
@@ -93,13 +93,13 @@ 
 		//cast
 		$subnet = (array) $subnet;
 		//ignore folders!
-		if($subnet['isFolder']!="1") {
+		if ($subnet['isFolder'] != "1") {
 			//vlan details
-			$vlan = (array) $Tools->fetch_object("vlans", "vlanId", $subnet['vlanId']);
-			if(strlen($vlan['number']) > 0) {
-				$vlanText = " (vlan: " . $vlan['number'];
-				if(strlen($vlan['name']) > 0) {
-					$vlanText .= ' - '. $vlan['name'] . ')';
+			$vlan = (array) $Tools->fetch_object ("vlans", "vlanId", $subnet['vlanId']);
+			if (strlen ($vlan['number']) > 0) {
+				$vlanText = " (vlan: ".$vlan['number'];
+				if (strlen ($vlan['name']) > 0) {
+					$vlanText .= ' - '.$vlan['name'].')';
 				}
 				else {
 					$vlanText .= ")";
@@ -109,8 +109,8 @@ 
 				$vlanText = "";
 			}
 
-			$worksheet->write($lineCount, 0, $Subnets->transform_to_dotted($subnet['subnet']) . "/" .$subnet['mask'] . " - " . $subnet['description'] . $vlanText, $format_header );
-			$worksheet->mergeCells($lineCount, 0, $lineCount, $colSize);
+			$worksheet->write ($lineCount, 0, $Subnets->transform_to_dotted ($subnet['subnet'])."/".$subnet['mask']." - ".$subnet['description'].$vlanText, $format_header);
+			$worksheet->mergeCells ($lineCount, 0, $lineCount, $colSize);
 
 			$lineCount++;
 
@@ -118,53 +118,53 @@ 
 			$ipaddresses = $Addresses->fetch_subnet_addresses ($subnet['id']);
 
 			//write headers
-			$worksheet->write($lineCount, 0, _('ip address' ),$format_title);
-			$worksheet->write($lineCount, 1, _('ip state' ),$format_title);
-			$worksheet->write($lineCount, 2, _('description' ),$format_title);
-			$worksheet->write($lineCount, 3, _('hostname' ),$format_title);
-			$worksheet->write($lineCount, 4, _('mac' ),$format_title);
-			$worksheet->write($lineCount, 5, _('owner' ),$format_title);
-			$worksheet->write($lineCount, 6, _('device' ),$format_title);
-			$worksheet->write($lineCount, 7, _('port' ),$format_title);
-			$worksheet->write($lineCount, 8, _('note' ),$format_title);
+			$worksheet->write ($lineCount, 0, _ ('ip address'), $format_title);
+			$worksheet->write ($lineCount, 1, _ ('ip state'), $format_title);
+			$worksheet->write ($lineCount, 2, _ ('description'), $format_title);
+			$worksheet->write ($lineCount, 3, _ ('hostname'), $format_title);
+			$worksheet->write ($lineCount, 4, _ ('mac'), $format_title);
+			$worksheet->write ($lineCount, 5, _ ('owner'), $format_title);
+			$worksheet->write ($lineCount, 6, _ ('device'), $format_title);
+			$worksheet->write ($lineCount, 7, _ ('port'), $format_title);
+			$worksheet->write ($lineCount, 8, _ ('note'), $format_title);
 			$m = 9;
 			//custom
-			if(sizeof($myFields) > 0) {
-				foreach($myFields as $myField) {
-					$worksheet->write($lineCount, $m, $myField['name'] ,$format_title);
+			if (sizeof ($myFields) > 0) {
+				foreach ($myFields as $myField) {
+					$worksheet->write ($lineCount, $m, $myField['name'], $format_title);
 					$m++;
 				}
 			}
 
 			$lineCount++;
 
-			if(sizeof($ipaddresses) > 0) {
+			if (sizeof ($ipaddresses) > 0) {
 
 			foreach ($ipaddresses as $ip) {
 				//cast
 				$ip = (array) $ip;
 
 				//reformat state
-				if(@$ip_types[$ip['state']]['showtag']==1) 	{ $ip['state'] = $ip_types[$ip['state']]['type']; }
-				else										{ $ip['state'] = ""; }
+				if (@$ip_types[$ip['state']]['showtag'] == 1) { $ip['state'] = $ip_types[$ip['state']]['type']; }
+				else { $ip['state'] = ""; }
 
 				//change switch ID to name
-				$ip['switch'] = is_null($ip['switch'])||strlen($ip['switch'])==0||$ip['switch']==0 ? "" : $devices_indexed[$ip['switch']]->hostname;
-
-				$worksheet->write($lineCount, 0, $Subnets->transform_to_dotted($ip['ip_addr']), $format_left);
-				$worksheet->write($lineCount, 1, $ip['state']);
-				$worksheet->write($lineCount, 2, $ip['description']);
-				$worksheet->write($lineCount, 3, $ip['dns_name']);
-				$worksheet->write($lineCount, 4, $ip['mac']);
-				$worksheet->write($lineCount, 5, $ip['owner']);
-				$worksheet->write($lineCount, 6, $ip['switch']);
-				$worksheet->write($lineCount, 7, $ip['port']);
-				$worksheet->write($lineCount, 8, $ip['note']);
+				$ip['switch'] = is_null ($ip['switch']) || strlen ($ip['switch']) == 0 || $ip['switch'] == 0 ? "" : $devices_indexed[$ip['switch']]->hostname;
+
+				$worksheet->write ($lineCount, 0, $Subnets->transform_to_dotted ($ip['ip_addr']), $format_left);
+				$worksheet->write ($lineCount, 1, $ip['state']);
+				$worksheet->write ($lineCount, 2, $ip['description']);
+				$worksheet->write ($lineCount, 3, $ip['dns_name']);
+				$worksheet->write ($lineCount, 4, $ip['mac']);
+				$worksheet->write ($lineCount, 5, $ip['owner']);
+				$worksheet->write ($lineCount, 6, $ip['switch']);
+				$worksheet->write ($lineCount, 7, $ip['port']);
+				$worksheet->write ($lineCount, 8, $ip['note']);
 				//custom
 				$m = 9;
-				if(sizeof($myFields) > 0) {
-					foreach($myFields as $myField) {
-						$worksheet->write($lineCount, $m, $ip[$myField['name']]);
+				if (sizeof ($myFields) > 0) {
+					foreach ($myFields as $myField) {
+						$worksheet->write ($lineCount, $m, $ip[$myField['name']]);
 						$m++;
 					}
 				}
@@ -174,7 +174,7 @@ 
 
 		}
 			else {
-				$worksheet->write($lineCount, 0, _('No hosts'));
+				$worksheet->write ($lineCount, 0, _ ('No hosts'));
 				$lineCount++;
 			}
 
@@ -185,9 +185,9 @@ 
 }
 
 // sending HTTP headers
-$workbook->send($filename);
+$workbook->send ($filename);
 
 // Let's send the file
-$workbook->close();
+$workbook->close ();
 
 ?>
\ No newline at end of file

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

Spacing +23 added lines, -23 removed lines

@@ -5,27 +5,27 @@ 
  */
 
 # 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);
-$Tools		= new Tools ($Database);
+$Database = new Database_PDO;
+$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","description");
+$expfields = array ("name", "description");
 $mtable = "vlanDomains"; # main table where to check the fields
 # required fields without which we will not continue
-$reqfields = array("name");
+$reqfields = array ("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"];
@@ -39,21 +39,21 @@ 
 	}
 
 	# 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>";
 }
 
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _("Select L2 Domain file and fields to import"); ?></div>
+<div class="pHeader"><?php print _ ("Select L2 Domain file and fields to import"); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -62,23 +62,23 @@ 
 
 # 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")."</div>";
+print "<div id='bottommsg'>"._ ("The fields marked with * are mandatory")."</div>";
 print "</form>";
 
 $templatetype = 'l2dom';
 # 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>";
 
@@ -89,7 +89,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="l2dom" 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="l2dom" disabled><i class="fa fa-eye"></i> <?php print _ ('Preview'); ?></button>
 	</div>
 </div>