phpipam / phpipam

app/admin/subnets/edit-nameserver-dropdown.php

Indentation +40 added lines, -40 removed lines

@@ -6,15 +6,15 @@ 
 
 /* required functions */
 if(!is_object($User)) {
-	/* functions */
-	require( dirname(__FILE__) . '/../../../functions/functions.php');
-
-	# initialize user object
-	$Database 	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools	 	= new Tools ($Database);
-	$Sections	= new Sections ($Database);
-	$Result 	= new Result ();
+    /* functions */
+    require( dirname(__FILE__) . '/../../../functions/functions.php');
+
+    # initialize user object
+    $Database 	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools	 	= new Tools ($Database);
+    $Sections	= new Sections ($Database);
+    $Result 	= new Result ();
 }
 
 # verify that user is logged in
@@ -28,18 +28,18 @@ 
 
 # Only parse nameserver if any exists
 if($permitted_nameservers != false) {
-	foreach($permitted_nameservers as $k=>$n) {
-		// fetch nameserver sets and append
-		$nameserver_set = $Tools->fetch_multiple_objects("nameservers", "id", $n, "name", "namesrv1");
-
-		//save to array
-		$nsout[$n] = $nameserver_set;
-
-		//count add
-		$cnt++;
-	}
-	//filter out empty
-	$permitted_nameservers = isset($nsout) ? array_filter($nsout) : false;
+    foreach($permitted_nameservers as $k=>$n) {
+        // fetch nameserver sets and append
+        $nameserver_set = $Tools->fetch_multiple_objects("nameservers", "id", $n, "name", "namesrv1");
+
+        //save to array
+        $nsout[$n] = $nameserver_set;
+
+        //count add
+        $cnt++;
+    }
+    //filter out empty
+    $permitted_nameservers = isset($nsout) ? array_filter($nsout) : false;
 }
 
 ?>
@@ -49,25 +49,25 @@ 
 
 	<option value="0"><?php print _('No nameservers'); ?></option>
 	<?php
-	# print all available nameserver sets
-	if ($permitted_nameservers!==false) {
-		foreach($permitted_nameservers as $n) {
-
-			if($n[0]!==null) {
-				foreach($n as $ns) {
-					// set print
-					$printNS = "$ns->name";
-					$printNS .= " (" . array_shift(explode(";",$ns->namesrv1)).",...)";
-
-					/* selected? */
-					if(@$subnet_old_details['nameserverId']==$ns->id) 	{ print '<option value="'. $ns->id .'" selected>'. $printNS .'</option>'. "\n"; }
-					elseif(@$_POST['nameserverId'] == $ns->id) 			{ print '<option value="'. $ns->id .'" selected>'. $printNS .'</option>'. "\n"; }
-					else 												{ print '<option value="'. $ns->id .'">'. $printNS .'</option>'. "\n"; }
-				}
-			}
-		}
-	}
-	?>
+    # print all available nameserver sets
+    if ($permitted_nameservers!==false) {
+        foreach($permitted_nameservers as $n) {
+
+            if($n[0]!==null) {
+                foreach($n as $ns) {
+                    // set print
+                    $printNS = "$ns->name";
+                    $printNS .= " (" . array_shift(explode(";",$ns->namesrv1)).",...)";
+
+                    /* selected? */
+                    if(@$subnet_old_details['nameserverId']==$ns->id) 	{ print '<option value="'. $ns->id .'" selected>'. $printNS .'</option>'. "\n"; }
+                    elseif(@$_POST['nameserverId'] == $ns->id) 			{ print '<option value="'. $ns->id .'" selected>'. $printNS .'</option>'. "\n"; }
+                    else 												{ print '<option value="'. $ns->id .'">'. $printNS .'</option>'. "\n"; }
+                }
+            }
+        }
+    }
+    ?>
 	</optgroup>
 
 

app/admin/subnets/edit-vlan-dropdown.php

Indentation +40 added lines, -40 removed lines

@@ -6,15 +6,15 @@ 
 
 /* required functions */
 if(!isset($User)) {
-	/* functions */
-	require( dirname(__FILE__) . '/../../../functions/functions.php');
+    /* functions */
+    require( dirname(__FILE__) . '/../../../functions/functions.php');
 
-	# initialize user object
-	$Database 	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools	 	= new Tools ($Database);
-	$Sections	= new Sections ($Database);
-	$Result 	= new Result ();
+    # initialize user object
+    $Database 	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools	 	= new Tools ($Database);
+    $Sections	= new Sections ($Database);
+    $Result 	= new Result ();
 }
 
 # verify that user is logged in
