phpipam / phpipam

app/admin/nameservers/edit-result.php

Spacing +22 added lines, -22 removed lines

@@ -5,63 +5,63 @@
  ***************************/
 
 /* 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 ();
 
 # strip input tags
-$_POST = $Admin->strip_input_tags($_POST);
+$_POST = $Admin->strip_input_tags ($_POST);
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "ns", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "ns", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 
 # Name and primary nameserver must be present!
-if ($_POST['action']!="delete") {
-	if($_POST['name'] == "") 				{ $Result->show("danger", _("Name is mandatory"), true); }
-	if(trim($_POST['namesrv-1']) == "") 	{ $Result->show("danger", _("Primary nameserver is mandatory"), true); }
+if ($_POST['action'] != "delete") {
+	if ($_POST['name'] == "") { $Result->show ("danger", _ ("Name is mandatory"), true); }
+	if (trim ($_POST['namesrv-1']) == "") { $Result->show ("danger", _ ("Primary nameserver is mandatory"), true); }
 }
 
 // merge nameservers
-foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"namesrv-"))>0) {
-		if (strlen($line)>0) {
-			$all_nameservers[] = trim($line);
+foreach ($_POST as $key=>$line) {
+	if (strlen (strstr ($key, "namesrv-")) > 0) {
+		if (strlen ($line) > 0) {
+			$all_nameservers[] = trim ($line);
 		}
 	}
 }
-$_POST['namesrv1'] = isset($all_nameservers) ? implode(";", $all_nameservers) : "";
+$_POST['namesrv1'] = isset($all_nameservers) ? implode (";", $all_nameservers) : "";
 
 // set sections
-foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"section-"))>0) {
-		$key2 = str_replace("section-", "", $key);
+foreach ($_POST as $key=>$line) {
+	if (strlen (strstr ($key, "section-")) > 0) {
+		$key2 = str_replace ("section-", "", $key);
 		$temp[] = $key2;
 		unset($_POST[$key]);
 	}
 }
 # glue sections together
-$_POST['permissions'] = sizeof($temp)>0 ? implode(";", $temp) : null;
+$_POST['permissions'] = sizeof ($temp) > 0 ? implode (";", $temp) : null;
 
 # set update array
-$values = array("id"=>@$_POST['nameserverId'],
+$values = array ("id"=>@$_POST['nameserverId'],
 				"name"=>$_POST['name'],
 				"permissions"=>$_POST['permissions'],
 				"namesrv1"=>$_POST['namesrv1'],
 				"description"=>$_POST['description']
 				);
 # update
-if(!$Admin->object_modify("nameservers", $_POST['action'], "id", $values))	{ $Result->show("danger",  _("Failed to $_POST[action] nameserver set").'!', true); }
-else																		{ $Result->show("success", _("Nameserver set $_POST[action] successfull").'!', false); }
+if (!$Admin->object_modify ("nameservers", $_POST['action'], "id", $values)) { $Result->show ("danger", _ ("Failed to $_POST[action] nameserver set").'!', true); }
+else { $Result->show ("success", _ ("Nameserver set $_POST[action] successfull").'!', false); }
 
 
 # remove all references if delete
-if($_POST['action']=="delete") { $Admin->remove_object_references ("nameservers", "id", $_POST['nameserverId']); }
+if ($_POST['action'] == "delete") { $Admin->remove_object_references ("nameservers", "id", $_POST['nameserverId']); }
 ?>

app/admin/nameservers/index.php

Spacing +27 added lines, -27 removed lines

@@ -5,34 +5,34 @@ 
  ************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all vrfs
-$all_nameservers = $Admin->fetch_all_objects("nameservers", "id");
+$all_nameservers = $Admin->fetch_all_objects ("nameservers", "id");
 ?>
 
-<h4><?php print _('Manage Nameserver sets'); ?></h4>
+<h4><?php print _ ('Manage Nameserver sets'); ?></h4>
 <hr><br>
 
-<button class='btn btn-sm btn-default nameserverManagement' data-action='add' data-nameserverid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _('Add nameserver set'); ?></button>
+<button class='btn btn-sm btn-default nameserverManagement' data-action='add' data-nameserverid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _ ('Add nameserver set'); ?></button>
 
 <!-- nameserver sets -->
 <?php
 
 # first check if they exist!
-if($all_nameservers===false) { $Result->show("danger", _("No nameserver sets defined")."!", true);}
+if ($all_nameservers === false) { $Result->show ("danger", _ ("No nameserver sets defined")."!", true); }
 else {
-	print '<table id="nameserverManagement" class="table sorted table-striped table-top table-hover table-td-top">'. "\n";
+	print '<table id="nameserverManagement" class="table sorted table-striped table-top table-hover table-td-top">'."\n";
 
 	# headers
 	print "<thead>";
-	print '<tr>'. "\n";
-	print '	<th>'._('Nameserver set').'</th>'. "\n";
-	print '	<th>'._('Nameservers').'</th>'. "\n";
-	print '	<th>'._('Sections').'</th>'. "\n";
-	print '	<th>'._('Description').'</th>'. "\n";
-	print '	<th></th>'. "\n";
-	print '</tr>'. "\n";
+	print '<tr>'."\n";
+	print '	<th>'._ ('Nameserver set').'</th>'."\n";
+	print '	<th>'._ ('Nameservers').'</th>'."\n";
+	print '	<th>'._ ('Sections').'</th>'."\n";
+	print '	<th>'._ ('Description').'</th>'."\n";
+	print '	<th></th>'."\n";
+	print '</tr>'."\n";
 	print "</thead>";
 
     print "<tbody>";
@@ -42,17 +42,17 @@ 
 		$nameservers = (array) $nameservers;
 
 		unset($permitted_sections);
-		$permitted_sections = array();
+		$permitted_sections = array ();
 
 		// sections
-		if (!is_null($nameservers['permissions'])) {
-			$sections = array_filter(explode(";", $nameservers['permissions']));
+		if (!is_null ($nameservers['permissions'])) {
+			$sections = array_filter (explode (";", $nameservers['permissions']));
 			// some
-			if (sizeof($sections)>0) {
-				foreach($sections as $id) {
+			if (sizeof ($sections) > 0) {
+				foreach ($sections as $id) {
 					$sect = $Admin->fetch_object ("sections", "id", $id);
 					// exists
-					if ($sect!==false) {
+					if ($sect !== false) {
 						$permitted_sections[] = "<span class='badge badge1 badge5'>".$sect->name."</span>";
 					}
 				}
@@ -67,24 +67,24 @@ 
 		}
 
 		// merge all nmeservers
-		$all_nameservers = explode(";", $nameservers['namesrv1']);
+		$all_nameservers = explode (";", $nameservers['namesrv1']);
 
 		//print details
-		print '<tr>'. "\n";
-		print '	<td class="name"><strong>'. $nameservers['name'] .'</strong></td>'. "\n";
-		print '	<td class="namesrv1">'. implode("<br>", $all_nameservers) .'</td>'. "\n";
-		print '	<td class="sections">'. implode("<br>", $permitted_sections).'</td>'. "\n";
-		print '	<td class="description">'. $nameservers['description'] .'</td>'. "\n";
+		print '<tr>'."\n";
+		print '	<td class="name"><strong>'.$nameservers['name'].'</strong></td>'."\n";
+		print '	<td class="namesrv1">'.implode ("<br>", $all_nameservers).'</td>'."\n";
+		print '	<td class="sections">'.implode ("<br>", $permitted_sections).'</td>'."\n";
+		print '	<td class="description">'.$nameservers['description'].'</td>'."\n";
 		print "	<td class='actions'>";
 		print "	<div class='btn-group'>";
 		print "		<button class='btn btn-xs btn-default nameserverManagement' data-action='edit'   data-nameserverid='$nameservers[id]'><i class='fa fa-pencil'></i></button>";
 		print "		<button class='btn btn-xs btn-default nameserverManagement' data-action='delete' data-nameserverid='$nameservers[id]'><i class='fa fa-times'></i></button>";
 		print "	</div>";
 		print "	</td>";
-		print '</tr>'. "\n";
+		print '</tr>'."\n";
 	}
 	print "</tbody>";
-	print '</table>'. "\n";
+	print '</table>'."\n";
 }
 ?>
 

app/admin/firewall-zones/zones-edit.php

Spacing +34 added lines, -34 removed lines

@@ -6,36 +6,36 @@ 
  ******************************************/
 
 # functions
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize classes
 $Database = new Database_PDO;
