Skip to content

Commit 1eaddca

Browse files
PromoFauxPromoFaux
authored
Pi-hole Web v6.1 (#3354)
2 parents 2544117 + 919b96e commit 1eaddca

File tree

120 files changed

+803
-732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+803
-732
lines changed

‎.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
* text=auto
1+
# Enforce Unix newlines
2+
* text=auto eol=lf

‎.github/codeql/codeql-config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
name: "CodeQL config"
2+
paths-ignore:
3+
- "**/vendor/**"

‎.github/workflows/codeql.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,40 @@ on:
77
- development
88
- "!dependabot/**"
99
pull_request:
10-
# The branches below must be a subset of the branches above
1110
branches:
1211
- master
1312
- development
13+
- "!dependabot/**"
1414
schedule:
1515
- cron: "0 0 * * 0"
16+
workflow_dispatch:
1617

1718
jobs:
1819
analyze:
1920
name: Analyze
2021
runs-on: ubuntu-latest
22+
permissions:
23+
actions: read
24+
contents: read
25+
security-events: write
2126

2227
steps:
23-
- name: Checkout repository
28+
- name: Clone repository
2429
uses: actions/checkout@v4.2.2
25-
# Initializes the CodeQL tools for scanning.
30+
with:
31+
persist-credentials: false
32+
2633
- name: Initialize CodeQL
27-
uses: github/codeql-action/init@v3
34+
uses: github/codeql-action/init@v3.28.13
2835
with:
36+
config-file: ./.github/codeql/codeql-config.yml
2937
languages: "javascript"
38+
queries: +security-and-quality
3039

3140
- name: Autobuild
32-
uses: github/codeql-action/autobuild@v3
41+
uses: github/codeql-action/autobuild@v3.28.13
3342

3443
- name: Perform CodeQL Analysis
35-
uses: github/codeql-action/analyze@v3
44+
uses: github/codeql-action/analyze@v3.28.13
45+
with:
46+
category: "/language:javascript"

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@v4.2.2
2323

2424
- name: Set up Node.js
25-
uses: actions/setup-node@v4.2.0
25+
uses: actions/setup-node@v4.3.0
2626
with:
2727
node-version: "20.x"
2828
cache: npm

‎gravity.lp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ mg.include('scripts/lua/header_authenticated.lp','r')
2727
<button type="button" id="gravityBtn" class="btn btn-lg btn-primary btn-block">Update</button>
2828
<pre id="output" style="width: 100%; height: 100%;" hidden></pre>
2929

30-
<script src="<?=pihole.fileversion('scripts/js/gravity.js')?>"></script>
30+
<script defer src="<?=pihole.fileversion('scripts/js/gravity.js')?>"></script>
3131
<? mg.include('scripts/lua/footer.lp','r')?>

‎groups-clients.lp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ mg.include('scripts/lua/header_authenticated.lp','r')
9595
</div>
9696
</div>
9797

98-
<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
99-
<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
100-
<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
101-
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
102-
<script src="<?=pihole.fileversion('scripts/js/groups-clients.js')?>"></script>
98+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
99+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
100+
<script defer src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
101+
<script defer src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
102+
<script defer src="<?=pihole.fileversion('scripts/js/groups-clients.js')?>"></script>
103103

104104
<? mg.include('scripts/lua/footer.lp','r')?>

‎groups-domains.lp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ mg.include('scripts/lua/header_authenticated.lp','r')
156156
</div>
157157
</div>
158158

159-
<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
160-
<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
161-
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
162-
<script src="<?=pihole.fileversion('scripts/js/groups-domains.js')?>"></script>
159+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
160+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
161+
<script defer src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
162+
<script defer src="<?=pihole.fileversion('scripts/js/groups-domains.js')?>"></script>
163163

164164
<? mg.include('scripts/lua/footer.lp','r')?>

‎groups-lists.lp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
4646
<strong>Hints:</strong>
4747
<ol>
4848
<li>Please run <code>pihole -g</code> or update your gravity list <a href="<?=webhome?>gravity">online</a> after modifying your lists.</li>
49-
<li>Multiple lists can be added by separating each <i>unique</i> URL with a space or comma</li>
49+
<li>Multiple lists can be added by separating each <em>unique</em> URL with a space or comma</li>
5050
<li>Click on the icon in the first column to get additional information about your lists. The icons correspond to the health of the list.</li>
5151
</ol>
5252
<div class="btn-toolbar pull-right" role="toolbar" aria-label="Toolbar with buttons">
@@ -94,9 +94,9 @@ mg.include('scripts/lua/header_authenticated.lp','r')
9494
</div>
9595
</div>
9696

97-
<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
98-
<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
99-
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
100-
<script src="<?=pihole.fileversion('scripts/js/groups-lists.js')?>"></script>
97+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
98+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
99+
<script defer src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
100+
<script defer src="<?=pihole.fileversion('scripts/js/groups-lists.js')?>"></script>
101101

102102
<? mg.include('scripts/lua/footer.lp','r')?>

‎groups.lp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ mg.include('scripts/lua/header_authenticated.lp','r')
7979
</div>
8080
</div>
8181

82-
<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
83-
<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
84-
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
85-
<script src="<?=pihole.fileversion('scripts/js/groups.js')?>"></script>
82+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
83+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
84+
<script defer src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
85+
<script defer src="<?=pihole.fileversion('scripts/js/groups.js')?>"></script>
8686

8787
<? mg.include('scripts/lua/footer.lp','r')?>

‎img/logo-bw.svg

Lines changed: 6 additions & 0 deletions
Loading

‎img/pihole_icon.svg

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎index.lp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
2222
<div class="icon">
2323
<i class="fas fa-globe-americas"></i>
2424
</div>
25-
<a href="network.lp" class="small-box-footer" title="" id="total_clients">
25+
<a href="network" class="small-box-footer" id="total_clients">
2626
<span id="active_clients">-</span> active clients <i class="fa fa-arrow-circle-right"></i>
2727
</a>
2828
</div>
@@ -38,7 +38,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
3838
<div class="icon">
3939
<i class="fas fa-hand-paper"></i>
4040
</div>
41-
<a href="queries.lp?upstream=blocklist" class="small-box-footer" title="">
41+
<a href="queries?upstream=blocklist" class="small-box-footer">
4242
List blocked queries <i class="fa fa-arrow-circle-right"></i>
4343
</a>
4444
</div>
@@ -54,7 +54,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
5454
<div class="icon">
5555
<i class="fas fa-chart-pie"></i>
5656
</div>
57-
<a href="queries.lp" class="small-box-footer" title="">
57+
<a href="queries" class="small-box-footer">
5858
List all queries <i class="fa fa-arrow-circle-right"></i>
5959
</a>
6060
</div>
@@ -70,7 +70,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
7070
<div class="icon">
7171
<i class="fas fa-list-alt"></i>
7272
</div>
73-
<a href="groups-lists.lp" class="small-box-footer" title="">
73+
<a href="groups-lists" class="small-box-footer">
7474
Manage lists <i class="fa fa-arrow-circle-right"></i>
7575
</a>
7676
</div>
@@ -279,7 +279,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
279279
</div>
280280
<!-- /.row -->
281281

282-
<script src="<?=pihole.fileversion('scripts/js/charts.js')?>"></script>
283-
<script src="<?=pihole.fileversion('scripts/js/index.js')?>"></script>
282+
<script defer src="<?=pihole.fileversion('scripts/js/charts.js')?>"></script>
283+
<script defer src="<?=pihole.fileversion('scripts/js/index.js')?>"></script>
284284

285285
<? mg.include('scripts/lua/footer.lp','r')?>

‎interfaces.lp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ mg.include('scripts/lua/header_authenticated.lp','r')
3232

3333
<pre id="output" style="width: 100%; height: 100%;" hidden></pre>
3434

35-
<script src="<?=pihole.fileversion('scripts/js/interfaces.js')?>"></script>
35+
<script defer src="<?=pihole.fileversion('scripts/js/interfaces.js')?>"></script>
3636
<? mg.include('scripts/lua/footer.lp','r')?>

‎login.lp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
mg.include('scripts/lua/header.lp','r')
1111
?>
12-
<body class="hold-transition layout-boxed login-page">
12+
<body class="hold-transition layout-boxed login-page" data-apiurl="<?=pihole.api_url()?>">
1313
<div class="box login-box" id="login-box">
1414
<section style="padding: 15px;">
1515
<div class="login-logo">
1616
<div class="text-center">
17-
<img src="<?=pihole.webhome()?>img/logo.svg" alt="Pi-hole logo" class="loginpage-logo">
17+
<img src="<?=webhome?>img/logo.svg" alt="Pi-hole logo" class="loginpage-logo" width="140" height="202">
1818
</div>
1919
<div class="panel-title text-center"><span class="logo-lg" style="font-size: 25px;">Pi-<b>hole</b></span></div>
2020
</div>
@@ -72,7 +72,7 @@ mg.include('scripts/lua/header.lp','r')
7272
</div>
7373
<div class="box-body">
7474
<p>Your Pi-hole has two-factor authentication enabled. You have to
75-
enter a valid <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_algorithm" target="_blank">TOTP</a>
75+
enter a valid <a href="https://en.wikipedia.org/wiki/Time-based_One-time_Password_algorithm" rel="noopener" target="_blank">TOTP</a>
7676
token in addition to your password. You see this message because your
7777
token was incorrect or has already expired.</p>
7878
</div>
@@ -96,17 +96,17 @@ mg.include('scripts/lua/header.lp','r')
9696
a new password (or explicitly disable the password by setting an empty password)
9797
using the command
9898
</p>
99-
<pre>sudo pihole setpassword</pre>
99+
<pre>pihole setpassword</pre>
100100
</div>
101101
</div>
102102
</div>
103103
</div>
104104
</div>
105105
<!-- /.login-card-body -->
106106
<div class="login-footer" style="margin-top: 15px; display: flex; justify-content: space-between;">
107-
<a class="btn btn-default btn-sm" role="button" href="https://docs.pi-hole.net/" target="_blank"><i class="fas fa-question-circle"></i> Documentation</a>
108-
<a class="btn btn-default btn-sm" role="button" href="https://github.com/pi-hole/" target="_blank"><i class="fab fa-github"></i> GitHub</a>
109-
<a class="btn btn-default btn-sm" role="button" href="https://discourse.pi-hole.net/" target="_blank"><i class="fab fa-discourse"></i> Pi-hole Discourse</a>
107+
<a class="btn btn-default btn-sm" role="button" href="https://docs.pi-hole.net/" rel="noopener" target="_blank"><i class="fas fa-question-circle"></i> Documentation</a>
108+
<a class="btn btn-default btn-sm" role="button" href="https://github.com/pi-hole/" rel="noopener" target="_blank"><i class="fab fa-github"></i> GitHub</a>
109+
<a class="btn btn-default btn-sm" role="button" href="https://discourse.pi-hole.net/" rel="noopener" target="_blank"><i class="fab fa-discourse"></i> Pi-hole Discourse</a>
110110
</div>
111111
</div>
112112
</section>
@@ -117,7 +117,7 @@ mg.include('scripts/lua/header.lp','r')
117117
<strong><a href="https://pi-hole.net/donate/" rel="noopener" target="_blank"><i class="fa fa-heart text-red"></i> Donate</a></strong> if you found this useful.
118118
</div>
119119
</div>
120-
<script src="<?=pihole.fileversion('scripts/js/login.js')?>"></script>
121-
<script src="<?=pihole.fileversion('scripts/js/footer.js')?>"></script>
120+
<script defer src="<?=pihole.fileversion('scripts/js/footer.js')?>"></script>
121+
<script defer src="<?=pihole.fileversion('scripts/js/login.js')?>"></script>
122122
</body>
123123
</html>

‎messages.lp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ mg.include('scripts/lua/header_authenticated.lp','r')
4141
</div>
4242
</div>
4343

44-
<script src="<?=pihole.fileversion('scripts/js/messages.js')?>"></script>
44+
<script defer src="<?=pihole.fileversion('scripts/js/messages.js')?>"></script>
4545

4646
<? mg.include('scripts/lua/footer.lp','r')?>

‎network.lp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
6464
</div>
6565
<!-- /.row -->
6666

67-
<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
68-
<script src="<?=pihole.fileversion('scripts/js/network.js')?>"></script>
67+
<script defer src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
68+
<script defer src="<?=pihole.fileversion('scripts/js/network.js')?>"></script>
6969

7070
<? mg.include('scripts/lua/footer.lp','r')?>

0 commit comments

Comments
 (0)