phpipam / phpipam

app/admin/requests/index.php

Indentation +53 added lines, -53 removed lines

@@ -37,33 +37,33 @@ 
 
 <tbody>
 <?php
-	# print requests
-	foreach($active_requests as $k=>$request) {
-		//cast
-		$request = (array) $request;
-
-		//get subnet details
-		$subnet = (array) $Subnets->fetch_subnet (null, $request['subnetId']);
-
-		//valid
-		if(sizeof($subnet)==0 || @$subnet[0]===false) {
-			unset($active_requests[$k]);
-		}
-		else {
-			// ip not provided
-			$request['ip_addr'] = strlen($request['ip_addr'])>0 ? $request['ip_addr'] : _("Automatic");
-
-			print '<tr>'. "\n";
-			print "	<td><button class='btn btn-sm btn-default' data-requestid='$request[id]'><i class='fa fa-pencil'></i> "._('Process')."</button></td>";
-			print '	<td>'. $request['ip_addr'] .'</td>'. "\n";
-			print '	<td>'. $Subnets->transform_to_dotted($subnet['subnet']) .'/'. $subnet['mask'] .' ('. $subnet['description'] .')</td>'. "\n";
-			print '	<td>'. $request['dns_name'] .'</td>'. "\n";
-			print '	<td>'. $request['description'] .'</td>'. "\n";
-			print '	<td>'. $request['requester'] .'</td>'. "\n";
-			print '	<td>'. $request['comment'] .'</td>'. "\n";
-			print '</tr>'. "\n";
-		}
-	}
+    # print requests
+    foreach($active_requests as $k=>$request) {
+        //cast
+        $request = (array) $request;
+
+        //get subnet details
+        $subnet = (array) $Subnets->fetch_subnet (null, $request['subnetId']);
+
+        //valid
+        if(sizeof($subnet)==0 || @$subnet[0]===false) {
+            unset($active_requests[$k]);
+        }
+        else {
+            // ip not provided
+            $request['ip_addr'] = strlen($request['ip_addr'])>0 ? $request['ip_addr'] : _("Automatic");
+
+            print '<tr>'. "\n";
+            print "	<td><button class='btn btn-sm btn-default' data-requestid='$request[id]'><i class='fa fa-pencil'></i> "._('Process')."</button></td>";
+            print '	<td>'. $request['ip_addr'] .'</td>'. "\n";
+            print '	<td>'. $Subnets->transform_to_dotted($subnet['subnet']) .'/'. $subnet['mask'] .' ('. $subnet['description'] .')</td>'. "\n";
+            print '	<td>'. $request['dns_name'] .'</td>'. "\n";
+            print '	<td>'. $request['description'] .'</td>'. "\n";
+            print '	<td>'. $request['requester'] .'</td>'. "\n";
+            print '	<td>'. $request['comment'] .'</td>'. "\n";
+            print '</tr>'. "\n";
+        }
+    }
 ?>
 </tbody>
 </table>
@@ -92,32 +92,32 @@ 
 
 <tbody>
 <?php
-	# print requests
-	foreach($inactive_requests as $k=>$request) {
-		//cast
-		$request = (array) $request;
-
-		//get subnet details
-		$subnet = (array) $Subnets->fetch_subnet (null, $request['subnetId']);
-
-		//valid
-		if(sizeof($subnet)==0 || @$subnet[0]===false) {
-			unset($inactive_requests[$k]);
-		}
-		else {
-			print '<tr>'. "\n";
-			print '	<td>'. $Subnets->transform_to_dotted($subnet['subnet']) .'/'. $subnet['mask'] .' ('. $subnet['description'] .')</td>'. "\n";
-			print '	<td>'. $request['dns_name'] .'</td>'. "\n";
-			print '	<td>'. $request['description'] .'</td>'. "\n";
-			print '	<td>'. $request['requester'] .'</td>'. "\n";
-			print '	<td>'. $request['comment'] .'</td>'. "\n";
-			print '	<td>'. $request['adminComment'] .'</td>'. "\n";
-			print '	<td>';
-			print $request['accepted']==1 ? "Yes" : "No";
-			print '</td>'. "\n";
-			print '</tr>'. "\n";
-		}
-	}
+    # print requests
+    foreach($inactive_requests as $k=>$request) {
+        //cast
+        $request = (array) $request;
+
+        //get subnet details
+        $subnet = (array) $Subnets->fetch_subnet (null, $request['subnetId']);
+
+        //valid
+        if(sizeof($subnet)==0 || @$subnet[0]===false) {
+            unset($inactive_requests[$k]);
+        }
+        else {
+            print '<tr>'. "\n";
+            print '	<td>'. $Subnets->transform_to_dotted($subnet['subnet']) .'/'. $subnet['mask'] .' ('. $subnet['description'] .')</td>'. "\n";
+            print '	<td>'. $request['dns_name'] .'</td>'. "\n";
+            print '	<td>'. $request['description'] .'</td>'. "\n";
+            print '	<td>'. $request['requester'] .'</td>'. "\n";
+            print '	<td>'. $request['comment'] .'</td>'. "\n";
+            print '	<td>'. $request['adminComment'] .'</td>'. "\n";
+            print '	<td>';
+            print $request['accepted']==1 ? "Yes" : "No";
+            print '</td>'. "\n";
+            print '</tr>'. "\n";
+        }
+    }
 ?>
 </tbody>
 </table>

Spacing +43 added lines, -43 removed lines

@@ -5,19 +5,19 @@ 
  ****************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all Active requests
 $active_requests   = $Admin->fetch_multiple_objects ("requests", "processed", 0, "id", false);
 $inactive_requests = $Admin->fetch_multiple_objects ("requests", "processed", 1, "id", false);
 ?>
 
-<h4><?php print _('List of all active IP addresses requests'); ?></h4>
+<h4><?php print _ ('List of all active IP addresses requests'); ?></h4>
 <hr><br>
 
 <?php
 # none
