phpipam / phpipam

app/admin/vlans/edit.php

Indentation +112 added lines, -112 removed lines

@@ -39,14 +39,14 @@ 
 
 # fetch l2 domain
 if($_POST['action']=="add") {
-	# all
-	if (@$_POST['domain']=="all") {
-		$vlan_domains = $Admin->fetch_all_objects("vlanDomains");
-	} else {
-		$vlan_domain = $Admin->fetch_object("vlanDomains", "id", $_POST['domain']);
-	}
+    # all
+    if (@$_POST['domain']=="all") {
+        $vlan_domains = $Admin->fetch_all_objects("vlanDomains");
+    } else {
+        $vlan_domain = $Admin->fetch_object("vlanDomains", "id", $_POST['domain']);
+    }
 } else {
-		$vlan_domain = $Admin->fetch_object("vlanDomains", "id", $vlan['domainId']);
+        $vlan_domain = $Admin->fetch_object("vlanDomains", "id", $vlan['domainId']);
 }
 if($vlan_domain===false)			{ $Result->show("danger", _("Invalid ID"), true, true); }
 ?>
@@ -71,17 +71,17 @@ 
 		<td><?php print _('l2 domain'); ?></td>
 		<th>
 		<?php
-		# not all
-		if (@$_POST['domain']!="all") {
-			print $vlan_domain->name." (".$vlan_domain->description.")";
-		} else {
-			print "<select name='domainId' class='form-control input-sm'>";
-			foreach ($vlan_domains as $d) {
-				print "<option value='$d->id'>$d->name</option>";
-			}
-			print "</select>";
-		}
-		?>
+        # not all
+        if (@$_POST['domain']!="all") {
+            print $vlan_domain->name." (".$vlan_domain->description.")";
+        } else {
+            print "<select name='domainId' class='form-control input-sm'>";
+            foreach ($vlan_domains as $d) {
+                print "<option value='$d->id'>$d->name</option>";
+            }
+            print "</select>";
+        }
+        ?>
 		</th>
 	</tr>
 	<tr>
@@ -133,105 +133,105 @@ 
 
 	<!-- Custom -->
 	<?php