@@ -26,15 +26,15 @@ 
 # fetch all belonging vlans
 $cnt = 0;
 foreach($permitted_domains as $k=>$d) {
-	//fetch domain
-	$domain = $Tools->fetch_object("vlanDomains","id",$d);
-	// fetch vlans and append
-	$vlans = $Tools->fetch_multiple_objects("vlans", "domainId", $domain->id, "number");
-	//save to array
-	$out[$d]['domain'] = $domain;
-	$out[$d]['vlans']  = $vlans;
-	//count add
-	$cnt++;
+    //fetch domain
+    $domain = $Tools->fetch_object("vlanDomains","id",$d);
+    // fetch vlans and append
+    $vlans = $Tools->fetch_multiple_objects("vlans", "domainId", $domain->id, "number");
+    //save to array
+    $out[$d]['domain'] = $domain;
+    $out[$d]['vlans']  = $vlans;
+    //count add
+    $cnt++;
 }
 //filter out empty
 $permitted_domains = array_filter($out);
@@ -44,29 +44,29 @@ 
 	<option disabled="disabled"><?php print _('Select VLAN'); ?>:</option>
 	<option value="0"><?php print _('No VLAN'); ?></option>
 	<?php
-	# print all available domains
-	foreach($permitted_domains as $d) {
-		//more than default
-			print "<optgroup label='".$d['domain']->name."'>";
-			//add
-			print "<option value='Add' data-domain='".$d['domain']->id."'>"._('+ Add new VLAN')."</option>";
+    # print all available domains
+    foreach($permitted_domains as $d) {
+        //more than default
+            print "<optgroup label='".$d['domain']->name."'>";
+            //add
+            print "<option value='Add' data-domain='".$d['domain']->id."'>"._('+ Add new VLAN')."</option>";
 
-			if($d['vlans'][0]!==null) {
-				foreach($d['vlans'] as $v) {
-					// set print
-					$printVLAN = $v->number;
-					if(!empty($v->name)) { $printVLAN .= " ($v->name)"; }
+            if($d['vlans'][0]!==null) {
+                foreach($d['vlans'] as $v) {
+                    // set print
+                    $printVLAN = $v->number;
+                    if(!empty($v->name)) { $printVLAN .= " ($v->name)"; }
 
-					/* selected? */
-					if(@$subnet_old_details['vlanId']==$v->vlanId) 	{ print '<option value="'. $v->vlanId .'" selected>'. $printVLAN .'</option>'. "\n"; }
-					elseif(@$_POST['vlanId'] == $v->vlanId) 	{ print '<option value="'. $v->vlanId .'" selected>'. $printVLAN .'</option>'. "\n"; }
-					else 										{ print '<option value="'. $v->vlanId .'">'. $printVLAN .'</option>'. "\n"; }
-				}
-			}
-			else {
-				print "<option value='0' disabled>"._('No VLANs')."</option>";
-			}
-			print "</optgroup>";
-	}
-	?>
+                    /* selected? */
+                    if(@$subnet_old_details['vlanId']==$v->vlanId) 	{ print '<option value="'. $v->vlanId .'" selected>'. $printVLAN .'</option>'. "\n"; }
+                    elseif(@$_POST['vlanId'] == $v->vlanId) 	{ print '<option value="'. $v->vlanId .'" selected>'. $printVLAN .'</option>'. "\n"; }
+                    else 										{ print '<option value="'. $v->vlanId .'">'. $printVLAN .'</option>'. "\n"; }
+                }
+            }
+            else {
+                print "<option value='0' disabled>"._('No VLANs')."</option>";
+            }
+            print "</optgroup>";
+    }
+    ?>
 </select>
\ No newline at end of file

app/admin/subnets/index.php

Indentation +80 added lines, -80 removed lines

