phpipam / phpipam

app/admin/powerDNS/record-edit.php

Indentation +61 added lines, -61 removed lines

@@ -29,49 +29,49 @@ 
 
 # get record
 if($_POST['action']!="add") {
-	$record = $PowerDNS->fetch_record ($_POST['id']);
-	$record!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+    $record = $PowerDNS->fetch_record ($_POST['id']);
+    $record!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
 }
 # new record
 else {
-	// from IP table
-	// we provide record hostname and strip domain from it
-	if (!is_numeric($_POST['domain_id']) && !is_numeric($_POST['id'])) {
-		// fetch all domains
-		$all_domains = $PowerDNS->fetch_all_domains ();
-		if ($all_domains!==false) {
-			foreach($all_domains as $dk=>$domain_s) {
-				// loop through and find all matches
-				if (strpos($_POST['domain_id'],$domain_s->name) !== false) {
-					// check best match to avoid for example a.example.net.nz1 added to example.net.nz
-					if (substr($_POST['domain_id'], -strlen($domain_s->name)) === $domain_s->name) {
-						$matches[$dk] = $domain_s;
-					}
-				}
-			}
-			// match found ?
-			if (isset($matches)) {
-				foreach($matches as $k=>$m){
-					$length = strlen($m->name);
-					if($length > $max){ $max = $length; $element_id = $k; }
-				}
-				// save longest match id
-				$_POST['domain_id'] = $all_domains[$element_id]->id;
-			}
-		}
-		// die if not existing
-		if (!is_numeric($_POST['domain_id'])) {
-    		# admin?
-    		if ($User->is_admin())   { $Result->show("danger", _("Domain")." <strong>".$_POST['domain_id']."</strong><span class='ip_dns_addr hidden'>".$_POST['id']."</span> "._("does not exist")."!"."<hr><button class='btn btn-sm btn-default editDomain2 editDomain' data-action='add' data-id='0'><i class='fa fa-plus'></i> "._('Create domain')."</button>", true, true); }
-    		else                     { $Result->show("danger", _("Domain")." <strong>".$_POST['domain_id']."</strong> "._("does not exist")."!", true, true); }
-		}
-		else {
-			$record = new StdClass ();
-			$record->ttl = 3600;
-			$record->name = $post['domain_id'];
-			$record->content = $_POST['id'];
-		}
-	}
+    // from IP table
+    // we provide record hostname and strip domain from it
+    if (!is_numeric($_POST['domain_id']) && !is_numeric($_POST['id'])) {
+        // fetch all domains
+        $all_domains = $PowerDNS->fetch_all_domains ();
+        if ($all_domains!==false) {
+            foreach($all_domains as $dk=>$domain_s) {
+                // loop through and find all matches
+                if (strpos($_POST['domain_id'],$domain_s->name) !== false) {
+                    // check best match to avoid for example a.example.net.nz1 added to example.net.nz
+                    if (substr($_POST['domain_id'], -strlen($domain_s->name)) === $domain_s->name) {
+                        $matches[$dk] = $domain_s;
+                    }
+                }
+            }
+            // match found ?
+            if (isset($matches)) {
+                foreach($matches as $k=>$m){
+                    $length = strlen($m->name);
+                    if($length > $max){ $max = $length; $element_id = $k; }
+                }
+                // save longest match id
+                $_POST['domain_id'] = $all_domains[$element_id]->id;
+            }
+        }
+        // die if not existing
+        if (!is_numeric($_POST['domain_id'])) {
+            # admin?
+            if ($User->is_admin())   { $Result->show("danger", _("Domain")." <strong>".$_POST['domain_id']."</strong><span class='ip_dns_addr hidden'>".$_POST['id']."</span> "._("does not exist")."!"."<hr><button class='btn btn-sm btn-default editDomain2 editDomain' data-action='add' data-id='0'><i class='fa fa-plus'></i> "._('Create domain')."</button>", true, true); }
+            else                     { $Result->show("danger", _("Domain")." <strong>".$_POST['domain_id']."</strong> "._("does not exist")."!", true, true); }
+        }
+        else {
+            $record = new StdClass ();
+            $record->ttl = 3600;
+            $record->name = $post['domain_id'];
+            $record->content = $_POST['id'];
+        }
+    }
 }
 
 // get domain
