From d9cbbde0501a7304c7348bdc1c4bf5164974a64c Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 3 Mar 2017 14:17:28 +0100 Subject: [PATCH] Read *all* DNS records in setupVars.conf (remove limitation to 12 servers) --- settings.php | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/settings.php b/settings.php index f86b7d4b..ca70b23c 100644 --- a/settings.php +++ b/settings.php @@ -398,36 +398,35 @@ $DNSservers = []; $DNSactive = []; - for($i=1;$i<=12;$i++) - { - if(isset($setupVars["PIHOLE_DNS_".$i])){ - if(isinserverlist($setupVars["PIHOLE_DNS_".$i])) + $i = 1; + while(isset($setupVars["PIHOLE_DNS_".$i])){ + if(isinserverlist($setupVars["PIHOLE_DNS_".$i])) + { + array_push($DNSactive,$setupVars["PIHOLE_DNS_".$i]); + } + elseif(strpos($setupVars["PIHOLE_DNS_".$i],".")) + { + if(!isset($custom1)) { - array_push($DNSactive,$setupVars["PIHOLE_DNS_".$i]); + $custom1 = $setupVars["PIHOLE_DNS_".$i]; } - elseif(strpos($setupVars["PIHOLE_DNS_".$i],".")) + else { - if(!isset($custom1)) - { - $custom1 = $setupVars["PIHOLE_DNS_".$i]; - } - else - { - $custom2 = $setupVars["PIHOLE_DNS_".$i]; - } - } - elseif(strpos($setupVars["PIHOLE_DNS_".$i],":")) - { - if(!isset($custom3)) - { - $custom3 = $setupVars["PIHOLE_DNS_".$i]; - } - else - { - $custom4 = $setupVars["PIHOLE_DNS_".$i]; - } + $custom2 = $setupVars["PIHOLE_DNS_".$i]; } } + elseif(strpos($setupVars["PIHOLE_DNS_".$i],":")) + { + if(!isset($custom3)) + { + $custom3 = $setupVars["PIHOLE_DNS_".$i]; + } + else + { + $custom4 = $setupVars["PIHOLE_DNS_".$i]; + } + } + $i++; } if(isset($setupVars["DNS_FQDN_REQUIRED"])){