@@ -24,87 +24,87 @@
 /* Foreach section fetch subnets and print it! */
 if(sizeof($sections) > 0) {
 
-	# print  table structure
-	print "<table id='manageSubnets' class='table sorted table-striped table-condensed table-top'>";
-
-	# headers
-	print "<thead>";
-	print "	<tr>";
-	print "	<th>"._('Subnet')."</th>";
-	print "	<th>"._('Description')."</th>";
-	print "	<th>"._('VLAN')."</th>";
-	if($User->settings->enableVRF == 1) {
-	print "	<th>"._('VRF')."</th>";
-	}
-	print "	<th>"._('Master Subnet')."</th>";
-	print "	<th>"._('Device')."</th>";
-	print "	<th class='hidden-xs hidden-sm'>"._('Requests')."</th>";
-
-	if(sizeof($custom_fields) > 0) {
-		foreach($custom_fields as $field) {
-			# hidden?
-			if(!in_array($field['name'], $hidden_custom_fields)) {
-				print "	<th class='hidden-xs hidden-sm hidden-md'>$field[name]</th>";
-			}
-		}
-	}
-	# actions
-	print "<th class='actions' style='padding:0px;'></th>";
-	print "</tr>";
-	print "</thead>";
-
-
-	$m = 0;	//for subnet index
+    # print  table structure
+    print "<table id='manageSubnets' class='table sorted table-striped table-condensed table-top'>";
+
+    # headers
+    print "<thead>";
+    print "	<tr>";
+    print "	<th>"._('Subnet')."</th>";
+    print "	<th>"._('Description')."</th>";
+    print "	<th>"._('VLAN')."</th>";
+    if($User->settings->enableVRF == 1) {
+    print "	<th>"._('VRF')."</th>";
+    }
+    print "	<th>"._('Master Subnet')."</th>";
+    print "	<th>"._('Device')."</th>";
+    print "	<th class='hidden-xs hidden-sm'>"._('Requests')."</th>";
+
+    if(sizeof($custom_fields) > 0) {
+        foreach($custom_fields as $field) {
+            # hidden?
+            if(!in_array($field['name'], $hidden_custom_fields)) {
+                print "	<th class='hidden-xs hidden-sm hidden-md'>$field[name]</th>";
+            }
+        }
+    }
+    # actions
+    print "<th class='actions' style='padding:0px;'></th>";
+    print "</tr>";
+    print "</thead>";
+
+
+    $m = 0;	//for subnet index
 
     print "<tbody>";
-	# print titles and content
-	if($sections!==false) {
-		foreach($sections as $section) {
-			//cast
-			$section = (array) $section;
-			# set colcount
-			$colCount = $User->settings->enableVRF==1 ? 10 : 9;
-
-			# just for count
-			if(sizeof($custom_fields) > 0) {
-				foreach($custom_fields as $field) {
-					if(!in_array($field['name'], $hidden_custom_fields)) {
-						$colCount++;
-					}
-				}
-			}
-
-			# print name
-			print "<tr class='subnet-title'>";
-			print "	<th colspan='$colCount'>";
-			print "		<h4> $section[name] </h4>";
-			print "	</th>";
-			print "</tr>";
-
-			# get all subnets in section
-			$section_subnets = $Subnets->fetch_section_subnets($section['id']);
-
-			# add new link
-			print "<tr>";
-			print "	<td colspan='$colCount'>";
-			print "		<button class='btn btn-sm btn-default editSubnet' data-action='add' data-sectionid='$section[id]' data-subnetId='' rel='tooltip' data-placement='right' title='"._('Add new subnet to section')." $section[name]'><i class='fa fa-plus'></i> "._('Add subnet')."</button>";
-			print "	</td>";
-			print "	</tr>";
-
-			# no subnets
-			if(sizeof($section_subnets) == 0) {
-				print "<tr><td colspan='$colCount'><div class='alert alert-info'>"._('Section has no subnets')."!</div></td></tr>";
-			}
-			else {
-				# subnets
-				$Subnets->print_subnets_tools($User->user, $section_subnets, $custom_fields);
-			}
-			$m++;
-		}
-	}
-	print "</tbody>";
-
-	# end master table
-	print "</table>";
+    # print titles and content
+    if($sections!==false) {
+        foreach($sections as $section) {
+            //cast
+            $section = (array) $section;
+            # set colcount
+            $colCount = $User->settings->enableVRF==1 ? 10 : 9;
+
+            # just for count
+            if(sizeof($custom_fields) > 0) {
+                foreach($custom_fields as $field) {
+                    if(!in_array($field['name'], $hidden_custom_fields)) {
+                        $colCount++;
+                    }
+                }
+            }
+
+            # print name
+            print "<tr class='subnet-title'>";
+            print "	<th colspan='$colCount'>";
+            print "		<h4> $section[name] </h4>";
+            print "	</th>";
+            print "</tr>";
+
+            # get all subnets in section
+            $section_subnets = $Subnets->fetch_section_subnets($section['id']);
+
+            # add new link
+            print "<tr>";
+            print "	<td colspan='$colCount'>";
+            print "		<button class='btn btn-sm btn-default editSubnet' data-action='add' data-sectionid='$section[id]' data-subnetId='' rel='tooltip' data-placement='right' title='"._('Add new subnet to section')." $section[name]'><i class='fa fa-plus'></i> "._('Add subnet')."</button>";
+            print "	</td>";
+            print "	</tr>";
+
+            # no subnets
+            if(sizeof($section_subnets) == 0) {
+                print "<tr><td colspan='$colCount'><div class='alert alert-info'>"._('Section has no subnets')."!</div></td></tr>";
+            }
+            else {
+                # subnets
+                $Subnets->print_subnets_tools($User->user, $section_subnets, $custom_fields);
+            }
+            $m++;
+        }
+    }
+    print "</tbody>";
+
+    # end master table
+    print "</table>";
 }
 ?>

