phpipam / phpipam

app/admin/subnets/truncate-save.php

Indentation +21 added lines, -21 removed lines

@@ -37,26 +37,26 @@
 
 # check for DNS PTR records
 if ($User->settings->enablePowerDNS=="1" && $subnet->DNSrecursive=="1") {
-	# powerDNS class
-	$PowerDNS = new PowerDNS ($Database);
-	if($PowerDNS->db_check()!==false) {
-		// set name
-		$zone = $PowerDNS->get_ptr_zone_name ($subnet->ip, $subnet->mask);
-		// fetch domain
-		$domain = $PowerDNS->fetch_domain_by_name ($zone);
-		// if it exist remove all PTR records
-		if ($domain!==false) {
-    		// get all PTRs
-    		$ptr_indexes = $Addresses->ptr_get_subnet_indexes ($subnet->id);
-			// remove existing records and links
-			$PowerDNS->remove_all_ptr_records ($domain->id, $ptr_indexes);
-			// ok
-			$Result->show("success", "PTR records removed", false);
-		}
-	}
-	# error
-	else {
-		$Result->show("danger", "Cannot connect to powerDNS database", false);
-	}
+    # powerDNS class
+    $PowerDNS = new PowerDNS ($Database);
+    if($PowerDNS->db_check()!==false) {
+        // set name
+        $zone = $PowerDNS->get_ptr_zone_name ($subnet->ip, $subnet->mask);
+        // fetch domain
+        $domain = $PowerDNS->fetch_domain_by_name ($zone);
+        // if it exist remove all PTR records
+        if ($domain!==false) {
+            // get all PTRs
+            $ptr_indexes = $Addresses->ptr_get_subnet_indexes ($subnet->id);
+            // remove existing records and links
+            $PowerDNS->remove_all_ptr_records ($domain->id, $ptr_indexes);
+            // ok
+            $Result->show("success", "PTR records removed", false);
+        }
+    }
+    # error
+    else {
+        $Result->show("danger", "Cannot connect to powerDNS database", false);
+    }
 }
 ?>
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -4,59 +4,59 @@
  * truncate subnet result
  *********************/
 /* 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, false);
 $Subnets	= new Subnets ($Database);
-$Addresses	= new Addresses ($Database);
+$Addresses = new Addresses ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "truncate", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "truncate", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 
 # id must be numeric
-if(!is_numeric($_POST['subnetId']))			{ $Result->show("danger", _("Invalid ID"), true); }
+if (!is_numeric ($_POST['subnetId'])) { $Result->show ("danger", _ ("Invalid ID"), true); }
 
 # get subnet details
 $subnet = $Subnets->fetch_subnet (null, $_POST['subnetId']);
 
 # verify that user has write permissions for subnet
 $subnetPerm = $Subnets->check_permission ($User->user, $subnet->id);
-if($subnetPerm < 3) 						{ $Result->show("danger", _('You do not have permissions to resize subnet').'!', true); }
+if ($subnetPerm < 3) { $Result->show ("danger", _ ('You do not have permissions to resize subnet').'!', true); }
 
 # truncate network
-if(!$Subnets->subnet_truncate($subnet->id))	{ $Result->show("danger",  _("Failed to truncate subnet"), false); }
-else										{ $Result->show("success", _("Subnet truncated succesfully")."!", false); }
+if (!$Subnets->subnet_truncate ($subnet->id)) { $Result->show ("danger", _ ("Failed to truncate subnet"), false); }
+else { $Result->show ("success", _ ("Subnet truncated succesfully")."!", false); }
 
 # check for DNS PTR records
-if ($User->settings->enablePowerDNS=="1" && $subnet->DNSrecursive=="1") {
+if ($User->settings->enablePowerDNS == "1" && $subnet->DNSrecursive == "1") {
 	# powerDNS class
 	$PowerDNS = new PowerDNS ($Database);
-	if($PowerDNS->db_check()!==false) {
+	if ($PowerDNS->db_check () !== false) {
 		// set name
 		$zone = $PowerDNS->get_ptr_zone_name ($subnet->ip, $subnet->mask);
 		// fetch domain
 		$domain = $PowerDNS->fetch_domain_by_name ($zone);
 		// if it exist remove all PTR records
-		if ($domain!==false) {
+		if ($domain !== false) {
     		// get all PTRs
     		$ptr_indexes = $Addresses->ptr_get_subnet_indexes ($subnet->id);
 			// remove existing records and links
 			$PowerDNS->remove_all_ptr_records ($domain->id, $ptr_indexes);
 			// ok
-			$Result->show("success", "PTR records removed", false);
+			$Result->show ("success", "PTR records removed", false);
 		}
 	}
 	# error
 	else {
-		$Result->show("danger", "Cannot connect to powerDNS database", false);
+		$Result->show ("danger", "Cannot connect to powerDNS database", false);
 	}
 }
 ?>
\ No newline at end of file

app/admin/subnets/ripe-query.php

Indentation +54 added lines, -54 removed lines

@@ -27,64 +27,64 @@
 <!-- content -->
 <div class="pContent">
 	<?php
-	// error ?
-	if ($res['result']=="error") {
-		$Result->show("danger", _(ucwords($res['error'])), false);
-	}
-	// ok, print field matching
-	else {
-		// fetch all fields for subnets
-		$standard_fields = array("description");
-		$custom_fields 	 = $Tools->fetch_custom_fields ("subnets");
+    // error ?
+    if ($res['result']=="error") {
+        $Result->show("danger", _(ucwords($res['error'])), false);
+    }
+    // ok, print field matching
+    else {
+        // fetch all fields for subnets
+        $standard_fields = array("description");
+        $custom_fields 	 = $Tools->fetch_custom_fields ("subnets");
 
-		// leave only varchar and text
-		foreach ($custom_fields as $k=>$f) {
-			if (!(strpos($f['type'], "varchar")!==false || $f['type']=="text")) {
-				unset($custom_fields[$k]);
-			}
-		}
-		// append description
-		$custom_fields = array_merge(array("description"=>array("name"=>"description")), $custom_fields);
+        // leave only varchar and text
+        foreach ($custom_fields as $k=>$f) {
+            if (!(strpos($f['type'], "varchar")!==false || $f['type']=="text")) {
+                unset($custom_fields[$k]);
+            }
+        }
+        // append description
+        $custom_fields = array_merge(array("description"=>array("name"=>"description")), $custom_fields);
 
-		print "<h4>"._("Please select fields to populate:")."</h4>";
-		// form
-		print "<form name='ripe-fields' id='ripe-fields'>";
-		print "<table class='table'>";
-		// loop
-		if (isset($res['data'])) {
-			foreach ($res['data'] as $k=>$d) {
-				print "<tr>";
-				print "<td>";
-				print "	<span class='text-muted'>$k</span>:  $d";
-				print "</td>";
+        print "<h4>"._("Please select fields to populate:")."</h4>";
+        // form
+        print "<form name='ripe-fields' id='ripe-fields'>";
+        print "<table class='table'>";
+        // loop
+        if (isset($res['data'])) {
+            foreach ($res['data'] as $k=>$d) {
+                print "<tr>";
+                print "<td>";
+                print "	<span class='text-muted'>$k</span>:  $d";
+                print "</td>";
 
-				print "<td>";
-				// add +
-				$d = str_replace(" ", "___", $d);
-				print "<select name='$d' class='form-control input-sm'>";
-				print "<option value='0'>None</option>";
-				// print custom
-				if (sizeof($custom_fields>0)) {
-					foreach ($custom_fields as $f) {
-						// replace descr with description
-						if ($k=="descr")	$k = "description";
+                print "<td>";
+                // add +
+                $d = str_replace(" ", "___", $d);
+                print "<select name='$d' class='form-control input-sm'>";
+                print "<option value='0'>None</option>";
+                // print custom
+                if (sizeof($custom_fields>0)) {
+                    foreach ($custom_fields as $f) {
+                        // replace descr with description
+                        if ($k=="descr")	$k = "description";
 
-						if (strtolower($f['name'])==strtolower($k))	{ print "<option values='$f[name]' selected='selected'>$f[name]</option>"; }
-						else										{ print "<option values='$f[name]'>$f[name]</option>"; }
-					}
-				}
-				print "</select>";
-				print "</td>";
-				print "</tr>";
-			}
-		}
-		else {
-			$Result->show("info", _("No result"), false);
-		}
-		print "</table>";
-		print "</form>";
-	}
-	?>
+                        if (strtolower($f['name'])==strtolower($k))	{ print "<option values='$f[name]' selected='selected'>$f[name]</option>"; }
+                        else										{ print "<option values='$f[name]'>$f[name]</option>"; }
+                    }
+                }
+                print "</select>";
+                print "</td>";
+                print "</tr>";
+            }
+        }
+        else {
+            $Result->show("info", _("No result"), false);
+        }
+        print "</table>";
+        print "</form>";
+    }
+    ?>
 	</pre>
 </div>
 

Braces +3 added lines, -1 removed lines

@@ -67,7 +67,9 @@
 				if (sizeof($custom_fields>0)) {
 					foreach ($custom_fields as $f) {
 						// replace descr with description
-						if ($k=="descr")	$k = "description";
+						if ($k=="descr") {
+						    $k = "description";
+						}
 
 						if (strtolower($f['name'])==strtolower($k))	{ print "<option values='$f[name]' selected='selected'>$f[name]</option>"; }
 						else										{ print "<option values='$f[name]'>$f[name]</option>"; }

Spacing +19 added lines, -19 removed lines

@@ -5,48 +5,48 @@ 
  ********************************************/
 
 /* functions */
-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);
 $Subnets	= new Subnets ($Database);
 $Tools		= new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # try to fetch
 $res = $Subnets->resolve_ripe_arin ($_POST['subnet']);
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _(ucwords($res['result'])); ?></div>
+<div class="pHeader"><?php print _ (ucwords ($res['result'])); ?></div>
 
 <!-- content -->
 <div class="pContent">
 	<?php
 	// error ?
