phpipam / phpipam

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

Spacing +43 added lines, -43 removed lines

@@ -5,42 +5,42 @@ 
  ******************************************/
 
 # include required scripts
-require_once( dirname(__FILE__) . '/../../../functions/functions.php' );
-require_once( dirname(__FILE__) . '/../../../functions/PEAR/Net/IPv4.php' );
-require_once( dirname(__FILE__) . '/../../../functions/PEAR/Net/IPv6.php' );
+require_once(dirname (__FILE__).'/../../../functions/functions.php');
+require_once(dirname (__FILE__).'/../../../functions/PEAR/Net/IPv4.php');
+require_once(dirname (__FILE__).'/../../../functions/PEAR/Net/IPv6.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); }
 
 # Load colors and icons
 include 'import-constants.php';
 
-$p=array();
-$pi4 = new Net_IPv4();	# Pear IPv4
-$pi6 = new Net_IPv6();	# Pear IPv6
+$p = array ();
+$pi4 = new Net_IPv4 (); # Pear IPv4
+$pi6 = new Net_IPv6 (); # Pear IPv6
 
-$rlist = array();
+$rlist = array ();
 $pass_inputs = ""; # Pass fields from one page to another
 
 # Pear IPv6 ip2Bin, local copy
-function my_ip2Bin($pi6,$ip)
+function my_ip2Bin ($pi6, $ip)
 {
 	$binstr = '';
 
-	$ip = $pi6->removeNetmaskSpec($ip);
-	$ip = $pi6->Uncompress($ip);
+	$ip = $pi6->removeNetmaskSpec ($ip);
+	$ip = $pi6->Uncompress ($ip);
 
-	$parts = explode(':', $ip);
+	$parts = explode (':', $ip);
 
-	foreach ( $parts as $v ) {
+	foreach ($parts as $v) {
 
-		$str     = base_convert($v, 16, 2);
-		$binstr .= str_pad($str, 16, '0', STR_PAD_LEFT);
+		$str     = base_convert ($v, 16, 2);
+		$binstr .= str_pad ($str, 16, '0', STR_PAD_LEFT);
 
 	}
 
@@ -48,59 +48,59 @@ 
 }
 
 # Read selected fields and pass them to the save form
-foreach($_GET as $key => $value) {
-	if (preg_match("/recomputeSection_(\d+)$/",$key,$matches) && ($value == "on")) {
+foreach ($_GET as $key => $value) {
+	if (preg_match ("/recomputeSection_(\d+)$/", $key, $matches) && ($value == "on")) {
 		# Grab provided values
 		$rlist[$matches[1]]["IPv4"] = ($_GET['recomputeSectionIPv4_'.$matches[1]] == "on" ? true : false);
 		$rlist[$matches[1]]["IPv6"] = ($_GET['recomputeSectionIPv6_'.$matches[1]] == "on" ? true : false);
 		$rlist[$matches[1]]["CVRF"] = ($_GET['recomputeSectionCVRF_'.$matches[1]] == "on" ? true : false);
 		# Build hidden form inputs
-		$pass_inputs.="<input name='".$key."' type='hidden' value='".$value."' style='display:none;'>";
-		$pass_inputs.="<input name='recomputeSectionIPv4_".$matches[1]."' type='hidden' value='".$_GET['recomputeSectionIPv4_'.$matches[1]]."' style='display:none;'>";
-		$pass_inputs.="<input name='recomputeSectionIPv6_".$matches[1]."' type='hidden' value='".$_GET['recomputeSectionIPv6_'.$matches[1]]."' style='display:none;'>";
-		$pass_inputs.="<input name='recomputeSectionCVRF_".$matches[1]."' type='hidden' value='".$_GET['recomputeSectionCVRF_'.$matches[1]]."' style='display:none;'>";
+		$pass_inputs .= "<input name='".$key."' type='hidden' value='".$value."' style='display:none;'>";
+		$pass_inputs .= "<input name='recomputeSectionIPv4_".$matches[1]."' type='hidden' value='".$_GET['recomputeSectionIPv4_'.$matches[1]]."' style='display:none;'>";
+		$pass_inputs .= "<input name='recomputeSectionIPv6_".$matches[1]."' type='hidden' value='".$_GET['recomputeSectionIPv6_'.$matches[1]]."' style='display:none;'>";
+		$pass_inputs .= "<input name='recomputeSectionCVRF_".$matches[1]."' type='hidden' value='".$_GET['recomputeSectionCVRF_'.$matches[1]]."' style='display:none;'>";
 	}
 }
 
 #print "<pre>";print_r($rlist);print "</pre>";
 
 # fetch all sections and store their names
-$all_sections = $Sections->fetch_all_sections(); $sect_names = array();
-foreach($all_sections as $section) { $section = (array) $section; $sect_names[$section['id']] = $section['name']; }
+$all_sections = $Sections->fetch_all_sections (); $sect_names = array ();
+foreach ($all_sections as $section) { $section = (array) $section; $sect_names[$section['id']] = $section['name']; }
 
 # fetch all VRFs
-$all_vrfs = $Admin->fetch_all_objects("vrf", "vrfId"); $vrf_name = array();
-if (!$all_vrfs) { $all_vrfs = array(); }
+$all_vrfs = $Admin->fetch_all_objects ("vrf", "vrfId"); $vrf_name = array ();
+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')));
 foreach ($all_vrfs as $vrf) { $vrf = (array) $vrf; $vrf_name[$vrf['vrfId']] = $vrf['name']; }
 
 # Precompute masks values, to avoid too much CPU load
-$masks = array();
+$masks = array ();
 for ($i = 0; $i <= 32; $i++) { $masks["IPv4"][$i] = 0xffffffff >> (32 - $i) << (32 - $i); }				# IPv4 masks, long
-for ($i = 0; $i <= 128; $i++) { $masks["IPv6"][$i] = str_repeat('1', $i).str_repeat('0', 128 - $i); }	# IPv6 masks, bin str
+for ($i = 0; $i <= 128; $i++) { $masks["IPv6"][$i] = str_repeat ('1', $i).str_repeat ('0', 128 - $i); }	# IPv6 masks, bin str
 
 # Read IPs for the sections we need to order
 foreach ($rlist as $sect_id => $sect_check) {
-	$section_subnets = $Subnets->fetch_section_subnets($sect_id);
+	$section_subnets = $Subnets->fetch_section_subnets ($sect_id);
 	# skip empty sections
-	if (sizeof($section_subnets)==0) { continue; }
+	if (sizeof ($section_subnets) == 0) { continue; }
 
-	$isFolder[$sect_id] = array();
+	$isFolder[$sect_id] = array ();
 	
 	foreach ($section_subnets as &$subnet) {
 		$subnet = (array) $subnet;
-		$subnet['ip'] = $Subnets->transform_to_dotted($subnet['subnet']);
-		$subnet['type'] = $Subnets->identify_address($subnet['ip']);
+		$subnet['ip'] = $Subnets->transform_to_dotted ($subnet['subnet']);
+		$subnet['type'] = $Subnets->identify_address ($subnet['ip']);
 		# Precompute subnet in AND format (long for IPv4 and bin str for IPv6)
-		$subnet['andip'] = ($subnet['type'] == "IPv4") ? $subnet['subnet'] : my_ip2Bin($pi6,$subnet['ip']);
+		$subnet['andip'] = ($subnet['type'] == "IPv4") ? $subnet['subnet'] : my_ip2Bin ($pi6, $subnet['ip']);
 		# Add to array
 		$edata[$sect_id][] = $subnet;
 		$isFolder[$sect_id][$subnet['id']] = $subnet['isFolder'];
 	}
 }
 
-$rows = ""; $counters = array();
+$rows = ""; $counters = array ();
 
 # Recompute master/nested relations for the selected sections and address families
 foreach ($rlist as $sect_id => $sect_check) {
@@ -129,14 +129,14 @@ 
 
 		# At the end, save the new master
 		$c_subnet['new_masterSubnetId'] = $c_master_id;
-		$c_subnet['new_master'] = (($c_master_id === "0") ? _("Root") : $c_master_ip."/".$c_master_mask);
+		$c_subnet['new_master'] = (($c_master_id === "0") ? _ ("Root") : $c_master_ip."/".$c_master_mask);
 		$c_subnet['action'] = ($c_subnet['masterSubnetId'] == $c_subnet['new_masterSubnetId'] ? "skip" : "edit");
-		$c_subnet['msg'] = ($c_subnet['masterSubnetId'] == $c_subnet['new_masterSubnetId'] ? _("No change, skip") : _("New master, update"));
+		$c_subnet['msg'] = ($c_subnet['masterSubnetId'] == $c_subnet['new_masterSubnetId'] ? _ ("No change, skip") : _ ("New master, update"));
 
-		$rows.="<tr class='".$colors[$c_subnet['action']]."'><td><i class='fa ".$icons[$c_subnet['action']]."' rel='tooltip' data-placement='bottom' title='"._($c_subnet['msg'])."'></i></td>";
-		$rows.="<td>".$sect_names[$sect_id]."</td><td>".$c_subnet['ip']."/".$c_subnet['mask']."</td>";
-		$rows.="<td>".$c_subnet['description']."</td><td>".$vrf_name[$c_subnet['vrfId']]."</td><td>";
-		$rows.=$c_subnet['new_master']."</td><td>".$c_subnet['msg']."</td></tr>\n";
+		$rows .= "<tr class='".$colors[$c_subnet['action']]."'><td><i class='fa ".$icons[$c_subnet['action']]."' rel='tooltip' data-placement='bottom' title='"._ ($c_subnet['msg'])."'></i></td>";
+		$rows .= "<td>".$sect_names[$sect_id]."</td><td>".$c_subnet['ip']."/".$c_subnet['mask']."</td>";
+		$rows .= "<td>".$c_subnet['description']."</td><td>".$vrf_name[$c_subnet['vrfId']]."</td><td>";
+		$rows .= $c_subnet['new_master']."</td><td>".$c_subnet['msg']."</td></tr>\n";
 
 		$counters[$c_subnet['action']]++;
 	}

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

Spacing +26 added lines, -26 removed lines

@@ -5,51 +5,51 @@ 
  *********************************/
 
 # 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;
-$Result		= new Result;
-$User		= new User ($Database);
+$Database = new Database_PDO;
+$Result = new Result;
+$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 ();
 
 # fetch all l2 domains
-$vlan_domains = $Admin->fetch_all_objects("vlanDomains", "id");
+$vlan_domains = $Admin->fetch_all_objects ("vlanDomains", "id");
 
 # Create a workbook
-$today = date("Ymd");
+$today = date ("Ymd");
 $filename = $today."_phpipam_L2-Domains_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 = "L2 domains";
-$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['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++;
 }
 
@@ -60,12 +60,12 @@ 
 	//cast
 	$vlan_domain = (array) $vlan_domain;
 
-	if( (isset($_GET['name'])) && ($_GET['name'] == "on") ) {
-		$worksheet->write($lineCount, $rowCount, $vlan_domain['name'], $format_text);
+	if ((isset($_GET['name'])) && ($_GET['name'] == "on")) {
+		$worksheet->write ($lineCount, $rowCount, $vlan_domain['name'], $format_text);
 		$rowCount++;
 	}
-	if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
-		$worksheet->write($lineCount, $rowCount, $vlan_domain['description'], $format_text);
+	if ((isset($_GET['description'])) && ($_GET['description'] == "on")) {
+		$worksheet->write ($lineCount, $rowCount, $vlan_domain['description'], $format_text);
 		$rowCount++;
 	}
 
@@ -75,9 +75,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/export-vlan.php

Spacing +55 added lines, -55 removed lines

@@ -5,73 +5,73 @@ 
  *********************************/
 
 # 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);
-$Tools	    = new Tools ($Database);
+$Tools = new Tools ($Database);
 
 # verify that user is logged in
-$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");
 
 # get all custom fields
-$custom_fields = $Tools->fetch_custom_fields('vlans');
+$custom_fields = $Tools->fetch_custom_fields ('vlans');
 
 # Create a workbook
-$today = date("Ymd");
+$today = date ("Ymd");
 $filename = $today."_phpipam_VLAN_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 = "VLANs";
-$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['number'])) && ($_GET['number'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Number') ,$format_header);
+if ((isset($_GET['number'])) && ($_GET['number'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('Number'), $format_header);
 	$rowCount++;
 }
-if( (isset($_GET['domain'])) && ($_GET['domain'] == "on") ) {
-	$worksheet->write($lineCount, $rowCount, _('Domain') ,$format_header);
+if ((isset($_GET['domain'])) && ($_GET['domain'] == "on")) {
+	$worksheet->write ($lineCount, $rowCount, _ ('Domain'), $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++;
 }
 
 //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++;
 		}
 	}
@@ -85,12 +85,12 @@ 
 	//cast
 	$vlan_domain = (array) $vlan_domain;
 
-	if( (isset($_GET['exportDomain__'.str_replace(" ", "_",$vlan_domain['name'])])) && ($_GET['exportDomain__'.str_replace(" ", "_",$vlan_domain['name'])] == "on") ) {
+	if ((isset($_GET['exportDomain__'.str_replace (" ", "_", $vlan_domain['name'])])) && ($_GET['exportDomain__'.str_replace (" ", "_", $vlan_domain['name'])] == "on")) {
 		// get all VLANs in VLAN domain
-		$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
@@ -99,31 +99,31 @@ 
 			//reset row count
 			$rowCount = 0;
 
-			if( (isset($_GET['name'])) && ($_GET['name'] == "on") ) {
-				$worksheet->write($lineCount, $rowCount, $vlan['name'], $format_text);
+			if ((isset($_GET['name'])) && ($_GET['name'] == "on")) {
+				$worksheet->write ($lineCount, $rowCount, $vlan['name'], $format_text);
 				$rowCount++;
 			}
-			if( (isset($_GET['number'])) && ($_GET['number'] == "on") ) {
-				$worksheet->write($lineCount, $rowCount, $vlan['number'], $format_text);
+			if ((isset($_GET['number'])) && ($_GET['number'] == "on")) {
+				$worksheet->write ($lineCount, $rowCount, $vlan['number'], $format_text);
 				$rowCount++;
 			}
-			if( (isset($_GET['domain'])) && ($_GET['domain'] == "on") ) {
-				$worksheet->write($lineCount, $rowCount, $vlan_domain['name'], $format_text);
+			if ((isset($_GET['domain'])) && ($_GET['domain'] == "on")) {
+				$worksheet->write ($lineCount, $rowCount, $vlan_domain['name'], $format_text);
 				$rowCount++;
 			}
-			if( (isset($_GET['description'])) && ($_GET['description'] == "on") ) {
-				$worksheet->write($lineCount, $rowCount, $vlan['description'], $format_text);
+			if ((isset($_GET['description'])) && ($_GET['description'] == "on")) {
+				$worksheet->write ($lineCount, $rowCount, $vlan['description'], $format_text);
 				$rowCount++;
 			}
 
 			//custom fields, per VLAN
-			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, $vlan[$myField['name']], $format_text);
+					if ((isset($_GET[$myField['nameTemp']])) && ($_GET[$myField['nameTemp']] == "on")) {
+						$worksheet->write ($lineCount, $rowCount, $vlan[$myField['name']], $format_text);
 						$rowCount++;
 					}
 				}
@@ -138,17 +138,17 @@ 
 $lineCount++;
 
 //write domain sheet
-if( (isset($_GET['exportVLANDomains'])) && ($_GET['exportVLANDomains'] == "on") ) {
+if ((isset($_GET['exportVLANDomains'])) && ($_GET['exportVLANDomains'] == "on")) {
 	// Create a worksheet
-	$worksheet_domains =& $workbook->addWorksheet('Domains');
+	$worksheet_domains = & $workbook->addWorksheet ('Domains');
 
 	$lineCount = 0;
 	$rowCount = 0;
 
 	//write headers
-	$worksheet_domains->write($lineCount, $rowCount, _('Name') ,$format_header);
+	$worksheet_domains->write ($lineCount, $rowCount, _ ('Name'), $format_header);
 	$rowCount++;
-	$worksheet_domains->write($lineCount, $rowCount, _('Description') ,$format_header);
+	$worksheet_domains->write ($lineCount, $rowCount, _ ('Description'), $format_header);
 	$rowCount++;
 
 	$lineCount++;
@@ -158,10 +158,10 @@ 
 		//cast
 		$vlan_domain = (array) $vlan_domain;
 
-		if( (isset($_GET['exportDomain__'.str_replace(" ", "_",$vlan_domain['name'])])) && ($_GET['exportDomain__'.str_replace(" ", "_",$vlan_domain['name'])] == "on") ) {
-			$worksheet_domains->write($lineCount, $rowCount, $vlan_domain['name'], $format_text);
+		if ((isset($_GET['exportDomain__'.str_replace (" ", "_", $vlan_domain['name'])])) && ($_GET['exportDomain__'.str_replace (" ", "_", $vlan_domain['name'])] == "on")) {
+			$worksheet_domains->write ($lineCount, $rowCount, $vlan_domain['name'], $format_text);
 			$rowCount++;
-			$worksheet_domains->write($lineCount, $rowCount, $vlan_domain['description'], $format_text);
+			$worksheet_domains->write ($lineCount, $rowCount, $vlan_domain['description'], $format_text);
 			$rowCount++;
 		}
 
@@ -171,9 +171,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/generate-hosts.php

Spacing +26 added lines, -26 removed lines

@@ -6,65 +6,65 @@
 
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.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 ();
 
 
 //set filename
-$filename = "phpipam_hosts_". date("Y-m-d");
+$filename = "phpipam_hosts_".date ("Y-m-d");
 
 //fetch all addresses with hostname set
-$hosts = $Tools->fetch_addresses_for_export();
+$hosts = $Tools->fetch_addresses_for_export ();
 
 //loop
-if(sizeof($hosts)>0) {
+if (sizeof ($hosts) > 0) {
 	//details
-	$m=0;
-	foreach($hosts as $host) {
+	$m = 0;
+	foreach ($hosts as $host) {
 		//fetch subnet and section details on change!
-		if(@$hosts[$m-1]->subnetId!=$hosts[$m]->subnetId) {
-			$subnet  = (array) $Subnets->fetch_subnet(null, $host->subnetId);
-			$section = (array) $Sections->fetch_section(null, $subnet['sectionId']);
+		if (@$hosts[$m - 1]->subnetId != $hosts[$m]->subnetId) {
+			$subnet  = (array) $Subnets->fetch_subnet (null, $host->subnetId);
+			$section = (array) $Sections->fetch_section (null, $subnet['sectionId']);
 
 			//first print subnet and section details
-			$res[] = "# $subnet[description] (".$Subnets->transform_to_dotted($subnet['subnet'])."/$subnet[mask]) - $section[description]";
+			$res[] = "# $subnet[description] (".$Subnets->transform_to_dotted ($subnet['subnet'])."/$subnet[mask]) - $section[description]";
 		}
 
 		//than address details
-		$diff = 17 - strlen($Subnets->transform_to_dotted($host->ip_addr));	//for print offset
-		$diff>0 ? : $diff = 3;												//IPv6 print offset
+		$diff = 17 - strlen ($Subnets->transform_to_dotted ($host->ip_addr)); //for print offset
+		$diff > 0 ? : $diff = 3; //IPv6 print offset
 
-		$res[] = $Subnets->transform_to_dotted($host->ip_addr).str_repeat(" ", $diff)."$host->dns_name";
+		$res[] = $Subnets->transform_to_dotted ($host->ip_addr).str_repeat (" ", $diff)."$host->dns_name";
 
 		//break
-		if($hosts[$m]->subnetId!=@$hosts[$m+1]->subnetId) {
+		if ($hosts[$m]->subnetId != @$hosts[$m + 1]->subnetId) {
 		$res[] = "";
 		}
 
-		$m++;		//next index
+		$m++; //next index
 	}
 }
 
 # join content
-$content = implode("\n", $res);
+$content = implode ("\n", $res);
 
 
 # headers
-header("Cache-Control: private");
-header("Content-Description: File Transfer");
-header('Content-type: application/octet-stream');
-header('Content-Disposition: attachment; filename="'. $filename .'"');
+header ("Cache-Control: private");
+header ("Content-Description: File Transfer");
+header ('Content-type: application/octet-stream');
+header ('Content-Disposition: attachment; filename="'.$filename.'"');
 
 print($content);
 ?>
\ No newline at end of file

app/admin/users/edit.php

Spacing +102 added lines, -102 removed lines

@@ -5,45 +5,45 @@ 
  *************************************************/
 
 /* functions */
-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);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "user");
 
 
 # fetch custom fields
-$custom 	= $Tools->fetch_custom_fields('users');
+$custom 	= $Tools->fetch_custom_fields ('users');
 # fetch all languages
 $langs 		= $Admin->fetch_all_objects ("lang", "l_id");
 # fetch all auth types
 $auth_types = $Admin->fetch_all_objects ("usersAuthMethod", "id");
 # fetch all groups
-$groups		= $Admin->fetch_all_objects ("userGroups", "g_id");
+$groups = $Admin->fetch_all_objects ("userGroups", "g_id");
 
 
 # set header parameters and fetch user
-if($_POST['action']!="add") {
+if ($_POST['action'] != "add") {
 	$user = $Admin->fetch_object ("users", "id", $_POST['id']);
 	//false
-	if($user===false)		{ $Result->show("danger", _("Invalid ID"), true, true); }
+	if ($user === false) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 	else {
 		$user = (array) $user;
 	}
 }
 else {
-	$user = array();
+	$user = array ();
 	//set default lang
-	$user['lang']=$User->settings->defaultLang;
+	$user['lang'] = $User->settings->defaultLang;
 }
 ?>
 
@@ -65,7 +65,7 @@ 
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords($_POST['action'])." "._('user'); ?></div>
+<div class="pHeader"><?php print ucwords ($_POST['action'])." "._ ('user'); ?></div>
 
 
 <!-- content -->
@@ -77,35 +77,35 @@ 
 	<tbody>
 	<!-- real name -->
 	<tr>
-	    <td><?php print _('Real name'); ?></td>
+	    <td><?php print _ ('Real name'); ?></td>
 	    <td><input type="text" class="form-control input-sm" name="real_name" value="<?php print @$user['real_name']; ?>"></td>
-       	<td class="info2"><?php print _('Enter users real name'); ?></td>
+       	<td class="info2"><?php print _ ('Enter users real name'); ?></td>
     </tr>
 
     <!-- username -->
     <tr>
-    	<td><?php print _('Username'); ?></td>
-    	<td><input type="text" class="form-control input-sm" name="username" value="<?php print @$user['username']; ?>" <?php if($_POST['action']=="edit"||$_POST['action']=="delete") print 'readonly'; ?>></td>
+    	<td><?php print _ ('Username'); ?></td>
+    	<td><input type="text" class="form-control input-sm" name="username" value="<?php print @$user['username']; ?>" <?php if ($_POST['action'] == "edit" || $_POST['action'] == "delete") print 'readonly'; ?>></td>
     	<td class="info2">
     		<a class='btn btn-xs btn-default adsearchuser' rel='tooltip' title='Search AD for user details'><i class='fa fa-search'></i></a>
-			<?php print _('Enter username'); ?>
+			<?php print _ ('Enter username'); ?>
 		</td>
     </tr>
 
     <!-- email -->
     <tr>
-    	<td><?php print _('e-mail'); ?></td>
+    	<td><?php print _ ('e-mail'); ?></td>
     	<td><input type="text" class="form-control input-sm input-w-250" name="email" value="<?php print @$user['email']; ?>"></td>
-    	<td class="info2"><?php print _('Enter users email address'); ?></td>
+    	<td class="info2"><?php print _ ('Enter users email address'); ?></td>
     </tr>
 
     <!-- role -->
     <tr>
-    	<td><?php print _('User role'); ?></td>
+    	<td><?php print _ ('User role'); ?></td>
     	<td>
         <select name="role" class="form-control input-sm input-w-auto">
-            <option value="Administrator"   <?php if (@$user['role'] == "Administrator") print "selected"; ?>><?php print _('Administrator'); ?></option>
-            <option value="User" 			<?php if (@$user['role'] == "User" || $_POST['action'] == "add") print "selected"; ?>><?php print _('Normal User'); ?></option>
+            <option value="Administrator"   <?php if (@$user['role'] == "Administrator") print "selected"; ?>><?php print _ ('Administrator'); ?></option>
+            <option value="User" 			<?php if (@$user['role'] == "User" || $_POST['action'] == "add") print "selected"; ?>><?php print _ ('Normal User'); ?></option>
         </select>
 
 
@@ -114,10 +114,10 @@ 
         <input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 
         </td>
-        <td class="info2"><?php print _('Select user role'); ?>
+        <td class="info2"><?php print _ ('Select user role'); ?>
 	    	<ul>
-		    	<li><?php print _('Administrator is almighty'); ?></li>
-		    	<li><?php print _('Users have access defined based on groups'); ?></li>
+		    	<li><?php print _ ('Administrator is almighty'); ?></li>
+		    	<li><?php print _ ('Users have access defined based on groups'); ?></li>
 		    </ul>
 		</td>
 	</tr>
@@ -125,19 +125,19 @@ 
 
 	<!-- auth type -->
 	<tr>
-		<td><?php print _("Authentication method"); ?></td>
+		<td><?php print _ ("Authentication method"); ?></td>
 		<td>
 			<select name="authMethod" id="authMethod" class="form-control input-sm input-w-auto">
 			<?php
-			foreach($auth_types as $type) {
+			foreach ($auth_types as $type) {
 				# match
-				if($type->id==@$user['authMethod'])	{ print "<option value='$type->id' selected>$type->type ($type->description)</option>"; }
-				else								{ print "<option value='$type->id'         >$type->type ($type->description)</option>"; }
+				if ($type->id == @$user['authMethod']) { print "<option value='$type->id' selected>$type->type ($type->description)</option>"; }
+				else { print "<option value='$type->id'         >$type->type ($type->description)</option>"; }
 			}
 			?>
 			</select>
 		</td>
-		<td class="info2"><?php print _("Select authentication method for user"); ?></td>
+		<td class="info2"><?php print _ ("Select authentication method for user"); ?></td>
 	</tr>
 
 	<tr>
@@ -147,28 +147,28 @@ 
 	</tbody>
 
     <!-- password -->
-	<tbody id="user_password" <?php if(@$user['authMethod']!="1" && isset($user['authMethod'])) print "style='display:none'"; ?>>
+	<tbody id="user_password" <?php if (@$user['authMethod'] != "1" && isset($user['authMethod'])) print "style='display:none'"; ?>>
 
     <tr class="password">
-    	<td><?php print _('Password'); ?></td>
+    	<td><?php print _ ('Password'); ?></td>
     	<td><input type="password" class="userPass form-control input-sm" name="password1"></td>
-    	<td class="info2"><?php print _("User's password"); ?> (<a href="#" id="randomPass"><?php print _('click to generate random'); ?>!</a>)</td>
+    	<td class="info2"><?php print _ ("User's password"); ?> (<a href="#" id="randomPass"><?php print _ ('click to generate random'); ?>!</a>)</td>
     </tr>
 
     <!-- password repeat -->
     <tr class="password">
-    	<td><?php print _('Password'); ?></td>
+    	<td><?php print _ ('Password'); ?></td>
     	<td><input type="password" class="userPass form-control input-sm" name="password2"></td>
-    	<td class="info2"><?php print _('Re-type password'); ?></td>
+    	<td class="info2"><?php print _ ('Re-type password'); ?></td>
     </tr>
 
     <!-- password change request -->
-    <?php if($_POST['action']=="add") { ?>
+    <?php if ($_POST['action'] == "add") { ?>
     <tr class="password">
     	<td></td>
     	<td class="info2" colspan="2">
     		<input type="checkbox" name="passChange" value="On" checked>
-			<?php print _('Require user to change password after initial login'); ?>
+			<?php print _ ('Require user to change password after initial login'); ?>
 		</td>
     </tr>
     <?php } ?>
@@ -180,55 +180,55 @@ 
 	<tbody>
 	<!-- Language -->
 	<tr>
-		<td><?php print _('Language'); ?></td>
+		<td><?php print _ ('Language'); ?></td>
 		<td>
 			<select name="lang" class="form-control input-sm input-w-auto">
 				<?php
-				foreach($langs as $lang) {
-					if($lang->l_id==$user['lang'])	{ print "<option value='$lang->l_id' selected>$lang->l_name ($lang->l_code)</option>"; }
-					else							{ print "<option value='$lang->l_id'		 >$lang->l_name ($lang->l_code)</option>"; }
+				foreach ($langs as $lang) {
+					if ($lang->l_id == $user['lang']) { print "<option value='$lang->l_id' selected>$lang->l_name ($lang->l_code)</option>"; }
+					else { print "<option value='$lang->l_id'		 >$lang->l_name ($lang->l_code)</option>"; }
 				}
 				?>
 			</select>
 		</td>
-		<td class="info2"><?php print _('Select language'); ?></td>
+		<td class="info2"><?php print _ ('Select language'); ?></td>
 	</tr>
 
     <!-- send notification mail -->
     <tr>
-    	<td><?php print _('Notification'); ?></td>
-    	<td><input type="checkbox" name="notifyUser" value="on" <?php if($_POST['action'] == "add") { print 'checked'; } else if($_POST['action'] == "delete") { print 'disabled="disabled"';} ?>></td>
-    	<td class="info2"><?php print _('Send notification email to user with account details'); ?></td>
+    	<td><?php print _ ('Notification'); ?></td>
+    	<td><input type="checkbox" name="notifyUser" value="on" <?php if ($_POST['action'] == "add") { print 'checked'; } else if ($_POST['action'] == "delete") { print 'disabled="disabled"'; } ?>></td>
+    	<td class="info2"><?php print _ ('Send notification email to user with account details'); ?></td>
     </tr>
 	</tbody>
 
 	<!-- mailNotify -->
-	<tbody id="user_notifications" <?php if(@$user['role']!="Administrator") print "style='display:none'"; ?>>
+	<tbody id="user_notifications" <?php if (@$user['role'] != "Administrator") print "style='display:none'"; ?>>
 	<tr>
-    	<td><?php print _('Mail State changes'); ?></td>
+    	<td><?php print _ ('Mail State changes'); ?></td>
     	<td>
         <select name="mailNotify" class="form-control input-sm input-w-auto">
-            <option value="No"><?php print _('No'); ?></option>
-            <option value="Yes"  <?php if (@$user['mailNotify'] == "Yes") print "selected='selected'"; ?>><?php print _('Yes'); ?></option>
+            <option value="No"><?php print _ ('No'); ?></option>
+            <option value="Yes"  <?php if (@$user['mailNotify'] == "Yes") print "selected='selected'"; ?>><?php print _ ('Yes'); ?></option>
         </select>
 
 
         </td>
-        <td class="info2"><?php print _('Select yes to receive notification change mail for State change'); ?></td>
+        <td class="info2"><?php print _ ('Select yes to receive notification change mail for State change'); ?></td>
 	</tr>
 
 	<!-- mailNotifyChangelog -->
 	<tr>
-    	<td><?php print _('Mail Changelog'); ?></td>
+    	<td><?php print _ ('Mail Changelog'); ?></td>
     	<td>
         <select name="mailChangelog" class="form-control input-sm input-w-auto">
-            <option value="No"><?php print _('No'); ?></option>
-            <option value="Yes" <?php if (@$user['mailChangelog'] == "Yes") print "selected='selected'"; ?>><?php print _('Yes'); ?></option>
+            <option value="No"><?php print _ ('No'); ?></option>
+            <option value="Yes" <?php if (@$user['mailChangelog'] == "Yes") print "selected='selected'"; ?>><?php print _ ('Yes'); ?></option>
         </select>
 
 
         </td>
-        <td class="info2"><?php print _('Select yes to receive notification change mail for changelog'); ?></td>
+        <td class="info2"><?php print _ ('Select yes to receive notification change mail for changelog'); ?></td>
 	</tr>
 	</tbody>
 
@@ -238,20 +238,20 @@ 
 		<td colspan="3"><hr></td>
 	</tr>
 	<tr>
-		<td><?php print _('Groups'); ?></td>
+		<td><?php print _ ('Groups'); ?></td>
 		<td class="groups">
 		<?php
 		//print groups
-		if($groups!==false) {
+		if ($groups !== false) {
 			//set groups
-			$ugroups = json_decode(@$user['groups'], true);
-			$ugroups = $Admin->groups_parse_ids($ugroups);
+			$ugroups = json_decode (@$user['groups'], true);
+			$ugroups = $Admin->groups_parse_ids ($ugroups);
 
-			foreach($groups as $g) {
+			foreach ($groups as $g) {
 				# empty fix
-				if(sizeof($ugroups) > 0) {
-					if(in_array($g->g_id, $ugroups)) 	{ print "<input type='checkbox' name='group$g->g_id' checked>$g->g_name<br>"; }
-					else 								{ print "<input type='checkbox' name='group$g->g_id'		>$g->g_name<br>"; }
+				if (sizeof ($ugroups) > 0) {
+					if (in_array ($g->g_id, $ugroups)) { print "<input type='checkbox' name='group$g->g_id' checked>$g->g_name<br>"; }
+					else { print "<input type='checkbox' name='group$g->g_id'		>$g->g_name<br>"; }
 				}
 				else {
 														{ print "<input type='checkbox' name='group$g->g_id'>$g->g_name<br>"; }
@@ -259,32 +259,32 @@ 
 			}
 		}
 		else {
-			$Result->show("danger", _("No groups configured"), false);
+			$Result->show ("danger", _ ("No groups configured"), false);
 		}
 
 		?>
 		</td>
-		<td class="info2"><?php print _('Select to which groups the user belongs to'); ?></td>
+		<td class="info2"><?php print _ ('Select to which groups the user belongs to'); ?></td>
 	</tr>
 
 	<!-- pdns -->
-    <?php if ($User->settings->enablePowerDNS==1) { ?>
+    <?php if ($User->settings->enablePowerDNS == 1) { ?>
 	<tbody>
 	<tr>
 		<td colspan="3"><hr></td>
 	</tr>
 	<tr>
-    	<td><?php print _("PowerDNS"); ?></td>
+    	<td><?php print _ ("PowerDNS"); ?></td>
     	<td>
-            <input type="checkbox" class="input-switch" value="Yes" name="pdns" <?php if(@$user->pdns == "Yes") print 'checked'; ?>>
+            <input type="checkbox" class="input-switch" value="Yes" name="pdns" <?php if (@$user->pdns == "Yes") print 'checked'; ?>>
     	</td>
-		<td class="info2"><?php print _('Select to allow user to create DNS records'); ?></td>
+		<td class="info2"><?php print _ ('Select to allow user to create DNS records'); ?></td>
 	</tr>
     <?php } ?>
 
 	<!-- Custom -->
 	<?php
-	if(sizeof($custom) > 0) {
+	if (sizeof ($custom) > 0) {
 		print '<tr>';
 		print '	<td colspan="3"><hr></td>';
 		print '</tr>';
@@ -293,39 +293,39 @@ 
 		$timeP = 0;
 
 		# all my fields
-		foreach($custom as $field) {
+		foreach ($custom as $field) {
 			# replace spaces with |
-			$field['nameNew'] = str_replace(" ", "___", $field['name']);
+			$field['nameNew'] = str_replace (" ", "___", $field['name']);
 
 			# required
-			if($field['Null']=="NO")	{ $required = "*"; }
-			else						{ $required = ""; }
+			if ($field['Null'] == "NO") { $required = "*"; }
+			else { $required = ""; }
 
 			# set default value !
-			if ($_POST['action']=="add")	{ $user[$field['name']] = $field['Default']; }
+			if ($_POST['action'] == "add") { $user[$field['name']] = $field['Default']; }
 
-			print '<tr>'. "\n";
-			print '	<td>'. $field['name'] .' '.$required.'</td>'. "\n";
-			print '	<td>'. "\n";
+			print '<tr>'."\n";
+			print '	<td>'.$field['name'].' '.$required.'</td>'."\n";
+			print '	<td>'."\n";
 
 			//set type
-			if(substr($field['type'], 0,3) == "set" || substr($field['type'], 0,4) == "enum") {
+			if (substr ($field['type'], 0, 3) == "set" || substr ($field['type'], 0, 4) == "enum") {
 				//parse values
-				$tmp = substr($field['type'], 0,3)=="set" ? explode(",", str_replace(array("set(", ")", "'"), "", $field['type'])) : explode(",", str_replace(array("enum(", ")", "'"), "", $field['type']));
+				$tmp = substr ($field['type'], 0, 3) == "set" ? explode (",", str_replace (array ("set(", ")", "'"), "", $field['type'])) : explode (",", str_replace (array ("enum(", ")", "'"), "", $field['type']));
 				//null
-				if($field['Null']!="NO") { array_unshift($tmp, ""); }
+				if ($field['Null'] != "NO") { array_unshift ($tmp, ""); }
 
 				print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
-				foreach($tmp as $v) {
-					if($v==$user[$field['name']])	{ print "<option value='$v' selected='selected'>$v</option>"; }
-					else								{ print "<option value='$v'>$v</option>"; }
+				foreach ($tmp as $v) {
+					if ($v == $user[$field['name']]) { print "<option value='$v' selected='selected'>$v</option>"; }
+					else { print "<option value='$v'>$v</option>"; }
 				}
 				print "</select>";
 			}
 			//date and time picker
-			elseif($field['type'] == "date" || $field['type'] == "datetime") {
+			elseif ($field['type'] == "date" || $field['type'] == "datetime") {
 				// just for first
-				if($timeP==0) {
+				if ($timeP == 0) {
 					print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
 					print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
 					print '<script type="text/javascript">';
@@ -341,39 +341,39 @@ 
 				$timeP++;
 
 				//set size
-				if($field['type'] == "date")	{ $size = 10; $class='datepicker';		$format = "yyyy-MM-dd"; }
-				else							{ $size = 19; $class='datetimepicker';	$format = "yyyy-MM-dd"; }
+				if ($field['type'] == "date") { $size = 10; $class = 'datepicker'; $format = "yyyy-MM-dd"; }
+				else { $size = 19; $class = 'datetimepicker'; $format = "yyyy-MM-dd"; }
 
 				//field
-				if(!isset($user[$field['name']]))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
-				else								{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" value="'. $user[$field['name']]. '" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+				if (!isset($user[$field['name']])) { print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'.$field['nameNew'].'" maxlength="'.$size.'" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'."\n"; }
+				else { print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'.$field['nameNew'].'" maxlength="'.$size.'" value="'.$user[$field['name']].'" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'."\n"; }
 			}
 			//boolean
-			elseif($field['type'] == "tinyint(1)") {
+			elseif ($field['type'] == "tinyint(1)") {
 				print "<select name='$field[nameNew]' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
-				$tmp = array(0=>"No",1=>"Yes");
+				$tmp = array (0=>"No", 1=>"Yes");
 				//null
-				if($field['Null']!="NO") { $tmp[2] = ""; }
+				if ($field['Null'] != "NO") { $tmp[2] = ""; }
 
-				foreach($tmp as $k=>$v) {
-					if(strlen($user[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					elseif($k==$user[$field['name']])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					else											{ print "<option value='$k'>"._($v)."</option>"; }
+				foreach ($tmp as $k=>$v) {
+					if (strlen ($user[$field['name']]) == 0 && $k == 2) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+					elseif ($k == $user[$field['name']]) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+					else { print "<option value='$k'>"._ ($v)."</option>"; }
 				}
 				print "</select>";
 			}
 			//text
-			elseif($field['type'] == "text") {
-				print ' <textarea class="form-control input-sm" name="'. $field['nameNew'] .'" placeholder="'. $field['name'] .'" rowspan=3>'. $user[$field['name']]. '</textarea>'. "\n";
+			elseif ($field['type'] == "text") {
+				print ' <textarea class="form-control input-sm" name="'.$field['nameNew'].'" placeholder="'.$field['name'].'" rowspan=3>'.$user[$field['name']].'</textarea>'."\n";
 			}
 			//default - input field
 			else {
-				print ' <input type="text" class="ip_addr form-control input-sm" name="'. @$field['nameNew'] .'" placeholder="'. @$field['name'] .'" value="'. @$user[$field['name']]. '" size="30">'. "\n";
+				print ' <input type="text" class="ip_addr form-control input-sm" name="'.@$field['nameNew'].'" placeholder="'.@$field['name'].'" value="'.@$user[$field['name']].'" size="30">'."\n";
 			}
 
 			print "	<td class='info2'>".$field['Comment']."</td>";
-			print '	</td>'. "\n";
-			print '</tr>'. "\n";
+			print '	</td>'."\n";
+			print '</tr>'."\n";
 		}
 	}
 	?>
@@ -389,8 +389,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 <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editUserSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default <?php if ($_POST['action'] == "delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editUserSubmit"><i class="fa <?php if ($_POST['action'] == "add") { print "fa-plus"; } else if ($_POST['action'] == "delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords (_ ($_POST['action'])); ?></button>
 	</div>
 
 	<!-- Result -->

app/admin/users/print-user.php

Spacing +48 added lines, -48 removed lines

@@ -5,46 +5,46 @@ 
  *************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch user details
-$user 		  = $Admin->fetch_object("users", "id", $_GET['subnetId']);
+$user = $Admin->fetch_object ("users", "id", $_GET['subnetId']);
 
 # invalid?
-if($user===false)		{ $Result->show("danger", _("Invalid ID"), true); }
+if ($user === false) { $Result->show ("danger", _ ("Invalid ID"), true); }
 
 # fetch user lang
-$language 	  = $Admin->fetch_object("lang", "l_id", $user->lang);
+$language = $Admin->fetch_object ("lang", "l_id", $user->lang);
 # check users auth method
-$auth_details = $Admin->fetch_object("usersAuthMethod", "id", $user->authMethod);
+$auth_details = $Admin->fetch_object ("usersAuthMethod", "id", $user->authMethod);
 # fetch custom fields
-$custom_fields = $Tools->fetch_custom_fields('users');
+$custom_fields = $Tools->fetch_custom_fields ('users');
 ?>
 
 <!-- display existing users -->
-<h4><?php print _('User details'); ?></h4>
+<h4><?php print _ ('User details'); ?></h4>
 <hr><br>
 
 <!-- Add new -->
-<a class='btn btn-sm btn-default' href="<?php print create_link("administration","users"); ?>" style="margin-bottom:10px;"><i class='fa fa-angle-left'></i> <?php print _('All users'); ?></a>
+<a class='btn btn-sm btn-default' href="<?php print create_link ("administration", "users"); ?>" style="margin-bottom:10px;"><i class='fa fa-angle-left'></i> <?php print _ ('All users'); ?></a>
 
 <!-- table -->
 <table id="userPrint" class="table table-hover table-auto table-condensed">
 
 <tr>
-	<td><?php print _('Real Name'); ?></td>
+	<td><?php print _ ('Real Name'); ?></td>
 	<td><strong><?php print $user->real_name; ?></strong></td>
 </tr>
 <tr>
-	<td><?php print _('Username'); ?></td>
+	<td><?php print _ ('Username'); ?></td>
 	<td><?php print $user->username; ?></td>
 </tr>
 <tr>
-	<td><?php print _('E-mail'); ?></td>
+	<td><?php print _ ('E-mail'); ?></td>
 	<td><?php print $user->email; ?></td>
 </tr>
 <tr>
-	<td><?php print _('Language'); ?></td>
+	<td><?php print _ ('Language'); ?></td>
 	<td><?php print $language->l_name; ?></td>
 </tr>
 <tr>
@@ -59,42 +59,42 @@ 
 
 
 <tr>
-	<td colspan="2"><h4><?php print _('Authentication settings'); ?></h4><hr></td>
+	<td colspan="2"><h4><?php print _ ('Authentication settings'); ?></h4><hr></td>
 </tr>
 
 <tr>
-	<td><?php print _('Role'); ?></td>
+	<td><?php print _ ('Role'); ?></td>
 	<td><?php print $user->role; ?></td>
 </tr>
 <tr>
-	<td><?php print _('Authentication'); ?></td>
+	<td><?php print _ ('Authentication'); ?></td>
 	<td>
 	<?php
-	if($auth_details===false) 	{ print "<span class='text-muted'>No auth method</span>"; }
-	else 					 	{ print $auth_details->type." <span class='text-muted'>(".$auth_details->description.")</span>"; }
+	if ($auth_details === false) { print "<span class='text-muted'>No auth method</span>"; }
+	else { print $auth_details->type." <span class='text-muted'>(".$auth_details->description.")</span>"; }
 	?>
 	</td>
 </tr>
 <tr>
-	<td><?php print _('Last login'); ?></td>
-	<td><?php print strlen($user->lastLogin)>0 ? $user->lastLogin : "<span class='text-muted'>"._("Never")."</span>"; ?></td>
+	<td><?php print _ ('Last login'); ?></td>
+	<td><?php print strlen ($user->lastLogin) > 0 ? $user->lastLogin : "<span class='text-muted'>"._ ("Never")."</span>"; ?></td>
 </tr>
 <tr>
-	<td><?php print _('Last activity'); ?></td>
-	<td><?php print strlen($user->lastActivity)>0 ? $user->lastActivity : "<span class='text-muted'>"._("Never")."</span>"; ?></td>
+	<td><?php print _ ('Last activity'); ?></td>
+	<td><?php print strlen ($user->lastActivity) > 0 ? $user->lastActivity : "<span class='text-muted'>"._ ("Never")."</span>"; ?></td>
 </tr>
 <tr>
-	<td><?php print _('Groups'); ?></td>
+	<td><?php print _ ('Groups'); ?></td>
 	<td>
 	<?php
-	if($user->role == "Administrator") {
-	print _('All groups');
+	if ($user->role == "Administrator") {
+	print _ ('All groups');
 	}
 	else {
-		$groups = json_decode($user->groups, true);
-		$gr = $Admin->groups_parse($groups);
-		if(sizeof($gr)>0) {
-			foreach($gr as $group) {
+		$groups = json_decode ($user->groups, true);
+		$gr = $Admin->groups_parse ($groups);
+		if (sizeof ($gr) > 0) {
+			foreach ($gr as $group) {
 				print $group['g_name']."<br>";
 			}
 		}
@@ -106,64 +106,64 @@ 
 	</td>
 </tr>
 <tr>
-	<td><?php print _('Password change required'); ?></td>
+	<td><?php print _ ('Password change required'); ?></td>
 	<td><?php print $user->passChange; ?></td>
 </tr>
 
 
 
 <tr>
-	<td colspan="2"><h4><?php print _('Display settings'); ?></h4><hr></td>
+	<td colspan="2"><h4><?php print _ ('Display settings'); ?></h4><hr></td>
 </tr>
 <tr>
-	<td><?php print _('compress override'); ?></td>
-	<td><?php print $user->compressOverride==1 ? _("Yes") : _("No") ?></td>
+	<td><?php print _ ('compress override'); ?></td>
+	<td><?php print $user->compressOverride == 1 ? _ ("Yes") : _ ("No") ?></td>
 </tr>
 <tr>
-	<td><?php print _('Hide free range'); ?></td>
-	<td><?php print $user->hideFreeRange==1 ? _("Yes") : _("No") ?></td>
+	<td><?php print _ ('Hide free range'); ?></td>
+	<td><?php print $user->hideFreeRange == 1 ? _ ("Yes") : _ ("No") ?></td>
 </tr>
 <tr>
-	<td><?php print _('IP address print limit'); ?></td>
+	<td><?php print _ ('IP address print limit'); ?></td>
 	<td><?php print $user->printLimit; ?></td>
 </tr>
 
 
 
 <tr>
-	<td colspan="2"><h4><?php print _('Mail settings'); ?></h4><hr></td>
+	<td colspan="2"><h4><?php print _ ('Mail settings'); ?></h4><hr></td>
 </tr>
 <tr>
-	<td><?php print _('Mail notifications'); ?></td>
-	<td><?php print $user->role == "Administrator" ? _($user->mailNotify) : _("No"); ?></td>
+	<td><?php print _ ('Mail notifications'); ?></td>
+	<td><?php print $user->role == "Administrator" ? _ ($user->mailNotify) : _ ("No"); ?></td>
 </tr>
 <tr>
-	<td><?php print _('Changelog notifications'); ?></td>
-	<td><?php print $user->role == "Administrator" ? _($user->mailChangelog) : _("No"); ?></td>
+	<td><?php print _ ('Changelog notifications'); ?></td>
+	<td><?php print $user->role == "Administrator" ? _ ($user->mailChangelog) : _ ("No"); ?></td>
 </tr>
 
 
 
 <tr>
-	<td colspan="2"><h4><?php print _('Custom fields'); ?></h4><hr></td>
+	<td colspan="2"><h4><?php print _ ('Custom fields'); ?></h4><hr></td>
 </tr>
 
 <?php
 # custom subnet fields
-if(sizeof($custom_fields) > 0) {
-	foreach($custom_fields as $key=>$field) {
-		$user->$key = str_replace("\n", "<br>",$user->$key);
+if (sizeof ($custom_fields) > 0) {
+	foreach ($custom_fields as $key=>$field) {
+		$user->$key = str_replace ("\n", "<br>", $user->$key);
 		print "<tr>";
 		print "	<td>$key</td>";
 		print "	<td>";
 		//no length
-		if(strlen($user->$key)==0) {
+		if (strlen ($user->$key) == 0) {
 			print "/";
 		}
 		//booleans
-		elseif($field['type']=="tinyint(1)")	{
-			if($user->$key == "0")		{ print _("No"); }
-			elseif($user->$key == "1")	{ print _("Yes"); }
+		elseif ($field['type'] == "tinyint(1)") {
+			if ($user->$key == "0") { print _ ("No"); }
+			elseif ($user->$key == "1") { print _ ("Yes"); }
 		}
 		else {
 			print $user->$key;

app/admin/users/index.php

Spacing +5 added lines, -5 removed lines

@@ -5,16 +5,16 @@
  *************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 // switch user
-if(@$_GET['subnetId']=="switch"){
+if (@$_GET['subnetId'] == "switch") {
 	$_SESSION['realipamusername'] = $_SESSION['ipamusername'];
 	$_SESSION['ipamusername'] = $_GET['sPage'];
-	print '<script>window.location.href = "'.create_link(null).'";</script>';
+	print '<script>window.location.href = "'.create_link (null).'";</script>';
 }
 
 # print all or specific user?
-if(isset($_GET['subnetId']))	{ include("print-user.php"); }
-else							{ include("print-all.php"); }
+if (isset($_GET['subnetId'])) { include("print-user.php"); }
+else { include("print-all.php"); }
 ?>
\ No newline at end of file

app/admin/users/ad-search-result.php

Spacing +29 added lines, -29 removed lines

@@ -5,84 +5,84 @@ 
  *************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
-require( dirname(__FILE__) . "/../../../functions/adLDAP/src/adLDAP.php");
+require(dirname (__FILE__).'/../../../functions/functions.php');
+require(dirname (__FILE__)."/../../../functions/adLDAP/src/adLDAP.php");
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch server
-$server = $Admin->fetch_object("usersAuthMethod", "id", $_POST['server']);
-$server!==false ? : $Result->show("danger", _("Invalid server ID"), true);
+$server = $Admin->fetch_object ("usersAuthMethod", "id", $_POST['server']);
+$server !== false ? : $Result->show ("danger", _ ("Invalid server ID"), true);
 
 //parse parameters
-$params = json_decode($server->params);
+$params = json_decode ($server->params);
 
 //no login parameters
-if(strlen(@$params->adminUsername)==0 || strlen(@$params->adminPassword)==0)	{ $Result->show("danger", _("Missing credentials"), true); }
+if (strlen (@$params->adminUsername) == 0 || strlen (@$params->adminPassword) == 0) { $Result->show ("danger", _ ("Missing credentials"), true); }
 //at least 2 chars
-if(strlen($_POST['dname'])<2) 													{ $Result->show("danger", _('Please enter at least 2 characters'), true); }
+if (strlen ($_POST['dname']) < 2) { $Result->show ("danger", _ ('Please enter at least 2 characters'), true); }
 
 
 //open connection
 try {
-	if($server->type == "NetIQ") { $params->account_suffix = ""; }
+	if ($server->type == "NetIQ") { $params->account_suffix = ""; }
 	//set options
-	$options = array(
+	$options = array (
 			'base_dn'=>$params->base_dn,
 			'account_suffix'=>$params->account_suffix,
-			'domain_controllers'=>explode(";",$params->domain_controllers),
+			'domain_controllers'=>explode (";", $params->domain_controllers),
 			'use_ssl'=>$params->use_ssl,
 			'use_tls'=>$params->use_tls,
 			'ad_port'=>$params->ad_port
 			);
 	//AD
-	$adldap = new adLDAP($options);
+	$adldap = new adLDAP ($options);
 
 	//try to login with higher credentials for search
-	$authUser = $adldap->authenticate($params->adminUsername, $params->adminPassword);
+	$authUser = $adldap->authenticate ($params->adminUsername, $params->adminPassword);
 	if ($authUser == false) {
-		$Result->show("danger", _("Invalid credentials"), true);
+		$Result->show ("danger", _ ("Invalid credentials"), true);
 	}
 
 	// set OpenLDAP flag
-	if($server->type == "LDAP") { $adldap->setUseOpenLDAP(true); }
+	if ($server->type == "LDAP") { $adldap->setUseOpenLDAP (true); }
 
 	//search for domain user!
-	$userinfo = $adldap->user()->info("$_POST[dname]*", array("*"),false,$server->type);
+	$userinfo = $adldap->user ()->info ("$_POST[dname]*", array ("*"), false, $server->type);
 
 	//echo $adldap->getLastError();
 }
 catch (adLDAPException $e) {
-	$Result->show("danger", $e->getMessage(), true);
+	$Result->show ("danger", $e->getMessage (), true);
 }
 
 
 //check for found
-if(!isset($userinfo['count'])) {
+if (!isset($userinfo['count'])) {
 	print "<div class='alert alert-info'>";
-	print _('No users found')."!<hr>";
-	print _('Possible reasons').":";
+	print _ ('No users found')."!<hr>";
+	print _ ('Possible reasons').":";
 	print "<ul>";
-	print "<li>"._('Username not existing')."</li>";
-	print "<li>"._('Invalid baseDN setting for AD')."</li>";
-	print "<li>"._('AD account does not have enough privileges for search')."</li>";
+	print "<li>"._ ('Username not existing')."</li>";
+	print "<li>"._ ('Invalid baseDN setting for AD')."</li>";
+	print "<li>"._ ('AD account does not have enough privileges for search')."</li>";
 	print "</div>";
 } else {
-	print _(" Following users were found").": ($userinfo[count]):<hr>";
+	print _ (" Following users were found").": ($userinfo[count]):<hr>";
 
 	print "<table class='table table-striped'>";
 
 	unset($userinfo['count']);
-	if(sizeof(@$userinfo)>0 && isset($userinfo)) {
+	if (sizeof (@$userinfo) > 0 && isset($userinfo)) {
 		// loop
-		foreach($userinfo as $u) {
+		foreach ($userinfo as $u) {
 			print "<tr>";
 			print "	<td>".$u['displayname'][0];
 			print "</td>";
@@ -90,7 +90,7 @@ 
 			print "	<td>".$u['mail'][0]."</td>";
 			//actions
 			print " <td style='width:10px;'>";
-			print "		<a href='' class='btn btn-sm btn-default btn-success userselect' data-uname='".$u['displayname'][0]."' data-username='".$u['samaccountname'][0]."' data-email='".$u['mail'][0]."' data-server='".$_POST['server']."' data-server-type='".$server->type."'>"._('Select')."</a>";
+			print "		<a href='' class='btn btn-sm btn-default btn-success userselect' data-uname='".$u['displayname'][0]."' data-username='".$u['samaccountname'][0]."' data-email='".$u['mail'][0]."' data-server='".$_POST['server']."' data-server-type='".$server->type."'>"._ ('Select')."</a>";
 			print "	</td>";
 			print "</tr>";
 		}

app/admin/users/ad-search-form.php

Spacing +12 added lines, -12 removed lines

@@ -5,32 +5,32 @@ 
  *************************************/
 
 /* functions */
-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);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all available LDAP servers
 $servers = $Admin->fetch_all_objects ("usersAuthMethod");
-foreach($servers as $k=>$s) {
-	if($s->type!="AD" && $s->type!="LDAP" && $s->type!="NetIQ") {
+foreach ($servers as $k=>$s) {
+	if ($s->type != "AD" && $s->type != "LDAP" && $s->type != "NetIQ") {
 		unset($servers[$k]);
 	}
 }
 
 # die if no servers
-if(sizeof($servers)==0) 	{ $Result->show("danger", _("No servers available"), true, true); }
+if (sizeof ($servers) == 0) { $Result->show ("danger", _ ("No servers available"), true, true); }
 ?>
 
 
 <!-- header -->
-<div class="pHeader"><?php print _('Search user in AD'); ?></div>
+<div class="pHeader"><?php print _ ('Search user in AD'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -39,7 +39,7 @@ 
 
 	<tr>
 		<td style="width:150px;">Enter username</td>
-		<td><input type="text" class="form-control input-sm" id='dusername' name="dusername" placeholder="<?php print _('Username'); ?>"></td>
+		<td><input type="text" class="form-control input-sm" id='dusername' name="dusername" placeholder="<?php print _ ('Username'); ?>"></td>
 	</tr>
 
 	<tr>
@@ -47,7 +47,7 @@ 
 		<td>
 			<select name="server" id="adserver" class="form-control input-w-auto">
 			<?php
-			foreach($servers as $s) {
+			foreach ($servers as $s) {
 				print "<option value='$s->id'>$s->description</option>";
 			}
 			?>
@@ -61,7 +61,7 @@ 
 
 	<tr>
 		<td></td>
-		<td><button class='btn btn-sm btn-default pull-right' class="form-control input-sm" id="adsearchusersubmit"><?php print _('Search'); ?></button></td>
+		<td><button class='btn btn-sm btn-default pull-right' class="form-control input-sm" id="adsearchusersubmit"><?php print _ ('Search'); ?></button></td>
 	</tr>
 
 	</table>
@@ -72,6 +72,6 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopup2"><?php print _('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default hidePopup2"><?php print _ ('Cancel'); ?></button>
 	</div>
 </div>
\ No newline at end of file