app/admin/subnets/split.php

Indentation +17 added lines, -17 removed lines

@@ -46,19 +46,19 @@ 
 
 //set mask options
 for($mask=($subnet->mask+1); $mask<=$max_new_mask; $mask++) {
-	# set vars
-	$opts[$m]['mask']   = $mask;
-	$opts[$m]['number'] = $n;
-	$opts[$m]['max']    = $Subnets->get_max_hosts ($mask, $Subnets->identify_address($Subnets->transform_to_dotted($subnet->subnet)));
-
-	# next
-	$m++;
-	$n = $n * 2;
-
-	# max number = 16!
-	if($n > 256) {
-		$mask = 1000;
-	}
+    # set vars
+    $opts[$m]['mask']   = $mask;
+    $opts[$m]['number'] = $n;
+    $opts[$m]['max']    = $Subnets->get_max_hosts ($mask, $Subnets->identify_address($Subnets->transform_to_dotted($subnet->subnet)));
+
+    # next
+    $m++;
+    $n = $n * 2;
+
+    # max number = 16!
+    if($n > 256) {
+        $mask = 1000;
+    }
 }
 ?>
 
@@ -84,10 +84,10 @@ 
         <td style="vertical-align:middle">
 	    	<select name="number" class="form-control input-sm input-w-auto">
 	    	<?php
-	    	foreach($opts as $line) {
-		    	print "<option value='$line[number]'>$line[number]x /$line[mask] subnet ($line[number]x $line[max] hosts)</option>";
-	    	}
-	    	?>
+            foreach($opts as $line) {
+                print "<option value='$line[number]'>$line[number]x /$line[mask] subnet ($line[number]x $line[max] hosts)</option>";
+            }
+            ?>
 	    	</select>
 	    	<input type="hidden" name="subnetId" value="<?php print $subnet->id; ?>">
 	    	<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">

app/admin/subnets/edit-folder.php

Indentation +118 added lines, -118 removed lines

@@ -24,16 +24,16 @@ 
 
 # ID must be numeric
 if($_POST['action']!="add") {
-	if(!is_numeric($_POST['subnetId']))										{ $Result->show("danger", _("Invalid ID"), true, true); }
+    if(!is_numeric($_POST['subnetId']))										{ $Result->show("danger", _("Invalid ID"), true, true); }
 }
 
 # 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); }
 }
 
 
@@ -43,13 +43,13 @@ 
 }
 # we are adding new folder - get folder details
 else {
-	# for selecting master subnet if added from subnet details!
-	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
-    	$subnet_old_details['vlanId'] 		 	= @$subnet_old_temp['vlanId'];		// same default vlan for nested
-    	$subnet_old_details['vrfId'] 		 	= @$subnet_old_temp['vrfId'];		// same default vrf for nested
-	}
+    # for selecting master subnet if added from subnet details!
+    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
+        $subnet_old_details['vlanId'] 		 	= @$subnet_old_temp['vlanId'];		// same default vlan for nested
+        $subnet_old_details['vrfId'] 		 	= @$subnet_old_temp['vrfId'];		// same default vrf for nested
+    }
 }
 
 # fetch custom fields