-$User 	  = new User ($Database);
-$Admin 	  = new Admin($Database);
+$User = new User ($Database);
+$Admin 	  = new Admin ($Database);
 $Subnets  = new Subnets ($Database);
 $Result   = new Result ();
-$Zones    = new FirewallZones($Database);
+$Zones    = new FirewallZones ($Database);
 
 # validate session parameters
-$User->check_user_session();
+$User->check_user_session ();
 
 
 # validate $_POST['id'] values
-if (!preg_match('/^[0-9]+$/i', $_POST['id'])) 												 { $Result->show("danger", _("Invalid ID. Do not manipulate the POST values!"), true); }
+if (!preg_match ('/^[0-9]+$/i', $_POST['id'])) { $Result->show ("danger", _ ("Invalid ID. Do not manipulate the POST values!"), true); }
 # validate $_POST['action'] values
-if ($_POST['action'] != 'add' && $_POST['action'] != 'edit' && $_POST['action'] != 'delete') { $Result->show("danger", _("Invalid action. Do not manipulate the POST values!"), true); }
+if ($_POST['action'] != 'add' && $_POST['action'] != 'edit' && $_POST['action'] != 'delete') { $Result->show ("danger", _ ("Invalid action. Do not manipulate the POST values!"), true); }
 
 
 # fetch module settings
-$firewallZoneSettings = json_decode($User->settings->firewallZoneSettings,true);
+$firewallZoneSettings = json_decode ($User->settings->firewallZoneSettings, true);
 
 # fetch old zone
 if ($_POST['action'] != 'add') {
-	$firewallZone = $Zones->get_zone($_POST['id']);
+	$firewallZone = $Zones->get_zone ($_POST['id']);
 }
 
 # disable edit on delete
-$readonly = $_POST['action']=="delete" ? "readonly" : "";
+$readonly = $_POST['action'] == "delete" ? "readonly" : "";
 ?>
 
 <script type="text/javascript">
@@ -51,7 +51,7 @@ 
 </script>
 
 <!-- header  -->
-<div class="pHeader"><?php print _('Add a firewall zone'); ?></div>
+<div class="pHeader"><?php print _ ('Add a firewall zone'); ?></div>
 <!-- content -->
 <div class="pContent">
 <!-- form -->
@@ -61,7 +61,7 @@ 
 	<!-- zone name -->
 	<tr>
 		<td style="width:150px;">
-			<?php print _('Zone name'); ?>
+			<?php print _ ('Zone name'); ?>
 		</td>
 
 		<?php
@@ -76,17 +76,17 @@ 
 		if ($_POST['action'] == 'add') {
 			# check if we have to autogenerate a zone name or if we have to display a text box
 			if ($firewallZoneSettings['zoneGenerator'] == 2) {
-				print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._('Zone name (Only alphanumeric and special characters like .-_ and space.)').'" value="'.$firewallZone->zone.'" '.$readonly.'></td>';
+				print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._ ('Zone name (Only alphanumeric and special characters like .-_ and space.)').'" value="'.$firewallZone->zone.'" '.$readonly.'></td>';
 			} else {
-				print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._('The zone name will be automatically generated').'" value="'.$firewallZone->zone.'" '.$readonly.' disabled></td>';
+				print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._ ('The zone name will be automatically generated').'" value="'.$firewallZone->zone.'" '.$readonly.' disabled></td>';
 			}
 		} else {
 			if ($firewallZone->generator == 1) {
-				print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._('Zone name').'" readonly value="'.$firewallZone->zone.'"></td>';
+				print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._ ('Zone name').'" readonly value="'.$firewallZone->zone.'"></td>';
 			} elseif ($firewallZone->generator != 2) {
-				print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._('Zone name').'" readonly value="'.$firewallZone->zone.'"></td>';
+				print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._ ('Zone name').'" readonly value="'.$firewallZone->zone.'"></td>';
 			} else {
-				print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._('Zone name (Only alphanumeric and special characters like .-_ and space.)').'" value="'.$firewallZone->zone.'" '.$readonly.'></td>';
+				print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._ ('Zone name (Only alphanumeric and special characters like .-_ and space.)').'" value="'.$firewallZone->zone.'" '.$readonly.'></td>';
 			}
 		}
 		?>