-	if(sizeof($custom) > 0) {
-
-		print '<tr>';
-		print '	<td colspan="2"><hr></td>';
-		print '</tr>';
-
-		foreach($custom as $field) {
-
-			# replace spaces
-		    $field['nameNew'] = str_replace(" ", "___", $field['name']);
-
-			# required
-			if($field['Null']=="NO")	{ $required = "*"; }
-			else						{ $required = ""; }
-
-			# set default value !
-			if ($_POST['action']=="add")	{ $vlan[$field['name']] = $field['Default']; }
-
-			print '<tr>'. "\n";
-			print '	<td>'. $field['name'] .' '.$required.'</td>'. "\n";
-			print '	<td>'. "\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==$vlan[$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($vlan[$field['name']]))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" '.$readonly.' 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="'. $vlan[$field['name']]. '" '.$readonly.' 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($vlan[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-					elseif($k==$vlan[$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'] .'" '.$readonly.' rowspan=3 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. $vlan[$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="'. @$vlan[$field['name']]. '" size="30" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
-			}
-
-			print '	</td>'. "\n";
-			print '</tr>'. "\n";
-		}
-	}
-	?>
+    if(sizeof($custom) > 0) {
+
+        print '<tr>';
+        print '	<td colspan="2"><hr></td>';
+        print '</tr>';
+
+        foreach($custom as $field) {
+
+            # replace spaces
+            $field['nameNew'] = str_replace(" ", "___", $field['name']);
+
+            # required
+            if($field['Null']=="NO")	{ $required = "*"; }
+            else						{ $required = ""; }
+
+            # set default value !
+            if ($_POST['action']=="add")	{ $vlan[$field['name']] = $field['Default']; }
+
+            print '<tr>'. "\n";
+            print '	<td>'. $field['name'] .' '.$required.'</td>'. "\n";
+            print '	<td>'. "\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==$vlan[$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($vlan[$field['name']]))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'] .'" maxlength="'.$size.'" '.$readonly.' 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="'. $vlan[$field['name']]. '" '.$readonly.' 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($vlan[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
+                    elseif($k==$vlan[$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'] .'" '.$readonly.' rowspan=3 rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. $vlan[$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="'. @$vlan[$field['name']]. '" size="30" '.$readonly.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
+            }
+
+            print '	</td>'. "\n";
+            print '</tr>'. "\n";
+        }
+    }
+    ?>
 
 	</table>
 	</form>
 
 	<?php
-	//print delete warning
-	if($_POST['action'] == "delete")	{ $Result->show("warning", _('Warning').':</strong> '._('removing VLAN will also remove VLAN reference from belonging subnets')."!", false);  }
-	?>
+    //print delete warning
+    if($_POST['action'] == "delete")	{ $Result->show("warning", _('Warning').':</strong> '._('removing VLAN will also remove VLAN reference from belonging subnets')."!", false);  }
+    ?>
 </div>
 
 

app/admin/vlans/move-vlan-result.php

Indentation +10 added lines, -10 removed lines

@@ -31,20 +31,20 @@
 
 // check that it is not already set !
 if($User->settings->vlanDuplicate==0) {
-	$check_vlan = $Admin->fetch_multiple_objects ("vlans", "domainId", $vlan_domain->id, "vlanId");
-	if($check_vlan!==false) {
-		foreach($check_vlan as $v) {
-			if($v->number == $vlan->number) {
-									{ $Result->show("danger", _("VLAN already exists"), true); }
-			}
-		}
-	}
+    $check_vlan = $Admin->fetch_multiple_objects ("vlans", "domainId", $vlan_domain->id, "vlanId");
+    if($check_vlan!==false) {
+        foreach($check_vlan as $v) {
+            if($v->number == $vlan->number) {
+                                    { $Result->show("danger", _("VLAN already exists"), true); }
+            }
+        }
+    }
 }
 
 # formulate update query
 $values = array("vlanId"=>@$_POST['vlanId'],
-				"domainId"=>$vlan_domain->id
-				);
+                "domainId"=>$vlan_domain->id
+                );
 # update
 if(!$Admin->object_modify("vlans", "edit", "vlanId", $values))	{ $Result->show("danger",  _("Failed to move VLAN to new domain").'!', true); }
 else															{ $Result->show("success", _("VLAN moved to new domain successfully").'!', false); }

app/admin/vlans/vlans-scan-execute.php

Indentation +128 added lines, -128 removed lines

@@ -71,20 +71,20 @@ 
         $res = $Snmp->get_query("get_vlan_table");
         // remove those not in subnet
         if (sizeof($res)>0) {
-           // save for debug
-           $debug[$d->hostname]["get_vlan_table"] = $res;
-           // loop and save
-           foreach ($res as $k=>$r) {
-               if (!array_key_exists($k, $new_vlans) && !array_key_exists($k, $ex_vlans) ) {
-                   $new_vlans[$k] = $r;
-               }
-           }
+            // save for debug
+            $debug[$d->hostname]["get_vlan_table"] = $res;
+            // loop and save
+            foreach ($res as $k=>$r) {
+                if (!array_key_exists($k, $new_vlans) && !array_key_exists($k, $ex_vlans) ) {
+                    $new_vlans[$k] = $r;
+                }
+            }
         }
-     } catch (Exception $e) {
-       // save for debug
-       $debug[$d->hostname]["get_vlan_table"] = $res;
-       $errors[] = $e->getMessage();
-	}
+        } catch (Exception $e) {
+        // save for debug
+        $debug[$d->hostname]["get_vlan_table"] = $res;
+        $errors[] = $e->getMessage();
+    }
 }
 
 # none and errors
@@ -107,131 +107,131 @@ 
     }
 
     // calculate colspan
-	$colspan = 4 + sizeof(@$required_fields);
+    $colspan = 4 + sizeof(@$required_fields);
 
 
-	//form
-	print "<form name='scan-snmp-vlan-form' class='scan-snmp-arp-form' id='scan-snmp-vlan-form'>";
-	print "<table class='table table-striped table-top table-condensed'>";
+    //form
+    print "<form name='scan-snmp-vlan-form' class='scan-snmp-arp-form' id='scan-snmp-vlan-form'>";
+    print "<table class='table table-striped table-top table-condensed'>";
 
-	// titles
-	print "<tr>";
-	print "	<th>"._("Number")."</th>";
-	print "	<th>"._("Name")."</th>";
-	print "	<th>"._("Description")."</th>";
+    // titles
+    print "<tr>";
+    print "	<th>"._("Number")."</th>";
+    print "	<th>"._("Name")."</th>";
+    print "	<th>"._("Description")."</th>";
     // custom
-	if (isset($required_fields)) {
-		foreach ($required_fields as $field) {
+    if (isset($required_fields)) {
+        foreach ($required_fields as $field) {
             print "<th>"._($field['name'])."</th>";
-		}
+        }
     }
-	print "	<th></th>";
-	print "</tr>";
+    print "	<th></th>";
+    print "</tr>";
 
-	// alive
-	$m=0;
-	foreach ($new_vlans as $number=>$name ) {
+    // alive
+    $m=0;
+    foreach ($new_vlans as $number=>$name ) {
         print "<tr class='result$m'>";
-		//number
-		print "<td>$number</td>";
-		//name
-		print "<td>";
-		print "	<input type='text' class='form-control input-sm' name='name$m' value='$name'>";
-		print "	<input type='hidden' name='number$m' value='$number'>";
-		print "	<input type='hidden' name='domainId$m' value='$_POST[domainId]'>";
-
-		print "</td>";
-		//description
-		print "<td>";
-		print "	<input type='text' class='form-control input-sm' name='description$m' value='$name'>";
-		print "</td>";
-		// custom
-		if (isset($required_fields)) {
-    		foreach ($required_fields as $field) {
-    			# replace spaces with |
-    			$field['nameNew'] = str_replace(" ", "___", $field['name']);
-
-    			print '	<td>'. "\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]$m' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
-    				foreach($tmp as $v) {
-    					if($v==@$address[$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($address[$field['name']]))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'].$m .'" maxlength="'.$size.'" '.$delete.' 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'].$m .'" maxlength="'.$size.'" value="'. $address[$field['name']]. '" '.$delete.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
-    			}
-    			//boolean
-    			elseif($field['type'] == "tinyint(1)") {
-    				print "<select name='$field[nameNew]$m' 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(@$address[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-    					elseif($k==@$address[$field['name']])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
-    					else												{ print "<option value='$k'>"._($v)."</option>"; }
-    				}
-    				print "</select>";
-    			}
-    			//default - input field
-    			else {
-    				print ' <input type="text" class="ip_addr form-control input-sm" name="'. $field['nameNew'].$m .'" placeholder="'. $field['name'] .'" value="'. @$address[$field['name']]. '" size="30" '.$delete.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
-    			}
+        //number
+        print "<td>$number</td>";
+        //name
+        print "<td>";
+        print "	<input type='text' class='form-control input-sm' name='name$m' value='$name'>";
+        print "	<input type='hidden' name='number$m' value='$number'>";
+        print "	<input type='hidden' name='domainId$m' value='$_POST[domainId]'>";
+
+        print "</td>";
+        //description
+        print "<td>";
+        print "	<input type='text' class='form-control input-sm' name='description$m' value='$name'>";
+        print "</td>";
+        // custom
+        if (isset($required_fields)) {
+            foreach ($required_fields as $field) {
+                # replace spaces with |
+                $field['nameNew'] = str_replace(" ", "___", $field['name']);
+
+                print '	<td>'. "\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]$m' class='form-control input-sm input-w-auto' rel='tooltip' data-placement='right' title='$field[Comment]'>";
+                    foreach($tmp as $v) {
+                        if($v==@$address[$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($address[$field['name']]))	{ print ' <input type="text" class="'.$class.' form-control input-sm input-w-auto" data-format="'.$format.'" name="'. $field['nameNew'].$m .'" maxlength="'.$size.'" '.$delete.' 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'].$m .'" maxlength="'.$size.'" value="'. $address[$field['name']]. '" '.$delete.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n"; }
+                }
+                //boolean
+                elseif($field['type'] == "tinyint(1)") {
+                    print "<select name='$field[nameNew]$m' 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(@$address[$field['name']])==0 && $k==2)	{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
+                        elseif($k==@$address[$field['name']])				{ print "<option value='$k' selected='selected'>"._($v)."</option>"; }
+                        else												{ print "<option value='$k'>"._($v)."</option>"; }
+                    }
+                    print "</select>";
+                }
+                //default - input field
+                else {
+                    print ' <input type="text" class="ip_addr form-control input-sm" name="'. $field['nameNew'].$m .'" placeholder="'. $field['name'] .'" value="'. @$address[$field['name']]. '" size="30" '.$delete.' rel="tooltip" data-placement="right" title="'.$field['Comment'].'">'. "\n";
+                }
 
                 print " </td>";
-    		}
-		}
-		//remove button
-		print 	"<td><a href='' class='btn btn-xs btn-danger resultRemove' data-target='result$m'><i class='fa fa-times'></i></a></td>";
-		print "</tr>";
-
-		$m++;
-	}
-
-	//submit
-	print "<tr>";
-	print "	<td colspan='$colspan'>";
-	print " <div id='vlanScanAddResult'></div>";
-	print "		<a href='' class='btn btn-sm btn-success pull-right' id='saveVlanScanResults' data-script='vlans-scan' data-subnetId='".$_POST['subnetId']."'><i class='fa fa-plus'></i> "._("Add discovered VLANS")."</a>";
-	print "	</td>";
-	print "</tr>";
-
-	print "</table>";
-	print "</form>";
+            }
+        }
+        //remove button
+        print 	"<td><a href='' class='btn btn-xs btn-danger resultRemove' data-target='result$m'><i class='fa fa-times'></i></a></td>";
+        print "</tr>";
+
+        $m++;
+    }
+
+    //submit
+    print "<tr>";
+    print "	<td colspan='$colspan'>";
+    print " <div id='vlanScanAddResult'></div>";
+    print "		<a href='' class='btn btn-sm btn-success pull-right' id='saveVlanScanResults' data-script='vlans-scan' data-subnetId='".$_POST['subnetId']."'><i class='fa fa-plus'></i> "._("Add discovered VLANS")."</a>";
+    print "	</td>";
+    print "</tr>";
+
+    print "</table>";
+    print "</form>";
 
     // print errors
     if (isset($errors)) {

app/admin/filter-fields/index.php

Indentation +13 added lines, -13 removed lines

@@ -10,7 +10,7 @@ 
 
 # get all fields in IP table
 foreach($Tools->fetch_standard_fields("ipaddresses") as $s) {
-	$standard_fields[$s] = $s;
+    $standard_fields[$s] = $s;
 }
 
 # get all selected fields and put them to array
@@ -18,10 +18,10 @@ 
 
 /* unset mandatory fields -> id,subnetid,ip_addr */
 unset($standard_fields['id'], $standard_fields['state'], $standard_fields['subnetId'],
-      $standard_fields['ip_addr'], $standard_fields['description'], $standard_fields['dns_name'],
-      $standard_fields['lastSeen'], $standard_fields['excludePing'], $standard_fields['editDate'],
-      $standard_fields['is_gateway'], $standard_fields['PTR'], $standard_fields['PTRignore'],
-      $standard_fields['firewallAddressObject']);
+        $standard_fields['ip_addr'], $standard_fields['description'], $standard_fields['dns_name'],
+        $standard_fields['lastSeen'], $standard_fields['excludePing'], $standard_fields['editDate'],
+        $standard_fields['is_gateway'], $standard_fields['PTR'], $standard_fields['PTRignore'],
+        $standard_fields['firewallAddressObject']);
 ?>
 
 
@@ -42,16 +42,16 @@ 
 <!-- fields -->
 <?php
 foreach($standard_fields as $field) {
-	# set active
-	$checked = in_array($field, $selected_fields) ? "checked" : "";
+    # set active
+    $checked = in_array($field, $selected_fields) ? "checked" : "";
 
-	# replace switch
-	$field_print = $field=="switch" ? "device" : $field;
+    # replace switch
+    $field_print = $field=="switch" ? "device" : $field;
 
-	print '<tr>'. "\n";
-	print '	<td style="width:10px;padding-left:10px;"><input type="checkbox" class="input-switch" name="'. $field .'" value="'. $field .'" '. $checked .'></td>';
-	print '	<td>'. ucfirst($field_print) .'</td>';
-	print '</tr>';
+    print '<tr>'. "\n";
+    print '	<td style="width:10px;padding-left:10px;"><input type="checkbox" class="input-switch" name="'. $field .'" value="'. $field .'" '. $checked .'></td>';
+    print '	<td>'. ucfirst($field_print) .'</td>';
+    print '</tr>';
 }
 ?>
 

app/admin/filter-fields/filter-result.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
 # set fields to update
 $values = array("id"=>1,
-				"IPfilter"=>implode(';', $_POST));
+                "IPfilter"=>implode(';', $_POST));
 
 # update
 if(!$Admin->object_modify("settings", "edit", "id", $values))   { $Result->show("danger alert-absolute",  _("Update failed"), true); }

app/admin/firewall-zones/settings-save.php

Indentation +37 added lines, -37 removed lines

@@ -22,104 +22,104 @@ 
 
 # check for the maximum length of the zone name, it has to be between 3 and 31. also be sure that this value is decimal.
 if (($_POST['zoneLength'] < 1) || ($_POST['zoneLength'] > 31)) {
-	$Result->show("danger", _("Invalid zone name length parameter. A valid valid value is between 1 and 31."), true);
+    $Result->show("danger", _("Invalid zone name length parameter. A valid valid value is between 1 and 31."), true);
 }
 
 # validate the IPv4 type alias.
 if (!preg_match('/^[a-zA-Z0-9\-\_.]+$/i', $_POST['ipType'][0])) {
-	$Result->show("danger", _("Invalid IPv4 address type alias. Only alphanumeric characters, &quot;-&quot;, &quot;_&quot; and &quot;.&quot; are allowed."), true);
+    $Result->show("danger", _("Invalid IPv4 address type alias. Only alphanumeric characters, &quot;-&quot;, &quot;_&quot; and &quot;.&quot; are allowed."), true);
 }
 
 # validate the IPv6 type alias.
 if (!preg_match('/^[a-zA-Z0-9\-\_.]+$/i', $_POST['ipType'][1])) {
-	$Result->show("danger", _("Invalid IPv4 address type alias. Only alphanumeric characters, &quot;-&quot;, &quot;_&quot; and &quot;.&quot; are allowed."), true);
+    $Result->show("danger", _("Invalid IPv4 address type alias. Only alphanumeric characters, &quot;-&quot;, &quot;_&quot; and &quot;.&quot; are allowed."), true);
 }
 
 # validate the separator character.
 if (!preg_match('/^[\-\_.]+$/i', $_POST['separator'])) {
-	$Result->show("danger", _("Invalid separator. Only &quot;-&quot;, &quot;_&quot; and &quot;.&quot; are allowed."), true);
+    $Result->show("danger", _("Invalid separator. Only &quot;-&quot;, &quot;_&quot; and &quot;.&quot; are allowed."), true);
 }
 
 # validate the indicator for own firewall zones.
 if (!preg_match('/^[a-zA-Z0-9\-\_.]+$/i', $_POST['indicator'][0])) {
-	$Result->show("danger", _("Invalid zone indicator. Only alphanumeric characters, &quot;-&quot;, &quot;_&quot; and &quot;.&quot; are allowed."), true);
+    $Result->show("danger", _("Invalid zone indicator. Only alphanumeric characters, &quot;-&quot;, &quot;_&quot; and &quot;.&quot; are allowed."), true);
 }
 
 # validate the IPv6 type alias.
 if (!preg_match('/^[a-zA-Z0-9\-\_.]+$/i', $_POST['indicator'][1])) {
-	$Result->show("danger", _("Invalid zone indicator. Only alphanumeric characters, &quot;-&quot;, &quot;_&quot; and &quot;.&quot; are allowed."), true);
+    $Result->show("danger", _("Invalid zone indicator. Only alphanumeric characters, &quot;-&quot;, &quot;_&quot; and &quot;.&quot; are allowed."), true);
 }
 
 # validate the zoneGenerator value.
 if (!preg_match('/^[0-3]$/i', $_POST['zoneGenerator'])) {
-	$Result->show("danger", _("Invalid zone generator method. Do not manipulate the POST values!"), true);
+    $Result->show("danger", _("Invalid zone generator method. Do not manipulate the POST values!"), true);
 }
 
 # validate the hidden values (zoneGeneratorType).
 if ($_POST['zoneGeneratorType'][0] != 'decimal') {
-	$Result->show("danger", _("Invalid zone generator types [decimal]. Do not manipulate the POST values!"), true);
+    $Result->show("danger", _("Invalid zone generator types [decimal]. Do not manipulate the POST values!"), true);
 }
 if ($_POST['zoneGeneratorType'][1] != 'hex') {
-	$Result->show("danger", _("Invalid zone generator types [hex]. Do not manipulate the POST values!"), true);
+    $Result->show("danger", _("Invalid zone generator types [hex]. Do not manipulate the POST values!"), true);
 }
 if ($_POST['zoneGeneratorType'][2] != 'text') {
-	$Result->show("danger", _("Invalid zone generator types [text]. Do not manipulate the POST values!"), true);
+    $Result->show("danger", _("Invalid zone generator types [text]. Do not manipulate the POST values!"), true);
 }
 
 # validate the padding checkbox value
 if ($_POST['padding']) {
-	if ($_POST['padding'] != 'on' && $_POST['padding'] != 'off') {
-		$Result->show("danger", _("Invalid padding value. Use the checkbox to set the padding value to on or off."), true);
-	}
+    if ($_POST['padding'] != 'on' && $_POST['padding'] != 'off') {
+        $Result->show("danger", _("Invalid padding value. Use the checkbox to set the padding value to on or off."), true);
+    }
 }
 
 # validate the strictMode checkbox value
 if ($_POST['strictMode']) {
-	if ($_POST['strictMode'] != 'on' && $_POST['strictMode'] != 'off') {
-		$Result->show("danger", _("Invalid padding value. Use the checkbox to set the padding value to on or off."), true);
-	}
+    if ($_POST['strictMode'] != 'on' && $_POST['strictMode'] != 'off') {
+        $Result->show("danger", _("Invalid padding value. Use the checkbox to set the padding value to on or off."), true);
+    }
 }
 
 # validate the autogen checkbox value
 if ($_POST['autogen']) {
-	if ($_POST['autogen'] != 'on' && $_POST['autogen'] != 'off') {
-		$Result->show("danger", _("Invalid autogen value. Use the checkbox to set the autogen value to on or off."), true);
-	}
+    if ($_POST['autogen'] != 'on' && $_POST['autogen'] != 'off') {
+        $Result->show("danger", _("Invalid autogen value. Use the checkbox to set the autogen value to on or off."), true);
+    }
 }
 
 # validate the pattern array
 if ($_POST['pattern']) {
-	foreach ($_POST['pattern'] as $pattern) {
-		if (	$pattern != 'patternIndicator' 
-			&& 	$pattern != 'patternZoneName' 
-			&& 	$pattern != 'patternIPType' 
-			&& 	$pattern != 'patternHost' 
-			&& 	$pattern != 'patternFQDN' 
-			&& 	$pattern != 'patternSeparator' 
-			&& 	$pattern != '') {
-			$Result->show("danger", _("Invalid pattern value."), true);
-		}
-	}
+    foreach ($_POST['pattern'] as $pattern) {
+        if (	$pattern != 'patternIndicator' 
+            && 	$pattern != 'patternZoneName' 
+            && 	$pattern != 'patternIPType' 
+            && 	$pattern != 'patternHost' 
+            && 	$pattern != 'patternFQDN' 
+            && 	$pattern != 'patternSeparator' 
+            && 	$pattern != '') {
+            $Result->show("danger", _("Invalid pattern value."), true);
+        }
+    }
 } else {
-	$Result->show("danger", _("Please select at least one item to generate a valid name pattern."), true);
+    $Result->show("danger", _("Please select at least one item to generate a valid name pattern."), true);
 }
 
 # validate device type ID.
 if (!preg_match('/^[0-9]+$/i', $_POST['deviceType'])) {
-	$Result->show("danger", _("Invalid device type."), true);
+    $Result->show("danger", _("Invalid device type."), true);
 }
 
 # validate the hidden values (subnetPatternValues).
 if ($_POST['subnetPatternValues'][0] != 'network') {
-	$Result->show("danger", _("Invalid subnet name type [network]. Do not manipulate the POST values!"), true);
+    $Result->show("danger", _("Invalid subnet name type [network]. Do not manipulate the POST values!"), true);
 }
 if ($_POST['subnetPatternValues'][1] != 'description') {
-	$Result->show("danger", _("Invalid subnet name type [description]. Do not manipulate the POST values!"), true);
+    $Result->show("danger", _("Invalid subnet name type [description]. Do not manipulate the POST values!"), true);
 }
 
 # validate the subnetPattern value.
 if (!preg_match('/^[0-1]$/i', $_POST['subnetPattern'])) {
-	$Result->show("danger", _("Invalid subnet name. Do not manipulate the POST values!"), true);
+    $Result->show("danger", _("Invalid subnet name. Do not manipulate the POST values!"), true);
 }
 
 # formulate json
@@ -151,8 +151,8 @@ 
 
 # prepare the database update and encode the array with JSON_FORCE_OBJECT to keep the ids.
 $values = array('id' => 1,
-				'firewallZoneSettings' => json_encode($values,JSON_FORCE_OBJECT)
-				);
+                'firewallZoneSettings' => json_encode($values,JSON_FORCE_OBJECT)
+                );
 
 # update the settings, alert or reply the success message.
 if(!$Admin->object_modify("settings", "edit", "id", $values)) 	{ $Result->show("danger",  _("Cannot update settings"), true); }

