pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Codacy and styling

Browse Source
This commit is contained in:
DL6ER
2017-03-03 14:39:51 +01:00
parent d9cbbde050
commit 4182a83bd4
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/pi-hole/php/savesettings.php
+12 -14
View File
@@ -24,15 +24,14 @@ function validIP($address){
// Check for existance of variable
// and test it only if it exists
function istrue(&$argument) {
$ret = false;
if(isset($argument))
{
if($argument)
{
$ret = true;
return true;
}
}
return $ret;
return false;
}
// Credit: http://stackoverflow.com/a/4694816/2087442
@@ -87,7 +86,6 @@ function readStaticLeasesFile()
}
function isequal(&$argument, &$compareto) {
$ret = false;
if(isset($argument))
{
if($argument === $compareto)
@@ -98,24 +96,24 @@ function isequal(&$argument, &$compareto) {
return false;
}
function isinserverlist($ip) {
function isinserverlist($addr) {
global $DNSserverslist;
foreach ($DNSserverslist as $key => $value) {
if (isequal($value['v4p'],$ip) || isequal($value['v4s'],$ip))
if (isequal($value['v4_1'],$addr) || isequal($value['v4_2'],$addr))
return true;
if (isequal($value['v6p'],$ip) || isequal($value['v6s'],$ip))
if (isequal($value['v6_1'],$addr) || isequal($value['v6_2'],$addr))
return true;
}
return false;
}
$DNSserverslist = [
"Google" => ["v4p" => "8.8.8.8","v4s" => "8.8.4.4", "v6p" => "2001:4860:4860:0:0:0:0:8888", "v6s" => "2001:4860:4860:0:0:0:0:8844"],
"OpenDNS" => ["v4p" => "208.67.222.222", "v4s" => "208.67.220.220"],
"Level3" => ["v4p" => "4.2.2.1", "v4s" => "4.2.2.2"],
"Norton" => ["v4p" => "199.85.126.10", "v4s" => "199.85.127.10"],
"Comodo" => ["v4p" => "8.26.56.26", "v4s" => "8.20.247.20"],
"DNS.WATCH" => ["v4p" => "84.200.69.80", "v4s" => "84.200.70.40", "v6p" => "2001:1608:10:25:0:0:1c04:b12f", "v6s" => "2001:1608:10:25:0:0:9249:d69b"]
"Google" => ["v4_1" => "8.8.8.8","v4_2" => "8.8.4.4", "v6_1" => "2001:4860:4860:0:0:0:0:8888", "v6_2" => "2001:4860:4860:0:0:0:0:8844"],
"OpenDNS" => ["v4_1" => "208.67.222.222", "v4_2" => "208.67.220.220"],
"Level3" => ["v4_1" => "4.2.2.1", "v4_2" => "4.2.2.2"],
"Norton" => ["v4_1" => "199.85.126.10", "v4_2" => "199.85.127.10"],
"Comodo" => ["v4_1" => "8.26.56.26", "v4_2" => "8.20.247.20"],
"DNS.WATCH" => ["v4_1" => "84.200.69.80", "v4_2" => "84.200.70.40", "v6_1" => "2001:1608:10:25:0:0:1c04:b12f", "v6_2" => "2001:1608:10:25:0:0:9249:d69b"]
];
$error = "";
@@ -132,7 +130,7 @@ function isinserverlist($ip) {
// Add selected predefined servers to list
foreach ($DNSserverslist as $key => $value)
{
foreach(["v4p", "v4s", "v6p", "v6s"] as $type)
foreach(["v4_1", "v4_2", "v6_1", "v6_2"] as $type)
{
if(@array_key_exists("DNSserver".str_replace(".","_",$value[$type]),$_POST))
{
settings.php
+15 -11
View File
@@ -493,20 +493,24 @@
<form role="form" method="post">
<div class="col-lg-6">
<label>Upstream DNS Servers</label>
<table><tr><th>IPv4 1&nbsp;&nbsp;</th><th>IPv4 2&nbsp;&nbsp;</th><th>IPv6 1&nbsp;&nbsp;</th><th>IPv6 2&nbsp;&nbsp;</th><th>Name</th></tr>
<table class="table table-bordered">
<tr>
<th colspan="2">IPv4</th>
<th colspan="2">IPv6</th>
<th>Name</th>
</tr>
<?php foreach ($DNSserverslist as $key => $value) { ?>
<tr>
<div class="checkbox">
<?php if(isset($value["v4p"])) { ?>
<td title="<?php echo $value["v4p"];?>"><input type="checkbox" name="DNSserver<?php echo $value["v4p"];?>" value="true" <?php if(in_array($value["v4p"],$DNSactive)){ ?>checked<?php } ?> ></td><?php }else{ ?><td></td><?php } ?>
<?php if(isset($value["v4s"])) { ?>
<td title="<?php echo $value["v4s"];?>"><input type="checkbox" name="DNSserver<?php echo $value["v4s"];?>" value="true" <?php if(in_array($value["v4s"],$DNSactive)){ ?>checked<?php } ?> ></td><?php }else{ ?><td></td><?php } ?>
<?php if(isset($value["v6p"])) { ?>
<td title="<?php echo $value["v6p"];?>"><input type="checkbox" name="DNSserver<?php echo $value["v6p"];?>" value="true" <?php if(in_array($value["v6p"],$DNSactive)){ ?>checked<?php } ?> ></td><?php }else{ ?><td></td><?php } ?>
<?php if(isset($value["v6s"])) { ?>
<td title="<?php echo $value["v6s"];?>"><input type="checkbox" name="DNSserver<?php echo $value["v6s"];?>" value="true" <?php if(in_array($value["v6s"],$DNSactive)){ ?>checked<?php } ?> ></td><?php }else{ ?><td></td><?php } ?>
<?php if(isset($value["v4_1"])) { ?>
<td title="<?php echo $value["v4_1"];?>"><input type="checkbox" name="DNSserver<?php echo $value["v4_1"];?>" value="true" <?php if(in_array($value["v4_1"],$DNSactive)){ ?>checked<?php } ?> ></td><?php }else{ ?><td></td><?php } ?>
<?php if(isset($value["v4_2"])) { ?>
<td title="<?php echo $value["v4_2"];?>"><input type="checkbox" name="DNSserver<?php echo $value["v4_2"];?>" value="true" <?php if(in_array($value["v4_2"],$DNSactive)){ ?>checked<?php } ?> ></td><?php }else{ ?><td></td><?php } ?>
<?php if(isset($value["v6_1"])) { ?>
<td title="<?php echo $value["v6_1"];?>"><input type="checkbox" name="DNSserver<?php echo $value["v6_1"];?>" value="true" <?php if(in_array($value["v6_1"],$DNSactive)){ ?>checked<?php } ?> ></td><?php }else{ ?><td></td><?php } ?>
<?php if(isset($value["v6_2"])) { ?>
<td title="<?php echo $value["v6_2"];?>"><input type="checkbox" name="DNSserver<?php echo $value["v6_2"];?>" value="true" <?php if(in_array($value["v6_2"],$DNSactive)){ ?>checked<?php } ?> ></td><?php }else{ ?><td></td><?php } ?>
<td><?php echo $key;?></td>
</div></tr>
</tr>
<?php } ?>
</table>
</div>