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

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

Browse Source 
Add multiple domains separated by whitespace
This commit is contained in:
Mcat12
2017-01-08 10:57:36 -05:00
committed by GitHub
parent 0d82d03c30 b6695f9882
commit b2279add88
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/pi-hole/js/list.js
+4 -2
View File
@@ -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 {
scripts/pi-hole/php/auth.php
+7 -3
View File
@@ -103,9 +103,13 @@ function check_csrf($token) {
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'));
}
}
}
}