app/admin/firewall-zones/mapping.php

Indentation +91 added lines, -91 removed lines

@@ -19,12 +19,12 @@ 
 
 # reorder by device
 if ($firewallZoneMapping!==false) {
-	# devices
-	$devices = array();
-	# add
-	foreach ($firewallZoneMapping as $m) {
-		$devices[$m->deviceId][] = $m;
-	}
+    # devices
+    $devices = array();
+    # add
+    foreach ($firewallZoneMapping as $m) {
+        $devices[$m->deviceId][] = $m;
+    }
 }
 ?>
 <!-- Add new firewall zone mapping -->
@@ -50,99 +50,99 @@ 
 
 	<?php
 
-	# loop
-	foreach ($devices as $k=>$firewallZoneMapping) { ?>
+    # loop
+    foreach ($devices as $k=>$firewallZoneMapping) { ?>
 		<!-- header -->
 		<tr>
 		<?php
-		$devices[$k][0]->deviceDescription = strlen($devices[$k][0]->deviceDescription)<1 ? "" : "(".$devices[$k][0]->deviceDescription.")";
-		print '<th colspan="8" style="background:white"><h4>'.$devices[$k][0]->deviceName.$devices[$k][0]->deviceDescription	.'</h4></th>';
-		?>
+        $devices[$k][0]->deviceDescription = strlen($devices[$k][0]->deviceDescription)<1 ? "" : "(".$devices[$k][0]->deviceDescription.")";
+        print '<th colspan="8" style="background:white"><h4>'.$devices[$k][0]->deviceName.$devices[$k][0]->deviceDescription	.'</h4></th>';
+        ?>
 		</tr>
 		<?php
 
-		# mappings
-		foreach ($firewallZoneMapping as $mapping ) {
-			# set rowspan in case if there are more than one networks bound to the zone
-			$counter = count($mapping->network);
-			if ($counter === 0) {
-				$counter = 1;
-			}
-			# set the loop counter
-			$i = 1;
-			if ($mapping->network) {
-				foreach ($mapping->network as $key => $network) {
-					print '<tr class="border-top">';
-					if ($i === 1) {
-						$title = $mapping->indicator == 0 ? 'Own Zone' : 'Customer Zone';
-						// print
-						print '<td rowspan="'.$counter.'"><span class="fa '.($mapping->indicator == 0 ? 'fa-home':'fa-group').'"  title="'._($title).'"></span></td>';
-						print '<td rowspan="'.$counter.'">'.$mapping->zone.'</td>';
-						print '<td rowspan="'.$counter.'">'.$mapping->alias.'</td>';
-						print '<td rowspan="'.$counter.'">'.$mapping->description.'</td>';
-						print '<td rowspan="'.$counter.'">'.$mapping->interface.'</td>';
-					}
-					# display subnet informations
-					if ($network->subnetId) {
-						// description fix
-						$network->subnetDescription = strlen($network->subnetDescription)>0 ? " (".$network->subnetDescription.")" : "";
-						// subnet
-						if (!$network->subnetIsFolder) {
-							print '<td><a href="'.create_link("subnets",$network->sectionId,$network->subnetId).'">'.$Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.$network->subnetDescription.'</a></td>';
-						}
-						else {
-							print '<td><a href="'.create_link("subnets",$network->sectionId,$network->subnetId).'">Folder'.$network->subnetDescription.'</a></td>';
-						}
-					} else {
-						print '<td>/</td>';
-					}
-					# display vlan informations
-					if ($network->vlanId) {
-						// name fix
-						$network->vlanName = strlen($network->vlanName)>0 ? " (".$network->vlanName.")" : "";
-						print '<td><a href="'.create_link('tools','vlan',$network->domainId,$network->vlanId).'">Vlan '.$network->vlan.''.$network->vlanName.'</a></td>';
-					} else {
-						print '<td>/</td>';
-					}
-					if ($i === 1) {
-						# action menu
-						print '<td rowspan="'.$counter.'">';
-						print '<div class="btn-group">';
-						print '<button class="btn btn-default btn-xs editMapping" data-action="edit" data-id="'.$mapping->mappingId.'""><i class="fa fa-pencil"></i></button>';
-						print '<button class="btn btn-default btn-xs editMapping" data-action="delete" data-id="'.$mapping->mappingId.'"><i class="fa fa-remove"></i></button>';
-						print '</div>';
-						print '</td>';
-					}
-					print '</tr>';
-					# increase the loop counter
-					$i++;
-				}
-			} else {
-				print "<tr class='border-top'>";
-				# display only the zone mapping data if there is no network data available
-				$title = $mapping->indicator == 0 ? 'Own Zone' : 'Customer Zone';
+        # mappings
+        foreach ($firewallZoneMapping as $mapping ) {
+            # set rowspan in case if there are more than one networks bound to the zone
+            $counter = count($mapping->network);
+            if ($counter === 0) {
+                $counter = 1;
+            }
+            # set the loop counter
+            $i = 1;
+            if ($mapping->network) {
+                foreach ($mapping->network as $key => $network) {
+                    print '<tr class="border-top">';
+                    if ($i === 1) {
+                        $title = $mapping->indicator == 0 ? 'Own Zone' : 'Customer Zone';
+                        // print
+                        print '<td rowspan="'.$counter.'"><span class="fa '.($mapping->indicator == 0 ? 'fa-home':'fa-group').'"  title="'._($title).'"></span></td>';
+                        print '<td rowspan="'.$counter.'">'.$mapping->zone.'</td>';
+                        print '<td rowspan="'.$counter.'">'.$mapping->alias.'</td>';
+                        print '<td rowspan="'.$counter.'">'.$mapping->description.'</td>';
+                        print '<td rowspan="'.$counter.'">'.$mapping->interface.'</td>';
+                    }
+                    # display subnet informations
+                    if ($network->subnetId) {
+                        // description fix
+                        $network->subnetDescription = strlen($network->subnetDescription)>0 ? " (".$network->subnetDescription.")" : "";
+                        // subnet
+                        if (!$network->subnetIsFolder) {
+                            print '<td><a href="'.create_link("subnets",$network->sectionId,$network->subnetId).'">'.$Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.$network->subnetDescription.'</a></td>';
+                        }
+                        else {
+                            print '<td><a href="'.create_link("subnets",$network->sectionId,$network->subnetId).'">Folder'.$network->subnetDescription.'</a></td>';
+                        }
+                    } else {
+                        print '<td>/</td>';
+                    }
+                    # display vlan informations
+                    if ($network->vlanId) {
+                        // name fix
+                        $network->vlanName = strlen($network->vlanName)>0 ? " (".$network->vlanName.")" : "";
+                        print '<td><a href="'.create_link('tools','vlan',$network->domainId,$network->vlanId).'">Vlan '.$network->vlan.''.$network->vlanName.'</a></td>';
+                    } else {
+                        print '<td>/</td>';
+                    }
+                    if ($i === 1) {
+                        # action menu
+                        print '<td rowspan="'.$counter.'">';
+                        print '<div class="btn-group">';
+                        print '<button class="btn btn-default btn-xs editMapping" data-action="edit" data-id="'.$mapping->mappingId.'""><i class="fa fa-pencil"></i></button>';
+                        print '<button class="btn btn-default btn-xs editMapping" data-action="delete" data-id="'.$mapping->mappingId.'"><i class="fa fa-remove"></i></button>';
+                        print '</div>';
+                        print '</td>';
+                    }
+                    print '</tr>';
+                    # increase the loop counter
+                    $i++;
+                }
+            } else {
+                print "<tr class='border-top'>";
+                # display only the zone mapping data if there is no network data available
+                $title = $mapping->indicator == 0 ? 'Own Zone' : 'Customer Zone';
 
-				print '<td rowspan="'.$counter.'"><span class="fa fa-home"  title="'._($title).'"></span></td>';
-				print '<td rowspan="'.$counter.'">'.$mapping->zone.'</td>';
-				print '<td rowspan="'.$counter.'">'.$mapping->alias.'</td>';
-				print '<td rowspan="'.$counter.'">'.$mapping->description.'</td>';
-				print '<td rowspan="'.$counter.'">'.$mapping->interface.'</td>';
-				print '<td colspan="2"></td>';
-				# action menu
-				print '<td>';
-				print '<div class="btn-group">';
-				print '<button class="btn btn-default btn-xs editMapping" data-action="edit" data-id="'.$mapping->mappingId.'""><i class="fa fa-pencil"></i></button>';
-				print '<button class="btn btn-default btn-xs editMapping" data-action="delete" data-id="'.$mapping->mappingId.'"><i class="fa fa-remove"></i></button>';
-				print '</div>';
-				print '</td>';
-				print '</tr>';
-			}
-		}
-	}
-	print '</table>';
+                print '<td rowspan="'.$counter.'"><span class="fa fa-home"  title="'._($title).'"></span></td>';
+                print '<td rowspan="'.$counter.'">'.$mapping->zone.'</td>';
+                print '<td rowspan="'.$counter.'">'.$mapping->alias.'</td>';
+                print '<td rowspan="'.$counter.'">'.$mapping->description.'</td>';
+                print '<td rowspan="'.$counter.'">'.$mapping->interface.'</td>';
+                print '<td colspan="2"></td>';
+                # action menu
+                print '<td>';
+                print '<div class="btn-group">';
+                print '<button class="btn btn-default btn-xs editMapping" data-action="edit" data-id="'.$mapping->mappingId.'""><i class="fa fa-pencil"></i></button>';
+                print '<button class="btn btn-default btn-xs editMapping" data-action="delete" data-id="'.$mapping->mappingId.'"><i class="fa fa-remove"></i></button>';
+                print '</div>';
+                print '</td>';
+                print '</tr>';
+            }
+        }
+    }
+    print '</table>';
 }
 else {
-	# print an info if there are no zones in the database
-	$Result->show("info", _("No firewall zones configured"), false);
+    # print an info if there are no zones in the database
+    $Result->show("info", _("No firewall zones configured"), false);
 }
 ?>