@@ -80,9 +80,9 @@ 
 
 // default
 if (!isset($record)) {
-	$record = new StdClass ();
-	$record->ttl = 3600;
-	$record->name = $domain->name;
+    $record = new StdClass ();
+    $record->ttl = 3600;
+    $record->name = $domain->name;
 }
 
 // if IPv6 automaticall add AAAA record!
@@ -122,15 +122,15 @@ 
 		<td>
 			<select name="type" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 			<?php
-			// loop
-			foreach($PowerDNS->record_types as $type) {
-				// active
-				if ($type == @$record->type)	{ $selected = "selected"; }
-				else							{ $selected = ""; }
-				// print
-				print "<option value='$type' $selected>$type</option>";
-			}
-			?>
+            // loop
+            foreach($PowerDNS->record_types as $type) {
+                // active
+                if ($type == @$record->type)	{ $selected = "selected"; }
+                else							{ $selected = ""; }
+                // print
+                print "<option value='$type' $selected>$type</option>";
+            }
+            ?>
 			</select>
 		</td>
 	</tr>
@@ -150,15 +150,15 @@ 
 		<td>
 			<select name="ttl" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 			<?php
-			// loop
-			foreach($PowerDNS->ttl as $k=>$type) {
-				// active
-				if ($k == @$record->ttl)		{ $selected = "selected"; }
-				else							{ $selected = ""; }
-				// print
-				print "<option value='$k' $selected>$type</option>";
-			}
-			?>
+            // loop
+            foreach($PowerDNS->ttl as $k=>$type) {
+                // active
+                if ($k == @$record->ttl)		{ $selected = "selected"; }
+                else							{ $selected = ""; }
+                // print
+                print "<option value='$k' $selected>$type</option>";
+            }
+            ?>
 			</select>
 		</td>
 	</tr>

app/admin/powerDNS/record-edit-result.php

Indentation +8 added lines, -8 removed lines

@@ -25,27 +25,27 @@
 
 # fetch old record
 if($_POST['action']!="add") {
-	$record = $PowerDNS->fetch_record ($_POST['id']);
-	$record!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+    $record = $PowerDNS->fetch_record ($_POST['id']);
+    $record!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
 }
 
 # edit and add - check that smth is in name and content!
 if ($_POST['action']!="delete") {
-	if (strlen($_POST['name'])<2)		{ $Result->show ("danger", _("Invalid name"), true); }
-	if (strlen($_POST['content'])<2)	{ $Result->show ("danger", _("Invalid content"), true); }
+    if (strlen($_POST['name'])<2)		{ $Result->show ("danger", _("Invalid name"), true); }
+    if (strlen($_POST['content'])<2)	{ $Result->show ("danger", _("Invalid content"), true); }
 }
 
 
 # validate and set values
 if($_POST['action']=="edit") {
-	$values = $PowerDNS->formulate_update_record ($_POST['name'], $_POST['type'], $_POST['content'], $_POST['ttl'], $_POST['prio'], $_POST['disabled'], $record->change_date);
-	$values['domain_id'] = $_POST['domain_id'];
+    $values = $PowerDNS->formulate_update_record ($_POST['name'], $_POST['type'], $_POST['content'], $_POST['ttl'], $_POST['prio'], $_POST['disabled'], $record->change_date);
+    $values['domain_id'] = $_POST['domain_id'];
 }
 elseif($_POST['action']=="add") {
-	$values = $PowerDNS->formulate_new_record ($_POST['domain_id'], $_POST['name'], $_POST['type'], $_POST['content'], $_POST['ttl'], $_POST['prio'], $_POST['disabled']);
+    $values = $PowerDNS->formulate_new_record ($_POST['domain_id'], $_POST['name'], $_POST['type'], $_POST['content'], $_POST['ttl'], $_POST['prio'], $_POST['disabled']);
 }
 elseif($_POST['action']=="delete") {
-	$values['domain_id'] = $_POST['domain_id'];
+    $values['domain_id'] = $_POST['domain_id'];
 }
 
 # add id

app/admin/vrfs/vrf-scan-result.php

Indentation +28 added lines, -28 removed lines

