Merge pull request #343 from pi-hole/tweak/multiadd

Add multiple domains separated by whitespace
pi-hole · Jan 8, 2017 · b2279ad · b2279ad
2 parents 0d82d03 + b6695f9
commit b2279ad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/list.php b/list.php
@@ -45,7 +45,7 @@ function getFullName() {
 </div>
 <div id="alFailure" class="alert alert-danger alert-dismissible fade in" role="alert" hidden="true">
     <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-    Failure! Something went wrong.
+    Failure! Something went wrong.<br/><span id="err"></span>
 </div>
 
 <!-- Domain List -->

diff --git a/scripts/pi-hole/js/list.js b/scripts/pi-hole/js/list.js
@@ -74,6 +74,7 @@ function add() {
     var alInfo = $("#alInfo");
     var alSuccess = $("#alSuccess");
     var alFailure = $("#alFailure");
+    var err = $("#err");
     alInfo.show();
     alSuccess.hide();
     alFailure.hide();
@@ -85,10 +86,11 @@ function add() {
           if (response.indexOf("not a valid argument") >= 0 ||
               response.indexOf("is not a valid domain") >= 0) {
             alFailure.show();
-            alFailure.delay(1000).fadeOut(2000, function() {
+            err.html(response);
+            alFailure.delay(4000).fadeOut(2000, function() {
                 alFailure.hide();
             });
-            alInfo.delay(1000).fadeOut(2000, function() {
+            alInfo.delay(4000).fadeOut(2000, function() {
                 alInfo.hide();
             });
           } else {

diff --git a/scripts/pi-hole/php/auth.php b/scripts/pi-hole/php/auth.php
@@ -103,9 +103,13 @@ function hash_equals($known_string, $user_string) {
 
 function check_domain() {
     if(isset($_POST['domain'])){
-        $validDomain = is_valid_domain_name($_POST['domain']);
-        if(!$validDomain){
-            log_and_die(htmlspecialchars($_POST['domain']. ' is not a valid domain'));
+        $domains = explode(" ",$_POST['domain']);
+        foreach($domains as $domain)
+        {
+            $validDomain = is_valid_domain_name($domain);
+            if(!$validDomain){
+                log_and_die(htmlspecialchars($domain. ' is not a valid domain'));
+            }
         }
     }
 }