Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-28 13:49:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into new/FTL-integration

Browse Source 
Conflicts:
	api.php
This commit is contained in:
DL6ER
2017-02-28 13:49:34 +01:00
parent aacc215394 3b5578321a
commit 7a73053bfd
15 changed files with 1784 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
api_PHP.php
View File

@@ -81,28 +81,46 @@
$data = array_merge($data, getAllQueries($_GET['getAllQueries']));
}
if (isset($_GET['enable'], $_GET['token']) && $auth) {
check_csrf($_GET['token']);
if (isset($_GET['enable']) && $auth) {
if(isset($_GET["auth"]))
{
if($_GET["auth"] !== $pwhash)
die("Not authorized!");
}
else
{
// Skip token validation if explicit auth string is given
check_csrf($_GET['token']);
}
exec('sudo pihole enable');
$data = array_merge($data, Array(
"status" => "enabled"
));
$data = array_merge($data, array("status" => "enabled"));
unlink("../custom_disable_timer");
}
elseif (isset($_GET['disable'], $_GET['token']) && $auth) {
check_csrf($_GET['token']);
elseif (isset($_GET['disable']) && $auth) {
if(isset($_GET["auth"]))
{
if($_GET["auth"] !== $pwhash)
die("Not authorized!");
}
else
{
// Skip token validation if explicit auth string is given
check_csrf($_GET['token']);
}
$disable = intval($_GET['disable']);
// intval returns the integer value on success, or 0 on failure
if($disable > 0)
{
$timestamp = time();
exec("sudo pihole disable ".$disable."s");
file_put_contents("../custom_disable_timer",($timestamp+$disable)*1000);
}
else
{
exec('sudo pihole disable');
unlink("../custom_disable_timer");
}
$data = array_merge($data, Array(
"status" => "disabled"
));
$data = array_merge($data, array("status" => "disabled"));
}
if (isset($_GET['getGravityDomains'])) {