@@ -34,43 +34,43 @@
 
 # ok, lets get results form post array!
 foreach($_POST as $key=>$line) {
-	// IP address
-	if(substr($key, 0,2)=="rd") 			    { $res[substr($key, 2)]['rd']  	        = $line; }
-	// mac
-	elseif(substr($key, 0,4)=="name") 		    { $res[substr($key, 4)]['name']  	    = $line; }
-	// description
-	elseif(substr($key, 0,11)=="description") 	{ $res[substr($key, 11)]['description'] = $line; }
-	// custom fields
-	elseif (isset($required_fields)) {
-    	foreach ($required_fields as $k=>$f) {
-        	if((strpos($key, $f['name'])) !== false) {
+    // IP address
+    if(substr($key, 0,2)=="rd") 			    { $res[substr($key, 2)]['rd']  	        = $line; }
+    // mac
+    elseif(substr($key, 0,4)=="name") 		    { $res[substr($key, 4)]['name']  	    = $line; }
+    // description
+    elseif(substr($key, 0,11)=="description") 	{ $res[substr($key, 11)]['description'] = $line; }
+    // custom fields
+    elseif (isset($required_fields)) {
+        foreach ($required_fields as $k=>$f) {
+            if((strpos($key, $f['name'])) !== false) {
                                                 { $res[substr($key, strlen($f['name']))][$f['name']] = $line; }
-        	}
-    	}
-	}
+            }
+        }
+    }
 }
 
 # insert entries
 if(sizeof($res)>0) {
-	$errors = 0;
-	foreach($res as $r) {
-		# set insert values
-		$values = array("rd"=>$r['rd'],
-						"name"=>$r['name'],
-						"description"=>$r['description']
-						);
+    $errors = 0;
+    foreach($res as $r) {
+        # set insert values
+        $values = array("rd"=>$r['rd'],
+                        "name"=>$r['name'],
+                        "description"=>$r['description']
+                        );
         # custom fields
-		if (isset($required_fields)) {
-			foreach ($required_fields as $k=>$f) {
-				$values[$f['name']] = $r[$f['name']];
-			}
-		}
+        if (isset($required_fields)) {
+            foreach ($required_fields as $k=>$f) {
+                $values[$f['name']] = $r[$f['name']];
+            }
+        }
         # insert vrfs
         if(!$Admin->object_modify("vrf", "add", "vrfId", $values))	{ $Result->show("danger", _("Failed to import entry")." ".$r['number']." ".$r['name'], false); $errors++; }
-	}
+    }
 
-	# success if no errors
-	if($errors==0) {  $Result->show("success", _("Scan results added to database")."!", true); }
+    # success if no errors
+    if($errors==0) {  $Result->show("success", _("Scan results added to database")."!", true); }
 }
 # error
 else { $Result->show("danger", _("No entries available"), true); }

app/admin/vrfs/index.php

Indentation +87 added lines, -87 removed lines