-if($active_requests===false) { print "<div class='alert alert-info'>"._('No IP address requests available')."!</div>"; }
+if ($active_requests === false) { print "<div class='alert alert-info'>"._ ('No IP address requests available')."!</div>"; }
 else {
 ?>
 <table id="requestedIPaddresses" class="table sorted table-striped table-condensed table-hover table-top">
@@ -26,19 +26,19 @@ 
 <thead>
 <tr>
 	<th style="width:50px;"></th>
-	<th><?php print _('IP'); ?></th>
-	<th><?php print _('Subnet'); ?></th>
-	<th><?php print _('Hostname'); ?></th>
-	<th><?php print _('Description'); ?></th>
-	<th><?php print _('Requested by'); ?></th>
-	<th><?php print _('Comment'); ?></th>
+	<th><?php print _ ('IP'); ?></th>
+	<th><?php print _ ('Subnet'); ?></th>
+	<th><?php print _ ('Hostname'); ?></th>
+	<th><?php print _ ('Description'); ?></th>
+	<th><?php print _ ('Requested by'); ?></th>
+	<th><?php print _ ('Comment'); ?></th>
 </tr>
 </thead>
 
 <tbody>
 <?php
 	# print requests
-	foreach($active_requests as $k=>$request) {
+	foreach ($active_requests as $k=>$request) {
 		//cast
 		$request = (array) $request;
 
@@ -46,22 +46,22 @@ 
 		$subnet = (array) $Subnets->fetch_subnet (null, $request['subnetId']);
 
 		//valid
-		if(sizeof($subnet)==0 || @$subnet[0]===false) {
+		if (sizeof ($subnet) == 0 || @$subnet[0] === false) {
 			unset($active_requests[$k]);
 		}
 		else {
 			// ip not provided
-			$request['ip_addr'] = strlen($request['ip_addr'])>0 ? $request['ip_addr'] : _("Automatic");
-
-			print '<tr>'. "\n";
-			print "	<td><button class='btn btn-sm btn-default' data-requestid='$request[id]'><i class='fa fa-pencil'></i> "._('Process')."</button></td>";
-			print '	<td>'. $request['ip_addr'] .'</td>'. "\n";
-			print '	<td>'. $Subnets->transform_to_dotted($subnet['subnet']) .'/'. $subnet['mask'] .' ('. $subnet['description'] .')</td>'. "\n";
-			print '	<td>'. $request['dns_name'] .'</td>'. "\n";
-			print '	<td>'. $request['description'] .'</td>'. "\n";
-			print '	<td>'. $request['requester'] .'</td>'. "\n";
-			print '	<td>'. $request['comment'] .'</td>'. "\n";
-			print '</tr>'. "\n";
+			$request['ip_addr'] = strlen ($request['ip_addr']) > 0 ? $request['ip_addr'] : _ ("Automatic");
+
+			print '<tr>'."\n";
+			print "	<td><button class='btn btn-sm btn-default' data-requestid='$request[id]'><i class='fa fa-pencil'></i> "._ ('Process')."</button></td>";
+			print '	<td>'.$request['ip_addr'].'</td>'."\n";
+			print '	<td>'.$Subnets->transform_to_dotted ($subnet['subnet']).'/'.$subnet['mask'].' ('.$subnet['description'].')</td>'."\n";
+			print '	<td>'.$request['dns_name'].'</td>'."\n";
+			print '	<td>'.$request['description'].'</td>'."\n";
+			print '	<td>'.$request['requester'].'</td>'."\n";
+			print '	<td>'.$request['comment'].'</td>'."\n";
+			print '</tr>'."\n";
 		}
 	}
 ?>
@@ -70,9 +70,9 @@ 
 <?php
 }
 # print resolved if present
-if($inactive_requests!==false) { ?>
+if ($inactive_requests !== false) { ?>
 
-<h4 style="margin-top:50px;"><?php print _('List of all processes IP addresses requests'); ?></h4>
+<h4 style="margin-top:50px;"><?php print _ ('List of all processes IP addresses requests'); ?></h4>
 <hr><br>
 
 <table id="requestedIPaddresses" class="table sorted table-striped table-condensed table-hover table-top table-auto1">
@@ -80,20 +80,20 @@ 
 <!-- headers -->
 <thead>
 <tr>
-	<th><?php print _('Subnet'); ?></th>
-	<th><?php print _('Hostname'); ?></th>
-	<th><?php print _('Description'); ?></th>
-	<th><?php print _('Requested by'); ?></th>
-	<th><?php print _('Comment'); ?></th>
-	<th><?php print _('Admin comment'); ?></th>
-	<th><?php print _('Accepted'); ?></th>
+	<th><?php print _ ('Subnet'); ?></th>
+	<th><?php print _ ('Hostname'); ?></th>
+	<th><?php print _ ('Description'); ?></th>
+	<th><?php print _ ('Requested by'); ?></th>
+	<th><?php print _ ('Comment'); ?></th>
+	<th><?php print _ ('Admin comment'); ?></th>
+	<th><?php print _ ('Accepted'); ?></th>
 </tr>
 </thead>
 
 <tbody>
 <?php
 	# print requests
-	foreach($inactive_requests as $k=>$request) {
+	foreach ($inactive_requests as $k=>$request) {
 		//cast
 		$request = (array) $request;
 
@@ -101,21 +101,21 @@ 
 		$subnet = (array) $Subnets->fetch_subnet (null, $request['subnetId']);
 
 		//valid
-		if(sizeof($subnet)==0 || @$subnet[0]===false) {
+		if (sizeof ($subnet) == 0 || @$subnet[0] === false) {
 			unset($inactive_requests[$k]);
 		}
 		else {
-			print '<tr>'. "\n";
-			print '	<td>'. $Subnets->transform_to_dotted($subnet['subnet']) .'/'. $subnet['mask'] .' ('. $subnet['description'] .')</td>'. "\n";
-			print '	<td>'. $request['dns_name'] .'</td>'. "\n";
-			print '	<td>'. $request['description'] .'</td>'. "\n";
-			print '	<td>'. $request['requester'] .'</td>'. "\n";
-			print '	<td>'. $request['comment'] .'</td>'. "\n";
-			print '	<td>'. $request['adminComment'] .'</td>'. "\n";
+			print '<tr>'."\n";
+			print '	<td>'.$Subnets->transform_to_dotted ($subnet['subnet']).'/'.$subnet['mask'].' ('.$subnet['description'].')</td>'."\n";
+			print '	<td>'.$request['dns_name'].'</td>'."\n";
+			print '	<td>'.$request['description'].'</td>'."\n";
+			print '	<td>'.$request['requester'].'</td>'."\n";
+			print '	<td>'.$request['comment'].'</td>'."\n";
+			print '	<td>'.$request['adminComment'].'</td>'."\n";
 			print '	<td>';
-			print $request['accepted']==1 ? "Yes" : "No";
-			print '</td>'. "\n";
-			print '</tr>'. "\n";
+			print $request['accepted'] == 1 ? "Yes" : "No";
+			print '</td>'."\n";
+			print '</tr>'."\n";
 		}
 	}
 ?>

app/admin/index.php

Indentation +16 added lines, -16 removed lines

@@ -7,24 +7,24 @@
 # print
 foreach($admin_menu as $k=>$menu) {
 
-	# headers
-	print "<h4>"._($k)."</h4>";
-	print "<hr>";
+    # headers
+    print "<h4>"._($k)."</h4>";
+    print "<hr>";
 
-	# items
-	foreach($menu as $t) {
-		print "	<div class='col-xs-12 col-md-6 col-lg-6 widget-dash'>";
-		print "	<div class='inner thumbnail'>";
-		print "		<div class='hContent'>";
-		print "			<div class='icon'><a href='".create_link("administration",$t['href'])."'><i class='fa $t[icon]'></i></a></div>";
-		print "			<div class='text'><a href='".create_link("administration",$t['href'])."'>"._($t['name'])."</a><hr><span class='text-muted'>"._($t['description'])."</span></div>";
-		print "		</div>";
-		print "	</div>";
-		print "	</div>";
-	}
+    # items
+    foreach($menu as $t) {
+        print "	<div class='col-xs-12 col-md-6 col-lg-6 widget-dash'>";
+        print "	<div class='inner thumbnail'>";
+        print "		<div class='hContent'>";
+        print "			<div class='icon'><a href='".create_link("administration",$t['href'])."'><i class='fa $t[icon]'></i></a></div>";
+        print "			<div class='text'><a href='".create_link("administration",$t['href'])."'>"._($t['name'])."</a><hr><span class='text-muted'>"._($t['description'])."</span></div>";
+        print "		</div>";
+        print "	</div>";
+        print "	</div>";
+    }
 
-	# clear and break
-	print "<div class='clearfix'></div>";
+    # clear and break
+    print "<div class='clearfix'></div>";
 }
 ?>
 </div>

Spacing +5 added lines, -5 removed lines

@@ -5,19 +5,19 @@
 
 <?php
 # print
-foreach($admin_menu as $k=>$menu) {
+foreach ($admin_menu as $k=>$menu) {
 
 	# headers
-	print "<h4>"._($k)."</h4>";
+	print "<h4>"._ ($k)."</h4>";
 	print "<hr>";
 
 	# items
-	foreach($menu as $t) {
+	foreach ($menu as $t) {
 		print "	<div class='col-xs-12 col-md-6 col-lg-6 widget-dash'>";
 		print "	<div class='inner thumbnail'>";
 		print "		<div class='hContent'>";
-		print "			<div class='icon'><a href='".create_link("administration",$t['href'])."'><i class='fa $t[icon]'></i></a></div>";
-		print "			<div class='text'><a href='".create_link("administration",$t['href'])."'>"._($t['name'])."</a><hr><span class='text-muted'>"._($t['description'])."</span></div>";
+		print "			<div class='icon'><a href='".create_link ("administration", $t['href'])."'><i class='fa $t[icon]'></i></a></div>";
+		print "			<div class='text'><a href='".create_link ("administration", $t['href'])."'>"._ ($t['name'])."</a><hr><span class='text-muted'>"._ ($t['description'])."</span></div>";
 		print "		</div>";
 		print "	</div>";
 		print "	</div>";

app/admin/subnets/permissions-submit.php

Indentation +5 added lines, -5 removed lines

@@ -24,11 +24,11 @@
 
 # get posted permissions
 foreach($_POST as $key=>$val) {
-	if(substr($key, 0,5) == "group") {
-		if($val != 0) {
-			$perm[substr($key,5)] = $val;
-		}
-	}
+    if(substr($key, 0,5) == "group") {
+        if($val != 0) {
+            $perm[substr($key,5)] = $val;
+        }
+    }
 }
 
 # set values and update

Spacing +17 added lines, -17 removed lines

@@ -5,46 +5,46 @@
  *************************************************/
 
 /* 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);
-$Sections	= new Sections ($Database);
+$Sections = new Sections ($Database);
 $Subnets	= new Subnets ($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", "permissions", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "permissions", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 
 # get posted permissions
-foreach($_POST as $key=>$val) {
-	if(substr($key, 0,5) == "group") {
-		if($val != 0) {
-			$perm[substr($key,5)] = $val;
+foreach ($_POST as $key=>$val) {
+	if (substr ($key, 0, 5) == "group") {
+		if ($val != 0) {
+			$perm[substr ($key, 5)] = $val;
 		}
 	}
 }
 
 # set values and update
-$permissions = isset($perm) ? array("permissions"=>json_encode($perm)) : array("permissions"=>"");
+$permissions = isset($perm) ? array ("permissions"=>json_encode ($perm)) : array ("permissions"=>"");
 
 # propagate ?
-if (@$_POST['set_inheritance']=="Yes") {
+if (@$_POST['set_inheritance'] == "Yes") {
     # fetch all possible slaves + master
-    $Subnets->fetch_subnet_slaves_recursive($_POST['subnetId']);
+    $Subnets->fetch_subnet_slaves_recursive ($_POST['subnetId']);
     # update
-    if(!$Admin->object_modify("subnets", "edit-multiple", $Subnets->slaves, $permissions))	{ $Result->show("danger",  _("Failed to set subnet permissons")."!", true); }
-    else																					{ $Result->show("success", _("Subnet permissions set")."!", true); }
+    if (!$Admin->object_modify ("subnets", "edit-multiple", $Subnets->slaves, $permissions)) { $Result->show ("danger", _ ("Failed to set subnet permissons")."!", true); }
+    else { $Result->show ("success", _ ("Subnet permissions set")."!", true); }
 }
 else {
-    if(!$Admin->object_modify("subnets", "edit", "id", array_merge(array("id"=>$_POST['subnetId']), $permissions)))	{ $Result->show("danger",  _("Failed to set subnet permissons")."!", true); }
-    else																					                        { $Result->show("success", _("Subnet permissions set")."!", true); }
+    if (!$Admin->object_modify ("subnets", "edit", "id", array_merge (array ("id"=>$_POST['subnetId']), $permissions))) { $Result->show ("danger", _ ("Failed to set subnet permissons")."!", true); }
+    else { $Result->show ("success", _ ("Subnet permissions set")."!", true); }
 }
 
 ?>
\ No newline at end of file

app/admin/subnets/permissions-show.php

Indentation +40 added lines, -40 removed lines

@@ -63,52 +63,52 @@
 <!-- content -->
 <div class="pContent">
 	<?php
-	if($subnet->isFolder==1)	{ print _('Manage permissions for folder')." $subnet->description"; }
-	else						{ print _('Manage permissions for subnet'); ?> <?php print $Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask." ($subnet->description)"; }
-	?>
+    if($subnet->isFolder==1)	{ print _('Manage permissions for folder')." $subnet->description"; }
+    else						{ print _('Manage permissions for subnet'); ?> <?php print $Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask." ($subnet->description)"; }
+    ?>
 	<hr>
 
 	<form id="editSubnetPermissions">
 	<table class="editSubnetPermissions table table-noborder table-condensed">
 
 	<?php
-	# parse permissions
-	if(strlen($subnet->permissions)>1) 	{ $permissons = $Sections->parse_section_permissions($subnet->permissions); }
-	else 								{ $permissons = ""; }
-
-	# print each group
-	if($groups) {
-		foreach($groups as $g) {
-			//cast
-			$g = (array) $g;
-
-			print "<tr>";
-			print "	<td>$g[g_name]</td>";
-			print "	<td>";
-
-			print "<span class='checkbox inline noborder'>";
-
-			print "	<input type='radio' name='group$g[g_id]' value='0' checked> na";
-			if(@$permissons[$g['g_id']]==1)	{ print " <input type='radio' name='group$g[g_id]' value='1' checked> ro"; }
-			else							{ print " <input type='radio' name='group$g[g_id]' value='1'> ro"; }
-			if(@$permissons[$g['g_id']]==2)	{ print " <input type='radio' name='group$g[g_id]' value='2' checked> rw"; }
-			else							{ print " <input type='radio' name='group$g[g_id]' value='2'> rw"; }
-			if(@$permissons[$g['g_id']]==3)	{ print " <input type='radio' name='group$g[g_id]' value='3' checked> rwa"; }
-			else							{ print " <input type='radio' name='group$g[g_id]' value='3'> rwa"; }
-			print "</span>";
-
-			# hidden
-			print "<input type='hidden' name='subnetId' value='$_POST[subnetId]'>";
-
-			print "	</td>";
-			print "</tr>";
-		}
-	} else {
-		print "<tr>";
-		print "	<td colspan='2'><span class='alert alert-info'>"._('No groups available')."</span></td>";
-		print "</tr>";
-	}
-	?>
+    # parse permissions
+    if(strlen($subnet->permissions)>1) 	{ $permissons = $Sections->parse_section_permissions($subnet->permissions); }
+    else 								{ $permissons = ""; }
+
+    # print each group
+    if($groups) {
+        foreach($groups as $g) {
+            //cast
+            $g = (array) $g;
+
+            print "<tr>";
+            print "	<td>$g[g_name]</td>";
+            print "	<td>";
+
+            print "<span class='checkbox inline noborder'>";
+
+            print "	<input type='radio' name='group$g[g_id]' value='0' checked> na";
+            if(@$permissons[$g['g_id']]==1)	{ print " <input type='radio' name='group$g[g_id]' value='1' checked> ro"; }
+            else							{ print " <input type='radio' name='group$g[g_id]' value='1'> ro"; }
+            if(@$permissons[$g['g_id']]==2)	{ print " <input type='radio' name='group$g[g_id]' value='2' checked> rw"; }
+            else							{ print " <input type='radio' name='group$g[g_id]' value='2'> rw"; }
+            if(@$permissons[$g['g_id']]==3)	{ print " <input type='radio' name='group$g[g_id]' value='3' checked> rwa"; }
+            else							{ print " <input type='radio' name='group$g[g_id]' value='3'> rwa"; }
+            print "</span>";
+
+            # hidden
+            print "<input type='hidden' name='subnetId' value='$_POST[subnetId]'>";
+
+            print "	</td>";
+            print "</tr>";
+        }
+    } else {
+        print "<tr>";
+        print "	<td colspan='2'><span class='alert alert-info'>"._('No groups available')."</span></td>";
+        print "</tr>";
+    }
+    ?>
 	<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 
     <!-- set parameters to slave subnets -->

Braces +2 added lines, -1 removed lines

@@ -53,7 +53,8 @@
 		$cfield = $extfields[$std_field]["field"];
 		$ctable = $extfields[$std_field]["table"];
 		$pname  = $extfields[$std_field]["pname"]." ";
-	} else {
+	}
+	else {
 		# default table and field
 		$cfield = $std_field;
 		$ctable = $mtable;

Spacing +26 added lines, -26 removed lines

@@ -5,30 +5,30 @@ 
  *********************/
 
 /* 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);
-$Sections	= new Sections ($Database);
+$Sections = new Sections ($Database);
 $Subnets	= new Subnets ($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", "permissions");
 
 
 # ID must be numeric
-if(!is_numeric($_POST['subnetId']))	{ $Result->show("danger", _("Invalid ID"), true, true); }
+if (!is_numeric ($_POST['subnetId'])) { $Result->show ("danger", _ ("Invalid ID"), true, true); }
 
 # get all groups
 $groups = $Admin->fetch_all_objects ("userGroups", "g_id");
 # get subnet details
-$subnet = $Subnets->fetch_subnet(null, $_POST['subnetId']);
+$subnet = $Subnets->fetch_subnet (null, $_POST['subnetId']);
 ?>
 
 
@@ -58,13 +58,13 @@ 
 
 
 <!-- header -->
-<div class="pHeader"><?php print $subnet->isFolder==1 ? _('Manage folder permissions') : _('Manage subnet permissions'); ?></div>
+<div class="pHeader"><?php print $subnet->isFolder == 1 ? _ ('Manage folder permissions') : _ ('Manage subnet permissions'); ?></div>
 
 <!-- content -->
 <div class="pContent">
 	<?php
-	if($subnet->isFolder==1)	{ print _('Manage permissions for folder')." $subnet->description"; }
-	else						{ print _('Manage permissions for subnet'); ?> <?php print $Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask." ($subnet->description)"; }
+	if ($subnet->isFolder == 1) { print _ ('Manage permissions for folder')." $subnet->description"; }
+	else { print _ ('Manage permissions for subnet'); ?> <?php print $Subnets->transform_to_dotted ($subnet->subnet)."/".$subnet->mask." ($subnet->description)"; }
 	?>
 	<hr>
 
@@ -73,12 +73,12 @@ 
 
 	<?php
 	# parse permissions
-	if(strlen($subnet->permissions)>1) 	{ $permissons = $Sections->parse_section_permissions($subnet->permissions); }
-	else 								{ $permissons = ""; }
+	if (strlen ($subnet->permissions) > 1) { $permissons = $Sections->parse_section_permissions ($subnet->permissions); }
+	else { $permissons = ""; }
 
 	# print each group
-	if($groups) {
-		foreach($groups as $g) {
+	if ($groups) {
+		foreach ($groups as $g) {
 			//cast
 			$g = (array) $g;
 
@@ -89,12 +89,12 @@ 
 			print "<span class='checkbox inline noborder'>";
 
 			print "	<input type='radio' name='group$g[g_id]' value='0' checked> na";
-			if(@$permissons[$g['g_id']]==1)	{ print " <input type='radio' name='group$g[g_id]' value='1' checked> ro"; }
-			else							{ print " <input type='radio' name='group$g[g_id]' value='1'> ro"; }
-			if(@$permissons[$g['g_id']]==2)	{ print " <input type='radio' name='group$g[g_id]' value='2' checked> rw"; }
-			else							{ print " <input type='radio' name='group$g[g_id]' value='2'> rw"; }
-			if(@$permissons[$g['g_id']]==3)	{ print " <input type='radio' name='group$g[g_id]' value='3' checked> rwa"; }
-			else							{ print " <input type='radio' name='group$g[g_id]' value='3'> rwa"; }
+			if (@$permissons[$g['g_id']] == 1) { print " <input type='radio' name='group$g[g_id]' value='1' checked> ro"; }
+			else { print " <input type='radio' name='group$g[g_id]' value='1'> ro"; }
+			if (@$permissons[$g['g_id']] == 2) { print " <input type='radio' name='group$g[g_id]' value='2' checked> rw"; }
+			else { print " <input type='radio' name='group$g[g_id]' value='2'> rw"; }
+			if (@$permissons[$g['g_id']] == 3) { print " <input type='radio' name='group$g[g_id]' value='3' checked> rwa"; }
+			else { print " <input type='radio' name='group$g[g_id]' value='3'> rwa"; }
 			print "</span>";
 
 			# hidden
@@ -105,26 +105,26 @@ 
 		}
 	} else {
 		print "<tr>";
-		print "	<td colspan='2'><span class='alert alert-info'>"._('No groups available')."</span></td>";
+		print "	<td colspan='2'><span class='alert alert-info'>"._ ('No groups available')."</span></td>";
 		print "</tr>";
 	}
 	?>
 	<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 
     <!-- set parameters to slave subnets -->
-    <?php if($Subnets->has_slaves($_POST['subnetId'])) { ?>
+    <?php if ($Subnets->has_slaves ($_POST['subnetId'])) { ?>
     <tr>
         <td colspan="2" class="hr"><hr></td>
     </tr>
     <tr>
-        <td><?php print _('Propagate changes'); ?></td>
+        <td><?php print _ ('Propagate changes'); ?></td>
         <td>
             <input type="checkbox" name="set_inheritance" class="input-switch" value="Yes" checked="checked">
         </td>
     </tr>
     <tr class="warning2">
         <td colspan="2">
-        <?php $Result->show("info", _('Permissions for all nested subnets will be overridden')."!", false); ?>
+        <?php $Result->show ("info", _ ('Permissions for all nested subnets will be overridden')."!", false); ?>
         </td>
     </tr>
     <tr>
@@ -141,8 +141,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 btn-success editSubnetPermissionsSubmit"><i class="fa fa-check"></i> <?php print _('Set permissions'); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default btn-success editSubnetPermissionsSubmit"><i class="fa fa-check"></i> <?php print _ ('Set permissions'); ?></button>
 	</div>
 
 	<div class="editSubnetPermissionsResult"></div>

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>
 
 

Spacing +20 added lines, -20 removed lines

@@ -5,20 +5,20 @@ 
  *******************************/
 
 /* required functions */
-if(!is_object($User)) {
+if (!is_object ($User)) {
 	/* 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);
 	$Tools	 	= new Tools ($Database);
-	$Sections	= new Sections ($Database);
+	$Sections = new Sections ($Database);
 	$Result 	= new Result ();
 }
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all permitted domains
 $permitted_nameservers = $Sections->fetch_section_nameserver_sets ($_POST['sectionId']);
@@ -27,10 +27,10 @@ 
 $cnt = 0;
 
 # Only parse nameserver if any exists
-if($permitted_nameservers != false) {
-	foreach($permitted_nameservers as $k=>$n) {
+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");
+		$nameserver_set = $Tools->fetch_multiple_objects ("nameservers", "id", $n, "name", "namesrv1");
 
 		//save to array
 		$nsout[$n] = $nameserver_set;
@@ -39,30 +39,30 @@ 
 		$cnt++;
 	}
 	//filter out empty
-	$permitted_nameservers = isset($nsout) ? array_filter($nsout) : false;
+	$permitted_nameservers = isset($nsout) ? array_filter ($nsout) : false;
 }
 
 ?>
 
 <select name="nameserverId" class="form-control input-sm input-w-auto">
-	<optgroup label='<?php print _('Select nameserver set'); ?>'>
+	<optgroup label='<?php print _ ('Select nameserver set'); ?>'>
 
-	<option value="0"><?php print _('No nameservers'); ?></option>
+	<option value="0"><?php print _ ('No nameservers'); ?></option>
 	<?php
 	# print all available nameserver sets
-	if ($permitted_nameservers!==false) {
-		foreach($permitted_nameservers as $n) {
+	if ($permitted_nameservers !== false) {
+		foreach ($permitted_nameservers as $n) {
 
-			if($n[0]!==null) {
-				foreach($n as $ns) {
+			if ($n[0] !== null) {
+				foreach ($n as $ns) {
 					// set print
 					$printNS = "$ns->name";
-					$printNS .= " (" . array_shift(explode(";",$ns->namesrv1)).",...)";
+					$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"; }
+					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"; }
 				}
 			}
 		}

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

Spacing +21 added lines, -21 removed lines

@@ -5,31 +5,31 @@ 
  *******************************/
 
 /* required functions */
-if(!isset($User)) {
+if (!isset($User)) {
 	/* 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);
 	$Tools	 	= new Tools ($Database);
-	$Sections	= new Sections ($Database);
+	$Sections = new Sections ($Database);
 	$Result 	= new Result ();
 }
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all permitted domains
 $permitted_domains = $Sections->fetch_section_domains ($_POST['sectionId']);
 
 # fetch all belonging vlans
 $cnt = 0;
-foreach($permitted_domains as $k=>$d) {
+foreach ($permitted_domains as $k=>$d) {
 	//fetch domain
-	$domain = $Tools->fetch_object("vlanDomains","id",$d);
+	$domain = $Tools->fetch_object ("vlanDomains", "id", $d);
 	// fetch vlans and append
-	$vlans = $Tools->fetch_multiple_objects("vlans", "domainId", $domain->id, "number");
+	$vlans = $Tools->fetch_multiple_objects ("vlans", "domainId", $domain->id, "number");
 	//save to array
 	$out[$d]['domain'] = $domain;
 	$out[$d]['vlans']  = $vlans;
@@ -37,34 +37,34 @@ 
 	$cnt++;
 }
 //filter out empty
-$permitted_domains = array_filter($out);
+$permitted_domains = array_filter ($out);
 ?>
 
 <select name="vlanId" class="form-control input-sm input-w-auto">
-	<option disabled="disabled"><?php print _('Select VLAN'); ?>:</option>
-	<option value="0"><?php print _('No VLAN'); ?></option>
+	<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) {
+	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 "<option value='Add' data-domain='".$d['domain']->id."'>"._ ('+ Add new VLAN')."</option>";
 
-			if($d['vlans'][0]!==null) {
-				foreach($d['vlans'] as $v) {
+			if ($d['vlans'][0] !== null) {
+				foreach ($d['vlans'] as $v) {
 					// set print
 					$printVLAN = $v->number;
-					if(!empty($v->name)) { $printVLAN .= " ($v->name)"; }
+					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"; }
+					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 "<option value='0' disabled>"._ ('No VLANs')."</option>";
 			}
 			print "</optgroup>";
 	}

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>";
 }
 ?>

Spacing +30 added lines, -30 removed lines

@@ -5,24 +5,24 @@ 
  ***************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch custom fields
-$custom_fields = $Tools->fetch_custom_fields('subnets');
+$custom_fields = $Tools->fetch_custom_fields ('subnets');
 
 # fetch all sections
-$sections = $Sections->fetch_all_sections();
+$sections = $Sections->fetch_all_sections ();
 
 # set hidden fields
-$hidden_custom_fields = json_decode($User->settings->hiddenCustomFields, true);
-$hidden_custom_fields = is_array(@$hidden_custom_fields['subnets']) ? $hidden_custom_fields['subnets'] : array();
+$hidden_custom_fields = json_decode ($User->settings->hiddenCustomFields, true);
+$hidden_custom_fields = is_array (@$hidden_custom_fields['subnets']) ? $hidden_custom_fields['subnets'] : array ();
 
 # print all sections with delete / edit button
-print '<h4>'._('Subnet management').'</h4>';
+print '<h4>'._ ('Subnet management').'</h4>';
 print "<hr>";
 
 /* Foreach section fetch subnets and print it! */
-if(sizeof($sections) > 0) {
+if (sizeof ($sections) > 0) {
 
 	# print  table structure
 	print "<table id='manageSubnets' class='table sorted table-striped table-condensed table-top'>";
@@ -30,20 +30,20 @@ 
 	# 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>"._ ('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>";
+	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) {
+	if (sizeof ($custom_fields) > 0) {
+		foreach ($custom_fields as $field) {
 			# hidden?
-			if(!in_array($field['name'], $hidden_custom_fields)) {
+			if (!in_array ($field['name'], $hidden_custom_fields)) {
 				print "	<th class='hidden-xs hidden-sm hidden-md'>$field[name]</th>";
 			}
 		}
@@ -54,21 +54,21 @@ 
 	print "</thead>";
 
 
-	$m = 0;	//for subnet index
+	$m = 0; //for subnet index
 
     print "<tbody>";
 	# print titles and content
-	if($sections!==false) {
-		foreach($sections as $section) {
+	if ($sections !== false) {
+		foreach ($sections as $section) {
 			//cast
 			$section = (array) $section;
 			# set colcount
-			$colCount = $User->settings->enableVRF==1 ? 10 : 9;
+			$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)) {
+			if (sizeof ($custom_fields) > 0) {
+				foreach ($custom_fields as $field) {
+					if (!in_array ($field['name'], $hidden_custom_fields)) {
 						$colCount++;
 					}
 				}
@@ -82,22 +82,22 @@ 
 			print "</tr>";
 
 			# get all subnets in section
-			$section_subnets = $Subnets->fetch_section_subnets($section['id']);
+			$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 "		<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>";
+			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);
+				$Subnets->print_subnets_tools ($User->user, $section_subnets, $custom_fields);
 			}
 			$m++;
 		}

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; ?>">

Spacing +30 added lines, -30 removed lines

@@ -5,65 +5,65 @@ 
  *********************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database, false);
 $Subnets	= new Subnets ($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", "split");
 
 
 # ID must be numeric
-if(!is_numeric($_POST['subnetId']))		{ $Result->show("danger", _("Invalid ID"), true, true); }
+if (!is_numeric ($_POST['subnetId'])) { $Result->show ("danger", _ ("Invalid ID"), true, 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, true); }
+if ($subnetPerm < 3) { $Result->show ("danger", _ ('You do not have permissions to resize subnet').'!', true, true); }
 
 # check if it has slaves - if yes it cannot be splitted!
-if($Subnets->has_slaves($subnet->id))	{ $Result->show("danger", _('Only subnets that have no nested subnets can be splitted')."!", true, true); }
+if ($Subnets->has_slaves ($subnet->id)) { $Result->show ("danger", _ ('Only subnets that have no nested subnets can be splitted')."!", true, true); }
 
 # calculate max mask
-$max_new_mask = $Subnets->identify_address($Subnets->transform_to_dotted($subnet->subnet))=="IPv4" ? 32 : 128;
+$max_new_mask = $Subnets->identify_address ($Subnets->transform_to_dotted ($subnet->subnet)) == "IPv4" ? 32 : 128;
 
 
 # die if too small
-if($max_new_mask < $subnet->mask)		{ $Result->show("danger", _("Subnet too small to be splitted"), true, true); }
+if ($max_new_mask < $subnet->mask) { $Result->show ("danger", _ ("Subnet too small to be splitted"), true, true); }
 
-$n = 2;		# step
-$m = 0;		# array id
+$n = 2; # step
+$m = 0; # array id
 
 //set mask options
-for($mask=($subnet->mask+1); $mask<=$max_new_mask; $mask++) {
+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)));
+	$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) {
+	if ($n > 256) {
 		$mask = 1000;
 	}
 }
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _('Split subnet'); ?></div>
+<div class="pHeader"><?php print _ ('Split subnet'); ?></div>
 
 
 <!-- content -->
@@ -74,17 +74,17 @@ 
 
     <!-- subnet -->
     <tr>
-        <td class="middle"><?php print _('Subnet'); ?></td>
-        <td><?php print $Subnets->transform_to_dotted($subnet->subnet) . "/$subnet->mask ($subnet->description)"; ?></td>
+        <td class="middle"><?php print _ ('Subnet'); ?></td>
+        <td><?php print $Subnets->transform_to_dotted ($subnet->subnet)."/$subnet->mask ($subnet->description)"; ?></td>
     </tr>
 
     <!-- number of new subnets -->
     <tr>
-        <td class="middle"><?php print _('Number of subnets'); ?></td>
+        <td class="middle"><?php print _ ('Number of subnets'); ?></td>
         <td style="vertical-align:middle">
 	    	<select name="number" class="form-control input-sm input-w-auto">
 	    	<?php
-	    	foreach($opts as $line) {
+	    	foreach ($opts as $line) {
 		    	print "<option value='$line[number]'>$line[number]x /$line[mask] subnet ($line[number]x $line[max] hosts)</option>";
 	    	}
 	    	?>
@@ -96,18 +96,18 @@ 
 
     <!-- Group under current -->
     <tr>
-        <td class="middle"><?php print _('Group under current'); ?></td>
+        <td class="middle"><?php print _ ('Group under current'); ?></td>
         <td>
 	        <select name="group" class="form-control input-sm input-w-auto">
-	        	<option value="yes"><?php print _('Yes'); ?></option>
-	        	<option value="no" ><?php print _('No'); ?></option>
+	        	<option value="yes"><?php print _ ('Yes'); ?></option>
+	        	<option value="no" ><?php print _ ('No'); ?></option>
 	        </select>
         </td>
     </tr>
 
     <!-- strict mode -->
     <tr>
-    	<td><?php print _('Strict mode'); ?></td>
+    	<td><?php print _ ('Strict mode'); ?></td>
     	<td>
 	    	<input type="checkbox" name="strict" value="yes" checked="checked">
     	</td>
@@ -115,7 +115,7 @@ 
 
     <!-- Prefix -->
     <tr>
-    	<td><?php print _('Name prefix'); ?></td>
+    	<td><?php print _ ('Name prefix'); ?></td>
     	<td>
 	    	<input type="text" name="prefix" value="<?php print $subnet->description."_"; ?>">
     	</td>
@@ -126,11 +126,11 @@ 
 
     <!-- warning -->
     <div class="alert alert-warning">
-    <?php print _('You can split subnet to smaller subnets by specifying new subnets. Please note:'); ?>
+    <?php print _ ('You can split subnet to smaller subnets by specifying new subnets. Please note:'); ?>
     <ul>
-    	<li><?php print _('Existing IP addresses will be assigned to new subnets'); ?></li>
-    	<li><?php print _('Group under current will create new nested subnets under current one'); ?></li>
-    	<li><?php print _('If existing IP will fall to subnet/broadcast of new subnets split will fail, except if strict mode is disabled'); ?></li>
+    	<li><?php print _ ('Existing IP addresses will be assigned to new subnets'); ?></li>
+    	<li><?php print _ ('Group under current will create new nested subnets under current one'); ?></li>
+    	<li><?php print _ ('If existing IP will fall to subnet/broadcast of new subnets split will fail, except if strict mode is disabled'); ?></li>
     </ul>
     </div>
 
@@ -140,8 +140,8 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopup2"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default btn-success" id="subnetSplitSubmit"><i class="fa fa-ok"></i> <?php print _('Split subnet'); ?></button>
+		<button class="btn btn-sm btn-default hidePopup2"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default btn-success" id="subnetSplitSubmit"><i class="fa fa-ok"></i> <?php print _ ('Split subnet'); ?></button>
 	</div>
 
 	<div class="subnetSplitResult"></div>

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>
 

Braces +9 added lines, -1 removed lines

@@ -250,7 +250,15 @@
 			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>
+		<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>
 
 	<div class="manageFolderEditResult"></div>

Spacing +75 added lines, -75 removed lines

@@ -5,67 +5,67 @@ 
  *********************/
 
 /* 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", "folder");
 
 # ID must be numeric
-if($_POST['action']!="add") {
-	if(!is_numeric($_POST['subnetId']))										{ $Result->show("danger", _("Invalid ID"), true, true); }
+if ($_POST['action'] != "add") {
+	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 ($_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); }
 }
 
 
 # we are editing or deleting existing subnet, get old details
 if ($_POST['action'] != "add") {
-    $folder_old_details = (array) $Subnets->fetch_subnet(null, $_POST['subnetId']);
+    $folder_old_details = (array) $Subnets->fetch_subnet (null, $_POST['subnetId']);
 }
 # 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
+	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
-$custom_fields = $Tools->fetch_custom_fields('subnets');
+$custom_fields = $Tools->fetch_custom_fields ('subnets');
 # fetch all sections
-$sections = $Sections->fetch_all_sections();
+$sections = $Sections->fetch_all_sections ();
 
 
 # set readonly flag
-$readonly = $_POST['action']=="edit" || $_POST['action']=="delete" ? true : false;
+$readonly = $_POST['action'] == "edit" || $_POST['action'] == "delete" ? true : false;
 ?>
 
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('folder'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('folder'); ?></div>
 
 
 <!-- content -->
@@ -76,25 +76,25 @@ 
 
     <!-- name -->
     <tr>
-        <td class="middle"><?php print _('Name'); ?></td>
+        <td class="middle"><?php print _ ('Name'); ?></td>
         <td>
             <input type="text" class="form-control input-sm input-w-250" id="field-description" name="description" value="<?php print @$folder_old_details['description']; ?>">
         </td>
-        <td class="info2"><?php print _('Enter folder name'); ?></td>
+        <td class="info2"><?php print _ ('Enter folder name'); ?></td>
     </tr>
 
-    <?php if($_POST['action'] != "add") { ?>
+    <?php if ($_POST['action'] != "add") { ?>
     <!-- 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"; }
 	            	}
             	}
             	?>
@@ -102,22 +102,22 @@ 
 
         	</select>
         </td>
-        <td class="info2"><?php print _('Move to different section'); ?></td>
+        <td class="info2"><?php print _ ('Move to different section'); ?></td>
     </tr>
     <?php } ?>
 
     <!-- Master subnet -->
     <tr>
-        <td><?php print _('Master Folder'); ?></td>
+        <td><?php print _ ('Master Folder'); ?></td>
         <td>
-        	<?php $Subnets->print_mastersubnet_dropdown_menu($_POST['sectionId'], @$folder_old_details['masterSubnetId'], true); ?>
+        	<?php $Subnets->print_mastersubnet_dropdown_menu ($_POST['sectionId'], @$folder_old_details['masterSubnetId'], true); ?>
         </td>
-        <td class="info2"><?php print _('Enter master folder if you want to nest it under existing folder, or select root to create root folder'); ?>!</td>
+        <td class="info2"><?php print _ ('Enter master folder if you want to nest it under existing folder, or select root to create root folder'); ?>!</td>
     </tr>
 
     <!-- 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="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="vlanId" 			value="0">
 	<input type="hidden" name="vrfId" 			value="0">
@@ -125,50 +125,50 @@ 
 
     <?php
     	# 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
-		    	$folder_old_details[$field['name']] = str_replace("\n", "\\n", @$folder_old_details[$field['name']]);
+		    	$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']; }
+				if ($_POST['action'] == "add") { $folder_old_details[$field['name']] = $field['Default']; }
 
 		    	# required
-				if($field['Null']=="NO")	{ $required = "*"; }
-				else						{ $required = ""; }
+				if ($field['Null'] == "NO") { $required = "*"; }
+				else { $required = ""; }
 
-				print '<tr>'. "\n";
-				print '	<td>'. $field['name'] .' '.$required.'</td>'. "\n";
-				print '	<td colspan="2">'. "\n";
+				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==$folder_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 == $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") {
+				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">';
@@ -184,38 +184,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($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"; }
+					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)") {
+				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($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>"; }
+					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";
+				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 ' <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";
+				print '	</td>'."\n";
+				print '</tr>'."\n";
 		    }
 	    }
 
@@ -231,8 +231,8 @@ 
 
     <?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>";
+    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>";
     }
     ?>
 
@@ -243,14 +243,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 editFolderSubmitDelete' data-action='delete' data-subnetId='$folder_old_details[id]'><i class='fa fa-trash-o'></i> "._('Delete folder')."</button>";
+		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>
+		<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>
 
 	<div class="manageFolderEditResult"></div>