\ No newline at end of file

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

Indentation +50 added lines, -50 removed lines

@@ -31,7 +31,7 @@ 
 
 # fetch old zone
 if ($_POST['action'] != 'add') {
-	$firewallZone = $Zones->get_zone($_POST['id']);
+    $firewallZone = $Zones->get_zone($_POST['id']);
 }
 
 # disable edit on delete
@@ -65,31 +65,31 @@ 
 		</td>
 
 		<?php
-		# transmit the action and firewall zone id
-		print '<input type="hidden" name="action" value="'.$_POST['action'].'">';
-		print '<input type="hidden" name="id" value="'.$firewallZone->id.'">';
-		# possible zoneGenerator values:
-		#		0 == autogenerated decimal name
-		#		1 == autogenerated hex name
-		#		2 == free text name
-
-		if ($_POST['action'] == 'add') {
-			# check if we have to autogenerate a zone name or if we have to display a text box
-			if ($firewallZoneSettings['zoneGenerator'] == 2) {
-				print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._('Zone name (Only alphanumeric and special characters like .-_ and space.)').'" value="'.$firewallZone->zone.'" '.$readonly.'></td>';
-			} else {
-				print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._('The zone name will be automatically generated').'" value="'.$firewallZone->zone.'" '.$readonly.' disabled></td>';
-			}
-		} else {
-			if ($firewallZone->generator == 1) {
-				print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._('Zone name').'" readonly value="'.$firewallZone->zone.'"></td>';
-			} elseif ($firewallZone->generator != 2) {
-				print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._('Zone name').'" readonly value="'.$firewallZone->zone.'"></td>';
-			} else {
-				print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._('Zone name (Only alphanumeric and special characters like .-_ and space.)').'" value="'.$firewallZone->zone.'" '.$readonly.'></td>';
-			}
-		}
-		?>
+        # transmit the action and firewall zone id
+        print '<input type="hidden" name="action" value="'.$_POST['action'].'">';
+        print '<input type="hidden" name="id" value="'.$firewallZone->id.'">';
+        # possible zoneGenerator values:
+        #		0 == autogenerated decimal name
+        #		1 == autogenerated hex name
+        #		2 == free text name
+
+        if ($_POST['action'] == 'add') {
+            # check if we have to autogenerate a zone name or if we have to display a text box
+            if ($firewallZoneSettings['zoneGenerator'] == 2) {
+                print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._('Zone name (Only alphanumeric and special characters like .-_ and space.)').'" value="'.$firewallZone->zone.'" '.$readonly.'></td>';
+            } else {
+                print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._('The zone name will be automatically generated').'" value="'.$firewallZone->zone.'" '.$readonly.' disabled></td>';
+            }
+        } else {
+            if ($firewallZone->generator == 1) {
+                print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._('Zone name').'" readonly value="'.$firewallZone->zone.'"></td>';
+            } elseif ($firewallZone->generator != 2) {
+                print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._('Zone name').'" readonly value="'.$firewallZone->zone.'"></td>';
+            } else {
+                print '<td><input type="text" class="form-control input-sm" name="zone" placeholder="'._('Zone name (Only alphanumeric and special characters like .-_ and space.)').'" value="'.$firewallZone->zone.'" '.$readonly.'></td>';
+            }
+        }
+        ?>
 		<input type="hidden" name="generator" value="<?php print $firewallZoneSettings['zoneGenerator']; ?>">
 
 	</tr>