@@ -40,95 +40,95 @@
 # first check if they exist!
 if($all_vrfs===false) { $Result->show("info", _("No VRFs configured")."!", false);}
 else {
-	print '<table id="vrfManagement" class="table sorted table-striped table-top table-hover">'. "\n";
-
-	# headers
-	print "<thead>";
-	print '<tr>'. "\n";
-	print '	<th>'._('Name').'</th>'. "\n";
-	print '	<th>'._('RD').'</th>'. "\n";
-	print '	<th>'._('Sections').'</th>'. "\n";
-	print '	<th>'._('Description').'</th>'. "\n";
-	if(sizeof($custom) > 0) {
-		foreach($custom as $field) {
-			if(!in_array($field['name'], $hidden_fields)) {
-				print "<th class='customField hidden-xs hidden-sm'>$field[name]</th>";
-			}
-		}
-	}
-	print '	<th></th>'. "\n";
-	print '</tr>'. "\n";
-	print "</thead>";
+    print '<table id="vrfManagement" class="table sorted table-striped table-top table-hover">'. "\n";
+
+    # headers
+    print "<thead>";
+    print '<tr>'. "\n";
+    print '	<th>'._('Name').'</th>'. "\n";
+    print '	<th>'._('RD').'</th>'. "\n";
+    print '	<th>'._('Sections').'</th>'. "\n";
+    print '	<th>'._('Description').'</th>'. "\n";
+    if(sizeof($custom) > 0) {
+        foreach($custom as $field) {
+            if(!in_array($field['name'], $hidden_fields)) {
+                print "<th class='customField hidden-xs hidden-sm'>$field[name]</th>";
+            }
+        }
+    }
+    print '	<th></th>'. "\n";
+    print '</tr>'. "\n";
+    print "</thead>";
 
     print "<tbody>";
-	# loop
-	foreach ($all_vrfs as $vrf) {
-		//cast
-		$vrf = (array) $vrf;
-
-    	// format sections
-    	if(strlen($vrf['sections'])==0) {
-    		$sections = "All sections";
-    	}
-    	else {
-    		//explode
-    		unset($sec);
-    		$sections_tmp = explode(";", $vrf['sections']);
-    		foreach($sections_tmp as $t) {
-    			//fetch section
-    			$tmp_section = $Sections->fetch_section(null, $t);
-    			$sec[] = " &middot; ".$tmp_section->name;
-    		}
-    		//implode
-    		$sections = implode("<br>", $sec);
-    	}
-
-		//print details
-		print '<tr class="text-top">'. "\n";
-		print '	<td class="name">'. $vrf['name'] .'</td>'. "\n";
-		print '	<td class="rd">'. $vrf['rd'] .'</td>'. "\n";
-		print "	<td><span class='text-muted'>$sections</span></td>";
-		print '	<td class="description">'. $vrf['description'] .'</td>'. "\n";
-
-		// custom fields
-		if(sizeof($custom) > 0) {
-			foreach($custom as $field) {
-				if(!in_array($field['name'], $hidden_fields)) {
-
-					print "<td class='customField hidden-xs hidden-sm'>";
-
-					// create links
-					$vrf[$field['name']] = $Result->create_links ($vrf[$field['name']], $field['type']);
-
-					//booleans
-					if($field['type']=="tinyint(1)")	{
-						if($vrf[$field['name']] == "0")		{ print _("No"); }
-						elseif($vrf[$field['name']] == "1")	{ print _("Yes"); }
-					}
-					//text
-					elseif($field['type']=="text") {
-						if(strlen($vrf[$field['name']])>0)	{ print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $vrf[$field['name']])."'>"; }
-						else											{ print ""; }
-					}
-					else {
-						print $vrf[$field['name']];
-
-					}
-					print "</td>";
-				}
-			}
-		}
-
-		print "	<td class='actions'>";
-		print "	<div class='btn-group'>";
-		print "		<button class='btn btn-xs btn-default vrfManagement' data-action='edit'   data-vrfid='$vrf[vrfId]'><i class='fa fa-pencil'></i></button>";
-		print "		<button class='btn btn-xs btn-default vrfManagement' data-action='delete' data-vrfid='$vrf[vrfId]'><i class='fa fa-times'></i></button>";
-		print "	</div>";
-		print "	</td>";
-		print '</tr>'. "\n";
-	}
-	print "</tbody>";
-	print '</table>'. "\n";
+    # loop
+    foreach ($all_vrfs as $vrf) {
+        //cast
+        $vrf = (array) $vrf;
+
+        // format sections
+        if(strlen($vrf['sections'])==0) {
+            $sections = "All sections";
+        }
+        else {
+            //explode
+            unset($sec);
+            $sections_tmp = explode(";", $vrf['sections']);
+            foreach($sections_tmp as $t) {
+                //fetch section
+                $tmp_section = $Sections->fetch_section(null, $t);
+                $sec[] = " &middot; ".$tmp_section->name;
+            }
+            //implode
+            $sections = implode("<br>", $sec);
+        }
+
+        //print details
+        print '<tr class="text-top">'. "\n";
+        print '	<td class="name">'. $vrf['name'] .'</td>'. "\n";
+        print '	<td class="rd">'. $vrf['rd'] .'</td>'. "\n";
+        print "	<td><span class='text-muted'>$sections</span></td>";
+        print '	<td class="description">'. $vrf['description'] .'</td>'. "\n";
+
+        // custom fields
+        if(sizeof($custom) > 0) {
+            foreach($custom as $field) {
+                if(!in_array($field['name'], $hidden_fields)) {
+
+                    print "<td class='customField hidden-xs hidden-sm'>";
+
+                    // create links
+                    $vrf[$field['name']] = $Result->create_links ($vrf[$field['name']], $field['type']);
+
+                    //booleans
+                    if($field['type']=="tinyint(1)")	{
+                        if($vrf[$field['name']] == "0")		{ print _("No"); }
+                        elseif($vrf[$field['name']] == "1")	{ print _("Yes"); }
+                    }
+                    //text
+                    elseif($field['type']=="text") {
+                        if(strlen($vrf[$field['name']])>0)	{ print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $vrf[$field['name']])."'>"; }
+                        else											{ print ""; }
+                    }
+                    else {
+                        print $vrf[$field['name']];
+
+                    }
+                    print "</td>";
+                }
+            }
+        }
+
+        print "	<td class='actions'>";
+        print "	<div class='btn-group'>";
+        print "		<button class='btn btn-xs btn-default vrfManagement' data-action='edit'   data-vrfid='$vrf[vrfId]'><i class='fa fa-pencil'></i></button>";
+        print "		<button class='btn btn-xs btn-default vrfManagement' data-action='delete' data-vrfid='$vrf[vrfId]'><i class='fa fa-times'></i></button>";
+        print "	</div>";
+        print "	</td>";
+        print '</tr>'. "\n";
+    }
+    print "</tbody>";
+    print '</table>'. "\n";
 }
 ?>
 

