phpipam / phpipam

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

Spacing +26 added lines, -26 removed lines

@@ -5,40 +5,40 @@ 
  */
 
 # 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);
-$Admin 		= new Admin ($Database);
+$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");
 
 # get all custom fields
-$custom_fields = $Tools->fetch_custom_fields('vlans');
+$custom_fields = $Tools->fetch_custom_fields ('vlans');
 # prepare HTML variables
 $custom_fields_names = "";
 $custom_fields_boxes = "";
 
 
-if(sizeof($custom_fields) > 0) {
-	foreach($custom_fields as $myField) {
+if (sizeof ($custom_fields) > 0) {
+	foreach ($custom_fields as $myField) {
 		//change spaces to "___" so it can be used as element id
-		$myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
-		$custom_fields_names.= "	<th>$myField[name]</th>";
-		$custom_fields_boxes.= "	<td><input type='checkbox' name='$myField[nameTemp]' checked> </td>";
+		$myField['nameTemp'] = str_replace (" ", "___", $myField['name']);
+		$custom_fields_names .= "	<th>$myField[name]</th>";
+		$custom_fields_boxes .= "	<td><input type='checkbox' name='$myField[nameTemp]' checked> </td>";
 	}
 }
 
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _("Select VLAN fields to export"); ?></div>
+<div class="pHeader"><?php print _ ("Select VLAN fields to export"); ?></div>
 
 <!-- content -->
 <div class="pContent" style="overflow:auto;">
@@ -52,15 +52,15 @@ 
 print "	<table class='table table-striped table-condensed'>";
 
 print "	<tr>";
-print "	<th>"._('Name')."</th>";
-print "	<th>"._('Number')."</th>";
-print "	<th>"._('Domain')."</th>";
-print "	<th>"._('Description')."</th>";
+print "	<th>"._ ('Name')."</th>";
+print "	<th>"._ ('Number')."</th>";
+print "	<th>"._ ('Domain')."</th>";
+print "	<th>"._ ('Description')."</th>";
 print $custom_fields_names;
 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='number' checked> </td>";
 print "	<td><input type='checkbox' name='domain' checked> </td>";
 print "	<td><input type='checkbox' name='description' checked> </td>";
@@ -73,29 +73,29 @@ 
 # print section form
 print '<form id="selectExportDomains">';
 
-if(sizeof($vlan_domains) > 0) {
+if (sizeof ($vlan_domains) > 0) {
 	print '<h4>L2 Domains</h4>';
 	print "	<table class='table table-striped table-condensed'>";
 	print "	<tr>";
-    print "	<th>"._('Name')."</th>";
-    print "	<th>"._('Description')."</th>";
-    print "	<th>"._('Export')."</th>";
+    print "	<th>"._ ('Name')."</th>";
+    print "	<th>"._ ('Description')."</th>";
+    print "	<th>"._ ('Export')."</th>";
     print "	</tr>\n";
 
-	foreach($vlan_domains as $domain) {
+	foreach ($vlan_domains as $domain) {
 		$domain = (array) $domain;
 
 		print "	<tr>";
 		print "	<td>".$domain['name']."</th>";
 		print "	<td>".$domain['description']."</th>";
-		print "	<td><input type='checkbox' name='exportDomain__".str_replace(" ", "_",$domain['name'])."' checked> </td>";
+		print "	<td><input type='checkbox' name='exportDomain__".str_replace (" ", "_", $domain['name'])."' checked> </td>";
 		print "	</tr>\n";
 	}
 }
 
 print '</table>';
 
-print '<div class="checkbox"><label><input type="checkbox" name="exportVLANDomains" checked>'._("Include the L2 domains in a separate sheet.").'</label></div>';
+print '<div class="checkbox"><label><input type="checkbox" name="exportVLANDomains" checked>'._ ("Include the L2 domains in a separate sheet.").'</label></div>';
 
 print '</form>';
 
@@ -106,7 +106,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="vlan"><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="vlan"><i class="fa fa-upload"></i> <?php print _ ('Export'); ?></button>
 	</div>
 </div>

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

Spacing +12 added lines, -12 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 _("VLAN import"); ?></div>
+<div class="pHeader"><?php print _ ("VLAN import"); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -35,21 +35,21 @@ 
 foreach ($data as &$cdata) {
 	if (($cdata['action'] == "add") || ($cdata['action'] == "edit")) {
 		# set update array
-		$values = array("vlanId"=>$cdata['vlanId'],
+		$values = array ("vlanId"=>$cdata['vlanId'],
 						"number"=>$cdata['number'],
 						"name"=>$cdata['name'],
 						"description"=>$cdata['description'],
 						"domainId"=>$cdata['domainId']
 						);
 		# add custom fields
-		if(sizeof($custom_fields) > 0) {
-			foreach($custom_fields as $myField) {
-				if(isset($cdata[$myField['name']])) { $values[$myField['name']] = $cdata[$myField['name']]; }
+		if (sizeof ($custom_fields) > 0) {
+			foreach ($custom_fields as $myField) {
+				if (isset($cdata[$myField['name']])) { $values[$myField['name']] = $cdata[$myField['name']]; }
 			}
 		}
 
 		# update
-		$cdata['result'] = $Admin->object_modify("vlans", $cdata['action'], "vlanId", $values);
+		$cdata['result'] = $Admin->object_modify ("vlans", $cdata['action'], "vlanId", $values);
 
 		if ($cdata['result']) {
 			$trc = $colors[$cdata['action']];
@@ -58,13 +58,13 @@ 
 			$trc = "danger";
 			$msg = "VLAN ".$cdata['action']." failed.";
 		}
-		$rows.="<tr class='".$trc."'><td><i class='fa ".$icons[$cdata['action']]."' rel='tooltip' data-placement='bottom' title='"._($msg)."'></i></td>
+		$rows .= "<tr class='".$trc."'><td><i class='fa ".$icons[$cdata['action']]."' rel='tooltip' data-placement='bottom' title='"._ ($msg)."'></i></td>
 			<td>".$cdata['name']."</td>
 			<td>".$cdata['number']."</td>
 			<td>".$cdata['description']."</td>
 			<td>".$cdata['domain']."</td>
 			".$cfieldtds."
-			<td>"._($msg)."</td></tr>";
+			<td>"._ ($msg)."</td></tr>";
 	}
 }
 
@@ -78,5 +78,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-vrf-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 _("VRF import data preview"); ?></div>
+<div class="pHeader"><?php print _ ("VRF 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="vrf" 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="vrf" disabled><i class="fa fa-download"></i> <?php print _ ('Import'); ?></button>
 	</div>
 </div>
 

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

Spacing +13 added lines, -13 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
 # 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($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 ();
 
 ?>
 
@@ -17,13 +17,13 @@ 
 	<table><tr><td align="left">
 	<div id="drop">
 		<input type="file" name="file" id="csvfile" style="display:none;">
-		<input type="hidden" name="expfields" value="<?php print implode('|',$expfields); ?>" style="display:none;">
+		<input type="hidden" name="expfields" value="<?php print implode ('|', $expfields); ?>" style="display:none;">
 
-		<?php print _('Select file'); ?>: <a class="btn btn-sm btn-default"><i class="fa fa-folder-open"></i> <?php print _("Browse / Drag & Drop"); ?></a>
+		<?php print _ ('Select file'); ?>: <a class="btn btn-sm btn-default"><i class="fa fa-folder-open"></i> <?php print _ ("Browse / Drag & Drop"); ?></a>
 	</div>
 	</td><td>&nbsp;</td><td align="right">
 	<!-- Download template -->
-	<?php print "<a class=\"csvtemplate btn btn-sm btn-default\" id=\"". $templatetype . "template\">Download template</a>"; ?>
+	<?php print "<a class=\"csvtemplate btn btn-sm btn-default\" id=\"".$templatetype."template\">Download template</a>"; ?>
 	</td></tr></table>
 	<span class="fname" style="display:none"></span>
 	<br>
@@ -69,7 +69,7 @@ 
 
 			// Append the file name and file size
 			$('#uploadResult').append(data.files[0].name + ' (<i>' + formatFileSize(data.files[0].size) + '</i>)');
-			$('#uploadResult').append(' <span rel="tooltip" data-placement="bottom" title="<?php print _("Cancel upload");?>"> <i class="fa fa-times-circle" ></i></span>');
+			$('#uploadResult').append(' <span rel="tooltip" data-placement="bottom" title="<?php print _ ("Cancel upload"); ?>"> <i class="fa fa-times-circle" ></i></span>');
 
 			// Listen for clicks on the cancel icon
 			$('#uploadResult').find('span').click(function(){
@@ -104,13 +104,13 @@ 
 
 					$('#topmsg').empty();
 					$('#bottommsg').empty();
-					$('#topmsg').append('<?php print "<h4>"._("Match fields")."</h4><hr>"._("Please match the DB fields with the uploaded fields:"); ?>');
+					$('#topmsg').append('<?php print "<h4>"._ ("Match fields")."</h4><hr>"._ ("Please match the DB fields with the uploaded fields:"); ?>');
 				    $("#fieldstable > tbody").append('<tr id="fieldsrow"></tr>');
 
 					resp.expfields.forEach(function(expfield) {
 						//console.log(resp.fields);
 						var td= $('<td></td>').appendTo("#fieldstable > tbody #fieldsrow");
-						var s = $('<select name="importFields__' + expfield.replace(/\s/g,"_") + '" class="form-control input-sm input-w-auto" rel="tooltip" data-placement="bottom" title="<?php print _("Pick import colum for"); ?> ' + expfield + ' <?php print _("field"); ?>"/>');
+						var s = $('<select name="importFields__' + expfield.replace(/\s/g,"_") + '" class="form-control input-sm input-w-auto" rel="tooltip" data-placement="bottom" title="<?php print _ ("Pick import colum for"); ?> ' + expfield + ' <?php print _ ("field"); ?>"/>');
 						$('<option />', {value: "-", text: "-"}).appendTo(s);
 						resp.impfields.forEach(function(impfield) {
 							if (expfield.toUpperCase() === impfield.toUpperCase()) {
@@ -124,17 +124,17 @@ 
 				    });
 					if (matches == 0) {
 						$('#bottommsg').addClass('alert alert-danger');
-						$('#bottommsg').append('<i class="fa fa-exclamation-triangle"></i> <?php print _("No fields were automatically matched. The import file needs to have a header row!"); ?><br>');
+						$('#bottommsg').append('<i class="fa fa-exclamation-triangle"></i> <?php print _ ("No fields were automatically matched. The import file needs to have a header row!"); ?><br>');
 					}
 					if ((matches > 0) && (matches != resp.expfields.length)) {
 						// console.log(matches + " mismatches vs " + resp.expfields.length);
 						$('#bottommsg').addClass('alert alert-warning');
-						$('#bottommsg').append('<i class="fa fa-exclamation-triangle"></i> <?php print _("Not all the fields were automatically matched. Please check manually."); ?><br>');
+						$('#bottommsg').append('<i class="fa fa-exclamation-triangle"></i> <?php print _ ("Not all the fields were automatically matched. Please check manually."); ?><br>');
 					}
 					if (matches == resp.expfields.length) {
 						// console.log(matches + " matches vs " + resp.expfields.length);
 						$('#bottommsg').addClass('alert alert-success');
-						$('#bottommsg').append('<i class="fa fa-info-circle"></i> <?php print _("All the fields were automatically matched. Please check if correct."); ?><br>');
+						$('#bottommsg').append('<i class="fa fa-info-circle"></i> <?php print _ ("All the fields were automatically matched. Please check if correct."); ?><br>');
 					}
 					// enable preview button
 				    $('#dataImportPreview').removeAttr('disabled');
@@ -144,7 +144,7 @@ 
 					$('#filetype').val(resp.filetype);
 
 				} else {
-					$('#topmsg').append('<?php print _("No header row found in uploaded file. Please check."); ?><br>');
+					$('#topmsg').append('<?php print _ ("No header row found in uploaded file. Please check."); ?><br>');
 				}
 
 			}

app/admin/import-export/not-implemented.php

Spacing +7 added lines, -7 removed lines

@@ -5,28 +5,28 @@
  */
 
 # 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);
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _("Not implemented"); ?></div>
+<div class="pHeader"><?php print _ ("Not implemented"); ?></div>
 
 <!-- content -->
 <div class="pContent">
 
-<i class="fa fa-exclamation-triangle"></i> <?php print _("Not implemented"); ?>
+<i class="fa fa-exclamation-triangle"></i> <?php print _ ("Not implemented"); ?>
 
 </div>
 <br>
 <!-- footer -->
 <div class="pFooter">
-	<button class="btn btn-sm btn-default hidePopups"><?php print _('Ok'); ?></button>
+	<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Ok'); ?></button>
 </div>

app/admin/import-export/import-l2dom-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 _("L2 Domain import data preview"); ?></div>
+<div class="pHeader"><?php print _ ("L2 Domain 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="l2dom" 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="l2dom" disabled><i class="fa fa-download"></i> <?php print _ ('Import'); ?></button>
 	</div>
 </div>
 

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

Spacing +11 added lines, -11 removed lines

@@ -5,19 +5,19 @@ 
  */
 
 # 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);
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _("Select VRF fields to export"); ?></div>
+<div class="pHeader"><?php print _ ("Select VRF fields to export"); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -31,13 +31,13 @@ 
 print "	<table class='table table-striped table-condensed'>";
 
 print "	<tr>";
-print "	<th>"._('Name')."</th>";
-print "	<th>"._('RD')."</th>";
-print "	<th>"._('Description')."</th>";
+print "	<th>"._ ('Name')."</th>";
+print "	<th>"._ ('RD')."</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='rd' checked> </td>";
 print "	<td><input type='checkbox' name='description' checked> </td>";
 print "	</tr>";
@@ -52,7 +52,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="vrf"><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="vrf"><i class="fa fa-upload"></i> <?php print _ ('Export'); ?></button>
 	</div>
 </div>

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

Spacing +29 added lines, -29 removed lines

@@ -5,37 +5,37 @@ 
  */
 
 # 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);
-$Admin 		= new Admin ($Database);
+$User = new User ($Database);
+$Admin = new Admin ($Database);
 $Tools	    = new Tools ($Database);
-$Sections	= new Sections ($Database);
+$Sections = new Sections ($Database);
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 $mtable = "subnets"; # main table where to check the fields
 # predefine field list
-$expfields = array ("section","subnet","mask","description","vrf");
+$expfields = array ("section", "subnet", "mask", "description", "vrf");
 # required fields without which we will not continue, vrf is optional - if not set we check against default VRF
-$reqfields = array("section","subnet");
+$reqfields = array ("section", "subnet");
 # we don't care about custom fields here
-$custom_fields = array();
+$custom_fields = array ();
 # fetch all sections
-$all_sections = $Sections->fetch_all_sections();
+$all_sections = $Sections->fetch_all_sections ();
 
 # Lets do some reordering to show slaves!
-foreach($all_sections as $s) {
-	if($s->masterSection=="0") {
+foreach ($all_sections as $s) {
+	if ($s->masterSection == "0") {
 		# it is master
 		$s->class = "master";
 		$sectionssorted[] = $s;
 		# check for slaves
-		foreach($all_sections as $ss) {
-			if($ss->masterSection==$s->id) {
+		foreach ($all_sections as $ss) {
+			if ($ss->masterSection == $s->id) {
 				$ss->class = "slave";
 				$sectionssorted[] = $ss;
 			}
@@ -47,25 +47,25 @@ 
 $sections_sorted = @$sectionssorted;
 
 # show sections
-if(sizeof($all_sections) > 0) {
+if (sizeof ($all_sections) > 0) {
 	$section_rows = ""; $last_master = 0;
 	# existing sections
 	foreach ($sections_sorted as $section) {
 		//cast
 		$section = (array) $section;
 		//master Section
-		if (($section['masterSection']!=0) && ($section['masterSection']==$last_master)) {
+		if (($section['masterSection'] != 0) && ($section['masterSection'] == $last_master)) {
 			$sect_prefix = " - ";
 		} else {
 			$sect_prefix = "";
 			$last_master = $section['id'];
 		}
-		$section_rows.= "<tr>";
-		$section_rows.= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeSectionCheck' name='recomputeSection_".$section['id']."' checked>".$sect_prefix.str_replace('_', ' ', $section['name'])."</label></div></td>";
-		$section_rows.= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeIPv4Check' name='recomputeSectionIPv4_".$section['id']."' checked></label></div></td>";
-		$section_rows.= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeIPv6Check' name='recomputeSectionIPv6_".$section['id']."' checked></label></div></td>";
-		$section_rows.= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeCVRFCheck' name='recomputeSectionCVRF_".$section['id']."' checked></label></div></td>";
-		$section_rows.="</tr>\n";
+		$section_rows .= "<tr>";
+		$section_rows .= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeSectionCheck' name='recomputeSection_".$section['id']."' checked>".$sect_prefix.str_replace ('_', ' ', $section['name'])."</label></div></td>";
+		$section_rows .= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeIPv4Check' name='recomputeSectionIPv4_".$section['id']."' checked></label></div></td>";
+		$section_rows .= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeIPv6Check' name='recomputeSectionIPv6_".$section['id']."' checked></label></div></td>";
+		$section_rows .= "<td><div class='checkbox'><label><input type='checkbox' id='recomputeCVRFCheck' name='recomputeSectionCVRF_".$section['id']."' checked></label></div></td>";
+		$section_rows .= "</tr>\n";
 	}
 } else {
 	$section_rows = "<td colspan='3'>No sections found!</td>";
@@ -74,7 +74,7 @@ 
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _("Select Subnet sections, VRFs and IP version to recompute"); ?></div>
+<div class="pHeader"><?php print _ ("Select Subnet sections, VRFs and IP version to recompute"); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -82,13 +82,13 @@ 
 <?php
 
 print "<form id='selectImportFields'><div id='topmsg'>";
-print '<h4>'._("Sections and IP versions").'</h4><hr>';
-print _("Please choose which section and IP version to recompute:");
+print '<h4>'._ ("Sections and IP versions").'</h4><hr>';
+print _ ("Please choose which section and IP version to recompute:");
 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 "<table class='table table-striped table-condensed' id='fieldstable'><tbody>";
-print "<tr>	<th><input type='checkbox' id='recomputeSectionSelectAll' checked> "._("Section")."</th>
+print "<tr>	<th><input type='checkbox' id='recomputeSectionSelectAll' checked> "._ ("Section")."</th>
 			<th><input type='checkbox' id='recomputeIPv4SelectAll' checked> IPv4</th>
 			<th><input type='checkbox' id='recomputeIPv6SelectAll' checked> IPv6</th>
 			<th><input type='checkbox' id='recomputeCVRFSelectAll' checked> Cross VRF</th></tr>";
@@ -101,7 +101,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 btn-success" id="dataImportPreview" data-type="recompute"><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 btn-success" id="dataImportPreview" data-type="recompute"><i class="fa fa-eye"></i> <?php print _ ('Preview'); ?></button>
 	</div>
 </div>

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

Spacing +40 added lines, -40 removed lines

@@ -5,33 +5,33 @@ 
  */
 
 # 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);
-$Admin 		= new Admin ($Database);
+$User = new User ($Database);
+$Admin = new Admin ($Database);
 $Tools	    = new Tools ($Database);
-$Sections	= new Sections ($Database);
+$Sections = new Sections ($Database);
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # Won't check per subnet/section rights since this is an admin section, where the admin user has full access
 
 # fetch all sections
-$all_sections = $Sections->fetch_all_sections();
+$all_sections = $Sections->fetch_all_sections ();
 
 # Lets do some reordering to show slaves!
-if($all_sections!==false) {
-	foreach($all_sections as $s) {
-		if($s->masterSection=="0") {
+if ($all_sections !== false) {
+	foreach ($all_sections as $s) {
+		if ($s->masterSection == "0") {
 			# it is master
 			$s->class = "master";
 			$sectionssorted[] = $s;
 			# check for slaves
-			foreach($all_sections as $ss) {
-				if($ss->masterSection==$s->id) {
+			foreach ($all_sections as $ss) {
+				if ($ss->masterSection == $s->id) {
 					$ss->class = "slave";
 					$sectionssorted[] = $ss;
 				}
@@ -43,24 +43,24 @@ 
 }
 
 # get all custom fields
-$custom_fields = $Tools->fetch_custom_fields('subnets');
+$custom_fields = $Tools->fetch_custom_fields ('subnets');
 # prepare HTML variables
 $custom_fields_names = "";
 $custom_fields_boxes = "";
 
-if(sizeof($custom_fields) > 0) {
-	foreach($custom_fields as $myField) {
+if (sizeof ($custom_fields) > 0) {
+	foreach ($custom_fields as $myField) {
 		//change spaces to "___" so it can be used as element id
-		$myField['nameTemp'] = str_replace(" ", "___", $myField['name']);
-		$custom_fields_names.= "	<th>$myField[name]</th>";
-		$custom_fields_boxes.= "	<td><input type='checkbox' name='$myField[nameTemp]' checked> </td>";
+		$myField['nameTemp'] = str_replace (" ", "___", $myField['name']);
+		$custom_fields_names .= "	<th>$myField[name]</th>";
+		$custom_fields_boxes .= "	<td><input type='checkbox' name='$myField[nameTemp]' checked> </td>";
 	}
 }
 
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _("Select sections and subnets fields to export"); ?></div>
+<div class="pHeader"><?php print _ ("Select sections and subnets fields to export"); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -74,21 +74,21 @@ 
 print "	<table class='table table-striped table-condensed'>";
 
 print "	<tr>";
-print "	<th>"._('Section')."</th>";
-print "	<th>"._('Subnet')."</th>";
-print "	<th>"._('Description')."</th>";
-print "	<th>"._('VLAN')."</th>";
-print "	<th>"._('VRF')."</th>";
-print "	<th>"._('Master Subnet')."</th>";
-print "	<th>"._('Requests')."</th>";
-print "	<th>"._('Hosts check')."</th>";
-print "	<th>"._('Discover')."</th>";
+print "	<th>"._ ('Section')."</th>";
+print "	<th>"._ ('Subnet')."</th>";
+print "	<th>"._ ('Description')."</th>";
+print "	<th>"._ ('VLAN')."</th>";
+print "	<th>"._ ('VRF')."</th>";
+print "	<th>"._ ('Master Subnet')."</th>";
+print "	<th>"._ ('Requests')."</th>";
+print "	<th>"._ ('Hosts check')."</th>";
+print "	<th>"._ ('Discover')."</th>";
 print $custom_fields_names;
 print "	</tr>";
 
 print "	<tr>";
 print "	<td><input type='checkbox' name='section' checked></td>";
-print "	<td><input type='checkbox' name='subnet' checked title='"._('Mandatory')."'> </td>";
+print "	<td><input type='checkbox' name='subnet' checked title='"._ ('Mandatory')."'> </td>";
 print "	<td><input type='checkbox' name='description' checked> </td>";
 print "	<td><input type='checkbox' name='VLAN' checked> </td>";
 print "	<td><input type='checkbox' name='VRF' checked> </td>";
@@ -106,13 +106,13 @@ 
 print '<form id="selectExportSections">';
 
 # show sections
-if($all_sections!==false) {
+if ($all_sections !== false) {
 	print '<h4>Sections</h4>';
 	print "	<table class='table table-striped table-condensed'>";
 	print "	<tr>";
-    print '	<th><input type="checkbox" id="exportSelectAll" checked> '._('Name').'</th>';
-    print "	<th>"._('Description')."</th>";
-    print "	<th>"._('Parent')."</th>";
+    print '	<th><input type="checkbox" id="exportSelectAll" checked> '._ ('Name').'</th>';
+    print "	<th>"._ ('Description')."</th>";
+    print "	<th>"._ ('Parent')."</th>";
     print "	</tr>\n";
 
 	# existing sections
@@ -121,22 +121,22 @@ 
 		$section = (array) $section;
 
 		print '<tr>';
-		print '	<td><div class="checkbox"><label><input type="checkbox" id="exportCheck" name="exportSection__'.str_replace(" ", "_", $section['name']).'" checked>'.str_replace("_", " ", $section['name']).'</label></div></td>';
-		print '	<td>'. $section['description'] .'</td>'. "\n";
+		print '	<td><div class="checkbox"><label><input type="checkbox" id="exportCheck" name="exportSection__'.str_replace (" ", "_", $section['name']).'" checked>'.str_replace ("_", " ", $section['name']).'</label></div></td>';
+		print '	<td>'.$section['description'].'</td>'."\n";
 		//master Section
-		if($section['masterSection']!=0) {
+		if ($section['masterSection'] != 0) {
 			# get section details
-			$ssec = $Admin->fetch_object("sections", "id", $section['masterSection']);
+			$ssec = $Admin->fetch_object ("sections", "id", $section['masterSection']);
 			print "	<td>$ssec->name</td>";
 		} else {
 			print "	<td>/</td>";
 		}
-		print '</tr>'. "\n";
+		print '</tr>'."\n";
 	}
 
 	print '</table>';
 
-	print '<div class="checkbox"><label><input type="checkbox" name="exportSections" checked>'._("Include the sections in a separate sheet.").'</label></div>';
+	print '<div class="checkbox"><label><input type="checkbox" name="exportSections" checked>'._ ("Include the sections in a separate sheet.").'</label></div>';
 
 }
 print '</form>';
@@ -147,7 +147,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="subnets"><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="subnets"><i class="fa fa-upload"></i> <?php print _ ('Export'); ?></button>
 	</div>
 </div>