-	if ($res['result']=="error") {
-		$Result->show("danger", _(ucwords($res['error'])), false);
+	if ($res['result'] == "error") {
+		$Result->show ("danger", _ (ucwords ($res['error'])), false);
 	}
 	// ok, print field matching
 	else {
 		// fetch all fields for subnets
-		$standard_fields = array("description");
+		$standard_fields = array ("description");
 		$custom_fields 	 = $Tools->fetch_custom_fields ("subnets");
 
 		// leave only varchar and text
 		foreach ($custom_fields as $k=>$f) {
-			if (!(strpos($f['type'], "varchar")!==false || $f['type']=="text")) {
+			if (!(strpos ($f['type'], "varchar") !== false || $f['type'] == "text")) {
 				unset($custom_fields[$k]);
 			}
 		}
 		// append description
-		$custom_fields = array_merge(array("description"=>array("name"=>"description")), $custom_fields);
+		$custom_fields = array_merge (array ("description"=>array ("name"=>"description")), $custom_fields);
 
-		print "<h4>"._("Please select fields to populate:")."</h4>";
+		print "<h4>"._ ("Please select fields to populate:")."</h4>";
 		// form
 		print "<form name='ripe-fields' id='ripe-fields'>";
 		print "<table class='table'>";
@@ -60,17 +60,17 @@ 
 
 				print "<td>";
 				// add +
-				$d = str_replace(" ", "___", $d);
+				$d = str_replace (" ", "___", $d);
 				print "<select name='$d' class='form-control input-sm'>";
 				print "<option value='0'>None</option>";
 				// print custom
-				if (sizeof($custom_fields>0)) {
+				if (sizeof ($custom_fields > 0)) {
 					foreach ($custom_fields as $f) {
 						// replace descr with description
-						if ($k=="descr")	$k = "description";
+						if ($k == "descr")	$k = "description";
 
-						if (strtolower($f['name'])==strtolower($k))	{ print "<option values='$f[name]' selected='selected'>$f[name]</option>"; }
-						else										{ print "<option values='$f[name]'>$f[name]</option>"; }
+						if (strtolower ($f['name']) == strtolower ($k)) { print "<option values='$f[name]' selected='selected'>$f[name]</option>"; }
+						else { print "<option values='$f[name]'>$f[name]</option>"; }
 					}
 				}
 				print "</select>";
@@ -79,7 +79,7 @@ 
 			}
 		}
 		else {
-			$Result->show("info", _("No result"), false);
+			$Result->show ("info", _ ("No result"), false);
 		}
 		print "</table>";
 		print "</form>";
@@ -92,9 +92,9 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopup2"><?php print _('Cancel'); ?></button>
-		<?php if($res['result']!="error") { ?>
-		<button class="btn btn-sm btn-default btn-success" id="ripeMatchSubmit"><i class="fa fa-check"></i> <?php print _('fill'); ?></button>
+		<button class="btn btn-sm btn-default hidePopup2"><?php print _ ('Cancel'); ?></button>
+		<?php if ($res['result'] != "error") { ?>
+		<button class="btn btn-sm btn-default btn-success" id="ripeMatchSubmit"><i class="fa fa-check"></i> <?php print _ ('fill'); ?></button>
 		<?php } ?>
 	</div>
 </div>
\ No newline at end of file

app/admin/subnets/edit.php

Indentation +239 added lines, -239 removed lines

@@ -26,11 +26,11 @@ 
 
 # verify that user has permissions to add subnet
 if($_POST['action'] == "add") {
-	if($Sections->check_permission ($User->user, $_POST['sectionId']) != 3) { $Result->show("danger", _('You do not have permissions to add new subnet in this section')."!", true, true); }
+    if($Sections->check_permission ($User->user, $_POST['sectionId']) != 3) { $Result->show("danger", _('You do not have permissions to add new subnet in this section')."!", true, true); }
 }
 # otherwise check subnet permission
 else {
-	if($Subnets->check_permission ($User->user, $_POST['subnetId']) != 3) 	{ $Result->show("danger", _('You do not have permissions to add edit/delete this subnet')."!", true, true); }
+    if($Subnets->check_permission ($User->user, $_POST['subnetId']) != 3) 	{ $Result->show("danger", _('You do not have permissions to add edit/delete this subnet')."!", true, true); }
 }
 
 
@@ -47,32 +47,32 @@ 
 # we are editing or deleting existing subnet, get old details
 if ($_POST['action'] != "add") {
     $subnet_old_details = (array) $Subnets->fetch_subnet(null, $_POST['subnetId']);
-	# false id
-	if (sizeof($subnet_old_details)==0) 	{ $Result->show("danger", _("Invalid subnetId"), true, true); }
+    # false id
+    if (sizeof($subnet_old_details)==0) 	{ $Result->show("danger", _("Invalid subnetId"), true, true); }
 }
 # we are adding new subnet
 else {
-	# for selecting master subnet if added from subnet details and slave inheritance!
-	if(strlen($_POST['subnetId']) > 0) {
-    	$subnet_old_temp = (array) $Subnets->fetch_subnet(null, $_POST['subnetId']);
-    	$subnet_old_details['masterSubnetId'] 	= @$subnet_old_temp['id'];                // same master subnet ID for nested
-    	// slave subnet inheritance
+    # for selecting master subnet if added from subnet details and slave inheritance!
+    if(strlen($_POST['subnetId']) > 0) {
+        $subnet_old_temp = (array) $Subnets->fetch_subnet(null, $_POST['subnetId']);
+        $subnet_old_details['masterSubnetId'] 	= @$subnet_old_temp['id'];                // same master subnet ID for nested
+        // slave subnet inheritance
         $subnet_old_details['vlanId'] 		 	= @$subnet_old_temp['vlanId'];            // inherit vlanId
-    	$subnet_old_details['vrfId'] 		 	= @$subnet_old_temp['vrfId'];             // inherit vrfId
-    	$subnet_old_details['allowRequests'] 	= @$subnet_old_temp['allowRequests'];     // inherit requests
-    	$subnet_old_details['showName'] 	    = @$subnet_old_temp['showName'];          // inherit show name
-    	$subnet_old_details['device'] 	        = @$subnet_old_temp['device'];            // inherit device
-    	$subnet_old_details['permissions'] 	    = @$subnet_old_temp['permissions'];       // inherit permissions
-    	$subnet_old_details['scanAgent'] 	    = @$subnet_old_temp['scanAgent'];         // inherit scanAgent
-    	$subnet_old_details['pingSubnet'] 	    = @$subnet_old_temp['pingSubnet'];        // inherit pingSubnet
-    	$subnet_old_details['discoverSubnet']   = @$subnet_old_temp['discoverSubnet'];    // inherit discovery
-    	$subnet_old_details['nameserverId']     = @$subnet_old_temp['nameserverId'];      // inherit nameserver
-
-	}
-	# set master if it came from free space!
-	if(isset($_POST['freespaceMSID'])) {
-		$subnet_old_details['masterSubnetId'] 	= $_POST['freespaceMSID'];		// dumb name, but it will do :)
-	}
+        $subnet_old_details['vrfId'] 		 	= @$subnet_old_temp['vrfId'];             // inherit vrfId
+        $subnet_old_details['allowRequests'] 	= @$subnet_old_temp['allowRequests'];     // inherit requests
+        $subnet_old_details['showName'] 	    = @$subnet_old_temp['showName'];          // inherit show name
+        $subnet_old_details['device'] 	        = @$subnet_old_temp['device'];            // inherit device
+        $subnet_old_details['permissions'] 	    = @$subnet_old_temp['permissions'];       // inherit permissions
+        $subnet_old_details['scanAgent'] 	    = @$subnet_old_temp['scanAgent'];         // inherit scanAgent
+        $subnet_old_details['pingSubnet'] 	    = @$subnet_old_temp['pingSubnet'];        // inherit pingSubnet
+        $subnet_old_details['discoverSubnet']   = @$subnet_old_temp['discoverSubnet'];    // inherit discovery
+        $subnet_old_details['nameserverId']     = @$subnet_old_temp['nameserverId'];      // inherit nameserver
+
+    }
+    # set master if it came from free space!
+    if(isset($_POST['freespaceMSID'])) {
+        $subnet_old_details['masterSubnetId'] 	= $_POST['freespaceMSID'];		// dumb name, but it will do :)
+    }
 }
 # fetch custom fields
 $custom_fields = $Tools->fetch_custom_fields('subnets');
@@ -86,7 +86,7 @@ 
 
 # for vlan result on the fly
 if(isset($_POST['vlanId'])) {
-	$subnet_old_details['vlanId'] = $_POST['vlanId'];
+    $subnet_old_details['vlanId'] = $_POST['vlanId'];
 }
 
 # set readonly flag
@@ -144,21 +144,21 @@ 
         <td>
         	<?php
             if ($_POST['subnetId'] && $_POST['action'] == "add"){ $showDropMenuFull = 1; }
-        	# set CIDR
-        	if (isset($subnet_old_temp['subnet'])&&$subnet_old_temp['isFolder']!="1")	{ $cidr = $Subnets->transform_to_dotted($subnet_old_temp['subnet']).'/'.($subnet_old_temp['mask']+1);} 		//for nested
-        	if (isset($subnet_old_temp['subnet']) && ($showDropMenuFull)) 				{ $dropdown_menu = $Subnets->subnet_dropdown_print_available($_POST['sectionId'], $_POST['subnetId']);  }
+            # set CIDR
+            if (isset($subnet_old_temp['subnet'])&&$subnet_old_temp['isFolder']!="1")	{ $cidr = $Subnets->transform_to_dotted($subnet_old_temp['subnet']).'/'.($subnet_old_temp['mask']+1);} 		//for nested
+            if (isset($subnet_old_temp['subnet']) && ($showDropMenuFull)) 				{ $dropdown_menu = $Subnets->subnet_dropdown_print_available($_POST['sectionId'], $_POST['subnetId']);  }
 
-        	if (@$_POST['location'] == "ipcalc") 	{ $cidr = strlen($_POST['bitmask'])>0 ? $_POST['subnet'].'/'.$_POST['bitmask'] : $_POST['subnet']; }  														//from ipcalc
+            if (@$_POST['location'] == "ipcalc") 	{ $cidr = strlen($_POST['bitmask'])>0 ? $_POST['subnet'].'/'.$_POST['bitmask'] : $_POST['subnet']; }  														//from ipcalc
             if ($_POST['action'] != "add") 			{ $cidr = $Subnets->transform_to_dotted($subnet_old_details['subnet']).'/'.$subnet_old_details['mask']; } 	//editing existing
 
-        	# reset CIDR if $showDropMenuFull
-        	if ($showDropMenuFull && strlen(@$dropdown_menu)>2) {
-	        	$cidr = explode("\n",$dropdown_menu);
-	        	$cidr = substr(strip_tags($cidr[1]), 2);
-	        	//validate
-	        	if ($Subnets->verify_cidr_address($cidr)===false) { unset($cidr); };
-	        }
-        	?>
+            # reset CIDR if $showDropMenuFull
+            if ($showDropMenuFull && strlen(@$dropdown_menu)>2) {
+                $cidr = explode("\n",$dropdown_menu);
+                $cidr = substr(strip_tags($cidr[1]), 2);
+                //validate
+                if ($Subnets->verify_cidr_address($cidr)===false) { unset($cidr); };
+            }
+            ?>
 
 
 			<?php  if (!$showDropMenuFull){ ?>
@@ -206,13 +206,13 @@ 
         <td>
         	<select name="sectionIdNew" class="form-control input-sm input-w-auto">
             	<?php
-            	if($sections!==false) {
-	            	foreach($sections as $section) {
-	            		/* selected? */
-	            		if($_POST['sectionId'] == $section->id)  { print '<option value="'. $section->id .'" selected>'. $section->name .'</option>'. "\n"; }
-	            		else 									 { print '<option value="'. $section->id .'">'. $section->name .'</option>'. "\n"; }
-	            	}
-            	}
+                if($sections!==false) {
+                    foreach($sections as $section) {
+                        /* selected? */
+                        if($_POST['sectionId'] == $section->id)  { print '<option value="'. $section->id .'" selected>'. $section->name .'</option>'. "\n"; }
+                        else 									 { print '<option value="'. $section->id .'">'. $section->name .'</option>'. "\n"; }
+                    }
+                }
             ?>
         	</select>
         </td>
@@ -236,21 +236,21 @@ 
 			<select name="device" class="form-control input-sm input-w-auto">
 				<option value="0"><?php print _('None'); ?></option>
 				<?php
-				// fetch all devices
-				$devices = $Admin->fetch_all_objects("devices");
-				// loop
-				if ($devices!==false) {
-					foreach($devices as $device) {
-						//check if permitted in this section!
-						$sections = explode(";", $device->sections);
-						if(in_array($_POST['sectionId'], $sections)) {
-							//if same
-							if($device->id == @$subnet_old_details['device']) 	{ print '<option value="'. $device->id .'" selected>'. $device->hostname .'</option>'. "\n"; }
-							else 												{ print '<option value="'. $device->id .'">'. $device->hostname .'</option>'. "\n";			 }
-						}
-					}
-				}
-				?>
+                // fetch all devices
+                $devices = $Admin->fetch_all_objects("devices");
+                // loop
+                if ($devices!==false) {
+                    foreach($devices as $device) {
+                        //check if permitted in this section!
+                        $sections = explode(";", $device->sections);
+                        if(in_array($_POST['sectionId'], $sections)) {
+                            //if same
+                            if($device->id == @$subnet_old_details['device']) 	{ print '<option value="'. $device->id .'" selected>'. $device->hostname .'</option>'. "\n"; }
+                            else 												{ print '<option value="'. $device->id .'">'. $device->hostname .'</option>'. "\n";			 }
+                        }
+                    }
+                }
+                ?>
 			</select>
 		</td>
 		<td class="info2"><?php print _('Select device where subnet is located'); ?></td>
@@ -270,9 +270,9 @@ 
         <td><?php print _('Master Subnet'); ?></td>
         <td>
 			<?php
-			if ($showDropMenuFull)	{ $Subnets->subnet_dropdown_master_only (@$subnet_old_details['masterSubnetId']); }
-			else 					{ $Subnets->print_mastersubnet_dropdown_menu ($_POST['sectionId'], @$subnet_old_details['masterSubnetId']);}
-			?>
+            if ($showDropMenuFull)	{ $Subnets->subnet_dropdown_master_only (@$subnet_old_details['masterSubnetId']); }
+            else 					{ $Subnets->print_mastersubnet_dropdown_menu ($_POST['sectionId'], @$subnet_old_details['masterSubnetId']);}
+            ?>
         </td>
         <td class="info2"><?php print _('Enter master subnet if you want to nest it under existing subnet, or select root to create root subnet'); ?>!</td>
     </tr>
@@ -280,14 +280,14 @@ 
     <?php
 
 
-	/* set default value */
-	if(empty($subnet_old_details['vrfId'])) 			{ $subnet_old_details['vrfId'] = "0"; }
-	/* set default value */
-	if(empty($subnet_old_details['allowRequests'])) 	{ $subnet_old_details['allowRequests'] = "0"; }
+    /* set default value */
+    if(empty($subnet_old_details['vrfId'])) 			{ $subnet_old_details['vrfId'] = "0"; }
+    /* set default value */
+    if(empty($subnet_old_details['allowRequests'])) 	{ $subnet_old_details['allowRequests'] = "0"; }
 
-	/* if vlan support is enabled print available vlans */
-	if($User->settings->enableVRF==1) {
-		print '<tr>' . "\n";
+    /* if vlan support is enabled print available vlans */
+    if($User->settings->enableVRF==1) {
+        print '<tr>' . "\n";
         print '	<td class="middle">'._('VRF').'</td>' . "\n";
         print '	<td>' . "\n";
         print '	<select name="vrfId" class="form-control input-sm input-w-auto">'. "\n";
@@ -297,33 +297,33 @@ 
         print '<option value="0">'._('None').'</option>';
 
         if($vrfs!=false) {
-	        foreach($vrfs as $vrf) {
-    	        // set permitted
-    	        $permitted_sections = explode(";", $vrf->sections);
-    	        // section must be in array
-    	        if (strlen($vrf->sections)==0 || in_array(@$_POST['sectionId'], $permitted_sections)) {
-    				//cast
-    				$vrf = (array) $vrf;
-    				// set description if present
-    				$vrf['description'] = strlen($vrf['description'])>0 ? " ($vrf[description])" : "";
-
-    	        	if ($vrf['vrfId'] == $subnet_old_details['vrfId']) 	{ print '<option value="'. $vrf['vrfId'] .'" selected>'.$vrf['name'].$vrf['description'].'</option>'; }
-    	        	else 												{ print '<option value="'. $vrf['vrfId'] .'">'.$vrf['name'].$vrf['description'].'</option>'; }
-    	        }
-	        }
+            foreach($vrfs as $vrf) {
+                // set permitted
+                $permitted_sections = explode(";", $vrf->sections);
+                // section must be in array
+                if (strlen($vrf->sections)==0 || in_array(@$_POST['sectionId'], $permitted_sections)) {
+                    //cast
+                    $vrf = (array) $vrf;
+                    // set description if present
+                    $vrf['description'] = strlen($vrf['description'])>0 ? " ($vrf[description])" : "";
+
+                    if ($vrf['vrfId'] == $subnet_old_details['vrfId']) 	{ print '<option value="'. $vrf['vrfId'] .'" selected>'.$vrf['name'].$vrf['description'].'</option>'; }
+                    else 												{ print '<option value="'. $vrf['vrfId'] .'">'.$vrf['name'].$vrf['description'].'</option>'; }
+                }
+            }
         }
 
         print ' </select>'. "\n";
         print '	</td>' . "\n";
         print '	<td class="info2">'._('Add this subnet to VRF').'</td>' . "\n";
-    	print '</tr>' . "\n";
+        print '</tr>' . "\n";
 
-	}
-	else {
-		print '<tr style="display:none"><td colspan="8"><input type="hidden" name="vrfId" value="'. $subnet_old_details['vrfId'] .'"></td></tr>'. "\n";
-	}
+    }
+    else {
+        print '<tr style="display:none"><td colspan="8"><input type="hidden" name="vrfId" value="'. $subnet_old_details['vrfId'] .'"></td></tr>'. "\n";
+    }
 
-	?>
+    ?>
 
 	<?php if($_POST['action']!="delete") { ?>
 	<!-- mark full -->
@@ -376,30 +376,30 @@ 
 
 	<!-- Scan agents -->
 	<?php
-	//fetch agents
-	$agents = $Tools->fetch_all_objects ("scanAgents");
-	// set hidden
-	if (@$subnet_old_details['pingSubnet']=="1" || @$subnet_old_details['discoverSubnet']=="1")	{ $hidden = ""; }
-	else																						{ $hidden = "hidden"; }
-	//print form
-	if ($agents!==false) {
-		print "<tr id='scanAgentDropdown' class='$hidden'>";
-		print "<td>"._('Select agent')."</td>";
-		print "<td>";
-		print "<select name='scanAgent' class='form-control input-sm'>";
-		foreach ($agents as $a) {
-			if ($a->id==@$subnet_old_details['scanAgent'])	{ print "<option value='".$a->id."' selected='selected'>".$a->name." (".$a->description.")</option>"; }
-			else											{ print "<option value='".$a->id."'>".$a->name." (".$a->description.")</option>"; }
-		}
-		print "</select>";
-		print "</td>";
-		print '	<td class="info2">'._('Select which scanagent to use').'</td>' . "\n";
-		print "</tr>";
-	}
-
-	//check host status
-	$checked = @$subnet_old_details['pingSubnet']==1 ? "checked": "";
-	print '<tr>' . "\n";
+    //fetch agents
+    $agents = $Tools->fetch_all_objects ("scanAgents");
+    // set hidden
+    if (@$subnet_old_details['pingSubnet']=="1" || @$subnet_old_details['discoverSubnet']=="1")	{ $hidden = ""; }
+    else																						{ $hidden = "hidden"; }
+    //print form
+    if ($agents!==false) {
+        print "<tr id='scanAgentDropdown' class='$hidden'>";
+        print "<td>"._('Select agent')."</td>";
+        print "<td>";
+        print "<select name='scanAgent' class='form-control input-sm'>";
+        foreach ($agents as $a) {
+            if ($a->id==@$subnet_old_details['scanAgent'])	{ print "<option value='".$a->id."' selected='selected'>".$a->name." (".$a->description.")</option>"; }
+            else											{ print "<option value='".$a->id."'>".$a->name." (".$a->description.")</option>"; }
+        }
+        print "</select>";
+        print "</td>";
+        print '	<td class="info2">'._('Select which scanagent to use').'</td>' . "\n";
+        print "</tr>";
+    }
+
+    //check host status
+    $checked = @$subnet_old_details['pingSubnet']==1 ? "checked": "";
+    print '<tr>' . "\n";
     print '	<td>'._('Check hosts status').'</td>' . "\n";
     print '	<td>' . "\n";
     print '		<input type="checkbox" name="pingSubnet" class="input-switch-agents-ping" value="1" '.$checked.'>'. "\n";
@@ -407,42 +407,42 @@ 
     print '	<td class="info2">'._('Ping hosts inside subnet to check availability').'</td>' . "\n";
     print '</tr>';
 
-	//Discover new hosts
-	$checked = @$subnet_old_details['discoverSubnet']==1 ? "checked": "";
-	print '<tr>' . "\n";
+    //Discover new hosts
+    $checked = @$subnet_old_details['discoverSubnet']==1 ? "checked": "";
+    print '<tr>' . "\n";
     print '	<td>'._('Discover new hosts').'</td>' . "\n";
     print '	<td>' . "\n";
     print '		<input type="checkbox" name="discoverSubnet" class="input-switch-agents-scan" value="1" '.$checked.'>'. "\n";
     print '	</td>' . "\n";
     print '	<td class="info2">'._('Discover new hosts in this subnet').'</td>' . "\n";
     print '</tr>';
-	?>
+    ?>
 
     <tr>
 	    <td colspan="3"><hr></td>
     </tr>
 
 	<?php
-	/* allow / deny IP requests if enabled in settings */
-	if($User->settings->enableIPrequests==1) {
-		//checked
-		$checked = @$subnet_old_details['allowRequests']==1 ? "checked" : "";
+    /* allow / deny IP requests if enabled in settings */
+    if($User->settings->enableIPrequests==1) {
+        //checked
+        $checked = @$subnet_old_details['allowRequests']==1 ? "checked" : "";
 
-		print '<tr>' . "\n";
+        print '<tr>' . "\n";
         print '	<td>'._('IP Requests').'</td>' . "\n";
         print '	<td>' . "\n";
         print '		<input type="checkbox" name="allowRequests" class="input-switch" value="1" '.$checked.'>'. "\n";
         print '	</td>' . "\n";
         print '	<td class="info2">'._('Allow or deny IP requests for this subnet').'</td>' . "\n";
-    	print '</tr>' . "\n";
+        print '</tr>' . "\n";
 
-	}
-	else {
-		print '<tr style="display:none"><td colspan="8"><input type="hidden" name="allowRequests" value="'. $subnet_old_details['allowRequests'] .'"></td></tr>'. "\n";
-	}
+    }
+    else {
+        print '<tr style="display:none"><td colspan="8"><input type="hidden" name="allowRequests" value="'. $subnet_old_details['allowRequests'] .'"></td></tr>'. "\n";
+    }
 
-		//show names instead of ip address
-		print '<tr>' . "\n";
+        //show names instead of ip address
+        print '<tr>' . "\n";
         print '	<td>'._('Show as name').'</td>' . "\n";
         print '	<td>' . "\n";
         print '		<input type="checkbox" name="showName" class="input-switch" value="1" ' . "\n";
@@ -465,12 +465,12 @@ 
         <?php
         print '	</td>' . "\n";
         print '	<td class="info2">'._('Show Subnet name instead of subnet IP address').'</td>' . "\n";
-    	print '</tr>' . "\n";
+        print '</tr>' . "\n";
 
-		//autocreate reverse records
-		if($User->settings->enablePowerDNS==1) {
-		$checked = @$subnet_old_details['DNSrecursive']==1 ? "checked": "";
-		print '<tr>' . "\n";
+        //autocreate reverse records
+        if($User->settings->enablePowerDNS==1) {
+        $checked = @$subnet_old_details['DNSrecursive']==1 ? "checked": "";
+        print '<tr>' . "\n";
         print '	<td>'._('Autocreate reverse records').'</td>' . "\n";
         print '	<td>' . "\n";
         print '		<input type="checkbox" name="DNSrecursive" class="input-switch" value="1" '.$checked.'>'. "\n";
@@ -478,9 +478,9 @@ 
         print '	<td class="info2">'._('Auto create reverse (PTR) records for this subnet').'</td>' . "\n";
         print '</tr>';
 
-		// show records
-		$checked = @$subnet_old_details['DNSrecords']==1 ? "checked": "";
-		print '<tr>' . "\n";
+        // show records
+        $checked = @$subnet_old_details['DNSrecords']==1 ? "checked": "";
+        print '<tr>' . "\n";
         print '	<td>'._('Show DNS records').'</td>' . "\n";
         print '	<td>' . "\n";
         print '		<input type="checkbox" name="DNSrecords" class="input-switch" value="1" '.$checked.'>'. "\n";
@@ -489,102 +489,102 @@ 
         print '</tr>';
         }
 
-    	//custom Subnet fields
-	    if(sizeof($custom_fields) > 0) {
-	    	# count datepickers
-			$timeP = 0;
-
-	    	print "<tr>";
-	    	print "	<td colspan='3' class='hr'><hr></td>";
-	    	print "</tr>";
-		    foreach($custom_fields as $field) {
-
-		    	# replace spaces
-		    	$field['nameNew'] = str_replace(" ", "___", $field['name']);
-		    	# retain newlines
-		    	$subnet_old_details[$field['name']] = str_replace("\n", "\\n", @$subnet_old_details[$field['name']]);
-
-				# set default value !
-				if ($_POST['action']=="add")	{ $subnet_old_details[$field['name']] = $field['Default']; }
-
-		    	# required
-		    	$required = $field['Null']=="NO" ? "*" : "";
-				print '<tr>'. "\n";
-				print '	<td>'. $field['name'] .' '.$required.'</td>'. "\n";
-				print '	<td colspan="2">'. "\n";
-
-				//set type
-				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']));
-					//null
-					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==$subnet_old_details[$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") {
-					// just for first
-					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">';
-						print '$(document).ready(function() {';
-						//date only
-						print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
-						//date + time
-						print '	$(".datetimepicker").datetimepicker( { pickDate: true, pickTime: true } );';
-
-						print '})';
-						print '</script>';
-					}
-					$timeP++;
-
-					//set size
-					if($field['type'] == "date")	{ $size = 10; $class='datepicker';		$format = "yyyy-MM-dd"; }
-					else							{ $size = 19; $class='datetimepicker';	$format = "yyyy-MM-dd"; }
-
-					//field
-					if(!isset($subnet_old_details[$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="'. $subnet_old_details[$field['name']]. '" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
-				}
-				//boolean
-				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");
-					//null
-					if($field['Null']!="NO") { $tmp[2] = ""; }
-
-					foreach($tmp as $k=>$v) {
-						if(strlen($subnet_old_details[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-						elseif($k==$subnet_old_details[$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 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. str_replace("\\n","",$subnet_old_details[$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="'. $subnet_old_details[$field['name']]. '" size="30" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
-				}
-
-				print '	</td>'. "\n";
-				print '</tr>'. "\n";
-		    }
-	    }
-
-	    # divider
-	    print "<tr>";
-	    print "	<td colspan='3' class='hr'><hr></td>";
-	    print "</tr>";
+        //custom Subnet fields
+        if(sizeof($custom_fields) > 0) {
+            # count datepickers
+            $timeP = 0;
+
+            print "<tr>";
+            print "	<td colspan='3' class='hr'><hr></td>";
+            print "</tr>";
+            foreach($custom_fields as $field) {
+
+                # replace spaces
+                $field['nameNew'] = str_replace(" ", "___", $field['name']);
+                # retain newlines
+                $subnet_old_details[$field['name']] = str_replace("\n", "\\n", @$subnet_old_details[$field['name']]);
+
+                # set default value !
+                if ($_POST['action']=="add")	{ $subnet_old_details[$field['name']] = $field['Default']; }
+
+                # required
+                $required = $field['Null']=="NO" ? "*" : "";
+                print '<tr>'. "\n";
+                print '	<td>'. $field['name'] .' '.$required.'</td>'. "\n";
+                print '	<td colspan="2">'. "\n";
+
+                //set type
+                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']));
+                    //null
+                    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==$subnet_old_details[$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") {
+                    // just for first
+                    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">';
+                        print '$(document).ready(function() {';
+                        //date only
+                        print '	$(".datepicker").datetimepicker( {pickDate: true, pickTime: false, pickSeconds: false });';
+                        //date + time
+                        print '	$(".datetimepicker").datetimepicker( { pickDate: true, pickTime: true } );';
+
+                        print '})';
+                        print '</script>';
+                    }
+                    $timeP++;
+
+                    //set size
+                    if($field['type'] == "date")	{ $size = 10; $class='datepicker';		$format = "yyyy-MM-dd"; }
+                    else							{ $size = 19; $class='datetimepicker';	$format = "yyyy-MM-dd"; }
+
+                    //field
+                    if(!isset($subnet_old_details[$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="'. $subnet_old_details[$field['name']]. '" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+                }
+                //boolean
+                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");
+                    //null
+                    if($field['Null']!="NO") { $tmp[2] = ""; }
+
+                    foreach($tmp as $k=>$v) {
+                        if(strlen($subnet_old_details[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
+                        elseif($k==$subnet_old_details[$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 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. str_replace("\\n","",$subnet_old_details[$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="'. $subnet_old_details[$field['name']]. '" size="30" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
+                }
+
+                print '	</td>'. "\n";
+                print '</tr>'. "\n";
+            }
+        }
+
+        # divider
+        print "<tr>";
+        print "	<td colspan='3' class='hr'><hr></td>";
+        print "</tr>";
     ?>
 
     <!-- set parameters to slave subnets -->
@@ -607,7 +607,7 @@ 
     <?php
     # warning if delete
     if($_POST['action'] == "delete" || (@$_POST['location'] == "IPaddresses" && $_POST['action'] != "add"  )) {
-	    print "<div class='alert alert-warning' style='margin-top:0px;'><strong>"._('Warning')."</strong><br>"._('Removing subnets will delete ALL underlaying subnets and belonging IP addresses')."!</div>";
+        print "<div class='alert alert-warning' style='margin-top:0px;'><strong>"._('Warning')."</strong><br>"._('Removing subnets will delete ALL underlaying subnets and belonging IP addresses')."!</div>";
     }
     ?>
 
@@ -620,11 +620,11 @@ 
 	<div class="btn-group">
 		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
 		<?php
-		//if action == edit and location = IPaddresses print also delete form
-		if($_POST['action'] == "edit" && @$_POST['location'] == "IPaddresses") {
-			print "<button class='btn btn-sm btn-default btn-danger editSubnetSubmitDelete editSubnetSubmit'><i class='icon-white icon-trash'></i> "._('Delete subnet')."</button>";
-		}
-		?>
+        //if action == edit and location = IPaddresses print also delete form
+        if($_POST['action'] == "edit" && @$_POST['location'] == "IPaddresses") {
+            print "<button class='btn btn-sm btn-default btn-danger editSubnetSubmitDelete editSubnetSubmit'><i class='icon-white icon-trash'></i> "._('Delete subnet')."</button>";
+        }
+        ?>
 		<button type="submit" class="btn btn-sm btn-default editSubnetSubmit <?php if($_POST['action']=="delete") print "btn-danger"; else print "btn-success"; ?>"><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>
 

Braces +22 added lines, -6 removed lines

@@ -77,8 +77,9 @@ 
 # fetch custom fields
 $custom_fields = $Tools->fetch_custom_fields('subnets');
 # fetch vrfs
-if($User->settings->enableVRF==1)
-$vrfs  = $Tools->fetch_all_objects("vrf", "name");
+if($User->settings->enableVRF==1) {
+    $vrfs  = $Tools->fetch_all_objects("vrf", "name");
+}
 # check if it has slaves - if yes it cannot be splitted!
 $slaves = $Subnets->has_slaves($_POST['subnetId']);
 # fetch all sections
@@ -162,8 +163,12 @@ 
 
 
 			<?php  if (!$showDropMenuFull){ ?>
-                <input type="text" class="form-control input-sm input-w-200" name="subnet" placeholder="<?php print _('subnet in CIDR'); ?>"  value="<?php print @$cidr; ?>" <?php if ($readonly) print "readonly"; ?>>
-            <?php } else { ?>
+                <input type="text" class="form-control input-sm input-w-200" name="subnet" placeholder="<?php print _('subnet in CIDR'); ?>"  value="<?php print @$cidr; ?>" <?php if ($readonly) {
+    print "readonly";
+}
+?>>
+            <?php }
+else { ?>
 			<div class="input-group input-w-200">
 				<input type="text" class="form-control input-sm input-w-200" name="subnet" placeholder="<?php print _('subnet in CIDR'); ?>" value="<?php print @$cidr; ?>">
 				<?php if (strlen($dropdown_menu)>0) { ?>
@@ -362,7 +367,10 @@ 
         <td>
 	    <div class="btn-group">
         	<button class="btn btn-xs btn-default"										  id="resize" 	rel="tooltip" data-container='body' title="<?php print _('Resize subnet'); ?>"   data-subnetId="<?php print $_POST['subnetId']; ?>"><i class="fa fa-gray fa-arrows-v"></i></button>
-        	<button class="btn btn-xs btn-default <?php if($slaves) print "disabled"; ?>" id="split"    rel="tooltip" data-container='body' title="<?php print _('Split subnet'); ?>"    data-subnetId="<?php print $_POST['subnetId']; ?>"><i class="fa fa-gray fa-expand"></i></button>
+        	<button class="btn btn-xs btn-default <?php if($slaves) {
+    print "disabled";
+}
+?>" id="split"    rel="tooltip" data-container='body' title="<?php print _('Split subnet'); ?>"    data-subnetId="<?php print $_POST['subnetId']; ?>"><i class="fa fa-gray fa-expand"></i></button>
         	<button class="btn btn-xs btn-default"										  id="truncate" rel="tooltip" data-container='body' title="<?php print _('Truncate subnet'); ?>" data-subnetId="<?php print $_POST['subnetId']; ?>"><i class="fa fa-gray fa-trash-o"></i></button>
 	    </div>
         </td>
@@ -625,7 +633,15 @@ 
 			print "<button class='btn btn-sm btn-default btn-danger editSubnetSubmitDelete editSubnetSubmit'><i class='icon-white icon-trash'></i> "._('Delete subnet')."</button>";
 		}
 		?>
-		<button type="submit" class="btn btn-sm btn-default editSubnetSubmit <?php if($_POST['action']=="delete") print "btn-danger"; else print "btn-success"; ?>"><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 type="submit" class="btn btn-sm btn-default editSubnetSubmit <?php if($_POST['action']=="delete") {
+    print "btn-danger";
+}
+else {
+    print "btn-success";
+}
+?>"><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>
 
 	<div class="manageSubnetEditResult"></div>

Spacing +218 added lines, -218 removed lines

@@ -6,31 +6,31 @@ 
 
 
 /* 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, false);
-$Sections	= new Sections ($Database);
+$Sections = new Sections ($Database);
 $Subnets	= new Subnets ($Database);
-$Tools		= new Tools ($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", "subnet");
 
 
 # verify that user has permissions to add subnet
-if($_POST['action'] == "add") {
-	if($Sections->check_permission ($User->user, $_POST['sectionId']) != 3) { $Result->show("danger", _('You do not have permissions to add new subnet in this section')."!", true, true); }
+if ($_POST['action'] == "add") {
+	if ($Sections->check_permission ($User->user, $_POST['sectionId']) != 3) { $Result->show ("danger", _ ('You do not have permissions to add new subnet in this section')."!", true, true); }
 }
 # otherwise check subnet permission
 else {
-	if($Subnets->check_permission ($User->user, $_POST['subnetId']) != 3) 	{ $Result->show("danger", _('You do not have permissions to add edit/delete this subnet')."!", true, true); }
+	if ($Subnets->check_permission ($User->user, $_POST['subnetId']) != 3) { $Result->show ("danger", _ ('You do not have permissions to add edit/delete this subnet')."!", true, true); }
 }
 
 
@@ -46,51 +46,51 @@ 
 
 # we are editing or deleting existing subnet, get old details
 if ($_POST['action'] != "add") {
-    $subnet_old_details = (array) $Subnets->fetch_subnet(null, $_POST['subnetId']);
+    $subnet_old_details = (array) $Subnets->fetch_subnet (null, $_POST['subnetId']);
 	# false id
-	if (sizeof($subnet_old_details)==0) 	{ $Result->show("danger", _("Invalid subnetId"), true, true); }
+	if (sizeof ($subnet_old_details) == 0) { $Result->show ("danger", _ ("Invalid subnetId"), true, true); }
 }
 # we are adding new subnet
 else {
 	# for selecting master subnet if added from subnet details and slave inheritance!
-	if(strlen($_POST['subnetId']) > 0) {
-    	$subnet_old_temp = (array) $Subnets->fetch_subnet(null, $_POST['subnetId']);
-    	$subnet_old_details['masterSubnetId'] 	= @$subnet_old_temp['id'];                // same master subnet ID for nested
+	if (strlen ($_POST['subnetId']) > 0) {
+    	$subnet_old_temp = (array) $Subnets->fetch_subnet (null, $_POST['subnetId']);
+    	$subnet_old_details['masterSubnetId'] = @$subnet_old_temp['id']; // same master subnet ID for nested
     	// slave subnet inheritance
-        $subnet_old_details['vlanId'] 		 	= @$subnet_old_temp['vlanId'];            // inherit vlanId
-    	$subnet_old_details['vrfId'] 		 	= @$subnet_old_temp['vrfId'];             // inherit vrfId
-    	$subnet_old_details['allowRequests'] 	= @$subnet_old_temp['allowRequests'];     // inherit requests
-    	$subnet_old_details['showName'] 	    = @$subnet_old_temp['showName'];          // inherit show name
-    	$subnet_old_details['device'] 	        = @$subnet_old_temp['device'];            // inherit device
-    	$subnet_old_details['permissions'] 	    = @$subnet_old_temp['permissions'];       // inherit permissions
-    	$subnet_old_details['scanAgent'] 	    = @$subnet_old_temp['scanAgent'];         // inherit scanAgent
-    	$subnet_old_details['pingSubnet'] 	    = @$subnet_old_temp['pingSubnet'];        // inherit pingSubnet
-    	$subnet_old_details['discoverSubnet']   = @$subnet_old_temp['discoverSubnet'];    // inherit discovery
-    	$subnet_old_details['nameserverId']     = @$subnet_old_temp['nameserverId'];      // inherit nameserver
+        $subnet_old_details['vlanId'] 		 	= @$subnet_old_temp['vlanId']; // inherit vlanId
+    	$subnet_old_details['vrfId'] = @$subnet_old_temp['vrfId']; // inherit vrfId
+    	$subnet_old_details['allowRequests'] = @$subnet_old_temp['allowRequests']; // inherit requests
+    	$subnet_old_details['showName'] 	    = @$subnet_old_temp['showName']; // inherit show name
+    	$subnet_old_details['device'] 	        = @$subnet_old_temp['device']; // inherit device
+    	$subnet_old_details['permissions'] 	    = @$subnet_old_temp['permissions']; // inherit permissions
+    	$subnet_old_details['scanAgent'] = @$subnet_old_temp['scanAgent']; // inherit scanAgent
+    	$subnet_old_details['pingSubnet'] 	    = @$subnet_old_temp['pingSubnet']; // inherit pingSubnet
+    	$subnet_old_details['discoverSubnet']   = @$subnet_old_temp['discoverSubnet']; // inherit discovery
+    	$subnet_old_details['nameserverId']     = @$subnet_old_temp['nameserverId']; // inherit nameserver
 
 	}
 	# set master if it came from free space!
-	if(isset($_POST['freespaceMSID'])) {
-		$subnet_old_details['masterSubnetId'] 	= $_POST['freespaceMSID'];		// dumb name, but it will do :)
+	if (isset($_POST['freespaceMSID'])) {
+		$subnet_old_details['masterSubnetId'] = $_POST['freespaceMSID']; // dumb name, but it will do :)
 	}
 }
 # fetch custom fields
-$custom_fields = $Tools->fetch_custom_fields('subnets');
+$custom_fields = $Tools->fetch_custom_fields ('subnets');
 # fetch vrfs
-if($User->settings->enableVRF==1)
-$vrfs  = $Tools->fetch_all_objects("vrf", "name");
+if ($User->settings->enableVRF == 1)
+$vrfs = $Tools->fetch_all_objects ("vrf", "name");
 # check if it has slaves - if yes it cannot be splitted!
-$slaves = $Subnets->has_slaves($_POST['subnetId']);
+$slaves = $Subnets->has_slaves ($_POST['subnetId']);
 # fetch all sections
-$sections = $Sections->fetch_all_sections();
+$sections = $Sections->fetch_all_sections ();
 
 # for vlan result on the fly
-if(isset($_POST['vlanId'])) {
+if (isset($_POST['vlanId'])) {
 	$subnet_old_details['vlanId'] = $_POST['vlanId'];
 }
 
 # set readonly flag
-$readonly = $_POST['action']=="edit" || $_POST['action']=="delete" ? true : false;
+$readonly = $_POST['action'] == "edit" || $_POST['action'] == "delete" ? true : false;
 ?>
 
 <script type="text/javascript">
@@ -118,7 +118,7 @@ 
 	if 		(ping==true || scan==true)		{ $("tr#scanAgentDropdown").removeClass("hidden"); }
 	else if (ping==false && scan==false)	{ $("tr#scanAgentDropdown").addClass("hidden"); }
 });
-<?php if ($User->settings->enableThreshold=="1") { ?>
+<?php if ($User->settings->enableThreshold == "1") { ?>
 $('.slider').slider().on('slide', function(ev){
     $('.slider-text span').html(ev.value);
 });
@@ -130,7 +130,7 @@ 
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('subnet'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('subnet'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -140,33 +140,33 @@ 
 
     <!-- name -->
     <tr>
-        <td class="middle"><?php print _('Subnet'); ?></td>
+        <td class="middle"><?php print _ ('Subnet'); ?></td>
         <td>
         	<?php
-            if ($_POST['subnetId'] && $_POST['action'] == "add"){ $showDropMenuFull = 1; }
+            if ($_POST['subnetId'] && $_POST['action'] == "add") { $showDropMenuFull = 1; }
         	# set CIDR
-        	if (isset($subnet_old_temp['subnet'])&&$subnet_old_temp['isFolder']!="1")	{ $cidr = $Subnets->transform_to_dotted($subnet_old_temp['subnet']).'/'.($subnet_old_temp['mask']+1);} 		//for nested
-        	if (isset($subnet_old_temp['subnet']) && ($showDropMenuFull)) 				{ $dropdown_menu = $Subnets->subnet_dropdown_print_available($_POST['sectionId'], $_POST['subnetId']);  }
+        	if (isset($subnet_old_temp['subnet']) && $subnet_old_temp['isFolder'] != "1") { $cidr = $Subnets->transform_to_dotted ($subnet_old_temp['subnet']).'/'.($subnet_old_temp['mask'] + 1); } 		//for nested
+        	if (isset($subnet_old_temp['subnet']) && ($showDropMenuFull)) { $dropdown_menu = $Subnets->subnet_dropdown_print_available ($_POST['sectionId'], $_POST['subnetId']); }
 
-        	if (@$_POST['location'] == "ipcalc") 	{ $cidr = strlen($_POST['bitmask'])>0 ? $_POST['subnet'].'/'.$_POST['bitmask'] : $_POST['subnet']; }  														//from ipcalc
-            if ($_POST['action'] != "add") 			{ $cidr = $Subnets->transform_to_dotted($subnet_old_details['subnet']).'/'.$subnet_old_details['mask']; } 	//editing existing
+        	if (@$_POST['location'] == "ipcalc") { $cidr = strlen ($_POST['bitmask']) > 0 ? $_POST['subnet'].'/'.$_POST['bitmask'] : $_POST['subnet']; }  														//from ipcalc
+            if ($_POST['action'] != "add") { $cidr = $Subnets->transform_to_dotted ($subnet_old_details['subnet']).'/'.$subnet_old_details['mask']; } 	//editing existing
 
         	# reset CIDR if $showDropMenuFull
-        	if ($showDropMenuFull && strlen(@$dropdown_menu)>2) {
-	        	$cidr = explode("\n",$dropdown_menu);
-	        	$cidr = substr(strip_tags($cidr[1]), 2);
+        	if ($showDropMenuFull && strlen (@$dropdown_menu) > 2) {
+	        	$cidr = explode ("\n", $dropdown_menu);
+	        	$cidr = substr (strip_tags ($cidr[1]), 2);
 	        	//validate
-	        	if ($Subnets->verify_cidr_address($cidr)===false) { unset($cidr); };
+	        	if ($Subnets->verify_cidr_address ($cidr) === false) { unset($cidr); };
 	        }
         	?>
 
 
-			<?php  if (!$showDropMenuFull){ ?>
-                <input type="text" class="form-control input-sm input-w-200" name="subnet" placeholder="<?php print _('subnet in CIDR'); ?>"  value="<?php print @$cidr; ?>" <?php if ($readonly) print "readonly"; ?>>
+			<?php  if (!$showDropMenuFull) { ?>
+                <input type="text" class="form-control input-sm input-w-200" name="subnet" placeholder="<?php print _ ('subnet in CIDR'); ?>"  value="<?php print @$cidr; ?>" <?php if ($readonly) print "readonly"; ?>>
             <?php } else { ?>
 			<div class="input-group input-w-200">
-				<input type="text" class="form-control input-sm input-w-200" name="subnet" placeholder="<?php print _('subnet in CIDR'); ?>" value="<?php print @$cidr; ?>">
-				<?php if (strlen($dropdown_menu)>0) { ?>
+				<input type="text" class="form-control input-sm input-w-200" name="subnet" placeholder="<?php print _ ('subnet in CIDR'); ?>" value="<?php print @$cidr; ?>">
+				<?php if (strlen ($dropdown_menu) > 0) { ?>
 				<div class="input-group-btn">
 					<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Select <span class="caret"></span></button>
 					<ul class="dropdown-menu dropdown-menu-right dropdown-subnets">
@@ -180,193 +180,193 @@ 
         </td>
         <td class="info2">
             <div class="btn-group">
-            	<button type="button" class="btn btn-xs btn-default show-masks" rel='tooltip' data-placement="bottom" title='<?php print _('Subnet masks'); ?>' data-closeClass="hidePopup2"><i class="fa fa-th-large"></i></button>
-            	<?php if($User->settings->enableSNMP == "1" && $_POST['action']=="add") { ?>
-            	<button type="button" class="btn btn-xs btn-default"  id='snmp-routing' rel='tooltip' data-placement="bottom" title='<?php print _('Search for subnets through SNMP'); ?>'><i class="fa fa-cogs"></i></button>
+            	<button type="button" class="btn btn-xs btn-default show-masks" rel='tooltip' data-placement="bottom" title='<?php print _ ('Subnet masks'); ?>' data-closeClass="hidePopup2"><i class="fa fa-th-large"></i></button>
+            	<?php if ($User->settings->enableSNMP == "1" && $_POST['action'] == "add") { ?>
+            	<button type="button" class="btn btn-xs btn-default"  id='snmp-routing' rel='tooltip' data-placement="bottom" title='<?php print _ ('Search for subnets through SNMP'); ?>'><i class="fa fa-cogs"></i></button>
             	<?php } ?>
-            	<button type="button" class="btn btn-xs btn-default"  id='get-ripe' rel='tooltip' data-placement="bottom" title='<?php print _('Get information from RIPE / ARIN database'); ?>'><i class="fa fa-refresh"></i></button>
+            	<button type="button" class="btn btn-xs btn-default"  id='get-ripe' rel='tooltip' data-placement="bottom" title='<?php print _ ('Get information from RIPE / ARIN database'); ?>'><i class="fa fa-refresh"></i></button>
             </div>
-        	<?php print _('Enter subnet in CIDR format'); ?>
+        	<?php print _ ('Enter subnet in CIDR format'); ?>
         </td>
     </tr>
 
     <!-- description -->
     <tr>
-        <td class="middle"><?php print _('Description'); ?></td>
+        <td class="middle"><?php print _ ('Description'); ?></td>
         <td>
-            <input type="text" class="form-control input-sm input-w-200" id="field-description" name="description"  placeholder="<?php print _('subnet description'); ?>" value="<?php print @$subnet_old_details['description']; ?>">
+            <input type="text" class="form-control input-sm input-w-200" id="field-description" name="description"  placeholder="<?php print _ ('subnet description'); ?>" value="<?php print @$subnet_old_details['description']; ?>">
         </td>
-        <td class="info2"><?php print _('Enter subnet description'); ?></td>
+        <td class="info2"><?php print _ ('Enter subnet description'); ?></td>
     </tr>
 
-    <?php if($_POST['action'] != "add") { ?>
+    <?php if ($_POST['action'] != "add") { ?>
     <!-- move to different section -->
     <tr>
-        <td class="middle"><?php print _('Section'); ?></td>
+        <td class="middle"><?php print _ ('Section'); ?></td>
         <td>
         	<select name="sectionIdNew" class="form-control input-sm input-w-auto">
             	<?php
-            	if($sections!==false) {
-	            	foreach($sections as $section) {
+            	if ($sections !== false) {
+	            	foreach ($sections as $section) {
 	            		/* selected? */
-	            		if($_POST['sectionId'] == $section->id)  { print '<option value="'. $section->id .'" selected>'. $section->name .'</option>'. "\n"; }
-	            		else 									 { print '<option value="'. $section->id .'">'. $section->name .'</option>'. "\n"; }
+	            		if ($_POST['sectionId'] == $section->id) { print '<option value="'.$section->id.'" selected>'.$section->name.'</option>'."\n"; }
+	            		else { print '<option value="'.$section->id.'">'.$section->name.'</option>'."\n"; }
 	            	}
             	}
             ?>
         	</select>
         </td>
-        <td class="info2"><?php print _('Move to different section'); ?></td>
+        <td class="info2"><?php print _ ('Move to different section'); ?></td>
     </tr>
     <?php } ?>
 
     <!-- vlan -->
     <tr>
-        <td class="middle"><?php print _('VLAN'); ?></td>
+        <td class="middle"><?php print _ ('VLAN'); ?></td>
         <td id="vlanDropdown">
 			<?php include('edit-vlan-dropdown.php'); ?>
          </td>
-        <td class="info2"><?php print _('Select VLAN'); ?></td>
+        <td class="info2"><?php print _ ('Select VLAN'); ?></td>
     </tr>
 
 	<!-- Device -->
 	<tr>
-		<td class="middle"><?php print _('Device'); ?></td>
+		<td class="middle"><?php print _ ('Device'); ?></td>
 		<td id="deviceDropdown">
 			<select name="device" class="form-control input-sm input-w-auto">
-				<option value="0"><?php print _('None'); ?></option>
+				<option value="0"><?php print _ ('None'); ?></option>
 				<?php
 				// fetch all devices
-				$devices = $Admin->fetch_all_objects("devices");
+				$devices = $Admin->fetch_all_objects ("devices");
 				// loop
-				if ($devices!==false) {
-					foreach($devices as $device) {
+				if ($devices !== false) {
+					foreach ($devices as $device) {
 						//check if permitted in this section!
-						$sections = explode(";", $device->sections);
-						if(in_array($_POST['sectionId'], $sections)) {
+						$sections = explode (";", $device->sections);
+						if (in_array ($_POST['sectionId'], $sections)) {
 							//if same
-							if($device->id == @$subnet_old_details['device']) 	{ print '<option value="'. $device->id .'" selected>'. $device->hostname .'</option>'. "\n"; }
-							else 												{ print '<option value="'. $device->id .'">'. $device->hostname .'</option>'. "\n";			 }
+							if ($device->id == @$subnet_old_details['device']) { print '<option value="'.$device->id.'" selected>'.$device->hostname.'</option>'."\n"; }
+							else { print '<option value="'.$device->id.'">'.$device->hostname.'</option>'."\n"; }
 						}
 					}
 				}
 				?>
 			</select>
 		</td>
-		<td class="info2"><?php print _('Select device where subnet is located'); ?></td>
+		<td class="info2"><?php print _ ('Select device where subnet is located'); ?></td>
     </tr>
 
 	<!-- Nameservers -->
 	<tr>
-		<td class="middle"><?php print _('Nameservers'); ?></td>
+		<td class="middle"><?php print _ ('Nameservers'); ?></td>
 		<td id="nameserverDropdown">
 			<?php include('edit-nameserver-dropdown.php'); ?>
 		</td>
-		<td class="info2"><?php print _('Select nameserver set'); ?></td>
+		<td class="info2"><?php print _ ('Select nameserver set'); ?></td>
     </tr>
 
     <!-- Master subnet -->
     <tr>
-        <td><?php print _('Master Subnet'); ?></td>
+        <td><?php print _ ('Master Subnet'); ?></td>
         <td>
 			<?php
-			if ($showDropMenuFull)	{ $Subnets->subnet_dropdown_master_only (@$subnet_old_details['masterSubnetId']); }
-			else 					{ $Subnets->print_mastersubnet_dropdown_menu ($_POST['sectionId'], @$subnet_old_details['masterSubnetId']);}
+			if ($showDropMenuFull) { $Subnets->subnet_dropdown_master_only (@$subnet_old_details['masterSubnetId']); }
+			else { $Subnets->print_mastersubnet_dropdown_menu ($_POST['sectionId'], @$subnet_old_details['masterSubnetId']); }
 			?>
         </td>
-        <td class="info2"><?php print _('Enter master subnet if you want to nest it under existing subnet, or select root to create root subnet'); ?>!</td>
+        <td class="info2"><?php print _ ('Enter master subnet if you want to nest it under existing subnet, or select root to create root subnet'); ?>!</td>
     </tr>
 
     <?php
 
 
 	/* set default value */
-	if(empty($subnet_old_details['vrfId'])) 			{ $subnet_old_details['vrfId'] = "0"; }
+	if (empty($subnet_old_details['vrfId'])) { $subnet_old_details['vrfId'] = "0"; }
 	/* set default value */
-	if(empty($subnet_old_details['allowRequests'])) 	{ $subnet_old_details['allowRequests'] = "0"; }
+	if (empty($subnet_old_details['allowRequests'])) { $subnet_old_details['allowRequests'] = "0"; }
 
 	/* if vlan support is enabled print available vlans */
-	if($User->settings->enableVRF==1) {
-		print '<tr>' . "\n";
-        print '	<td class="middle">'._('VRF').'</td>' . "\n";
-        print '	<td>' . "\n";
-        print '	<select name="vrfId" class="form-control input-sm input-w-auto">'. "\n";
+	if ($User->settings->enableVRF == 1) {
+		print '<tr>'."\n";
+        print '	<td class="middle">'._ ('VRF').'</td>'."\n";
+        print '	<td>'."\n";
+        print '	<select name="vrfId" class="form-control input-sm input-w-auto">'."\n";
 
         //blank
-        print '<option disabled="disabled">'._('Select VRF').'</option>';
-        print '<option value="0">'._('None').'</option>';
+        print '<option disabled="disabled">'._ ('Select VRF').'</option>';
+        print '<option value="0">'._ ('None').'</option>';
 
-        if($vrfs!=false) {
-	        foreach($vrfs as $vrf) {
+        if ($vrfs != false) {
+	        foreach ($vrfs as $vrf) {
     	        // set permitted
-    	        $permitted_sections = explode(";", $vrf->sections);
+    	        $permitted_sections = explode (";", $vrf->sections);
     	        // section must be in array
-    	        if (strlen($vrf->sections)==0 || in_array(@$_POST['sectionId'], $permitted_sections)) {
+    	        if (strlen ($vrf->sections) == 0 || in_array (@$_POST['sectionId'], $permitted_sections)) {
     				//cast
     				$vrf = (array) $vrf;
     				// set description if present
-    				$vrf['description'] = strlen($vrf['description'])>0 ? " ($vrf[description])" : "";
+    				$vrf['description'] = strlen ($vrf['description']) > 0 ? " ($vrf[description])" : "";
 
-    	        	if ($vrf['vrfId'] == $subnet_old_details['vrfId']) 	{ print '<option value="'. $vrf['vrfId'] .'" selected>'.$vrf['name'].$vrf['description'].'</option>'; }
-    	        	else 												{ print '<option value="'. $vrf['vrfId'] .'">'.$vrf['name'].$vrf['description'].'</option>'; }
+    	        	if ($vrf['vrfId'] == $subnet_old_details['vrfId']) { print '<option value="'.$vrf['vrfId'].'" selected>'.$vrf['name'].$vrf['description'].'</option>'; }
+    	        	else { print '<option value="'.$vrf['vrfId'].'">'.$vrf['name'].$vrf['description'].'</option>'; }
     	        }
 	        }
         }
 
-        print ' </select>'. "\n";
-        print '	</td>' . "\n";
-        print '	<td class="info2">'._('Add this subnet to VRF').'</td>' . "\n";
-    	print '</tr>' . "\n";
+        print ' </select>'."\n";
+        print '	</td>'."\n";
+        print '	<td class="info2">'._ ('Add this subnet to VRF').'</td>'."\n";
+    	print '</tr>'."\n";
 
 	}
 	else {
-		print '<tr style="display:none"><td colspan="8"><input type="hidden" name="vrfId" value="'. $subnet_old_details['vrfId'] .'"></td></tr>'. "\n";
+		print '<tr style="display:none"><td colspan="8"><input type="hidden" name="vrfId" value="'.$subnet_old_details['vrfId'].'"></td></tr>'."\n";
 	}
 
 	?>
 
-	<?php if($_POST['action']!="delete") { ?>
+	<?php if ($_POST['action'] != "delete") { ?>
 	<!-- mark full -->
     <tr>
 	    <td colspan="3"><hr></td>
     </tr>
 	<tr>
-        <td class="middle"><?php print _('Mark as full'); ?></td>
+        <td class="middle"><?php print _ ('Mark as full'); ?></td>
         <td>
-            <?php $checked = @$subnet_old_details['isFull']==1 ? "checked": ""; ?>
+            <?php $checked = @$subnet_old_details['isFull'] == 1 ? "checked" : ""; ?>
             <input type="checkbox" name="isFull" class="input-switch" value="1" <?php print $checked; ?>>
         </td>
-        <td class="info2"><?php print _('Mark subnet as utilized'); ?></td>
+        <td class="info2"><?php print _ ('Mark subnet as utilized'); ?></td>
     </tr>
-    <?php if ($User->settings->enableThreshold=="1") { ?>
+    <?php if ($User->settings->enableThreshold == "1") { ?>
 	<tr>
-        <td class="middle"><?php print _('Threshold'); ?></td>
+        <td class="middle"><?php print _ ('Threshold'); ?></td>
         <td>
-            <?php $svalue = !is_null($subnet_old_details['threshold']) ? $subnet_old_details['threshold'] : 0; ?>
+            <?php $svalue = !is_null ($subnet_old_details['threshold']) ? $subnet_old_details['threshold'] : 0; ?>
             <input type="text" style="width:200px;" class="slider" name="threshold" value="<?php print $svalue; ?>" data-slider-handle="square" data-slider-min="0" data-slider-max="100" data-slider-step="1" data-slider-value="<?php print $svalue; ?>" data-slider-orientation="horizontal" data-slider-selection="after">
         </td>
-        <td class="info2"><?php print _('Set subnet alert threshold'); ?> <span class='badge badge1 badge5 slider-text'><span><?php print $svalue; ?></span>%</span></td>
+        <td class="info2"><?php print _ ('Set subnet alert threshold'); ?> <span class='badge badge1 badge5 slider-text'><span><?php print $svalue; ?></span>%</span></td>
     </tr>
     <?php } ?>
 
 	<?php } ?>
 
-	<?php if($_POST['action']=="edit") { ?>
+	<?php if ($_POST['action'] == "edit") { ?>
 	<!-- resize / split -->
     <tr>
 	    <td colspan="3"><hr></td>
     </tr>
 
 	<tr>
-        <td class="middle"><?php print _('Resize'); ?> / <?php print _('split'); ?></td>
+        <td class="middle"><?php print _ ('Resize'); ?> / <?php print _ ('split'); ?></td>
         <td>
 	    <div class="btn-group">
-        	<button class="btn btn-xs btn-default"										  id="resize" 	rel="tooltip" data-container='body' title="<?php print _('Resize subnet'); ?>"   data-subnetId="<?php print $_POST['subnetId']; ?>"><i class="fa fa-gray fa-arrows-v"></i></button>
-        	<button class="btn btn-xs btn-default <?php if($slaves) print "disabled"; ?>" id="split"    rel="tooltip" data-container='body' title="<?php print _('Split subnet'); ?>"    data-subnetId="<?php print $_POST['subnetId']; ?>"><i class="fa fa-gray fa-expand"></i></button>
-        	<button class="btn btn-xs btn-default"										  id="truncate" rel="tooltip" data-container='body' title="<?php print _('Truncate subnet'); ?>" data-subnetId="<?php print $_POST['subnetId']; ?>"><i class="fa fa-gray fa-trash-o"></i></button>
+        	<button class="btn btn-xs btn-default"										  id="resize" 	rel="tooltip" data-container='body' title="<?php print _ ('Resize subnet'); ?>"   data-subnetId="<?php print $_POST['subnetId']; ?>"><i class="fa fa-gray fa-arrows-v"></i></button>
+        	<button class="btn btn-xs btn-default <?php if ($slaves) print "disabled"; ?>" id="split"    rel="tooltip" data-container='body' title="<?php print _ ('Split subnet'); ?>"    data-subnetId="<?php print $_POST['subnetId']; ?>"><i class="fa fa-gray fa-expand"></i></button>
+        	<button class="btn btn-xs btn-default"										  id="truncate" rel="tooltip" data-container='body' title="<?php print _ ('Truncate subnet'); ?>" data-subnetId="<?php print $_POST['subnetId']; ?>"><i class="fa fa-gray fa-trash-o"></i></button>
 	    </div>
         </td>
-        <td class="info2"><?php print _('Resize, split or truncate this subnet'); ?></td>
+        <td class="info2"><?php print _ ('Resize, split or truncate this subnet'); ?></td>
     </tr>
     <?php } ?>
 
@@ -379,42 +379,42 @@ 
 	//fetch agents
 	$agents = $Tools->fetch_all_objects ("scanAgents");
 	// set hidden
-	if (@$subnet_old_details['pingSubnet']=="1" || @$subnet_old_details['discoverSubnet']=="1")	{ $hidden = ""; }
-	else																						{ $hidden = "hidden"; }
+	if (@$subnet_old_details['pingSubnet'] == "1" || @$subnet_old_details['discoverSubnet'] == "1") { $hidden = ""; }
+	else { $hidden = "hidden"; }
 	//print form
-	if ($agents!==false) {
+	if ($agents !== false) {
 		print "<tr id='scanAgentDropdown' class='$hidden'>";
-		print "<td>"._('Select agent')."</td>";
+		print "<td>"._ ('Select agent')."</td>";
 		print "<td>";
 		print "<select name='scanAgent' class='form-control input-sm'>";
 		foreach ($agents as $a) {
-			if ($a->id==@$subnet_old_details['scanAgent'])	{ print "<option value='".$a->id."' selected='selected'>".$a->name." (".$a->description.")</option>"; }
-			else											{ print "<option value='".$a->id."'>".$a->name." (".$a->description.")</option>"; }
+			if ($a->id == @$subnet_old_details['scanAgent']) { print "<option value='".$a->id."' selected='selected'>".$a->name." (".$a->description.")</option>"; }
+			else { print "<option value='".$a->id."'>".$a->name." (".$a->description.")</option>"; }
 		}
 		print "</select>";
 		print "</td>";
-		print '	<td class="info2">'._('Select which scanagent to use').'</td>' . "\n";
+		print '	<td class="info2">'._ ('Select which scanagent to use').'</td>'."\n";
 		print "</tr>";
 	}
 
 	//check host status
-	$checked = @$subnet_old_details['pingSubnet']==1 ? "checked": "";
-	print '<tr>' . "\n";
-    print '	<td>'._('Check hosts status').'</td>' . "\n";
-    print '	<td>' . "\n";
-    print '		<input type="checkbox" name="pingSubnet" class="input-switch-agents-ping" value="1" '.$checked.'>'. "\n";
-    print '	</td>' . "\n";
-    print '	<td class="info2">'._('Ping hosts inside subnet to check availability').'</td>' . "\n";
+	$checked = @$subnet_old_details['pingSubnet'] == 1 ? "checked" : "";
+	print '<tr>'."\n";
+    print '	<td>'._ ('Check hosts status').'</td>'."\n";
+    print '	<td>'."\n";
+    print '		<input type="checkbox" name="pingSubnet" class="input-switch-agents-ping" value="1" '.$checked.'>'."\n";
+    print '	</td>'."\n";
+    print '	<td class="info2">'._ ('Ping hosts inside subnet to check availability').'</td>'."\n";
     print '</tr>';
 
 	//Discover new hosts
-	$checked = @$subnet_old_details['discoverSubnet']==1 ? "checked": "";
-	print '<tr>' . "\n";
-    print '	<td>'._('Discover new hosts').'</td>' . "\n";
-    print '	<td>' . "\n";
-    print '		<input type="checkbox" name="discoverSubnet" class="input-switch-agents-scan" value="1" '.$checked.'>'. "\n";
-    print '	</td>' . "\n";
-    print '	<td class="info2">'._('Discover new hosts in this subnet').'</td>' . "\n";
+	$checked = @$subnet_old_details['discoverSubnet'] == 1 ? "checked" : "";
+	print '<tr>'."\n";
+    print '	<td>'._ ('Discover new hosts').'</td>'."\n";
+    print '	<td>'."\n";
+    print '		<input type="checkbox" name="discoverSubnet" class="input-switch-agents-scan" value="1" '.$checked.'>'."\n";
+    print '	</td>'."\n";
+    print '	<td class="info2">'._ ('Discover new hosts in this subnet').'</td>'."\n";
     print '</tr>';
 	?>
 
@@ -424,113 +424,113 @@ 
 
 	<?php
 	/* allow / deny IP requests if enabled in settings */
-	if($User->settings->enableIPrequests==1) {
+	if ($User->settings->enableIPrequests == 1) {
 		//checked
-		$checked = @$subnet_old_details['allowRequests']==1 ? "checked" : "";
+		$checked = @$subnet_old_details['allowRequests'] == 1 ? "checked" : "";
 
-		print '<tr>' . "\n";
-        print '	<td>'._('IP Requests').'</td>' . "\n";
-        print '	<td>' . "\n";
-        print '		<input type="checkbox" name="allowRequests" class="input-switch" value="1" '.$checked.'>'. "\n";
-        print '	</td>' . "\n";
-        print '	<td class="info2">'._('Allow or deny IP requests for this subnet').'</td>' . "\n";
-    	print '</tr>' . "\n";
+		print '<tr>'."\n";
+        print '	<td>'._ ('IP Requests').'</td>'."\n";
+        print '	<td>'."\n";
+        print '		<input type="checkbox" name="allowRequests" class="input-switch" value="1" '.$checked.'>'."\n";
+        print '	</td>'."\n";
+        print '	<td class="info2">'._ ('Allow or deny IP requests for this subnet').'</td>'."\n";
+    	print '</tr>'."\n";
 
 	}
 	else {
-		print '<tr style="display:none"><td colspan="8"><input type="hidden" name="allowRequests" value="'. $subnet_old_details['allowRequests'] .'"></td></tr>'. "\n";
+		print '<tr style="display:none"><td colspan="8"><input type="hidden" name="allowRequests" value="'.$subnet_old_details['allowRequests'].'"></td></tr>'."\n";
 	}
 
 		//show names instead of ip address
-		print '<tr>' . "\n";
-        print '	<td>'._('Show as name').'</td>' . "\n";
-        print '	<td>' . "\n";
-        print '		<input type="checkbox" name="showName" class="input-switch" value="1" ' . "\n";
-        if( @$subnet_old_details['showName'] == 1) { print 'checked';}
-        print ' >'. "\n";
+		print '<tr>'."\n";
+        print '	<td>'._ ('Show as name').'</td>'."\n";
+        print '	<td>'."\n";
+        print '		<input type="checkbox" name="showName" class="input-switch" value="1" '."\n";
+        if (@$subnet_old_details['showName'] == 1) { print 'checked'; }
+        print ' >'."\n";
 
         //hidden ones
         ?>
             <!-- hidden values -->
             <input type="hidden" name="sectionId"       value="<?php print $_POST['sectionId']; ?>">
-            <input type="hidden" name="subnetId"        value="<?php print $_POST['subnetId'];  ?>">
-            <input type="hidden" name="action"    		value="<?php print $_POST['action'];    ?>">
+            <input type="hidden" name="subnetId"        value="<?php print $_POST['subnetId']; ?>">
+            <input type="hidden" name="action"    		value="<?php print $_POST['action']; ?>">
             <input type="hidden" name="location"    	value="<?php print @$_POST['location']; ?>">
-            <?php if(isset($_POST['freespaceMSID'])) { ?>
+            <?php if (isset($_POST['freespaceMSID'])) { ?>
             <input type="hidden" name="freespace"    	value="true">
             <?php } ?>
-            <input type="hidden" name="vrfIdOld"        value="<?php print $subnet_old_details['vrfId'];    ?>">
+            <input type="hidden" name="vrfIdOld"        value="<?php print $subnet_old_details['vrfId']; ?>">
             <input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 
         <?php
-        print '	</td>' . "\n";
-        print '	<td class="info2">'._('Show Subnet name instead of subnet IP address').'</td>' . "\n";
-    	print '</tr>' . "\n";
+        print '	</td>'."\n";
+        print '	<td class="info2">'._ ('Show Subnet name instead of subnet IP address').'</td>'."\n";
+    	print '</tr>'."\n";
 
 		//autocreate reverse records
-		if($User->settings->enablePowerDNS==1) {
-		$checked = @$subnet_old_details['DNSrecursive']==1 ? "checked": "";
-		print '<tr>' . "\n";
-        print '	<td>'._('Autocreate reverse records').'</td>' . "\n";
-        print '	<td>' . "\n";
-        print '		<input type="checkbox" name="DNSrecursive" class="input-switch" value="1" '.$checked.'>'. "\n";
-        print '	</td>' . "\n";
-        print '	<td class="info2">'._('Auto create reverse (PTR) records for this subnet').'</td>' . "\n";
+		if ($User->settings->enablePowerDNS == 1) {
+		$checked = @$subnet_old_details['DNSrecursive'] == 1 ? "checked" : "";
+		print '<tr>'."\n";
+        print '	<td>'._ ('Autocreate reverse records').'</td>'."\n";
+        print '	<td>'."\n";
+        print '		<input type="checkbox" name="DNSrecursive" class="input-switch" value="1" '.$checked.'>'."\n";
+        print '	</td>'."\n";
+        print '	<td class="info2">'._ ('Auto create reverse (PTR) records for this subnet').'</td>'."\n";
         print '</tr>';
 
 		// show records
-		$checked = @$subnet_old_details['DNSrecords']==1 ? "checked": "";
-		print '<tr>' . "\n";
-        print '	<td>'._('Show DNS records').'</td>' . "\n";
-        print '	<td>' . "\n";
-        print '		<input type="checkbox" name="DNSrecords" class="input-switch" value="1" '.$checked.'>'. "\n";
-        print '	</td>' . "\n";
-        print '	<td class="info2">'._('Show DNS records for hosts').'</td>' . "\n";
+		$checked = @$subnet_old_details['DNSrecords'] == 1 ? "checked" : "";
+		print '<tr>'."\n";
+        print '	<td>'._ ('Show DNS records').'</td>'."\n";
+        print '	<td>'."\n";
+        print '		<input type="checkbox" name="DNSrecords" class="input-switch" value="1" '.$checked.'>'."\n";
+        print '	</td>'."\n";
+        print '	<td class="info2">'._ ('Show DNS records for hosts').'</td>'."\n";
         print '</tr>';
         }
 
     	//custom Subnet fields
-	    if(sizeof($custom_fields) > 0) {
+	    if (sizeof ($custom_fields) > 0) {
 	    	# count datepickers
 			$timeP = 0;
 
 	    	print "<tr>";
 	    	print "	<td colspan='3' class='hr'><hr></td>";
 	    	print "</tr>";
-		    foreach($custom_fields as $field) {
+		    foreach ($custom_fields as $field) {
 
 		    	# replace spaces
-		    	$field['nameNew'] = str_replace(" ", "___", $field['name']);
+		    	$field['nameNew'] = str_replace (" ", "___", $field['name']);
 		    	# retain newlines
-		    	$subnet_old_details[$field['name']] = str_replace("\n", "\\n", @$subnet_old_details[$field['name']]);
+		    	$subnet_old_details[$field['name']] = str_replace ("\n", "\\n", @$subnet_old_details[$field['name']]);
 
 				# set default value !
-				if ($_POST['action']=="add")	{ $subnet_old_details[$field['name']] = $field['Default']; }
+				if ($_POST['action'] == "add") { $subnet_old_details[$field['name']] = $field['Default']; }
 
 		    	# required
-		    	$required = $field['Null']=="NO" ? "*" : "";
-				print '<tr>'. "\n";
-				print '	<td>'. $field['name'] .' '.$required.'</td>'. "\n";
-				print '	<td colspan="2">'. "\n";
+		    	$required = $field['Null'] == "NO" ? "*" : "";
+				print '<tr>'."\n";
+				print '	<td>'.$field['name'].' '.$required.'</td>'."\n";
+				print '	<td colspan="2">'."\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==$subnet_old_details[$field['name']])	{ print "<option value='$v' selected='selected'>$v</option>"; }
-						else										{ print "<option value='$v'>$v</option>"; }
+					foreach ($tmp as $v) {
+						if ($v == $subnet_old_details[$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">';
@@ -546,38 +546,38 @@ 
 					$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($subnet_old_details[$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="'. $subnet_old_details[$field['name']]. '" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+					if (!isset($subnet_old_details[$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="'.$subnet_old_details[$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($subnet_old_details[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-						elseif($k==$subnet_old_details[$field['name']])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-						else														{ print "<option value='$k'>"._($v)."</option>"; }
+					foreach ($tmp as $k=>$v) {
+						if (strlen ($subnet_old_details[$field['name']]) == 0 && $k == 2) { print "<option value='$k' selected='selected'>"._ ($v)."</option>"; }
+						elseif ($k == $subnet_old_details[$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 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. str_replace("\\n","",$subnet_old_details[$field['name']]). '</textarea>'. "\n";
+				elseif ($field['type'] == "text") {
+					print ' <textarea class="form-control input-sm" name="'.$field['nameNew'].'" placeholder="'.$field['name'].'" rowspan=3 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'.str_replace ("\\n", "", $subnet_old_details[$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="'. $subnet_old_details[$field['name']]. '" size="30" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
+					print ' <input type="text" class="ip_addr form-control input-sm" name="'.$field['nameNew'].'" placeholder="'.$field['name'].'" value="'.$subnet_old_details[$field['name']].'" size="30" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'."\n";
 				}
 
-				print '	</td>'. "\n";
-				print '</tr>'. "\n";
+				print '	</td>'."\n";
+				print '</tr>'."\n";
 		    }
 	    }
 
@@ -588,12 +588,12 @@ 
     ?>
 
     <!-- set parameters to slave subnets -->
-    <?php if($slaves && $_POST['action']=="edit") { ?>
+    <?php if ($slaves && $_POST['action'] == "edit") { ?>
     <tr>
-        <td><?php print _('Propagate changes'); ?></td>
+        <td><?php print _ ('Propagate changes'); ?></td>
         <td colspan="2">
             <input type="checkbox" name="set_inheritance" class="input-switch" value="Yes">
-            <span class="text-muted"><?php print _("Apply changes to underlying subnets"); ?></span>
+            <span class="text-muted"><?php print _ ("Apply changes to underlying subnets"); ?></span>
         </td>
     </tr>
     <tr>
@@ -606,8 +606,8 @@ 
 
     <?php
     # warning if delete
-    if($_POST['action'] == "delete" || (@$_POST['location'] == "IPaddresses" && $_POST['action'] != "add"  )) {
-	    print "<div class='alert alert-warning' style='margin-top:0px;'><strong>"._('Warning')."</strong><br>"._('Removing subnets will delete ALL underlaying subnets and belonging IP addresses')."!</div>";
+    if ($_POST['action'] == "delete" || (@$_POST['location'] == "IPaddresses" && $_POST['action'] != "add")) {
+	    print "<div class='alert alert-warning' style='margin-top:0px;'><strong>"._ ('Warning')."</strong><br>"._ ('Removing subnets will delete ALL underlaying subnets and belonging IP addresses')."!</div>";
     }
     ?>
 
@@ -618,14 +618,14 @@ 
 <!-- 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 hidePopups"><?php print _ ('Cancel'); ?></button>
 		<?php
 		//if action == edit and location = IPaddresses print also delete form
-		if($_POST['action'] == "edit" && @$_POST['location'] == "IPaddresses") {
-			print "<button class='btn btn-sm btn-default btn-danger editSubnetSubmitDelete editSubnetSubmit'><i class='icon-white icon-trash'></i> "._('Delete subnet')."</button>";
+		if ($_POST['action'] == "edit" && @$_POST['location'] == "IPaddresses") {
+			print "<button class='btn btn-sm btn-default btn-danger editSubnetSubmitDelete editSubnetSubmit'><i class='icon-white icon-trash'></i> "._ ('Delete subnet')."</button>";
 		}
 		?>
-		<button type="submit" class="btn btn-sm btn-default editSubnetSubmit <?php if($_POST['action']=="delete") print "btn-danger"; else print "btn-success"; ?>"><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 type="submit" class="btn btn-sm btn-default editSubnetSubmit <?php if ($_POST['action'] == "delete") print "btn-danger"; else print "btn-success"; ?>"><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>
 
 	<div class="manageSubnetEditResult"></div>

app/admin/scan-agents/index.php

Indentation +31 added lines, -31 removed lines

@@ -23,50 +23,50 @@
 /* print existing APIs */
 if($all_agents!==false) {
 
-	print '<table id="userPrint" class="table table-striped table-top table-auto">';
-	# headers
-	print '<tr>';
+    print '<table id="userPrint" class="table table-striped table-top table-auto">';
+    # headers
+    print '<tr>';
     print "<th>"._('Agent id').'</th>';
-	print "<th>"._('Name').'</th>';
+    print "<th>"._('Name').'</th>';
     print "<th>"._('Description').'</th>';
     print "<th>"._('Type').'</th>';
     print "<th>"._('Code').'</th>';
     print "<th>"._('Last access').'</th>';
     print '<th></th>';
-	print '</tr>';
+    print '</tr>';
 
-	# loop
-	foreach ($all_agents as $a) {
-		//cast
-		$a = (array) $a;
+    # loop
+    foreach ($all_agents as $a) {
+        //cast
+        $a = (array) $a;
 
-		// fixes
-		$a['code'] = strlen($a['code'])===0 ? "/" : $a['code'];
-		$a['last_access'] = strlen($a['last_access'])===0 ? "<span class='text-muted'>Never</span>" : $a['last_access'];
+        // fixes
+        $a['code'] = strlen($a['code'])===0 ? "/" : $a['code'];
+        $a['last_access'] = strlen($a['last_access'])===0 ? "<span class='text-muted'>Never</span>" : $a['last_access'];
 
-		// print
-		print '<tr>' . "\n";
-		print '	<td>' . $a['id'] . '</td>'. "\n";
-		print '	<td>' . $a['name'] . '</td>'. "\n";
-		print '	<td>' . $a['description'] . '</td>'. "\n";
-		print '	<td>' . $a['type'] . '</td>'. "\n";
-		print '	<td>' . $a['code'] . '</td>'. "\n";
-		print '	<td>' . $a['last_access'] . '</td>'. "\n";
+        // print
+        print '<tr>' . "\n";
+        print '	<td>' . $a['id'] . '</td>'. "\n";
+        print '	<td>' . $a['name'] . '</td>'. "\n";
+        print '	<td>' . $a['description'] . '</td>'. "\n";
+        print '	<td>' . $a['type'] . '</td>'. "\n";
+        print '	<td>' . $a['code'] . '</td>'. "\n";
+        print '	<td>' . $a['last_access'] . '</td>'. "\n";
 
-		// add/remove agents
-		print "	<td class='actions'>";
-		print "	<div class='btn-group'>";
-		print "		<button class='btn btn-xs btn-default editAgent'  data-container='body' data-id='$a[id]' data-action='edit'   rel='tooltip' title='"._('edit agent details')."'>	<i class='fa fa-pencil'></i></button>";
-		print "		<button class='btn btn-xs btn-default editAgent'  data-container='body' data-id='$a[id]' data-action='delete' rel='tooltip' title='"._('remove agent')."'>		<i class='fa fa-times'></i></button>";
-		print "	</div>";
-		print "</td>";
+        // add/remove agents
+        print "	<td class='actions'>";
+        print "	<div class='btn-group'>";
+        print "		<button class='btn btn-xs btn-default editAgent'  data-container='body' data-id='$a[id]' data-action='edit'   rel='tooltip' title='"._('edit agent details')."'>	<i class='fa fa-pencil'></i></button>";
+        print "		<button class='btn btn-xs btn-default editAgent'  data-container='body' data-id='$a[id]' data-action='delete' rel='tooltip' title='"._('remove agent')."'>		<i class='fa fa-times'></i></button>";
+        print "	</div>";
+        print "</td>";
 
-		print '</tr>' . "\n";
-	}
-	print "</table>";
+        print '</tr>' . "\n";
+    }
+    print "</table>";
 }
 else {
-	$Result->show("info alert-nomargin", _("No agents available")."!", false);
+    $Result->show("info alert-nomargin", _("No agents available")."!", false);
 }
 ?>
 <hr>

Spacing +25 added lines, -25 removed lines

@@ -5,33 +5,33 @@ 
  *************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all APIs
-$all_agents = $Admin->fetch_all_objects("scanAgents");
+$all_agents = $Admin->fetch_all_objects ("scanAgents");
 ?>
 
 <!-- display existing groups -->
-<h4><?php print _('phpipam Scan agents'); ?></h4>
+<h4><?php print _ ('phpipam Scan agents'); ?></h4>
 <hr><br>
 
 <!-- Add new -->
-<button class='btn btn-sm btn-default editAgent' style="margin-bottom:10px;" data-action='add'><i class='fa fa-plus'></i> <?php print _('Create new agent'); ?></button>
+<button class='btn btn-sm btn-default editAgent' style="margin-bottom:10px;" data-action='add'><i class='fa fa-plus'></i> <?php print _ ('Create new agent'); ?></button>
 
 
 <?php
 /* print existing APIs */
-if($all_agents!==false) {
+if ($all_agents !== false) {
 
 	print '<table id="userPrint" class="table table-striped table-top table-auto">';
 	# headers
 	print '<tr>';
-    print "<th>"._('Agent id').'</th>';
-	print "<th>"._('Name').'</th>';
-    print "<th>"._('Description').'</th>';
-    print "<th>"._('Type').'</th>';
-    print "<th>"._('Code').'</th>';
-    print "<th>"._('Last access').'</th>';
+    print "<th>"._ ('Agent id').'</th>';
+	print "<th>"._ ('Name').'</th>';
+    print "<th>"._ ('Description').'</th>';
+    print "<th>"._ ('Type').'</th>';
+    print "<th>"._ ('Code').'</th>';
+    print "<th>"._ ('Last access').'</th>';
     print '<th></th>';
 	print '</tr>';
 
@@ -41,35 +41,35 @@ 
 		$a = (array) $a;
 
 		// fixes
-		$a['code'] = strlen($a['code'])===0 ? "/" : $a['code'];
-		$a['last_access'] = strlen($a['last_access'])===0 ? "<span class='text-muted'>Never</span>" : $a['last_access'];
+		$a['code'] = strlen ($a['code']) === 0 ? "/" : $a['code'];
+		$a['last_access'] = strlen ($a['last_access']) === 0 ? "<span class='text-muted'>Never</span>" : $a['last_access'];
 
 		// print
-		print '<tr>' . "\n";
-		print '	<td>' . $a['id'] . '</td>'. "\n";
-		print '	<td>' . $a['name'] . '</td>'. "\n";
-		print '	<td>' . $a['description'] . '</td>'. "\n";
-		print '	<td>' . $a['type'] . '</td>'. "\n";
-		print '	<td>' . $a['code'] . '</td>'. "\n";
-		print '	<td>' . $a['last_access'] . '</td>'. "\n";
+		print '<tr>'."\n";
+		print '	<td>'.$a['id'].'</td>'."\n";
+		print '	<td>'.$a['name'].'</td>'."\n";
+		print '	<td>'.$a['description'].'</td>'."\n";
+		print '	<td>'.$a['type'].'</td>'."\n";
+		print '	<td>'.$a['code'].'</td>'."\n";
+		print '	<td>'.$a['last_access'].'</td>'."\n";
 
 		// add/remove agents
 		print "	<td class='actions'>";
 		print "	<div class='btn-group'>";
-		print "		<button class='btn btn-xs btn-default editAgent'  data-container='body' data-id='$a[id]' data-action='edit'   rel='tooltip' title='"._('edit agent details')."'>	<i class='fa fa-pencil'></i></button>";
-		print "		<button class='btn btn-xs btn-default editAgent'  data-container='body' data-id='$a[id]' data-action='delete' rel='tooltip' title='"._('remove agent')."'>		<i class='fa fa-times'></i></button>";
+		print "		<button class='btn btn-xs btn-default editAgent'  data-container='body' data-id='$a[id]' data-action='edit'   rel='tooltip' title='"._ ('edit agent details')."'>	<i class='fa fa-pencil'></i></button>";
+		print "		<button class='btn btn-xs btn-default editAgent'  data-container='body' data-id='$a[id]' data-action='delete' rel='tooltip' title='"._ ('remove agent')."'>		<i class='fa fa-times'></i></button>";
 		print "	</div>";
 		print "</td>";
 
-		print '</tr>' . "\n";
+		print '</tr>'."\n";
 	}
 	print "</table>";
 }
 else {
-	$Result->show("info alert-nomargin", _("No agents available")."!", false);
+	$Result->show ("info alert-nomargin", _ ("No agents available")."!", false);
 }
 ?>
 <hr>
 
-<h4><?php print _('phpipam-agent documentation'); ?></h4>
+<h4><?php print _ ('phpipam-agent documentation'); ?></h4>
 <a href="https://github.com/phpipam/phpipam-agent">https://github.com/phpipam/phpipam-agent</a>

app/admin/scan-agents/edit-result.php

Indentation +39 added lines, -39 removed lines

@@ -27,62 +27,62 @@
 
 # for edit check old details
 if ($_POST['action']=="edit" || $_POST['action']=="delete") {
-	# old
-	$agent_old = $Admin->fetch_object ("scanAgents", "id", $_POST['id']);
-	// invalid id
-	if($agent_old===false)	{ $error[] = "Invalid agent Id"; }
-	// remove type and code if direct
-	if (@$agent_old->type=="direct") {
-		unset($_POST['type'], $_POST['code']);
-	}
+    # old
+    $agent_old = $Admin->fetch_object ("scanAgents", "id", $_POST['id']);
+    // invalid id
+    if($agent_old===false)	{ $error[] = "Invalid agent Id"; }
+    // remove type and code if direct
+    if (@$agent_old->type=="direct") {
+        unset($_POST['type'], $_POST['code']);
+    }
 }
 
 # die if direct and delete
 if (@$agent_old->type=="direct" && $_POST['action']=="delete") {
-	$Result->show("danger", _("Cannot remove localhost scan agent"),true);
+    $Result->show("danger", _("Cannot remove localhost scan agent"),true);
 }
 
 # checks for edit / add
 if($_POST['action']!="delete") {
-	# code must be exactly 32 chars long and alfanumeric if app_security = crypt
-	if(@$agent_old->type!="direct") {
-	if(strlen($_POST['code'])!=32 || !ctype_alnum($_POST['code']))		{ $error[] = "Invalid agent code"; }
-	}
-	# name must be more than 2 and alphanumberic
-	if(strlen($_POST['name'])==0)										{ $error[] = "Invalid agent name"; }
+    # code must be exactly 32 chars long and alfanumeric if app_security = crypt
+    if(@$agent_old->type!="direct") {
+    if(strlen($_POST['code'])!=32 || !ctype_alnum($_POST['code']))		{ $error[] = "Invalid agent code"; }
+    }
+    # name must be more than 2 and alphanumberic
+    if(strlen($_POST['name'])==0)										{ $error[] = "Invalid agent name"; }
 }
 
 # die if errors
 if(sizeof($error) > 0) {
-	$Result->show("danger", $error, true);
+    $Result->show("danger", $error, true);
 }
 else {
-	# create array of values for modification
-	$values = array("id"=>@$_POST['id'],
-					"name"=>$_POST['name'],
-					"description"=>@$_POST['description'],
-					"code"=>@$_POST['code'],
-					"type"=>@$_POST['type']
-					);
-	# null
-	$values = $Admin->remove_empty_array_fields ($values);
+    # create array of values for modification
+    $values = array("id"=>@$_POST['id'],
+                    "name"=>$_POST['name'],
+                    "description"=>@$_POST['description'],
+                    "code"=>@$_POST['code'],
+                    "type"=>@$_POST['type']
+                    );
+    # null
+    $values = $Admin->remove_empty_array_fields ($values);
 
-	# execute
-	if(!$Admin->object_modify("scanAgents", $_POST['action'], "id", $values)) 	{ $Result->show("danger",  _("Agent $_POST[action] error"), true); }
-	else 																		{ $Result->show("success", _("Agent $_POST[action] success"), false); }
+    # execute
+    if(!$Admin->object_modify("scanAgents", $_POST['action'], "id", $values)) 	{ $Result->show("danger",  _("Agent $_POST[action] error"), true); }
+    else 																		{ $Result->show("success", _("Agent $_POST[action] success"), false); }
 
-	# delete - unset scanning in all subnets
-	if ($_POST['action']=="delete") {
-		$query = "update `subnets` set `scanAgent`=0, `pingSubnet`=0, `discoverSubnet`=0 where `scanAgent` = ?;";
+    # delete - unset scanning in all subnets
+    if ($_POST['action']=="delete") {
+        $query = "update `subnets` set `scanAgent`=0, `pingSubnet`=0, `discoverSubnet`=0 where `scanAgent` = ?;";
 
-		try { $Database->runQuery($query, array($_POST['id'])); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-		// references removed
-		$this->Result->show("info", _("Scan agent references removed"));
-	}
+        try { $Database->runQuery($query, array($_POST['id'])); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+        // references removed
+        $this->Result->show("info", _("Scan agent references removed"));
+    }
 }
 
 ?>
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -75,8 +75,7 @@
 	if ($_POST['action']=="delete") {
 		$query = "update `subnets` set `scanAgent`=0, `pingSubnet`=0, `discoverSubnet`=0 where `scanAgent` = ?;";
 
-		try { $Database->runQuery($query, array($_POST['id'])); }
-		catch (Exception $e) {
+		try { $Database->runQuery($query, array($_POST['id'])); } catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage());
 			return false;
 		}

Spacing +25 added lines, -25 removed lines

@@ -5,60 +5,60 @@ 
  *************************************/
 
 /* 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", "agent", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "agent", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 /* checks */
-$error = array();
+$error = array ();
 
 # for edit check old details
-if ($_POST['action']=="edit" || $_POST['action']=="delete") {
+if ($_POST['action'] == "edit" || $_POST['action'] == "delete") {
 	# old
 	$agent_old = $Admin->fetch_object ("scanAgents", "id", $_POST['id']);
 	// invalid id
-	if($agent_old===false)	{ $error[] = "Invalid agent Id"; }
+	if ($agent_old === false) { $error[] = "Invalid agent Id"; }
 	// remove type and code if direct
-	if (@$agent_old->type=="direct") {
+	if (@$agent_old->type == "direct") {
 		unset($_POST['type'], $_POST['code']);
 	}
 }
 
 # die if direct and delete
-if (@$agent_old->type=="direct" && $_POST['action']=="delete") {
-	$Result->show("danger", _("Cannot remove localhost scan agent"),true);
+if (@$agent_old->type == "direct" && $_POST['action'] == "delete") {
+	$Result->show ("danger", _ ("Cannot remove localhost scan agent"), true);
 }
 
 # checks for edit / add
-if($_POST['action']!="delete") {
+if ($_POST['action'] != "delete") {
 	# code must be exactly 32 chars long and alfanumeric if app_security = crypt
-	if(@$agent_old->type!="direct") {
-	if(strlen($_POST['code'])!=32 || !ctype_alnum($_POST['code']))		{ $error[] = "Invalid agent code"; }
+	if (@$agent_old->type != "direct") {
+	if (strlen ($_POST['code']) != 32 || !ctype_alnum ($_POST['code'])) { $error[] = "Invalid agent code"; }
 	}
 	# name must be more than 2 and alphanumberic
-	if(strlen($_POST['name'])==0)										{ $error[] = "Invalid agent name"; }
+	if (strlen ($_POST['name']) == 0) { $error[] = "Invalid agent name"; }
 }
 
 # die if errors
-if(sizeof($error) > 0) {
-	$Result->show("danger", $error, true);
+if (sizeof ($error) > 0) {
+	$Result->show ("danger", $error, true);
 }
 else {
 	# create array of values for modification
-	$values = array("id"=>@$_POST['id'],
+	$values = array ("id"=>@$_POST['id'],
 					"name"=>$_POST['name'],
 					"description"=>@$_POST['description'],
 					"code"=>@$_POST['code'],
@@ -68,20 +68,20 @@ 
 	$values = $Admin->remove_empty_array_fields ($values);
 
 	# execute
-	if(!$Admin->object_modify("scanAgents", $_POST['action'], "id", $values)) 	{ $Result->show("danger",  _("Agent $_POST[action] error"), true); }
-	else 																		{ $Result->show("success", _("Agent $_POST[action] success"), false); }
+	if (!$Admin->object_modify ("scanAgents", $_POST['action'], "id", $values)) { $Result->show ("danger", _ ("Agent $_POST[action] error"), true); }
+	else { $Result->show ("success", _ ("Agent $_POST[action] success"), false); }
 
 	# delete - unset scanning in all subnets
-	if ($_POST['action']=="delete") {
+	if ($_POST['action'] == "delete") {
 		$query = "update `subnets` set `scanAgent`=0, `pingSubnet`=0, `discoverSubnet`=0 where `scanAgent` = ?;";
 
-		try { $Database->runQuery($query, array($_POST['id'])); }
+		try { $Database->runQuery ($query, array ($_POST['id'])); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage ());
 			return false;
 		}
 		// references removed
-		$this->Result->show("info", _("Scan agent references removed"));
+		$this->Result->show ("info", _ ("Scan agent references removed"));
 	}
 }
 

app/admin/scan-agents/edit.php

Indentation +20 added lines, -20 removed lines

@@ -24,23 +24,23 @@ 
 
 # fetch api for edit / add
 if($_POST['action']!="add") {
-	# fetch api details
-	$agent = $Admin->fetch_object ("scanAgents", "id", $_POST['id']);
-	# null ?
-	$agent===false ? $Result->show("danger", _("Invalid ID"), true) : null;
-	# title
-	$title =  ucwords($_POST['action']) .' '._('agent').' '.$agent->name;
+    # fetch api details
+    $agent = $Admin->fetch_object ("scanAgents", "id", $_POST['id']);
+    # null ?
+    $agent===false ? $Result->show("danger", _("Invalid ID"), true) : null;
+    # title
+    $title =  ucwords($_POST['action']) .' '._('agent').' '.$agent->name;
 } else {
-	# generate new code
-	$agent = new StdClass;
-	$agent->code = str_shuffle(md5(microtime()));
-	# title
-	$title = _('Create new scan agent');
+    # generate new code
+    $agent = new StdClass;
+    $agent->code = str_shuffle(md5(microtime()));
+    # title
+    $title = _('Create new scan agent');
 }
 
 # die if direct and delete
 if (@$agent->type=="direct" && $_POST['action']=="delete") {
-	$Result->show("danger", _("Cannot remove localhost scan agent"),true, true);
+    $Result->show("danger", _("Cannot remove localhost scan agent"),true, true);
 }
 ?>
 
@@ -87,14 +87,14 @@ 
 	    <td>
 	    	<select name="type" class="form-control input-sm input-w-auto" <?php if(@$agent->type=="direct"||$_POST['action'] == "delete") print "readonly"; ?>>
 	    	<?php
-	    	//$types = array("mysql"=>"MySQL", "api"=>"Api");
-	    	$types = array("mysql"=>"MySQL");
-
-	    	foreach($types as $k=>$p) {
-		    	if($k==$agent->type)	{ print "<option value='$k' selected='selected'>"._($p)."</option>"; }
-		    	else					{ print "<option value='$k' 				   >"._($p)."</option>"; }
-	    	}
-	    	?>
+            //$types = array("mysql"=>"MySQL", "api"=>"Api");
+            $types = array("mysql"=>"MySQL");
+
+            foreach($types as $k=>$p) {
+                if($k==$agent->type)	{ print "<option value='$k' selected='selected'>"._($p)."</option>"; }
+                else					{ print "<option value='$k' 				   >"._($p)."</option>"; }
+            }
+            ?>
 	    	</select>
        	<td class="info2"><?php print _('Agent type'); ?></td>
     </tr>

Braces +22 added lines, -6 removed lines

@@ -30,7 +30,8 @@ 
 	$agent===false ? $Result->show("danger", _("Invalid ID"), true) : null;
 	# title
 	$title =  ucwords($_POST['action']) .' '._('agent').' '.$agent->name;
-} else {
+}
+else {
 	# generate new code
 	$agent = new StdClass;
 	$agent->code = str_shuffle(md5(microtime()));
@@ -58,7 +59,10 @@ 
 	<tr>
 	    <td><?php print _('Name'); ?></td>
 	    <td>
-	    	<input type="text" name="name" class="form-control input-sm" value="<?php print @$agent->name; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>>
+	    	<input type="text" name="name" class="form-control input-sm" value="<?php print @$agent->name; ?>" <?php if($_POST['action'] == "delete") {
+    print "readonly";
+}
+?>>
 	        <input type="hidden" name="id" value="<?php print $agent->id; ?>">
     		<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
     		<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
@@ -69,7 +73,10 @@ 
 	<!-- description -->
 	<tr>
 	    <td><?php print _('Description'); ?></td>
-	    <td><input type="text" id="description" name="description" class="form-control input-sm"  value="<?php print @$agent->description; ?>"  <?php if($_POST['action'] == "delete") print "readonly"; ?>></td>
+	    <td><input type="text" id="description" name="description" class="form-control input-sm"  value="<?php print @$agent->description; ?>"  <?php if($_POST['action'] == "delete") {
+    print "readonly";
+}
+?>></td>
        	<td class="info2"><?php print _('Agent description'); ?></td>
     </tr>
 
@@ -77,7 +84,10 @@ 
 	<!-- code -->
 	<tr>
 	    <td><?php print _('Code'); ?></td>
-	    <td><input type="text" id="code" name="code" class="form-control input-sm"  value="<?php print @$agent->code; ?>"  maxlength='32' <?php if(@$agent->type=="direct"||$_POST['action'] == "delete") print "readonly"; ?>></td>
+	    <td><input type="text" id="code" name="code" class="form-control input-sm"  value="<?php print @$agent->code; ?>"  maxlength='32' <?php if(@$agent->type=="direct"||$_POST['action'] == "delete") {
+    print "readonly";
+}
+?>></td>
        	<td class="info2"><?php print _('Agent code'); ?><?php if(@$agent->type!="direct") { ?> <button class="btn btn-xs btn-default" id="regAgentKey"><i class="fa fa-random"></i> <?php print _('Regenerate'); ?></button><?php } ?></td>
     </tr>
 
@@ -85,7 +95,10 @@ 
 	<tr>
 	    <td><?php print _('Agent type'); ?></td>
 	    <td>
-	    	<select name="type" class="form-control input-sm input-w-auto" <?php if(@$agent->type=="direct"||$_POST['action'] == "delete") print "readonly"; ?>>
+	    	<select name="type" class="form-control input-sm input-w-auto" <?php if(@$agent->type=="direct"||$_POST['action'] == "delete") {
+    print "readonly";
+}
+?>>
 	    	<?php
 	    	//$types = array("mysql"=>"MySQL", "api"=>"Api");
 	    	$types = array("mysql"=>"MySQL");
@@ -110,7 +123,10 @@ 
 <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="agentEditSubmit"><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 <?php if($_POST['action']=="delete") { print "btn-danger"; }
+else { print "btn-success"; } ?>" id="agentEditSubmit"><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="agentEditResult"></div>

Spacing +31 added lines, -31 removed lines

@@ -5,42 +5,42 @@ 
  *************************************************/
 
 /* 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 ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "agent");
 
 # ID must be numeric
-if($_POST['action']!="add" && !is_numeric($_POST['id'])) { $Result->show("danger", _("Invalid ID"), true, true); }
+if ($_POST['action'] != "add" && !is_numeric ($_POST['id'])) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 # fetch api for edit / add
-if($_POST['action']!="add") {
+if ($_POST['action'] != "add") {
 	# fetch api details
 	$agent = $Admin->fetch_object ("scanAgents", "id", $_POST['id']);
 	# null ?
-	$agent===false ? $Result->show("danger", _("Invalid ID"), true) : null;
+	$agent === false ? $Result->show ("danger", _ ("Invalid ID"), true) : null;
 	# title
-	$title =  ucwords($_POST['action']) .' '._('agent').' '.$agent->name;
+	$title = ucwords ($_POST['action']).' '._ ('agent').' '.$agent->name;
 } else {
 	# generate new code
 	$agent = new StdClass;
-	$agent->code = str_shuffle(md5(microtime()));
+	$agent->code = str_shuffle (md5 (microtime ()));
 	# title
-	$title = _('Create new scan agent');
+	$title = _ ('Create new scan agent');
 }
 
 # die if direct and delete
-if (@$agent->type=="direct" && $_POST['action']=="delete") {
-	$Result->show("danger", _("Cannot remove localhost scan agent"),true, true);
+if (@$agent->type == "direct" && $_POST['action'] == "delete") {
+	$Result->show ("danger", _ ("Cannot remove localhost scan agent"), true, true);
 }
 ?>
 
@@ -56,47 +56,47 @@ 
 
 	<!-- name -->
 	<tr>
-	    <td><?php print _('Name'); ?></td>
+	    <td><?php print _ ('Name'); ?></td>
 	    <td>
-	    	<input type="text" name="name" class="form-control input-sm" value="<?php print @$agent->name; ?>" <?php if($_POST['action'] == "delete") print "readonly"; ?>>
+	    	<input type="text" name="name" class="form-control input-sm" value="<?php print @$agent->name; ?>" <?php if ($_POST['action'] == "delete") print "readonly"; ?>>
 	        <input type="hidden" name="id" value="<?php print $agent->id; ?>">
     		<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
     		<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 	    </td>
-       	<td class="info2"><?php print _('Enter scan agent name'); ?></td>
+       	<td class="info2"><?php print _ ('Enter scan agent name'); ?></td>
     </tr>
 
 	<!-- description -->
 	<tr>
-	    <td><?php print _('Description'); ?></td>
-	    <td><input type="text" id="description" name="description" class="form-control input-sm"  value="<?php print @$agent->description; ?>"  <?php if($_POST['action'] == "delete") print "readonly"; ?>></td>
-       	<td class="info2"><?php print _('Agent description'); ?></td>
+	    <td><?php print _ ('Description'); ?></td>
+	    <td><input type="text" id="description" name="description" class="form-control input-sm"  value="<?php print @$agent->description; ?>"  <?php if ($_POST['action'] == "delete") print "readonly"; ?>></td>
+       	<td class="info2"><?php print _ ('Agent description'); ?></td>
     </tr>
 
-	<?php if(@$agent->type!=="direct") { ?>
+	<?php if (@$agent->type !== "direct") { ?>
 	<!-- code -->
 	<tr>
-	    <td><?php print _('Code'); ?></td>
-	    <td><input type="text" id="code" name="code" class="form-control input-sm"  value="<?php print @$agent->code; ?>"  maxlength='32' <?php if(@$agent->type=="direct"||$_POST['action'] == "delete") print "readonly"; ?>></td>
-       	<td class="info2"><?php print _('Agent code'); ?><?php if(@$agent->type!="direct") { ?> <button class="btn btn-xs btn-default" id="regAgentKey"><i class="fa fa-random"></i> <?php print _('Regenerate'); ?></button><?php } ?></td>
+	    <td><?php print _ ('Code'); ?></td>
+	    <td><input type="text" id="code" name="code" class="form-control input-sm"  value="<?php print @$agent->code; ?>"  maxlength='32' <?php if (@$agent->type == "direct" || $_POST['action'] == "delete") print "readonly"; ?>></td>
+       	<td class="info2"><?php print _ ('Agent code'); ?><?php if (@$agent->type != "direct") { ?> <button class="btn btn-xs btn-default" id="regAgentKey"><i class="fa fa-random"></i> <?php print _ ('Regenerate'); ?></button><?php } ?></td>
     </tr>
 
 	<!-- type -->
 	<tr>
-	    <td><?php print _('Agent type'); ?></td>
+	    <td><?php print _ ('Agent type'); ?></td>
 	    <td>
-	    	<select name="type" class="form-control input-sm input-w-auto" <?php if(@$agent->type=="direct"||$_POST['action'] == "delete") print "readonly"; ?>>
+	    	<select name="type" class="form-control input-sm input-w-auto" <?php if (@$agent->type == "direct" || $_POST['action'] == "delete") print "readonly"; ?>>
 	    	<?php
 	    	//$types = array("mysql"=>"MySQL", "api"=>"Api");
-	    	$types = array("mysql"=>"MySQL");
+	    	$types = array ("mysql"=>"MySQL");
 
-	    	foreach($types as $k=>$p) {
-		    	if($k==$agent->type)	{ print "<option value='$k' selected='selected'>"._($p)."</option>"; }
-		    	else					{ print "<option value='$k' 				   >"._($p)."</option>"; }
+	    	foreach ($types as $k=>$p) {
+		    	if ($k == $agent->type) { print "<option value='$k' selected='selected'>"._ ($p)."</option>"; }
+		    	else { print "<option value='$k' 				   >"._ ($p)."</option>"; }
 	    	}
 	    	?>
 	    	</select>
-       	<td class="info2"><?php print _('Agent type'); ?></td>
+       	<td class="info2"><?php print _ ('Agent type'); ?></td>
     </tr>
     <?php } ?>
 
@@ -109,8 +109,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="agentEditSubmit"><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="agentEditSubmit"><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="agentEditResult"></div>

app/admin/powerDNS/domains-print.php

Indentation +44 added lines, -44 removed lines

@@ -12,25 +12,25 @@ 
 
 // fetch required domains
 switch ($type) {
-	// fetch forward domains
-	case 'domains':
-		$title = _("Domains");
-		$domains = $PowerDNS->fetch_all_forward_domains ();
-		break;
-	// fetch v4 reverse domains
-	case 'reverse_v4':
-		$title = _("IPv4 reverse domains");
-		$domains = $PowerDNS->fetch_reverse_v4_domains ();
-		break;
-	// fetch v6 reverse domains
-	case 'reverse_v6':
-		$title = _("IPv6 reverse domains");
-		$domains = $PowerDNS->fetch_reverse_v6_domains ();
-		break;
-	// error
-	default:
-		$Result->show("danger", "Invalid request", true);
-		break;
+    // fetch forward domains
+    case 'domains':
+        $title = _("Domains");
+        $domains = $PowerDNS->fetch_all_forward_domains ();
+        break;
+    // fetch v4 reverse domains
+    case 'reverse_v4':
+        $title = _("IPv4 reverse domains");
+        $domains = $PowerDNS->fetch_reverse_v4_domains ();
+        break;
+    // fetch v6 reverse domains
+    case 'reverse_v6':
+        $title = _("IPv6 reverse domains");
+        $domains = $PowerDNS->fetch_reverse_v6_domains ();
+        break;
+    // error
+    default:
+        $Result->show("danger", "Invalid request", true);
+        break;
 }
 ?>
 
@@ -71,34 +71,34 @@ 
 <?php
 /* prints domain records */
 foreach ($domains as $d) {
-	// nulls
-	foreach($d as $k=>$v) {
-		if (strlen($v)==0)	$d->$k = "<span class='muted'>/</span>";
-	}
-	// cont records
-	$cnt = $PowerDNS->count_domain_records ($d->id);
-	// get SOA record
-	$soa = $PowerDNS->fetch_domain_records_by_type ($d->id, "SOA");
-	$serial = explode(" ", $soa[0]->content);
-	$serial = $serial[2];
+    // nulls
+    foreach($d as $k=>$v) {
+        if (strlen($v)==0)	$d->$k = "<span class='muted'>/</span>";
+    }
+    // cont records
+    $cnt = $PowerDNS->count_domain_records ($d->id);
+    // get SOA record
+    $soa = $PowerDNS->fetch_domain_records_by_type ($d->id, "SOA");
+    $serial = explode(" ", $soa[0]->content);
+    $serial = $serial[2];
 
-	print "<tr>";
-	// actions
-	print "	<td>";
-	print "	<div class='btn-group'>";
-	print "		<button class='btn btn-default btn-xs editDomain' data-action='edit' data-id='$d->id'><i class='fa fa-pencil'></i></button>";
-	print "		<button class='btn btn-default btn-xs editDomain' data-action='delete' data-id='$d->id'><i class='fa fa-remove'></i></button>";
-	print "	</div>";
-	print "	</td>";
+    print "<tr>";
+    // actions
+    print "	<td>";
+    print "	<div class='btn-group'>";
+    print "		<button class='btn btn-default btn-xs editDomain' data-action='edit' data-id='$d->id'><i class='fa fa-pencil'></i></button>";
+    print "		<button class='btn btn-default btn-xs editDomain' data-action='delete' data-id='$d->id'><i class='fa fa-remove'></i></button>";
+    print "	</div>";
+    print "	</td>";
 
-	// content
-	print "	<td><a href='".create_link("administration", "powerDNS", $_GET['subnetId'], "records", $d->name)."'>$d->name</a></td>";
-	print "	<td><span class='badge badge1'>$d->type</span></td>";
-	print "	<td>$d->master</td>";
-	print "	<td><span class='badge'>$cnt</span></td>";
-	print "	<td>$serial</td>";
+    // content
+    print "	<td><a href='".create_link("administration", "powerDNS", $_GET['subnetId'], "records", $d->name)."'>$d->name</a></td>";
+    print "	<td><span class='badge badge1'>$d->type</span></td>";
+    print "	<td>$d->master</td>";
+    print "	<td><span class='badge'>$cnt</span></td>";
+    print "	<td>$serial</td>";
 
-	print "</tr>";
+    print "</tr>";
 }
 ?>
 </tbody>

Braces +3 added lines, -1 removed lines

@@ -73,7 +73,9 @@
 foreach ($domains as $d) {
 	// nulls
 	foreach($d as $k=>$v) {
-		if (strlen($v)==0)	$d->$k = "<span class='muted'>/</span>";
+		if (strlen($v)==0) {
+		    $d->$k = "<span class='muted'>/</span>";
+		}
 	}
 	// cont records
 	$cnt = $PowerDNS->count_domain_records ($d->id);

Spacing +16 added lines, -16 removed lines

@@ -5,7 +5,7 @@ 
  *************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch domains
 $type = $_GET['subnetId'];
@@ -14,22 +14,22 @@ 
 switch ($type) {
 	// fetch forward domains
 	case 'domains':
-		$title = _("Domains");
+		$title = _ ("Domains");
 		$domains = $PowerDNS->fetch_all_forward_domains ();
 		break;
 	// fetch v4 reverse domains
 	case 'reverse_v4':
-		$title = _("IPv4 reverse domains");
+		$title = _ ("IPv4 reverse domains");
 		$domains = $PowerDNS->fetch_reverse_v4_domains ();
 		break;
 	// fetch v6 reverse domains
 	case 'reverse_v6':
-		$title = _("IPv6 reverse domains");
+		$title = _ ("IPv6 reverse domains");
 		$domains = $PowerDNS->fetch_reverse_v6_domains ();
 		break;
 	// error
 	default:
-		$Result->show("danger", "Invalid request", true);
+		$Result->show ("danger", "Invalid request", true);
 		break;
 }
 ?>
@@ -39,14 +39,14 @@ 
 
 <!-- Back -->
 <div class="btn-group" style="margin-bottom:10px;margin-top: 10px;">
-    <button class='btn btn-sm btn-default btn-success editDomain' data-action='add' data-id='0'><i class='fa fa-plus'></i> <?php print _('Create domain'); ?></button>
+    <button class='btn btn-sm btn-default btn-success editDomain' data-action='add' data-id='0'><i class='fa fa-plus'></i> <?php print _ ('Create domain'); ?></button>
 </div>
 <br>
 
 
 <?php
 // none
-if($domains===false) 								{ $Result->show("info alert-absolute", _("No domains configured"), false); }
+if ($domains === false) { $Result->show ("info alert-absolute", _ ("No domains configured"), false); }
 else {
 
 ?>
@@ -58,11 +58,11 @@ 
 <thead id="headers">
 <tr>
 	<th style="width:80px;"></th>
-    <th><?php print _('Domain'); ?></th>
-    <th><?php print _('Type'); ?></th>
-    <th><?php print _('Master NS'); ?></th>
-    <th><?php print _('Records'); ?></th>
-    <th><?php print _('Serial number'); ?></th>
+    <th><?php print _ ('Domain'); ?></th>
+    <th><?php print _ ('Type'); ?></th>
+    <th><?php print _ ('Master NS'); ?></th>
+    <th><?php print _ ('Records'); ?></th>
+    <th><?php print _ ('Serial number'); ?></th>
 </tr>
 </thead>
 
@@ -72,14 +72,14 @@ 
 /* prints domain records */
 foreach ($domains as $d) {
 	// nulls
-	foreach($d as $k=>$v) {
-		if (strlen($v)==0)	$d->$k = "<span class='muted'>/</span>";
+	foreach ($d as $k=>$v) {
+		if (strlen ($v) == 0)	$d->$k = "<span class='muted'>/</span>";
 	}
 	// cont records
 	$cnt = $PowerDNS->count_domain_records ($d->id);
 	// get SOA record
 	$soa = $PowerDNS->fetch_domain_records_by_type ($d->id, "SOA");
-	$serial = explode(" ", $soa[0]->content);
+	$serial = explode (" ", $soa[0]->content);
 	$serial = $serial[2];
 
 	print "<tr>";
@@ -92,7 +92,7 @@ 
 	print "	</td>";
 
 	// content
-	print "	<td><a href='".create_link("administration", "powerDNS", $_GET['subnetId'], "records", $d->name)."'>$d->name</a></td>";
+	print "	<td><a href='".create_link ("administration", "powerDNS", $_GET['subnetId'], "records", $d->name)."'>$d->name</a></td>";
 	print "	<td><span class='badge badge1'>$d->type</span></td>";
 	print "	<td>$d->master</td>";
 	print "	<td><span class='badge'>$cnt</span></td>";

app/admin/powerDNS/refresh-ptr-records.php

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@ 
 <!-- header -->
-<div class="pHeader"><?php print _("PTR zone refresh records"); ?></div>
+<div class="pHeader"><?php print _ ("PTR zone refresh records"); ?></div>
 
 <!-- content -->
 <div class="pContent">
-	<?php print _('Clicking on regenerate will remove all PTR records for subnet and recreate new.'); ?>
+	<?php print _ ('Clicking on regenerate will remove all PTR records for subnet and recreate new.'); ?>
 	<br>
 
 	<div class="text-righ2t">
@@ -19,6 +19,6 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopupsReload"><?php print _('Close'); ?></button>
+		<button class="btn btn-sm btn-default hidePopupsReload"><?php print _ ('Close'); ?></button>
 	</div>
 </div>
\ No newline at end of file

app/admin/powerDNS/settings-save.php

Indentation +2 added lines, -2 removed lines

@@ -44,8 +44,8 @@
 
 # set update values
 $values_new = array("id"=>1,
-				"powerDNS"=>json_encode($values),
-				);
+                "powerDNS"=>json_encode($values),
+                );
 if(!$Admin->object_modify("settings", "edit", "id", $values_new))	{ $Result->show("danger",  _("Cannot update settings"), false); }
 else															    { $Result->show("success", _("Settings updated successfully"), false); }
 

Spacing +21 added lines, -21 removed lines

@@ -5,24 +5,24 @@ 
  **************************/
 
 /* 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 ();
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "pdns_settings", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "pdns_settings", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 // validations
-if(strlen($_POST['name'])==0)			{ $Result->show("danger", "Invalid database name", true); }
-if(strlen($_POST['port'])==0)			{ $_POST['port'] = 3306; }
-elseif (!is_numeric($_POST['port']))	{ $Result->show("danger", "Invalid port number", true); }
+if (strlen ($_POST['name']) == 0) { $Result->show ("danger", "Invalid database name", true); }
+if (strlen ($_POST['port']) == 0) { $_POST['port'] = 3306; }
+elseif (!is_numeric ($_POST['port'])) { $Result->show ("danger", "Invalid port number", true); }
 
 // formulate json
 $values = new StdClass ();
@@ -35,30 +35,30 @@ 
 $values->autoserial = isset($_POST['autoserial']) ? "Yes" : "No";
 
 // get old settings for defaults
-$old_values = json_decode($User->settings->powerDNS);
+$old_values = json_decode ($User->settings->powerDNS);
 
-$values->ns			= $old_values->ns;
-$values->hostmaster	= $old_values->hostmaster;
-$values->def_ptr_domain	= $old_values->def_ptr_domain;
-$values->refresh 	= $old_values->refresh;
+$values->ns = $old_values->ns;
+$values->hostmaster = $old_values->hostmaster;
+$values->def_ptr_domain = $old_values->def_ptr_domain;
+$values->refresh = $old_values->refresh;
 $values->retry 		= $old_values->retry;
 $values->expire 	= $old_values->expire;
 $values->nxdomain_ttl = $old_values->nxdomain_ttl;
-$values->ttl 		= $old_values->ttl;
+$values->ttl = $old_values->ttl;
 
 # set update values
-$values_new = array("id"=>1,
-				"powerDNS"=>json_encode($values),
+$values_new = array ("id"=>1,
+				"powerDNS"=>json_encode ($values),
 				);
-if(!$Admin->object_modify("settings", "edit", "id", $values_new))	{ $Result->show("danger",  _("Cannot update settings"), false); }
-else															    { $Result->show("success", _("Settings updated successfully"), false); }
+if (!$Admin->object_modify ("settings", "edit", "id", $values_new)) { $Result->show ("danger", _ ("Cannot update settings"), false); }
+else { $Result->show ("success", _ ("Settings updated successfully"), false); }
 
 # autoserial change - set default SOA for all records !
-if ($values->autoserial!==@$old_values->autoserial) {
+if ($values->autoserial !== @$old_values->autoserial) {
     // start class
-    $PowerDNS 	= new PowerDNS ($Database);
+    $PowerDNS = new PowerDNS ($Database);
     // check connection
-    if($PowerDNS->db_check()!==false) {
+    if ($PowerDNS->db_check () !== false) {
         // update all serials
         $PowerDNS->update_all_soa_serials ($values->autoserial);
     }