@@ -96,12 +96,12 @@ 
 	<tr>
 		<!-- zone indicator -->
 		<td rowspan="2">
-			<?php print _('Indicator'); ?>
+			<?php print _ ('Indicator'); ?>
 		</td>
 		<td>
 			<div class="radio" style="margin-top:5px;margin-bottom:2px;">
 				<label>
-					<input type="radio" name="indicator" value="0" <?php (($firewallZone->indicator == false) ? print 'checked' : print ''); ?> ><?php print '<span class="fa fa-home"  title="'._('Own zone').'"></span> '._('Own Zone'); ?>
+					<input type="radio" name="indicator" value="0" <?php (($firewallZone->indicator == false) ? print 'checked' : print ''); ?> ><?php print '<span class="fa fa-home"  title="'._ ('Own zone').'"></span> '._ ('Own Zone'); ?>
 				</label>
 			</div>
 		</td>
@@ -110,41 +110,41 @@ 
 		<td>
 			<div class="radio" style="margin-top:2px;margin-bottom:2px;">
 				<label>
-					<input type="radio" name="indicator" value="1" <?php (($firewallZone->indicator == true) ? print 'checked' : print ''); ?> ><?php print '<span class="fa fa-group"  title="'._('Customer zone').'"></span> '._('Customer Zone'); ?>
+					<input type="radio" name="indicator" value="1" <?php (($firewallZone->indicator == true) ? print 'checked' : print ''); ?> ><?php print '<span class="fa fa-group"  title="'._ ('Customer zone').'"></span> '._ ('Customer Zone'); ?>
 				</label>
 			</div>
 		</td>
 	</tr>