app/admin/vrfs/vrf-scan-execute.php

Indentation +126 added lines, -126 removed lines

@@ -65,20 +65,20 @@ 
         $res = $Snmp->get_query("get_vrf_table");
         // remove those not in subnet
         if (sizeof($res)>0) {
-           // save for debug
-           $debug[$d->hostname]["get_vrf_table"] = $res;
-           // loop and save
-           foreach ($res as $k=>$r) {
-               if (!array_key_exists($k, $new_vrfs) && !array_key_exists($k, $ex_vrfs) ) {
-                   $new_vrfs[$k] = $r;
-               }
-           }
+            // save for debug
+            $debug[$d->hostname]["get_vrf_table"] = $res;
+            // loop and save
+            foreach ($res as $k=>$r) {
+                if (!array_key_exists($k, $new_vrfs) && !array_key_exists($k, $ex_vrfs) ) {
+                    $new_vrfs[$k] = $r;
+                }
+            }
         }
-     } catch (Exception $e) {
-       // save for debug
-       $debug[$d->hostname]["get_vrf_table"] = $res;
-       $errors[] = $e->getMessage();
-	}
+        } catch (Exception $e) {
+        // save for debug
+        $debug[$d->hostname]["get_vrf_table"] = $res;
+        $errors[] = $e->getMessage();
+    }
 }
 
 # none and errors
@@ -101,129 +101,129 @@ 
     }
 
     // calculate colspan
-	$colspan = 4 + sizeof(@$required_fields);
+    $colspan = 4 + sizeof(@$required_fields);
 
 
-	//form
-	print "<form name='scan-snmp-vrf-form' class='scan-snmp-arp-form' id='scan-snmp-vrf-form'>";
-	print "<table class='table table-striped table-top table-condensed'>";
+    //form
+    print "<form name='scan-snmp-vrf-form' class='scan-snmp-arp-form' id='scan-snmp-vrf-form'>";
+    print "<table class='table table-striped table-top table-condensed'>";
 