@@ -143,29 +143,29 @@ 
 <table class="table table-noborder table-condensed" style="padding-bottom:20px;">
 <?php
 if ($firewallZone->network) {
-	print "<tr><td colspan='2'><hr></tr>";
-	$rowspan = count($firewallZone->network);
-	$i = 1;
-	foreach ($firewallZone->network as $network) {
-		print '<tr>';
-		if ($i === 1) {
-			print '<td rowspan="'.$rowspan.'" style="width:150px;vertical-align:top">Networks</td>';
-		}
-		print '<td>';
-		print '<a class="btn btn-xs btn-danger editNetwork" style="margin-right:5px;" alt="'._('Delete Network').'" title="'._('Delete Network').'" data-action="delete" data-zoneId="'.$firewallZone->id.'" data-subnetId="'.$network->subnetId.'">';
-		print '<span><i class="fa fa-close"></i></span>';
-		print "</a>";
-
-		if ($network->subnetIsFolder == 1) {
-			print 'Folder: '.$network->subnetDescription.'</td>';
-		} else {
-			# display network information with or without description
-			if ($network->subnetDescription) 	{	print $Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.' ('.$network->subnetDescription.')</td>';	}
-			else 								{	print $Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.'</td>';	}
-		}
-		print '</tr>';
-		$i++;
-	}
+    print "<tr><td colspan='2'><hr></tr>";
+    $rowspan = count($firewallZone->network);
+    $i = 1;
+    foreach ($firewallZone->network as $network) {
+        print '<tr>';
+        if ($i === 1) {
+            print '<td rowspan="'.$rowspan.'" style="width:150px;vertical-align:top">Networks</td>';
+        }
+        print '<td>';
+        print '<a class="btn btn-xs btn-danger editNetwork" style="margin-right:5px;" alt="'._('Delete Network').'" title="'._('Delete Network').'" data-action="delete" data-zoneId="'.$firewallZone->id.'" data-subnetId="'.$network->subnetId.'">';
+        print '<span><i class="fa fa-close"></i></span>';
+        print "</a>";
+
+        if ($network->subnetIsFolder == 1) {
+            print 'Folder: '.$network->subnetDescription.'</td>';
+        } else {
+            # display network information with or without description
+            if ($network->subnetDescription) 	{	print $Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.' ('.$network->subnetDescription.')</td>';	}
+            else 								{	print $Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.'</td>';	}
+        }
+        print '</tr>';
+        $i++;
+    }
 }
 ?>
 </table>
