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

Required backend changes in savesettings.php

Browse Source
This commit is contained in:
DL6ER
2017-01-13 13:47:06 +01:00
parent 6958f50039
commit 0924f20214
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/pi-hole/php/savesettings.php
+21 -6
View File
@@ -6,7 +6,7 @@ if(basename($_SERVER['SCRIPT_FILENAME']) !== "settings.php")
}
function validIP($address){
return !filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false;
return !filter_var($address, FILTER_VALIDATE_IP) === false;
}
// Check for existance of variable
@@ -61,9 +61,13 @@ function validDomain($domain_name)
$secondaryDNS = $_POST["secondaryDNS"];
// Get primary DNS server IP address
if($primaryDNS === "Custom")
if($primaryDNS === "Customv4")
{
$primaryIP = $_POST["DNS1IP"];
$primaryIP = $_POST["DNS1IPv4"];
}
elseif($primaryDNS === "Customv6")
{
$primaryIP = $_POST["DNS1IPv6"];
}
else
{
@@ -77,11 +81,22 @@ function validDomain($domain_name)
}
// Get secondary DNS server IP address
if($secondaryDNS === "Custom")
if($secondaryDNS === "Customv4")
{
if(strlen($_POST["DNS2IP"]) > 0)
if(strlen($_POST["DNS2IPv4"]) > 0)
{
$secondaryIP = $_POST["DNS2IP"];
$secondaryIP = $_POST["DNS2IPv4"];
}
else
{
$secondaryIP = "none";
}
}
elseif($secondaryDNS === "Customv6")
{
if(strlen($_POST["DNS2IPv6"]) > 0)
{
$secondaryIP = $_POST["DNS2IPv6"];
}
else
{
settings.php
+8 -8
View File
@@ -453,14 +453,14 @@
<?php foreach ($primaryDNSservers as $key => $value) { ?> <div class="radio"><label><input type="radio" name="primaryDNS" value="<?php echo $value;?>" <?php if($piHoleDNS1 === $value){ ?>checked<?php } ?> ><?php echo $value;?> (<?php echo $key;?>)</label></div> <?php } ?>
<label>Custom (IPv4)</label>
<div class="input-group">
<div class="input-group-addon"><input type="radio" name="primaryDNS" value="Custom"
<?php if($piHoleDNS1 === "Custom"){ ?>checked<?php } ?>></div>
<div class="input-group-addon"><input type="radio" name="primaryDNS" value="Customv4"
<?php if($piHoleDNS1 === "Customv4"){ ?>checked<?php } ?>></div>
<input type="text" name="DNS1IPv4" class="form-control" id="DNS1IPv4" <?php if($piHoleDNS1 === "Customv4"){ ?>value="<?php echo $setupVars["PIHOLE_DNS_1"]; ?>"<?php } ?>>
</div>
<label>Custom (IPv6)</label>
<div class="input-group">
<div class="input-group-addon"><input type="radio" name="primaryDNS" value="Custom"
<?php if($piHoleDNS1 === "Custom"){ ?>checked<?php } ?>></div>
<div class="input-group-addon"><input type="radio" name="primaryDNS" value="Customv6"
<?php if($piHoleDNS1 === "Customv6"){ ?>checked<?php } ?>></div>
<input type="text" name="DNS1IPv6" class="form-control" id="DNS1IPv6" <?php if($piHoleDNS1 === "Customv6"){ ?>value="<?php echo $setupVars["PIHOLE_DNS_1"]; ?>"<?php } ?>>
</div>
</div>
@@ -471,15 +471,15 @@
<?php foreach ($secondaryDNSservers as $key => $value) { ?> <div class="radio"><label><input type="radio" name="secondaryDNS" value="<?php echo $value;?>" <?php if($piHoleDNS2 === $value){ ?>checked<?php } ?> ><?php echo $value;?> (<?php echo $key;?>)</label></div> <?php } ?>
<label>Custom (IPv4)</label>
<div class="input-group">
<div class="input-group-addon"><input type="radio" name="secondaryDNS" value="Custom"
<?php if($piHoleDNS2 === "Custom"){ ?>checked<?php } ?>></div>
<div class="input-group-addon"><input type="radio" name="secondaryDNS" value="Customv4"
<?php if($piHoleDNS2 === "Customv4"){ ?>checked<?php } ?>></div>
<input type="text" name="DNS2IPv4" class="form-control" id="DNS2IPv4" <?php if($piHoleDNS2 === "Customv4"){ ?>value="<?php echo $setupVars["PIHOLE_DNS_2"]; ?>"<?php } ?>>
</div>
<label>Custom (IPv6)</label>
<div class="input-group">
<div class="input-group-addon"><input type="radio" name="secondaryDNS" value="Custom"
<div class="input-group-addon"><input type="radio" name="secondaryDNS" value="Customv6"
<?php if($piHoleDNS2 === "Customv6"){ ?>checked<?php } ?>></div>
<input type="text" name="DNS2IPv6" class="form-control" id="DNS2IPv6" <?php if($piHoleDNS2 === "Custom"){ ?>value="<?php echo $setupVars["PIHOLE_DNS_2"]; ?>"<?php } ?>>
<input type="text" name="DNS2IPv6" class="form-control" id="DNS2IPv6" <?php if($piHoleDNS2 === "Customv6"){ ?>value="<?php echo $setupVars["PIHOLE_DNS_2"]; ?>"<?php } ?>>
</div>
</div>
</div>