-	// titles
-	print "<tr>";
-	print "	<th>"._("Name")."</th>";
-	print "	<th>"._("RD")."</th>";
-	print "	<th>"._("Description")."</th>";
+    // titles
+    print "<tr>";
+    print "	<th>"._("Name")."</th>";
+    print "	<th>"._("RD")."</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_vrfs as $name=>$rd ) {
+    // alive
+    $m=0;
+    foreach ($new_vrfs as $name=>$rd ) {
         print "<tr class='result$m'>";
-		//name
-		print "<td>$name</td>";
-		//rd
-		print "<td>";
-		print "	<input type='text' class='form-control input-sm' name='rd$m' value='$rd'>";
-		print "	<input type='hidden' name='name$m' value='$name'>";
-		print "</td>";
-		//description
-		print "<td>";
-		print "	<input type='text' class='form-control input-sm' name='description$m'>";
-		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";
-    			}
+        //name
+        print "<td>$name</td>";
+        //rd
+        print "<td>";
+        print "	<input type='text' class='form-control input-sm' name='rd$m' value='$rd'>";
+        print "	<input type='hidden' name='name$m' value='$name'>";
+        print "</td>";
+        //description
+        print "<td>";
+        print "	<input type='text' class='form-control input-sm' name='description$m'>";
+        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='vrfScanAddResult'></div>";
-	print "		<a href='' class='btn btn-sm btn-success pull-right' id='saveVrfScanResults'><i class='fa fa-plus'></i> "._("Add discovered vrfs")."</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='vrfScanAddResult'></div>";
+    print "		<a href='' class='btn btn-sm btn-success pull-right' id='saveVrfScanResults'><i class='fa fa-plus'></i> "._("Add discovered vrfs")."</a>";
+    print "	</td>";
+    print "</tr>";
+
+    print "</table>";
+    print "</form>";
 
     // print errors
     if (isset($errors)) {

app/admin/vrfs/edit-result.php

Indentation +15 added lines, -15 removed lines

@@ -32,11 +32,11 @@ 
 
 // set sections
 foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"section-"))>0) {
-		$key2 = str_replace("section-", "", $key);
-		$temp[] = $key2;
-		unset($_POST[$key]);
-	}
+    if (strlen(strstr($key,"section-"))>0) {
+        $key2 = str_replace("section-", "", $key);
+        $temp[] = $key2;
+        unset($_POST[$key]);
+    }
 }
 # glue sections together
 $_POST['sections'] = sizeof($temp)>0 ? implode(";", $temp) : null;
@@ -45,18 +45,18 @@ 
 
 # set update array
 $values = array("vrfId"=>@$_POST['vrfId'],
-				"name"=>$_POST['name'],
-				"rd"=>$_POST['rd'],
-				"sections"=>$_POST['sections'],
-				"description"=>$_POST['description']
-				);
+                "name"=>$_POST['name'],
+                "rd"=>$_POST['rd'],
+                "sections"=>$_POST['sections'],
+                "description"=>$_POST['description']
+                );
 # append custom
 if(sizeof($custom) > 0) {
-	foreach($custom as $myField) {
-		# replace possible ___ back to spaces!
-		$myField['nameTest']      = str_replace(" ", "___", $myField['name']);
-		if(isset($_POST[$myField['nameTest']])) { $values[$myField['name']] = @$_POST[$myField['nameTest']];}
-	}
+    foreach($custom as $myField) {
+        # replace possible ___ back to spaces!
+        $myField['nameTest']      = str_replace(" ", "___", $myField['name']);
+        if(isset($_POST[$myField['nameTest']])) { $values[$myField['name']] = @$_POST[$myField['nameTest']];}
+    }
 }
 
 # update

app/admin/tags/index.php

Indentation +24 added lines, -24 removed lines

@@ -33,33 +33,33 @@
 
 # loop
 if ($all_types!==false) {
-	// cast
-	$all_types = (array) $all_types;
-	// loop
-	foreach ($all_types as $type) {
-		//cast
-		$type = (array) $type;
+    // cast
+    $all_types = (array) $all_types;
+    // loop
+    foreach ($all_types as $type) {
+        //cast
+        $type = (array) $type;
 
-		//format type
-		$showtag = $type['showtag']==1 ? "Yes" : "No";
+        //format type
+        $showtag = $type['showtag']==1 ? "Yes" : "No";
 
-		//print details
-		print '<tr>'. "\n";
-		print '	<td>'. $type['type'] .'</td>'. "\n";
-		print '	<td>'.$showtag.'</td>'. "\n";
-		print '	<td style="background-color:'.$type['bgcolor'].'">'. $type['bgcolor'] .'</td>'. "\n";
-		print '	<td style="background-color:'.$type['fgcolor'].'">'. $type['fgcolor'] .'</td>'. "\n";
-		print '	<td>'. $type['compress'] .'</td>'. "\n";
-		print '	<td>'. $type['locked'] .'</td>'. "\n";
+        //print details
+        print '<tr>'. "\n";
+        print '	<td>'. $type['type'] .'</td>'. "\n";
+        print '	<td>'.$showtag.'</td>'. "\n";
+        print '	<td style="background-color:'.$type['bgcolor'].'">'. $type['bgcolor'] .'</td>'. "\n";
+        print '	<td style="background-color:'.$type['fgcolor'].'">'. $type['fgcolor'] .'</td>'. "\n";
+        print '	<td>'. $type['compress'] .'</td>'. "\n";
+        print '	<td>'. $type['locked'] .'</td>'. "\n";
 
-		print "	<td class='actions'>";
-		print "	<div class='btn-group'>";
-		print "		<button class='btn btn-xs btn-default editType' data-action='edit'   data-id='$type[id]'><i class='fa fa-pencil'></i></button>";
-		print "		<button class='btn btn-xs btn-default editType' data-action='delete' data-id='$type[id]'><i class='fa fa-times'></i></button>";
-		print "	</div>";
-		print "	</td>";
-		print '</tr>'. "\n";
-	}
+        print "	<td class='actions'>";
+        print "	<div class='btn-group'>";
+        print "		<button class='btn btn-xs btn-default editType' data-action='edit'   data-id='$type[id]'><i class='fa fa-pencil'></i></button>";
+        print "		<button class='btn btn-xs btn-default editType' data-action='delete' data-id='$type[id]'><i class='fa fa-times'></i></button>";
+        print "	</div>";
+        print "	</td>";
+        print '</tr>'. "\n";
+    }
 }
 print '</table>'. "\n";
 ?>