-	<?php if($firewallZone->generator != 2 && $firewallZoneSettings['zoneGenerator'] != 2) { ?>
+	<?php if ($firewallZone->generator != 2 && $firewallZoneSettings['zoneGenerator'] != 2) { ?>
 		<tr>
 			<td>
-				<?php print _('Padding'); ?>
+				<?php print _ ('Padding'); ?>
 			</td>
 			<td>
-				<input type="checkbox" class="input-switch" name="padding" <?php if($_POST['action'] == 'edit' && $firewallZone->padding == 1){ print 'checked';} elseif($_POST['action'] == 'edit' && $firewallZone->padding == 0) {} elseif ($firewallZoneSettings['padding'] == 'on'){print 'checked';}?>>
+				<input type="checkbox" class="input-switch" name="padding" <?php if ($_POST['action'] == 'edit' && $firewallZone->padding == 1) { print 'checked'; } elseif ($_POST['action'] == 'edit' && $firewallZone->padding == 0) {} elseif ($firewallZoneSettings['padding'] == 'on') {print 'checked'; }?>>
 			</td>
 		</tr>
 	<?php } ?>
 	<tr>
 		<!-- description -->
 		<td>
-			<?php print _('Description'); ?>
+			<?php print _ ('Description'); ?>
 		</td>
 		<td>
-			<input type="text" class="form-control input-sm" name="description" placeholder="<?php print _('Zone description'); ?>" value="<?php print $firewallZone->description; ?>">
+			<input type="text" class="form-control input-sm" name="description" placeholder="<?php print _ ('Zone description'); ?>" value="<?php print $firewallZone->description; ?>">
 		</td>
 	</tr>
 </table>
 
 <!-- network information -->
-<span class="btn btn-sm btn-default btn-success editNetwork" style="margin-bottom:10px;margin-top: 25px;" data-action="add" data-zoneId="<?php print $firewallZone->id; ?>"><i style="padding-right:5px;" class="fa fa-plus"></i><?php print _('Add a network to the Zone'); ?></span>
+<span class="btn btn-sm btn-default btn-success editNetwork" style="margin-bottom:10px;margin-top: 25px;" data-action="add" data-zoneId="<?php print $firewallZone->id; ?>"><i style="padding-right:5px;" class="fa fa-plus"></i><?php print _ ('Add a network to the Zone'); ?></span>
 
 <div class="zoneNetwork">
 <table class="table table-noborder table-condensed" style="padding-bottom:20px;">
 <?php
 if ($firewallZone->network) {
 	print "<tr><td colspan='2'><hr></tr>";
-	$rowspan = count($firewallZone->network);
+	$rowspan = count ($firewallZone->network);
 	$i = 1;
 	foreach ($firewallZone->network as $network) {
 		print '<tr>';
@@ -152,7 +152,7 @@ 
 			print '<td rowspan="'.$rowspan.'" style="width:150px;vertical-align:top">Networks</td>';
 		}
 		print '<td>';
-		print '<a class="btn btn-xs btn-danger editNetwork" style="margin-right:5px;" alt="'._('Delete Network').'" title="'._('Delete Network').'" data-action="delete" data-zoneId="'.$firewallZone->id.'" data-subnetId="'.$network->subnetId.'">';
+		print '<a class="btn btn-xs btn-danger editNetwork" style="margin-right:5px;" alt="'._ ('Delete Network').'" title="'._ ('Delete Network').'" data-action="delete" data-zoneId="'.$firewallZone->id.'" data-subnetId="'.$network->subnetId.'">';
 		print '<span><i class="fa fa-close"></i></span>';
 		print "</a>";
 
@@ -160,8 +160,8 @@ 
 			print 'Folder: '.$network->subnetDescription.'</td>';
 		} else {
 			# display network information with or without description
-			if ($network->subnetDescription) 	{	print $Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.' ('.$network->subnetDescription.')</td>';	}
-			else 								{	print $Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.'</td>';	}
+			if ($network->subnetDescription) {	print $Subnets->transform_to_dotted ($network->subnet).'/'.$network->subnetMask.' ('.$network->subnetDescription.')</td>'; }
+			else {	print $Subnets->transform_to_dotted ($network->subnet).'/'.$network->subnetMask.'</td>'; }
 		}
 		print '</tr>';
 		$i++;
@@ -176,16 +176,16 @@ 
 
 <?php
 #print delete warning
-if($_POST['action'] == "delete"){
-	$Result->show("warning", "<strong>"._('Warning').":</strong> "._("Removing this firewall zone will also remove all referenced mappings!"), false);
+if ($_POST['action'] == "delete") {
+	$Result->show ("warning", "<strong>"._ ('Warning').":</strong> "._ ("Removing this firewall zone will also remove all referenced mappings!"), false);
 }
 ?>
 </div>
 <!-- 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="editZoneSubmit"><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="editZoneSubmit"><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 -->
 	<div class="zones-edit-result"></div>

app/admin/firewall-zones/subnet-to-zone-save.php

Spacing +16 added lines, -16 removed lines

@@ -6,49 +6,49 @@
  *********************************/
 
 # functions
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize classes
 $Database = new Database_PDO;
-$User 	  = new User ($Database);
+$User = new User ($Database);
 $Result   = new Result ();
-$Zones    = new FirewallZones($Database);
+$Zones    = new FirewallZones ($Database);
 
 # validate session parameters
-$User->check_user_session();
+$User->check_user_session ();
 
 # validate $_POST['subnetId'] values
-if (!preg_match('/^[0-9]+$/i', $_POST['subnetId']))  						{ $Result->show("danger", _("Invalid subnet ID. Do not manipulate the POST values!"), true); }
+if (!preg_match ('/^[0-9]+$/i', $_POST['subnetId'])) { $Result->show ("danger", _ ("Invalid subnet ID. Do not manipulate the POST values!"), true); }
 # validate $_POST['zoneId'] values
-if (!preg_match('/^[0-9]+$/i', $_POST['zoneId']) || $_POST['zoneId'] == 0) 	 { $Result->show("danger", _("Invalid or no zone ID. "), true); }
+if (!preg_match ('/^[0-9]+$/i', $_POST['zoneId']) || $_POST['zoneId'] == 0) { $Result->show ("danger", _ ("Invalid or no zone ID. "), true); }
 
 # validate $_POST['deviceId'] values
-if ($_POST['deviceId'] && !preg_match('/^[0-9]+$/i', $_POST['deviceId'])) 	 { $Result->show("danger", _("Invalid device ID. Do not manipulate the POST values!"), true); }
+if ($_POST['deviceId'] && !preg_match ('/^[0-9]+$/i', $_POST['deviceId'])) { $Result->show ("danger", _ ("Invalid device ID. Do not manipulate the POST values!"), true); }
 
 # check the zone alias. valid values are alphanumeric characters and special characters like ".-_ "
-if($_POST['alias'] && !preg_match('/^[0-9a-zA-Z.\/\-_ ]+$/i',$_POST['alias'])) {
-	$Result->show("danger", _("Invalid zone alias value."), true);
+if ($_POST['alias'] && !preg_match ('/^[0-9a-zA-Z.\/\-_ ]+$/i', $_POST['alias'])) {
+	$Result->show ("danger", _ ("Invalid zone alias value."), true);
 }
 # check the interface name. valid values are alphanumeric characters and special characters like ".-_/ "
-if($_POST['interface'] && !preg_match('/^[0-9a-zA-Z.\/\-_ ]+$/i',$_POST['interface'])) {
-	$Result->show("danger", _("Invalid interface."), true);
+if ($_POST['interface'] && !preg_match ('/^[0-9a-zA-Z.\/\-_ ]+$/i', $_POST['interface'])) {
+	$Result->show ("danger", _ ("Invalid interface."), true);
 }
 
 # check if there is any device mapping necessary
 if ($_POST['deviceId']) {
 	# build the query parameter arrary
-	$values = array('id' => '',
+	$values = array ('id' => '',
 					'zoneId' => $_POST['zoneId'],
 					'alias' => $_POST['alias'],
 					'deviceId' => $_POST['deviceId'],
 					'interface' => $_POST['interface']
 					);
 	# modify
-	if(!$Zones->modify_mapping('add',$values)) 	{ $Result->show("danger",  _("Cannot add mapping"), true); }
+	if (!$Zones->modify_mapping ('add', $values)) { $Result->show ("danger", _ ("Cannot add mapping"), true); }
 }
 # check and then add the network to the zone if possible
-if($Zones->check_zone_network($_POST['subnetId']))	{ 
-	if (!$Zones->add_zone_network($_POST['zoneId'],$_POST['subnetId']))	{ 	$Result->show("danger",  _("Cannot add this network to a zone."), true); }
-	else 																{	$Result->show("success", _("Zone modified successfully"), true); }
+if ($Zones->check_zone_network ($_POST['subnetId'])) { 
+	if (!$Zones->add_zone_network ($_POST['zoneId'], $_POST['subnetId'])) { 	$Result->show ("danger", _ ("Cannot add this network to a zone."), true); }
+	else {	$Result->show ("success", _ ("Zone modified successfully"), true); }
 }
 ?>
\ No newline at end of file

app/admin/firewall-zones/zones-edit-result.php

Spacing +33 added lines, -33 removed lines

@@ -5,55 +5,55 @@ 
  *****************************************/
 
 # functions
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize classes
 $Database = new Database_PDO;
-$User 	  = new User ($Database);
+$User = new User ($Database);
 $Admin 	  = new Admin ($Database);
 $Result   = new Result ();
-$Zones 	  = new FirewallZones($Database);
+$Zones 	  = new FirewallZones ($Database);
 
 # validate session parameters
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch module settings
-$firewallZoneSettings = json_decode($User->settings->firewallZoneSettings,true);
+$firewallZoneSettings = json_decode ($User->settings->firewallZoneSettings, true);
 
 # validations
 # validate the action type
-if($_POST['action'] != 'add' && $_POST['action'] != 'delete' && $_POST['action'] != 'edit'){
-	$Result->show("danger", _("Invalid action."), true);
+if ($_POST['action'] != 'add' && $_POST['action'] != 'delete' && $_POST['action'] != 'edit') {
+	$Result->show ("danger", _ ("Invalid action."), true);
 }
 
 # check the zone name. valid values are alphanumeric characters and special characters like ".-_ "
-if($_POST['zone'] && !preg_match('/^[0-9a-zA-Z.\-_ ]+$/i',$_POST['zone'])) {
-	$Result->show("danger", _("Invalid zone name value."), true);
+if ($_POST['zone'] && !preg_match ('/^[0-9a-zA-Z.\-_ ]+$/i', $_POST['zone'])) {
+	$Result->show ("danger", _ ("Invalid zone name value."), true);
 }
 
-if($firewallZoneSettings['zoneGenerator']=="2")
-if(strlen(@$_POST['zone']) < 1 || strlen(@$_POST['zone'])>$firewallZoneSettings['zoneLength']) {
-	$Result->show("danger", _("Invalid zone name length."), true);
+if ($firewallZoneSettings['zoneGenerator'] == "2")
+if (strlen (@$_POST['zone']) < 1 || strlen (@$_POST['zone']) > $firewallZoneSettings['zoneLength']) {
+	$Result->show ("danger", _ ("Invalid zone name length."), true);
 }
 
 # check the zone indicator ID. valid values are 0 or 1.
-if($_POST['indicator'] && !preg_match('/^[0-1]$/i',$_POST['indicator'])) {
-	$Result->show("danger", _("Invalid indicator ID."), true);
+if ($_POST['indicator'] && !preg_match ('/^[0-1]$/i', $_POST['indicator'])) {
+	$Result->show ("danger", _ ("Invalid indicator ID."), true);
 }
 
 # check the generator value. valid value: integer
-if($_POST['generator'] && !preg_match('/^[0-9]+$/i',$_POST['generator'])) {
-	$Result->show("danger", _("Invalid generator ID."), true);
+if ($_POST['generator'] && !preg_match ('/^[0-9]+$/i', $_POST['generator'])) {
+	$Result->show ("danger", _ ("Invalid generator ID."), true);
 }
 
 # check the padding value. valid value: on or off
-if($_POST['padding'] && !preg_match('/^(on|off)$/i',$_POST['padding'])) {
-	$Result->show("danger", _("Invalid padding setting."), true);
+if ($_POST['padding'] && !preg_match ('/^(on|off)$/i', $_POST['padding'])) {
+	$Result->show ("danger", _ ("Invalid padding setting."), true);
 }
 
 # transform the padding checkbox values into 1 or 0
-if($_POST['generator'] != 2) {
-	if($_POST['padding']) {
+if ($_POST['generator'] != 2) {
+	if ($_POST['padding']) {
 		$padding = 1;
 	} else {
 		$padding = 0;
@@ -61,28 +61,28 @@ 
 }
 
 # transform description to valid value
-$description = trim(htmlspecialchars($_POST['description']));
+$description = trim (htmlspecialchars ($_POST['description']));
 
 # generate a unique zone name if the generator is set to decimal or hex
-if (!$_POST['zone'] && $_POST['action'] == 'add')  {
-	if(!$zone=$Zones->generate_zone_name()){
-		$Result->show("danger",  _("Cannot generate zone name"), true);
+if (!$_POST['zone'] && $_POST['action'] == 'add') {
+	if (!$zone = $Zones->generate_zone_name ()) {
+		$Result->show ("danger", _ ("Cannot generate zone name"), true);
 	}
 } else {
 	$zone = $_POST['zone'];
 }
 
 # validate the zone name if text mode is enabled
-if ($_POST['generator'] == 2 ) {
-	$textSettings = array ( $_POST['zone'],$_POST['id']);
-	if(!$zone=$Zones->generate_zone_name($textSettings)){
-		$Result->show("danger",  _("Cannot validate zone name"), true);
+if ($_POST['generator'] == 2) {
+	$textSettings = array ($_POST['zone'], $_POST['id']);
+	if (!$zone = $Zones->generate_zone_name ($textSettings)) {
+		$Result->show ("danger", _ ("Cannot validate zone name"), true);
 	}
 }
 
 # build the query parameter arrary
-if($_POST['generator'] != 2 && $_POST['action'] == 'edit') {
-	$values = array('id' => $_POST['id'],
+if ($_POST['generator'] != 2 && $_POST['action'] == 'edit') {
+	$values = array ('id' => $_POST['id'],
 					'indicator' => $_POST['indicator'],
 					'padding' => $padding,
 					'description' => $description,
@@ -90,7 +90,7 @@ 
 					);
 }
 else {
-	$values = array('id' => $_POST['id'],
+	$values = array ('id' => $_POST['id'],
 					'generator' => $_POST['generator'],
 					'zone' => $zone,
 					'indicator' => $_POST['indicator'],
@@ -101,7 +101,7 @@ 
 }
 
 # update
-if(!$Zones->modify_zone($_POST['action'],$values))	{ $Result->show("danger",  _("Cannot add zone"), true); }
-else 												{ $Result->show("success", _("Zone modified successfully"), true);  }
+if (!$Zones->modify_zone ($_POST['action'], $values)) { $Result->show ("danger", _ ("Cannot add zone"), true); }
+else { $Result->show ("success", _ ("Zone modified successfully"), true); }
 
 ?>
\ No newline at end of file

app/admin/firewall-zones/index.php

Spacing +12 added lines, -12 removed lines

@@ -5,36 +5,36 @@ 
  ******************************************/
 
 # validate session parameters
-$User->check_user_session();
+$User->check_user_session ();
 
 ?>
 
 
-<h4><?php print _('Firewall zone management'); ?></h4>
+<h4><?php print _ ('Firewall zone management'); ?></h4>
 <hr><br>
 
 <?php
 # check if the feature is activated, otherwise provide a short notice to enable this feature in the phpIPAM settings menu
-if($User->settings->enableFirewallZones==1) {
+if ($User->settings->enableFirewallZones == 1) {
 ?>
 <!-- tabs -->
 <ul class="nav nav-tabs">
 	<?php
 	# tabs
-	$tabs = array("mapping", "zones", "settings");
+	$tabs = array ("mapping", "zones", "settings");
 
 	# default tab
-	if(!isset($_GET['subnetId'])) {
+	if (!isset($_GET['subnetId'])) {
 		$_GET['subnetId'] = "mapping";
 	}
 
 	# check
-	if(!in_array($_GET['subnetId'], $tabs)) 	{ $Result->show("danger", "Invalid request", true); }
+	if (!in_array ($_GET['subnetId'], $tabs)) { $Result->show ("danger", "Invalid request", true); }
 
 	# print
-	foreach($tabs as $t) {
-		$class = $_GET['subnetId']==$t ? "class='active'" : "";
-		print "<li role='presentation' $class><a href=".create_link("administration", "firewall-zones", "$t").">". _(ucwords($t))."</a></li>";
+	foreach ($tabs as $t) {
+		$class = $_GET['subnetId'] == $t ? "class='active'" : "";
+		print "<li role='presentation' $class><a href=".create_link ("administration", "firewall-zones", "$t").">"._ (ucwords ($t))."</a></li>";
 	}
 	?>
 </ul>
@@ -42,14 +42,14 @@ 
 <div>
 <?php
 # include content
-if(!file_exists(dirname(__FILE__) . '/'.$_GET['subnetId'].".php")) 	{ $Result->show("danger", "Invalid request", true); }
-else																{ include(dirname(__FILE__) . '/'.$_GET['subnetId'].".php"); }
+if (!file_exists (dirname (__FILE__).'/'.$_GET['subnetId'].".php")) { $Result->show ("danger", "Invalid request", true); }
+else { include(dirname (__FILE__).'/'.$_GET['subnetId'].".php"); }
 ?>
 </div>
 
 <?php
 } else {
-	$Result->show("info", _('Please enable the firewall zone module under server management'), false);
+	$Result->show ("info", _ ('Please enable the firewall zone module under server management'), false);
 }
 ?>
 </div>
\ No newline at end of file

app/admin/firewall-zones/zones.php

Spacing +20 added lines, -20 removed lines

@@ -6,19 +6,19 @@ 
  *******************************/
 
 # validate session parameters
-$User->check_user_session();
+$User->check_user_session ();
 
 # initialize classes
-$Zones = new FirewallZones($Database);
-$firewallZones = $Zones->get_zones();
+$Zones = new FirewallZones ($Database);
+$firewallZones = $Zones->get_zones ();
 
 
 # Add new firewall zone
-print '<button class="btn btn-sm btn-default btn-success editFirewallZone" style="margin-bottom:10px;margin-top: 25px;" data-action="add" data-id="0"><i style="padding-right:5px;" class="fa fa-plus"></i>'._('Create Firewall zone').'</button>';
+print '<button class="btn btn-sm btn-default btn-success editFirewallZone" style="margin-bottom:10px;margin-top: 25px;" data-action="add" data-id="0"><i style="padding-right:5px;" class="fa fa-plus"></i>'._ ('Create Firewall zone').'</button>';
 
 
 # display the zone table if there are any zones in the database
-if($firewallZones) {
+if ($firewallZones) {
 
 	# table
 	print '<table id="zonesPrint" class="table table-top table-td-top table-condensed">';
@@ -26,20 +26,20 @@ 
 	# table headers
 	print "<thead>";
 	print '<tr style="background:white">';
-	print '<th>'._('Type').'</th>';
-	print '<th>'._('Zone').'</th>';
-	print '<th>'._('Description').'</th>';
-	print '<th>'._('Subnet').'</th>';
-	print '<th>'._('VLAN').'</th>';
+	print '<th>'._ ('Type').'</th>';
+	print '<th>'._ ('Zone').'</th>';
+	print '<th>'._ ('Description').'</th>';
+	print '<th>'._ ('Subnet').'</th>';
+	print '<th>'._ ('VLAN').'</th>';
 	print '<th style="width:60px;"></th>';
 	print '</tr>';
 	print "</thead>";
 
     print "<tbody>";
 	# display all firewall zones and network information
-	foreach ($firewallZones as $zoneObject ) {
+	foreach ($firewallZones as $zoneObject) {
 		# set rowspan in case if there are more than one networks bound to the zone
-		$counter = count($zoneObject->network);
+		$counter = count ($zoneObject->network);
 		if ($counter === 0) {
 			$counter = 1;
 		}
@@ -52,19 +52,19 @@ 
 					// set title
 					$title = $zoneObject->indicator == 0 ? 'Own Zone' : 'Customer Zone';
 					// print
-					print '<td rowspan="'.$counter.'"><span class="fa '.($zoneObject->indicator == 0 ? 'fa-home':'fa-group').'"  title="'._($title).'"></span></td>';
+					print '<td rowspan="'.$counter.'"><span class="fa '.($zoneObject->indicator == 0 ? 'fa-home' : 'fa-group').'"  title="'._ ($title).'"></span></td>';
 					print '<td rowspan="'.$counter.'">'.$zoneObject->zone.'</td>';
 					print '<td rowspan="'.$counter.'">'.$zoneObject->description.'</td>';
 				}
 				# display subnet informations
 				if ($network->subnetId) {
 					// description fix
-					$network->subnetDescription = strlen($network->subnetDescription)>0 ? " (".$network->subnetDescription.")" : "";
+					$network->subnetDescription = strlen ($network->subnetDescription) > 0 ? " (".$network->subnetDescription.")" : "";
 
 					if (!$network->subnetIsFolder) {
-						print '<td><a href="'.create_link("subnets",$network->sectionId,$network->subnetId).'">'.$Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.$network->subnetDescription.'</a></td>';
+						print '<td><a href="'.create_link ("subnets", $network->sectionId, $network->subnetId).'">'.$Subnets->transform_to_dotted ($network->subnet).'/'.$network->subnetMask.$network->subnetDescription.'</a></td>';
 					} else {
-						print '<td><a href="'.create_link("subnets",$network->sectionId,$network->subnetId).'">Folder'.$network->subnetDescription.'</a></td>';
+						print '<td><a href="'.create_link ("subnets", $network->sectionId, $network->subnetId).'">Folder'.$network->subnetDescription.'</a></td>';
 					}
 				} else {
 					print '<td>/</td>';
@@ -72,8 +72,8 @@ 
 				# display vlan informations
 				if ($network->vlanId) {
 					// name fix
-					$network->vlanName = strlen($network->vlanName)>0 ? " (".$network->vlanName.")" : "";
-					print '<td><a href="'.create_link('tools','vlan',$network->domainId,$network->vlanId).'">'.$network->vlan.$network->vlanName.'</a></td>';
+					$network->vlanName = strlen ($network->vlanName) > 0 ? " (".$network->vlanName.")" : "";
+					print '<td><a href="'.create_link ('tools', 'vlan', $network->domainId, $network->vlanId).'">'.$network->vlan.$network->vlanName.'</a></td>';
 				} else {
 					print '<td>/</td>';
 				}
@@ -99,7 +99,7 @@ 
 			$title = $zoneObject->indicator == 0 ? 'Own Zone' : 'Customer Zone';
 
 			print '<tr class="border-top">';
-			print '<td rowspan="'.$counter.'"><span class="fa fa-home"  title="'._($title).'"></span></td>';
+			print '<td rowspan="'.$counter.'"><span class="fa fa-home"  title="'._ ($title).'"></span></td>';
 			print '<td>'.$zoneObject->zone.'</td>';
 			print '<td>'.$zoneObject->description.'</td>';
 			print '<td>/</td>';
@@ -118,6 +118,6 @@ 
 	print '</table>';
 } else {
 	# print an info if there are no zones in the database
-	$Result->show("info", _("No firewall zones configured"), false);
+	$Result->show ("info", _ ("No firewall zones configured"), false);
 }
 ?>

app/admin/firewall-zones/mapping-edit.php

Spacing +36 added lines, -36 removed lines

@@ -5,48 +5,48 @@ 
  **************************************************/
 
 # functions
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize classes
 $Database = new Database_PDO;
-$User 	  = new User ($Database);
+$User = new User ($Database);
 $Subnets  = new Subnets ($Database);
 $Tools 	  = new Tools ($Database);
 $Result   = new Result ();
-$Zones 	  = new FirewallZones($Database);
+$Zones 	  = new FirewallZones ($Database);
 
 # validate session parameters
-$User->check_user_session();
+$User->check_user_session ();
 
 # validate $_POST['id'] values
-if (!preg_match('/^[0-9]+$/i', $_POST['id'])) {
-	$Result->show("danger", _("Invalid ID. Do not manipulate the POST values!"), true);
+if (!preg_match ('/^[0-9]+$/i', $_POST['id'])) {
+	$Result->show ("danger", _ ("Invalid ID. Do not manipulate the POST values!"), true);
 }
 
 # validate $_POST['action'] values
 if ($_POST['action'] != 'add' && $_POST['action'] != 'edit' && $_POST['action'] != 'delete') {
-	$Result->show("danger", _("Invalid action. Do not manipulate the POST values!"), true);
+	$Result->show ("danger", _ ("Invalid action. Do not manipulate the POST values!"), true);
 }
 
 # disable edit on delete
-$readonly = $_POST['action']=="delete" ? "disabled" : "";
+$readonly = $_POST['action'] == "delete" ? "disabled" : "";
 
 # fetch all firewall zones
-$firewallZones = $Zones->get_zones();
+$firewallZones = $Zones->get_zones ();
 
 # fetch settings
-$firewallZoneSettings = json_decode($User->settings->firewallZoneSettings,true);
+$firewallZoneSettings = json_decode ($User->settings->firewallZoneSettings, true);
 
 # fetch all devices
 $devices = $Tools->fetch_multiple_objects ("devices", "type", $firewallZoneSettings['deviceType']);
 
 # fetch old mapping
 if ($_POST['action'] != 'add') {
-	$mapping = $Zones->get_zone_mapping($_POST['id']);
+	$mapping = $Zones->get_zone_mapping ($_POST['id']);
 }
 ?>
 <!-- header  -->
-<div class="pHeader"><?php print _('Add a mapping between a firewall device and a firewall zone'); ?></div>
+<div class="pHeader"><?php print _ ('Add a mapping between a firewall device and a firewall zone'); ?></div>
 <!-- content -->
 <div class="pContent">
 	<!-- form -->
@@ -57,19 +57,19 @@ 
 	<!-- zone name -->
 	<tr>
 		<td style="width:150px;">
-			<?php print _('Zone to map'); ?>
+			<?php print _ ('Zone to map'); ?>
 		</td>
 		<td>
 			<select name="zoneId" class="mappingZoneInformation form-control input-sm input-w-auto input-max-200"  <?php print $readonly; ?>>
-			<option value="0"><?php print _('Select a firewall zone'); ?></option>
+			<option value="0"><?php print _ ('Select a firewall zone'); ?></option>
 			<?php
 			foreach ($firewallZones as $zone) {
-				if ($zone->id == $mapping->id) 	{
-					if($zone->description) 	{ print '<option value="'.$zone->id.'" selected>'.$zone->zone.' ('.$zone->description.')</option>'; }
-					else 					{ print '<option value="'.$zone->id.'" selected>'.$zone->zone.'</option>'; }}
+				if ($zone->id == $mapping->id) {
+					if ($zone->description) { print '<option value="'.$zone->id.'" selected>'.$zone->zone.' ('.$zone->description.')</option>'; }
+					else { print '<option value="'.$zone->id.'" selected>'.$zone->zone.'</option>'; }}
 				else {
-					if($zone->description) 	{ print '<option value="'.$zone->id.'">'.		  $zone->zone.' ('.$zone->description.')</option>'; }
-					else 					{ print '<option value="'.$zone->id.'">'.		  $zone->zone.'</option>'; }}
+					if ($zone->description) { print '<option value="'.$zone->id.'">'.$zone->zone.' ('.$zone->description.')</option>'; }
+					else { print '<option value="'.$zone->id.'">'.$zone->zone.'</option>'; }}
 			}
 			?>
 			</select>
@@ -84,7 +84,7 @@ 
 				<?php
 				if ($mapping->zoneId) {
 					# return the zone details
-					$Zones->get_zone_detail($mapping->id);
+					$Zones->get_zone_detail ($mapping->id);
 				}
 				?>
 			</div>
@@ -93,20 +93,20 @@ 
 	<tr>
 		<!-- zone indicator -->
 		<td>
-			<?php print _('Firewall to map'); ?>
+			<?php print _ ('Firewall to map'); ?>
 		</td>
 		<td>
 			<select name="deviceId" class="form-control input-sm input-w-auto input-max-200" <?php print $readonly; ?>>
-			<option value="0"><?php print _('Select firewall'); ?></option>
+			<option value="0"><?php print _ ('Select firewall'); ?></option>
 			<?php
-            if ($devices !==false) {
+            if ($devices !== false) {
     			foreach ($devices as $device) {
-    				if ($device->id == $mapping->deviceId) 	{
-    					if($device->description) 	{	print '<option value="'.$device->id.'" selected>'.	$device->hostname.' ('.$device->description.')</option>'; }
-    					else 						{ 	print '<option value="'.$device->id.'" selected>'.	$device->hostname.'</option>'; }}
+    				if ($device->id == $mapping->deviceId) {
+    					if ($device->description) {	print '<option value="'.$device->id.'" selected>'.$device->hostname.' ('.$device->description.')</option>'; }
+    					else { 	print '<option value="'.$device->id.'" selected>'.$device->hostname.'</option>'; }}
     				else {
-    					if($device->description)	{	print '<option value="'.$device->id.'">'.			$device->hostname.' ('.$device->description.')</option>'; }
-    					else 						{	print '<option value="'.$device->id.'">'.			$device->hostname.'</option>'; }}
+    					if ($device->description) {	print '<option value="'.$device->id.'">'.$device->hostname.' ('.$device->description.')</option>'; }
+    					else {	print '<option value="'.$device->id.'">'.$device->hostname.'</option>'; }}
     			}
 			}
 			?>
@@ -115,20 +115,20 @@ 
 	</tr>
 	<tr>
 		<td>
-			<?php print _('Interface'); ?>
+			<?php print _ ('Interface'); ?>
 		</td>
 		<td>
-			<input type="text" class="form-control input-sm" name="interface" placeholder="<?php print _('Firewall interface'); ?>" value="<?php print $mapping->interface; ?>" <?php print $readonly; ?>>
+			<input type="text" class="form-control input-sm" name="interface" placeholder="<?php print _ ('Firewall interface'); ?>" value="<?php print $mapping->interface; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 
 	<tr>
 		<!-- description -->
 		<td>
-			<?php print _('Zone alias'); ?>
+			<?php print _ ('Zone alias'); ?>
 		</td>
 		<td>
-			<input type="text" class="form-control input-sm" name="alias" placeholder="<?php print _('Local zone alias'); ?>" value="<?php print $mapping->alias; ?>" <?php print $readonly; ?>>
+			<input type="text" class="form-control input-sm" name="alias" placeholder="<?php print _ ('Local zone alias'); ?>" value="<?php print $mapping->alias; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 	</table>
@@ -139,16 +139,16 @@ 
 
 	<?php
 	# print delete warning
-	if($_POST['action'] == "delete"){
-		$Result->show("warning", "<strong>"._('Warning').":</strong> "._("You are about to remove the firewall to zone mapping!"), false);
+	if ($_POST['action'] == "delete") {
+		$Result->show ("warning", "<strong>"._ ('Warning').":</strong> "._ ("You are about to remove the firewall to zone mapping!"), false);
 	}
 	?>
 </div>
 <!-- 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="editMappingSubmit"><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="editMappingSubmit"><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 -->
 	<div class="mapping-edit-result"></div>

app/admin/firewall-zones/mapping-edit-result.php

Spacing +22 added lines, -22 removed lines

@@ -6,57 +6,57 @@
  **********************************************/
 
 # functions
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize classes
 $Database = new Database_PDO;
 $User = new User ($Database);
 $Result = new Result ();
-$Zones = new FirewallZones($Database);
+$Zones = new FirewallZones ($Database);
 
 # validate session parameters
-$User->check_user_session();
+$User->check_user_session ();
 
 # validate the action type
-if($_POST['action'] != 'add' && $_POST['action'] != 'delete' && $_POST['action'] != 'edit'){
-	$Result->show("danger", _("Invalid action."), true);
+if ($_POST['action'] != 'add' && $_POST['action'] != 'delete' && $_POST['action'] != 'edit') {
+	$Result->show ("danger", _ ("Invalid action."), true);
 }
 # check the zone alias. valid values are alphanumeric characters and special characters like ".-_ "
-if($_POST['alias'] && !preg_match('/^[0-9a-zA-Z.\/\-_ ]+$/i',$_POST['alias'])) {
-	$Result->show("danger", _("Invalid zone alias value."), true);
+if ($_POST['alias'] && !preg_match ('/^[0-9a-zA-Z.\/\-_ ]+$/i', $_POST['alias'])) {
+	$Result->show ("danger", _ ("Invalid zone alias value."), true);
 }
 # check the interface name. valid values are alphanumeric characters and special characters like ".-_/ "
-if($_POST['interface'] && !preg_match('/^[0-9a-zA-Z.\/\-_ ]+$/i',$_POST['interface'])) {
-	$Result->show("danger", _("Invalid interface."), true);
+if ($_POST['interface'] && !preg_match ('/^[0-9a-zA-Z.\/\-_ ]+$/i', $_POST['interface'])) {
+	$Result->show ("danger", _ ("Invalid interface."), true);
 }
 if ($_POST['action'] != 'delete') {
 	# check the zone  ID. valid value: integer
-	if(!preg_match('/^[0-9]+$/i',$_POST['zoneId'])) {
-		$Result->show("danger", _("Invalid zone ID."), true);
-	} elseif (preg_match('/^0$/i',$_POST['zoneId'])) {
-		$Result->show("danger", _("Invalid zone ID."), true);
+	if (!preg_match ('/^[0-9]+$/i', $_POST['zoneId'])) {
+		$Result->show ("danger", _ ("Invalid zone ID."), true);
+	} elseif (preg_match ('/^0$/i', $_POST['zoneId'])) {
+		$Result->show ("danger", _ ("Invalid zone ID."), true);
 	}
 	# check the device ID. valid value: integer
-	if(!preg_match('/^[0-9]+$/i',$_POST['deviceId'])) {
-		$Result->show("danger", _("Invalid device ID."), true);
-	} elseif (preg_match('/^0$/i',$_POST['deviceId'])) {
-		$Result->show("danger", _("Please select a device."), true);
+	if (!preg_match ('/^[0-9]+$/i', $_POST['deviceId'])) {
+		$Result->show ("danger", _ ("Invalid device ID."), true);
+	} elseif (preg_match ('/^0$/i', $_POST['deviceId'])) {
+		$Result->show ("danger", _ ("Please select a device."), true);
 	}
 	# check the mapping ID. valid value: integer
-	if($_POST['id'] && !preg_match('/^[0-9]+$/i',$_POST['id'])) {
-		$Result->show("danger", _("Invalid mapping ID."), true);
+	if ($_POST['id'] && !preg_match ('/^[0-9]+$/i', $_POST['id'])) {
+		$Result->show ("danger", _ ("Invalid mapping ID."), true);
 	}
 }
 
 
 # build the query parameter arrary
-$values = array('id' => $_POST['id'],
+$values = array ('id' => $_POST['id'],
 				'zoneId' => $_POST['zoneId'],
 				'alias' => $_POST['alias'],
 				'deviceId' => $_POST['deviceId'],
 				'interface' => $_POST['interface']
 				);
 # modify
-if(!$Zones->modify_mapping($_POST['action'],$values)) 	{ $Result->show("danger",  _("Cannot add mapping"), true); }
-else 													{ $Result->show("success", _("Mapping modified successfully"), true);  }
+if (!$Zones->modify_mapping ($_POST['action'], $values)) { $Result->show ("danger", _ ("Cannot add mapping"), true); }
+else { $Result->show ("success", _ ("Mapping modified successfully"), true); }
 ?>
\ No newline at end of file