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 #903 from pi-hole/release/v4.2

Browse Source 
Release v4.2
This commit is contained in:
Dan Schaper
2019-02-03 08:51:17 -08:00
committed by GitHub
parent de7aa5a3fa f2b2aa42c0
commit 347994db16
20 changed files with 79 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
auditlog.php
+3 -2
View File
@@ -82,8 +82,9 @@
</div>
</div>
</div>
<script src="scripts/pi-hole/js/auditlog.js"></script>
<?php
require "scripts/pi-hole/php/footer.php";
?>
<script src="scripts/pi-hole/js/auditlog.js"></script>
db_graph.php
+4 -4
View File
@@ -62,10 +62,10 @@ $token = $_SESSION['token'];
</div>
</div>
<?php
require "scripts/pi-hole/php/footer.php";
?>
<script src="scripts/vendor/moment.min.js"></script>
<script src="scripts/vendor/daterangepicker.js"></script>
<script src="scripts/pi-hole/js/db_graph.js"></script>
<?php
require "scripts/pi-hole/php/footer.php";
?>
db_lists.php
+4 -4
View File
@@ -138,10 +138,10 @@ else
<!-- /.col -->
</div>
<?php
require "scripts/pi-hole/php/footer.php";
?>
<script src="scripts/vendor/moment.min.js"></script>
<script src="scripts/vendor/daterangepicker.js"></script>
<script src="scripts/pi-hole/js/db_lists.js"></script>
<?php
require "scripts/pi-hole/php/footer.php";
?>
db_queries.php
+3 -4
View File
@@ -176,11 +176,10 @@ $token = $_SESSION['token'];
</div>
<!-- /.row -->
<script src="scripts/vendor/moment.min.js"></script>
<script src="scripts/vendor/daterangepicker.js"></script>
<script src="scripts/pi-hole/js/db_queries.js"></script>
<?php
require "scripts/pi-hole/php/footer.php";
?>
<script src="scripts/vendor/moment.min.js"></script>
<script src="scripts/vendor/daterangepicker.js"></script>
<script src="scripts/pi-hole/js/db_queries.js"></script>
debug.php
+2 -3
View File
@@ -17,9 +17,8 @@
<button class="btn btn-lg btn-primary btn-block" id="debugBtn">Generate debug log</button>
<pre id="output" style="width: 100%; height: 100%;" hidden="true"></pre>
<script src="scripts/pi-hole/js/debug.js"></script>
<?php
require "scripts/pi-hole/php/footer.php";
?>
<script src="scripts/pi-hole/js/debug.js"></script>
gravity.php
+2 -3
View File
@@ -25,9 +25,8 @@
<button class="btn btn-lg btn-primary btn-block" id="gravityBtn">Update</button>
<pre id="output" style="width: 100%; height: 100%;" hidden="true"></pre>
<script src="scripts/pi-hole/js/gravity.js"></script>
<?php
require "scripts/pi-hole/php/footer.php";
?>
<script src="scripts/pi-hole/js/gravity.js"></script>
index.php
+3 -2
View File
@@ -348,8 +348,9 @@ else
</div>
<!-- /.row -->
<?php } ?>
<script src="scripts/pi-hole/js/index.js"></script>
<?php
require "scripts/pi-hole/php/footer.php";
?>
<script src="scripts/pi-hole/js/index.js"></script>
list.php
+2 -2
View File
@@ -75,8 +75,8 @@ function getFullName() {
<ul class="list-group" id="list-regex"></ul>
<?php } ?>
<script src="scripts/pi-hole/js/list.js"></script>
<?php
require "scripts/pi-hole/php/footer.php";
?>
<script src="scripts/pi-hole/js/list.js"></script>
queries.php
+3 -3
View File
@@ -165,9 +165,9 @@ if(strlen($showing) > 0)
</div>
<!-- /.row -->
<script src="scripts/vendor/moment.min.js"></script>
<script src="scripts/pi-hole/js/queries.js"></script>
<?php
require "scripts/pi-hole/php/footer.php";
?>
<script src="scripts/vendor/moment.min.js"></script>
<script src="scripts/pi-hole/js/queries.js"></script>
queryads.php
+2 -3
View File
@@ -23,9 +23,8 @@
<pre id="output" style="width: 100%; height: 100%;" hidden="true"></pre>
<script src="scripts/pi-hole/js/queryads.js"></script>
<?php
require "scripts/pi-hole/php/footer.php";
?>
<script src="scripts/pi-hole/js/queryads.js"></script>
scripts/pi-hole/js/db_graph.js
+1
View File
@@ -21,6 +21,7 @@ $(function () {
{
timePicker: true, timePickerIncrement: 15,
locale: { format: "MMMM Do YYYY, HH:mm" },
startDate: start__, endDate: end__,
ranges: {
"Today": [moment().startOf("day"), moment()],
"Yesterday": [moment().subtract(1, "days").startOf("day"), moment().subtract(1, "days").endOf("day")],
scripts/pi-hole/js/db_lists.js
+1
View File
@@ -22,6 +22,7 @@ $(function () {
{
timePicker: true, timePickerIncrement: 15,
locale: { format: "MMMM Do YYYY, HH:mm" },
startDate: start__, endDate: end__,
ranges: {
"Today": [moment().startOf("day"), moment()],
"Yesterday": [moment().subtract(1, "days").startOf("day"), moment().subtract(1, "days").endOf("day")],
scripts/pi-hole/js/db_queries.js
+1
View File
@@ -36,6 +36,7 @@ $(function () {
{
timePicker: true, timePickerIncrement: 15,
locale: { format: "MMMM Do YYYY, HH:mm" },
startDate: start__, endDate: end__,
ranges: {
"Today": [moment().startOf("day"), moment()],
"Yesterday": [moment().subtract(1, "days").startOf("day"), moment().subtract(1, "days").endOf("day")],
scripts/pi-hole/js/queries.js
+1 -1
View File
@@ -170,7 +170,7 @@ $(document).ready(function() {
dnssec_status = "<br><span style=\"color:red\">ABANDONED</span>";
break;
case "5":
dnssec_status = "<br><span style=\"color:red\">?</span>";
dnssec_status = "<br><span style=\"color:red\">UNKNOWN</span>";
break;
default: // No DNSSEC
dnssec_status = "";
scripts/pi-hole/php/footer.php
-10
View File
@@ -66,16 +66,6 @@
</footer>
</div>
<!-- ./wrapper -->
<script src="scripts/vendor/jquery.min.js"></script>
<script src="scripts/vendor/jquery-ui.min.js"></script>
<script src="style/vendor/bootstrap/js/bootstrap.min.js"></script>
<script src="scripts/vendor/app.min.js"></script>
<script src="scripts/vendor/jquery.dataTables.min.js"></script>
<script src="scripts/vendor/dataTables.bootstrap.min.js"></script>
<script src="scripts/vendor/Chart.bundle.min.js"></script>
<script src="scripts/pi-hole/js/footer.js"></script>
</body>
</html>
scripts/pi-hole/php/header.php
+10
View File
@@ -220,6 +220,16 @@ if($auth) {
}
?>
<script src="scripts/pi-hole/js/header.js"></script>
<script src="scripts/vendor/jquery.min.js"></script>
<script src="scripts/vendor/jquery-ui.min.js"></script>
<script src="style/vendor/bootstrap/js/bootstrap.min.js"></script>
<script src="scripts/vendor/app.min.js"></script>
<script src="scripts/vendor/jquery.dataTables.min.js"></script>
<script src="scripts/vendor/dataTables.bootstrap.min.js"></script>
<script src="scripts/vendor/Chart.bundle.min.js"></script>
<!-- Send token to JS -->
<div id="token" hidden><?php if($auth) echo $token; ?></div>
<div id="enableTimer" hidden><?php if(file_exists("../custom_disable_timer")){ echo file_get_contents("../custom_disable_timer"); } ?></div>
scripts/pi-hole/php/savesettings.php
+15 -1
View File
@@ -558,6 +558,11 @@ function readAdlists()
$error .= "Static release for MAC address (".htmlspecialchars($mac).") already defined!<br>";
break;
}
if($ip !== "noip" && $lease["IP"] === $ip)
{
$error .= "Static lease for IP address (".htmlspecialchars($ip).") already defined!<br>";
break;
}
}
if(!strlen($error))
@@ -635,9 +640,18 @@ function readAdlists()
$type = "(IPv4)";
}
if(isset($_POST["DHCP_rapid_commit"]))
{
$rapidcommit = "true";
}
else
{
$rapidcommit = "false";
}
if(!strlen($error))
{
exec("sudo pihole -a enabledhcp ".$from." ".$to." ".$router." ".$leasetime." ".$domain." ".$ipv6);
exec("sudo pihole -a enabledhcp ".$from." ".$to." ".$router." ".$leasetime." ".$domain." ".$ipv6." ".$rapidcommit);
$success .= "The DHCP server has been activated ".htmlspecialchars($type);
}
}
settings.php
+18 -4
View File
@@ -340,6 +340,11 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
} else {
$DHCPIPv6 = false;
}
if (isset($setupVars["DHCP_rapid_commit"])) {
$DHCP_rapid_commit = $setupVars["DHCP_rapid_commit"];
} else {
$DHCP_rapid_commit = false;
}
} else {
$DHCP = false;
@@ -356,6 +361,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
}
$DHCPleasetime = 24;
$DHCPIPv6 = false;
$DHCP_rapid_commit = false;
}
if (isset($setupVars["PIHOLE_DOMAIN"])) {
$piHoleDomain = $setupVars["PIHOLE_DOMAIN"];
@@ -475,6 +481,14 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
?>>Enable IPv6 support (SLAAC + RA)</label>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<label><input type="checkbox" name="DHCP_rapid_commit" class="DHCPgroup"
<?php if ($DHCP_rapid_commit){ ?>checked<?php };
if (!$DHCP){ ?> disabled<?php }
?>>Enable DHCP rapid commit (fast address assignment)</label>
</div>
</div>
</div>
</div>
</div>
@@ -1369,11 +1383,11 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
</div>
</div>
<?php
require "scripts/pi-hole/php/footer.php";
?>
<script src="scripts/vendor/jquery.inputmask.js"></script>
<script src="scripts/vendor/jquery.inputmask.extensions.js"></script>
<script src="scripts/vendor/jquery.confirm.min.js"></script>
<script src="scripts/pi-hole/js/settings.js"></script>
<?php
require "scripts/pi-hole/php/footer.php";
?>
taillog-FTL.php
+2 -3
View File
@@ -16,9 +16,8 @@
<pre id="output" style="width: 100%; height: 100%; max-height:650px; overflow-y:scroll;"></pre>
<div class="checkbox"><label><input type="checkbox" name="active" checked id="chk2"> Automatic scrolling on update</label></div>
<script src="scripts/pi-hole/js/taillog-FTL.js"></script>
<?php
require "scripts/pi-hole/php/footer.php";
?>
<script src="scripts/pi-hole/js/taillog-FTL.js"></script>
taillog.php
+2 -3
View File
@@ -16,9 +16,8 @@
<pre id="output" style="width: 100%; height: 100%; max-height:650px; overflow-y:scroll;"></pre>
<div class="checkbox"><label><input type="checkbox" name="active" checked id="chk2"> Automatic scrolling on update</label></div>
<script src="scripts/pi-hole/js/taillog.js"></script>
<?php
require "scripts/pi-hole/php/footer.php";
?>
<script src="scripts/pi-hole/js/taillog.js"></script>