app/admin/tags/edit-result.php

Indentation +12 added lines, -12 removed lines

@@ -24,28 +24,28 @@ 
 
 # fetch old values
 if($_POST['action']=="delete") {
-	$old_tag = $Admin->fetch_object ("ipTags", "id", $_POST['id']);
+    $old_tag = $Admin->fetch_object ("ipTags", "id", $_POST['id']);
 }
 else {
-	$old_tag = new StdClass ();
+    $old_tag = new StdClass ();
 }
 
 /* checks */
 if($_POST['action']=="delete" && $old_tag->locked!="No")				{ $Result->show("danger", _("Cannot delete locked tag"), true); }
 if($_POST['action']!="delete") {
-	if(strlen($_POST['type'])<3)										{ $Result->show("danger", _("Invalid tag name"), true); }
-	if(strlen($_POST['bgcolor'])<4)										{ $Result->show("danger", _("Invalid bg color"), true); }
-	if(strlen($_POST['fgcolor'])<4)										{ $Result->show("danger", _("Invalid fg color"), true); }
+    if(strlen($_POST['type'])<3)										{ $Result->show("danger", _("Invalid tag name"), true); }
+    if(strlen($_POST['bgcolor'])<4)										{ $Result->show("danger", _("Invalid bg color"), true); }
+    if(strlen($_POST['fgcolor'])<4)										{ $Result->show("danger", _("Invalid fg color"), true); }
 }
 
 # create array of values for modification
 $values = array("id"=>@$_POST['id'],
-				"type"=>$_POST['type'],
-				"bgcolor"=>@$_POST['bgcolor'],
-				"fgcolor"=>@$_POST['fgcolor'],
-				"showtag"=>@$_POST['showtag'],
-				"compress"=>@$_POST['compress']
-				);
+                "type"=>$_POST['type'],
+                "bgcolor"=>@$_POST['bgcolor'],
+                "fgcolor"=>@$_POST['fgcolor'],
+                "showtag"=>@$_POST['showtag'],
+                "compress"=>@$_POST['compress']
+                );
 
 # execute
 if(!$Admin->object_modify("ipTags", $_POST['action'], "id", $values)) 	{ $Result->show("danger",  _("Tag $_POST[action] error"), true); }
@@ -53,6 +53,6 @@ 
 
 # reset if delete to online
 if($_POST['action']=="delete") {
-	$Admin->update_object_references ("ipaddresses", "state", $old_tag->id, 0);
+    $Admin->update_object_references ("ipaddresses", "state", $old_tag->id, 0);
 }
 ?>
\ No newline at end of file

app/admin/tags/edit.php

Indentation +4 added lines, -4 removed lines

@@ -24,10 +24,10 @@
 
 # fetch api for edit / add
 if($_POST['action']!="add") {
-	# fetch api details
-	$tag = $Admin->fetch_object ("ipTags", "id", $_POST['id']);
-	# null ?
-	$tag===false ? $Result->show("danger", _("Invalid ID"), true, true) : null;
+    # fetch api details
+    $tag = $Admin->fetch_object ("ipTags", "id", $_POST['id']);
+    # null ?
+    $tag===false ? $Result->show("danger", _("Invalid ID"), true, true) : null;
 }
 ?>