@@ -177,7 +177,7 @@ 
 <?php
 #print delete warning
 if($_POST['action'] == "delete"){
-	$Result->show("warning", "<strong>"._('Warning').":</strong> "._("Removing this firewall zone will also remove all referenced mappings!"), false);
+    $Result->show("warning", "<strong>"._('Warning').":</strong> "._("Removing this firewall zone will also remove all referenced mappings!"), false);
 }
 ?>
 </div>

app/admin/firewall-zones/zones.php

Indentation +92 added lines, -92 removed lines

@@ -20,104 +20,104 @@
 # display the zone table if there are any zones in the database
 if($firewallZones) {
 
-	# table
-	print '<table id="zonesPrint" class="table table-top table-td-top table-condensed">';
+    # table
+    print '<table id="zonesPrint" class="table table-top table-td-top table-condensed">';
 
-	# table headers
-	print "<thead>";
-	print '<tr style="background:white">';
-	print '<th>'._('Type').'</th>';
-	print '<th>'._('Zone').'</th>';
-	print '<th>'._('Description').'</th>';
-	print '<th>'._('Subnet').'</th>';
-	print '<th>'._('VLAN').'</th>';
-	print '<th style="width:60px;"></th>';
-	print '</tr>';
-	print "</thead>";
+    # table headers
+    print "<thead>";
+    print '<tr style="background:white">';
+    print '<th>'._('Type').'</th>';
+    print '<th>'._('Zone').'</th>';
+    print '<th>'._('Description').'</th>';
+    print '<th>'._('Subnet').'</th>';
+    print '<th>'._('VLAN').'</th>';
+    print '<th style="width:60px;"></th>';
+    print '</tr>';
+    print "</thead>";
 
     print "<tbody>";
-	# display all firewall zones and network information
-	foreach ($firewallZones as $zoneObject ) {
-		# set rowspan in case if there are more than one networks bound to the zone
-		$counter = count($zoneObject->network);
-		if ($counter === 0) {
-			$counter = 1;
-		}
-		# set the loop counter
-		$i = 1;
-		if ($zoneObject->network) {
-			foreach ($zoneObject->network as $key => $network) {
-				print '<tr class="border-top">';
-				if ($i === 1) {
-					// set title
-					$title = $zoneObject->indicator == 0 ? 'Own Zone' : 'Customer Zone';
-					// print
-					print '<td rowspan="'.$counter.'"><span class="fa '.($zoneObject->indicator == 0 ? 'fa-home':'fa-group').'"  title="'._($title).'"></span></td>';
-					print '<td rowspan="'.$counter.'">'.$zoneObject->zone.'</td>';
-					print '<td rowspan="'.$counter.'">'.$zoneObject->description.'</td>';
-				}
-				# display subnet informations
-				if ($network->subnetId) {
-					// description fix
-					$network->subnetDescription = strlen($network->subnetDescription)>0 ? " (".$network->subnetDescription.")" : "";
+    # display all firewall zones and network information
+    foreach ($firewallZones as $zoneObject ) {
+        # set rowspan in case if there are more than one networks bound to the zone
+        $counter = count($zoneObject->network);
+        if ($counter === 0) {
+            $counter = 1;
+        }
+        # set the loop counter
+        $i = 1;
+        if ($zoneObject->network) {
+            foreach ($zoneObject->network as $key => $network) {
+                print '<tr class="border-top">';
+                if ($i === 1) {
+                    // set title
+                    $title = $zoneObject->indicator == 0 ? 'Own Zone' : 'Customer Zone';
+                    // print
+                    print '<td rowspan="'.$counter.'"><span class="fa '.($zoneObject->indicator == 0 ? 'fa-home':'fa-group').'"  title="'._($title).'"></span></td>';
+                    print '<td rowspan="'.$counter.'">'.$zoneObject->zone.'</td>';
+                    print '<td rowspan="'.$counter.'">'.$zoneObject->description.'</td>';
+                }
+                # display subnet informations
+                if ($network->subnetId) {
+                    // description fix
+                    $network->subnetDescription = strlen($network->subnetDescription)>0 ? " (".$network->subnetDescription.")" : "";
 
-					if (!$network->subnetIsFolder) {
-						print '<td><a href="'.create_link("subnets",$network->sectionId,$network->subnetId).'">'.$Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.$network->subnetDescription.'</a></td>';
-					} else {
-						print '<td><a href="'.create_link("subnets",$network->sectionId,$network->subnetId).'">Folder'.$network->subnetDescription.'</a></td>';
-					}
-				} else {
-					print '<td>/</td>';
-				}
-				# display vlan informations
-				if ($network->vlanId) {
-					// name fix
-					$network->vlanName = strlen($network->vlanName)>0 ? " (".$network->vlanName.")" : "";
-					print '<td><a href="'.create_link('tools','vlan',$network->domainId,$network->vlanId).'">'.$network->vlan.$network->vlanName.'</a></td>';
-				} else {
-					print '<td>/</td>';
-				}
-				// actions
-				if ($i === 1) {
-					# action menu
-					print '<td rowspan="'.$counter.'">';
-					print '<div class="btn-group">';
-					print '<button class="btn btn-default btn-xs editFirewallZone" data-action="edit" data-id="'.$zoneObject->id.'""><i class="fa fa-pencil"></i></button>';
-					print '<button class="btn btn-default btn-xs editFirewallZone" data-action="delete" data-id="'.$zoneObject->id.'"><i class="fa fa-remove"></i></button>';
-					print '</div>';
-					print '</td>';
-				}
-				print '</tr>';
+                    if (!$network->subnetIsFolder) {
+                        print '<td><a href="'.create_link("subnets",$network->sectionId,$network->subnetId).'">'.$Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.$network->subnetDescription.'</a></td>';
+                    } else {
+                        print '<td><a href="'.create_link("subnets",$network->sectionId,$network->subnetId).'">Folder'.$network->subnetDescription.'</a></td>';
+                    }
+                } else {
+                    print '<td>/</td>';
+                }
+                # display vlan informations
+                if ($network->vlanId) {
+                    // name fix
+                    $network->vlanName = strlen($network->vlanName)>0 ? " (".$network->vlanName.")" : "";
+                    print '<td><a href="'.create_link('tools','vlan',$network->domainId,$network->vlanId).'">'.$network->vlan.$network->vlanName.'</a></td>';
+                } else {
+                    print '<td>/</td>';
+                }
+                // actions
+                if ($i === 1) {
+                    # action menu
+                    print '<td rowspan="'.$counter.'">';
+                    print '<div class="btn-group">';
+                    print '<button class="btn btn-default btn-xs editFirewallZone" data-action="edit" data-id="'.$zoneObject->id.'""><i class="fa fa-pencil"></i></button>';
+                    print '<button class="btn btn-default btn-xs editFirewallZone" data-action="delete" data-id="'.$zoneObject->id.'"><i class="fa fa-remove"></i></button>';
+                    print '</div>';
+                    print '</td>';
+                }
+                print '</tr>';
 
-				// increase the loop counter
-				$i++;
-			}
-		}
-		# display only the zone data if there is no network data available
-		else {
-			// set title
-			$title = $zoneObject->indicator == 0 ? 'Own Zone' : 'Customer Zone';
+                // increase the loop counter
+                $i++;
+            }
+        }
+        # display only the zone data if there is no network data available
+        else {
+            // set title
+            $title = $zoneObject->indicator == 0 ? 'Own Zone' : 'Customer Zone';
 
-			print '<tr class="border-top">';
-			print '<td rowspan="'.$counter.'"><span class="fa fa-home"  title="'._($title).'"></span></td>';
-			print '<td>'.$zoneObject->zone.'</td>';
-			print '<td>'.$zoneObject->description.'</td>';
-			print '<td>/</td>';
-			print '<td>/</td>';
-			# action menu
-			print '<td>';
-			print '<div class="btn-group">';
-			print '<button class="btn btn-default btn-xs editFirewallZone" data-action="edit" data-id="'.$zoneObject->id.'""><i class="fa fa-pencil"></i></button>';
-			print '<button class="btn btn-default btn-xs editFirewallZone" data-action="delete" data-id="'.$zoneObject->id.'"><i class="fa fa-remove"></i></button>';
-			print '</div>';
-			print '</td>';
-			print '</tr>';
-		}
-	}
-	print "</tbody>";
-	print '</table>';
+            print '<tr class="border-top">';
+            print '<td rowspan="'.$counter.'"><span class="fa fa-home"  title="'._($title).'"></span></td>';
+            print '<td>'.$zoneObject->zone.'</td>';
+            print '<td>'.$zoneObject->description.'</td>';
+            print '<td>/</td>';
+            print '<td>/</td>';
+            # action menu
+            print '<td>';
+            print '<div class="btn-group">';
+            print '<button class="btn btn-default btn-xs editFirewallZone" data-action="edit" data-id="'.$zoneObject->id.'""><i class="fa fa-pencil"></i></button>';
+            print '<button class="btn btn-default btn-xs editFirewallZone" data-action="delete" data-id="'.$zoneObject->id.'"><i class="fa fa-remove"></i></button>';
+            print '</div>';
+            print '</td>';
+            print '</tr>';
+        }
+    }
+    print "</tbody>";
+    print '</table>';
 } else {
-	# print an info if there are no zones in the database
-	$Result->show("info", _("No firewall zones configured"), false);
+    # print an info if there are no zones in the database
+    $Result->show("info", _("No firewall zones configured"), false);
 }
 ?>