@@ -90,14 +90,14 @@ 
         <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>
 
         	</select>
@@ -124,100 +124,100 @@ 
 	<input type="hidden" name="csrf_cookie"     value="<?php print $csrf; ?>">
 
     <?php
-    	# 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
-		    	$folder_old_details[$field['name']] = str_replace("\n", "\\n", @$folder_old_details[$field['name']]);
-
-				# set default value !
-				if ($_POST['action']=="add"){ $folder_old_details[$field['name']] = $field['Default']; }
-
-		    	# required
-				if($field['Null']=="NO")	{ $required = "*"; }
-				else						{ $required = ""; }
-
-				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==$folder_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($folder_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="'. $folder_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($folder_old_details[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-						elseif($k==$folder_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","",$folder_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="'. $folder_old_details[$field['name']]. '" size="30" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
-				}
-
-				print '	</td>'. "\n";
-				print '</tr>'. "\n";
-		    }
-	    }
+        # 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
+                $folder_old_details[$field['name']] = str_replace("\n", "\\n", @$folder_old_details[$field['name']]);
+
+                # set default value !
+                if ($_POST['action']=="add"){ $folder_old_details[$field['name']] = $field['Default']; }
+
+                # required
+                if($field['Null']=="NO")	{ $required = "*"; }
+                else						{ $required = ""; }
+
+                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==$folder_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($folder_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="'. $folder_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($folder_old_details[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
+                        elseif($k==$folder_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","",$folder_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="'. $folder_old_details[$field['name']]. '" size="30" rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
+                }
+
+                print '	</td>'. "\n";
+                print '</tr>'. "\n";
+            }
+        }
 
 
     # divider
@@ -232,7 +232,7 @@ 
     <?php
     # warning if delete
     if($_POST['action'] == "delete") {
-	    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>";
     }
     ?>
 
@@ -245,11 +245,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 editFolderSubmitDelete' data-action='delete' data-subnetId='$folder_old_details[id]'><i class='fa fa-trash-o'></i> "._('Delete folder')."</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 editFolderSubmitDelete' data-action='delete' data-subnetId='$folder_old_details[id]'><i class='fa fa-trash-o'></i> "._('Delete folder')."</button>";
+        }
+        ?>
 		<button class="btn btn-sm btn-default editFolderSubmit <?php if($_POST['action']=="delete") print "btn-danger"; else print "btn-success"; ?>"><i class="<?php if($_POST['action']=="add") { print "fa fa-plus"; } else if ($_POST['action']=="delete") { print "fa fa-trash-o"; } else { print "fa fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
 	</div>
 

app/admin/subnets/resize-save.php

Indentation +6 added lines, -6 removed lines

@@ -36,18 +36,18 @@
 
 # we need to recalculate subnet address if needed
 if ($subnet_old['mask'] < $_POST['newMask']) {
-	$subnet_new['subnet'] = $subnet_old['subnet'];
+    $subnet_new['subnet'] = $subnet_old['subnet'];
 }
 else {
-	$new_boundaries		  = $Subnets->get_network_boundaries ($Subnets->transform_address($subnet_old['subnet'], "dotted"), $_POST['newMask']);
-	$subnet_new['subnet'] = $Subnets->transform_address($new_boundaries['network'], "decimal");
+    $new_boundaries		  = $Subnets->get_network_boundaries ($Subnets->transform_address($subnet_old['subnet'], "dotted"), $_POST['newMask']);
+    $subnet_new['subnet'] = $Subnets->transform_address($new_boundaries['network'], "decimal");
 }
 
 # set update values
 $values = array("id"=>$_POST['subnetId'],
-				"subnet"=>$subnet_new['subnet'],
-				"mask"=>$_POST['newMask']
-				);
+                "subnet"=>$subnet_new['subnet'],
+                "mask"=>$_POST['newMask']
+                );
 if(!$Subnets->modify_subnet ("resize", $values))				{ $Result->show("danger",  _("Error resizing subnet")."!", true); }
 else															{ $Result->show("success", _("Subnet resized successfully")."!", true); }
 

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

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>
 

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>