Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-20 02:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not show Logout button when either no password is set or this is a local browser and localAPIauth is set to false

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2023-05-28 08:22:36 +02:00
parent 0f0f8c9deb
commit ab2d15bf91
3 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/pi-hole/lua/header.lp
View File

@@ -10,6 +10,7 @@
<? <?
starttime = mg.time(true) starttime = mg.time(true)
hostname = pihole.hostname() hostname = pihole.hostname()
webhome = pihole.webhome()
-- Get name of script by matching whatever is after the last "/" in the URI -- Get name of script by matching whatever is after the last "/" in the URI
scriptname = mg.request_info.request_uri:match(pihole.webhome().."(.*)$") scriptname = mg.request_info.request_uri:match(pihole.webhome().."(.*)$")
-- Fall back to "index.lp" if no match is found (e.g. when accessing the root) -- Fall back to "index.lp" if no match is found (e.g. when accessing the root)

2
scripts/pi-hole/lua/header_authenticated.lp
View File

@@ -94,7 +94,9 @@ mg.include('header.lp','r')
<a class="btn-link" href="https://discourse.pi-hole.net/" rel="noopener" target="_blank"><i class="fa-fw menu-icon fab fa-discourse"></i> Pi-hole Forum</a> <a class="btn-link" href="https://discourse.pi-hole.net/" rel="noopener" target="_blank"><i class="fa-fw menu-icon fab fa-discourse"></i> Pi-hole Forum</a>
<a class="btn-link" href="https://github.com/pi-hole" rel="noopener" target="_blank"><i class="fa-fw menu-icon fab fa-github"></i> GitHub</a> <a class="btn-link" href="https://github.com/pi-hole" rel="noopener" target="_blank"><i class="fa-fw menu-icon fab fa-github"></i> GitHub</a>
<a class="btn-link" href="https://discourse.pi-hole.net/c/announcements/5" rel="noopener" target="_blank"><i class="fa-fw menu-icon fa-solid fa-rocket"></i> Pi-hole Releases</a> <a class="btn-link" href="https://discourse.pi-hole.net/c/announcements/5" rel="noopener" target="_blank"><i class="fa-fw menu-icon fa-solid fa-rocket"></i> Pi-hole Releases</a>
<? if pihole.needLogin(mg.request_info.remote_addr) then ?>
<a class="btn-link" href="#" onclick="utils.doLogout();"><i class="fa-fw menu-icon fa-solid fa-arrow-right-from-bracket"></i> Log out</a> <a class="btn-link" href="#" onclick="utils.doLogout();"><i class="fa-fw menu-icon fa-solid fa-arrow-right-from-bracket"></i> Log out</a>
<? end ?>
</li> </li>
</ul> </ul>
</li> </li>

68
scripts/pi-hole/lua/sidebar.lp
View File

@@ -13,7 +13,7 @@
<!-- Sidebar user panel --> <!-- Sidebar user panel -->
<div class="user-panel"> <div class="user-panel">
<div class="pull-left image"> <div class="pull-left image">
<img class="logo-img" src="<?=pihole.webhome()?>img/logo.svg" alt="Pi-hole logo"> <img class="logo-img" src="<?=webhome?>img/logo.svg" alt="Pi-hole logo">
</div> </div>
<div class="pull-left info"> <div class="pull-left info">
<p>Status</p> <p>Status</p>
@@ -28,13 +28,13 @@
<li class="header text-uppercase">Main</li> <li class="header text-uppercase">Main</li>
<!-- Home Page --> <!-- Home Page -->
<li class="menu-main<? if scriptname == 'index' or scriptname == 'index.lp' then ?> active<? end ?>"> <li class="menu-main<? if scriptname == 'index' or scriptname == 'index.lp' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>"> <a href="<?=webhome?>">
<i class="fa fa-fw menu-icon fa-home"></i> <span>Dashboard</span> <i class="fa fa-fw menu-icon fa-home"></i> <span>Dashboard</span>
</a> </a>
</li> </li>
<!-- Query Log --> <!-- Query Log -->
<li class="menu-analysis<? if scriptname == 'queries' then ?> active<? end ?>"> <li class="menu-analysis<? if scriptname == 'queries' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>queries"> <a href="<?=webhome?>queries">
<i class="fa fa-fw menu-icon fa-file-alt"></i> <span>Query Log</span> <i class="fa fa-fw menu-icon fa-file-alt"></i> <span>Query Log</span>
</a> </a>
</li> </li>
@@ -42,7 +42,7 @@
<li class="header text-uppercase">Group Management</li> <li class="header text-uppercase">Group Management</li>
<!-- Group Management --> <!-- Group Management -->
<li class="menu-group<? if scriptname == 'groups' then ?> active<? end ?>"> <li class="menu-group<? if scriptname == 'groups' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>groups"> <a href="<?=webhome?>groups">
<i class="fa fa-fw menu-icon fa-user-friends"></i> <span>Groups <i class="fa fa-fw menu-icon fa-user-friends"></i> <span>Groups
<span class="pull-right-container"> <span class="pull-right-container">
<span class="label label-primary pull-right" id="num_groups" title="Number of defined groups"></span> <span class="label label-primary pull-right" id="num_groups" title="Number of defined groups"></span>
@@ -50,7 +50,7 @@
</a> </a>
</li> </li>
<li class="menu-group<? if scriptname == 'groups/clients' then ?> active<? end ?>"> <li class="menu-group<? if scriptname == 'groups/clients' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>groups/clients"> <a href="<?=webhome?>groups/clients">
<i class="fa fa-fw menu-icon fa-laptop"></i> <span>Clients <i class="fa fa-fw menu-icon fa-laptop"></i> <span>Clients
<span class="pull-right-container"> <span class="pull-right-container">
<span class="label label-primary pull-right" id="num_clients" title="Number of defined clients"></span> <span class="label label-primary pull-right" id="num_clients" title="Number of defined clients"></span>
@@ -58,7 +58,7 @@
</a> </a>
</li> </li>
<li class="menu-group<? if scriptname == 'groups/domains' then ?> active<? end ?>"> <li class="menu-group<? if scriptname == 'groups/domains' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>groups/domains"> <a href="<?=webhome?>groups/domains">
<i class="fa fa-fw menu-icon fa-list"></i> <span>Domains <i class="fa fa-fw menu-icon fa-list"></i> <span>Domains
<span class="pull-right-container"> <span class="pull-right-container">
<span class="label bg-red pull-right" id="num_denied" title="Number of deny rules (domains and regex)"></span> <span class="label bg-red pull-right" id="num_denied" title="Number of deny rules (domains and regex)"></span>
@@ -67,7 +67,7 @@
</a> </a>
</li> </li>
<li class="menu-group<? if scriptname == 'groups/adlists' then ?> active<? end ?>"> <li class="menu-group<? if scriptname == 'groups/adlists' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>groups/adlists"> <a href="<?=webhome?>groups/adlists">
<i class="fa fa-fw menu-icon fa-shield-alt"></i> <span>Adlists <i class="fa fa-fw menu-icon fa-shield-alt"></i> <span>Adlists
<span class="pull-right-container"> <span class="pull-right-container">
<span class="label bg-blue pull-right" id="num_lists" title="Number of defined adlists"></span> <span class="label bg-blue pull-right" id="num_lists" title="Number of defined adlists"></span>
@@ -80,7 +80,7 @@
<!-- Local DNS Records --> <!-- Local DNS Records -->
<!-- Enable/Disable Blocking --> <!-- Enable/Disable Blocking -->
<li id="pihole-disable" class="menu-dns treeview"> <li id="pihole-disable" class="menu-dns treeview">
<a href="<?=pihole.webhome()?>#"> <a href="<?=webhome?>#">
<i class="fa fa-fw menu-icon fa-stop"></i> <span>Disable Blocking&nbsp;&nbsp;&nbsp;<span id="flip-status-disable"></span></span> <i class="fa fa-fw menu-icon fa-stop"></i> <span>Disable Blocking&nbsp;&nbsp;&nbsp;<span id="flip-status-disable"></span></span>
<span class="pull-right-container"> <span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
@@ -88,35 +88,35 @@
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li> <li>
<a href="<?=pihole.webhome()?>#" id="pihole-disable-indefinitely"> <a href="<?=webhome?>#" id="pihole-disable-indefinitely">
<i class="fa fa-fw menu-icon fa-infinity"></i> Indefinitely <i class="fa fa-fw menu-icon fa-infinity"></i> Indefinitely
</a> </a>
</li> </li>
<li> <li>
<a href="<?=pihole.webhome()?>#" id="pihole-disable-10s"> <a href="<?=webhome?>#" id="pihole-disable-10s">
<i class="fa fa-fw menu-icon fa-clock"></i> For 10 seconds <i class="fa fa-fw menu-icon fa-clock"></i> For 10 seconds
</a> </a>
</li> </li>
<li> <li>
<a href="<?=pihole.webhome()?>#" id="pihole-disable-30s"> <a href="<?=webhome?>#" id="pihole-disable-30s">
<i class="fa fa-fw menu-icon fa-clock"></i> For 30 seconds <i class="fa fa-fw menu-icon fa-clock"></i> For 30 seconds
</a> </a>
</li> </li>
<li> <li>
<a href="<?=pihole.webhome()?>#" id="pihole-disable-5m"> <a href="<?=webhome?>#" id="pihole-disable-5m">
<i class="fa fa-fw menu-icon fas fa-clock"></i> For 5 minutes <i class="fa fa-fw menu-icon fas fa-clock"></i> For 5 minutes
</a> </a>
</li> </li>
<li> <li>
<a href="<?=pihole.webhome()?>#" id="pihole-disable-cst" data-toggle="modal" data-target="#customDisableModal"> <a href="<?=webhome?>#" id="pihole-disable-cst" data-toggle="modal" data-target="#customDisableModal">
<i class="fa fa-fw menu-icon fa-user-clock"></i> Custom time <i class="fa fa-fw menu-icon fa-user-clock"></i> Custom time
</a> </a>
</li> </li>
</ul> </ul>
<!-- <a href="<?=pihole.webhome()?>#" id="flip-status"><i class="fa fa-stop"></i> <span>Disable</span></a> --> <!-- <a href="<?=webhome?>#" id="flip-status"><i class="fa fa-stop"></i> <span>Disable</span></a> -->
</li> </li>
<li id="pihole-enable" class="menu-dns treeview" style="display: none;"> <li id="pihole-enable" class="menu-dns treeview" style="display: none;">
<a href="<?=pihole.webhome()?>#"> <a href="<?=webhome?>#">
<i class="fa fa-fw menu-icon fa-play"></i> <i class="fa fa-fw menu-icon fa-play"></i>
<span id="enableLabel">Enable Blocking&nbsp;&nbsp;&nbsp; <span id="enableLabel">Enable Blocking&nbsp;&nbsp;&nbsp;
<span id="flip-status-enable"></span> <span id="flip-status-enable"></span>
@@ -126,7 +126,7 @@
<li class="header text-uppercase">System</li> <li class="header text-uppercase">System</li>
<!-- Settings --> <!-- Settings -->
<li class="menu-system treeview <? if startsWith(scriptname, 'settings/') then ?> active<? end ?>"> <li class="menu-system treeview <? if startsWith(scriptname, 'settings/') then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>#"> <a href="<?=webhome?>#">
<i class="fa fa-fw menu-icon fa-cogs"></i> <span>Settings</span> <i class="fa fa-fw menu-icon fa-cogs"></i> <span>Settings</span>
<span class="pull-right-container"> <span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
@@ -134,42 +134,42 @@
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li class="<? if scriptname == 'settings/system' then ?> active<? end ?>"> <li class="<? if scriptname == 'settings/system' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>settings/system"> <a href="<?=webhome?>settings/system">
<i class="fa-fw menu-icon fa-solid fa-circle-info"></i> <span>System</span> <i class="fa-fw menu-icon fa-solid fa-circle-info"></i> <span>System</span>
</a> </a>
</li> </li>
<li class="<? if scriptname == 'settings/dns' then ?> active<? end ?>"> <li class="<? if scriptname == 'settings/dns' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>settings/dns"> <a href="<?=webhome?>settings/dns">
<i class="fa-fw menu-icon fa-solid fa-book-atlas"></i> <span>DNS</span> <i class="fa-fw menu-icon fa-solid fa-book-atlas"></i> <span>DNS</span>
</a> </a>
</li> </li>
<li class="<? if scriptname == 'settings/dhcp' then ?> active<? end ?>"> <li class="<? if scriptname == 'settings/dhcp' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>settings/dhcp"> <a href="<?=webhome?>settings/dhcp">
<i class="fa-fw menu-icon fa-solid fa-sitemap"></i> <span>DHCP</span> <i class="fa-fw menu-icon fa-solid fa-sitemap"></i> <span>DHCP</span>
</a> </a>
</li> </li>
<li class="<? if scriptname == 'settings/api' then ?> active<? end ?>"> <li class="<? if scriptname == 'settings/api' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>settings/api"> <a href="<?=webhome?>settings/api">
<i class="fa-fw menu-icon fa-solid fa-window-restore"></i> <span>Web interface / API</span> <i class="fa-fw menu-icon fa-solid fa-window-restore"></i> <span>Web interface / API</span>
</a> </a>
</li> </li>
<li class="<? if scriptname == 'settings/privacy' then ?> active<? end ?>"> <li class="<? if scriptname == 'settings/privacy' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>settings/privacy"> <a href="<?=webhome?>settings/privacy">
<i class="fa-fw menu-icon fa-solid fa-binoculars"></i> <span>Privacy</span> <i class="fa-fw menu-icon fa-solid fa-binoculars"></i> <span>Privacy</span>
</a> </a>
</li> </li>
<li class="<? if scriptname == 'settings/teleporter' then ?> active<? end ?>"> <li class="<? if scriptname == 'settings/teleporter' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>settings/teleporter"> <a href="<?=webhome?>settings/teleporter">
<i class="fa-fw menu-icon fa-solid fa-file-export"></i> <span>Teleporter</span> <i class="fa-fw menu-icon fa-solid fa-file-export"></i> <span>Teleporter</span>
</a> </a>
</li> </li>
<li class="<? if scriptname == 'settings/dnsrecords' then ?> active<? end ?> settings-level-1"> <li class="<? if scriptname == 'settings/dnsrecords' then ?> active<? end ?> settings-level-1">
<a href="<?=pihole.webhome()?>settings/dnsrecords"> <a href="<?=webhome?>settings/dnsrecords">
<i class="fa-fw menu-icon fa-solid fa-address-book"></i> <span>Local DNS Records</span> <i class="fa-fw menu-icon fa-solid fa-address-book"></i> <span>Local DNS Records</span>
</a> </a>
</li> </li>
<li class="<? if scriptname == 'settings/advanced' then ?> active<? end ?> settings-level-2"> <li class="<? if scriptname == 'settings/advanced' then ?> active<? end ?> settings-level-2">
<a href="<?=pihole.webhome()?>settings/advanced"> <a href="<?=webhome?>settings/advanced">
<i class="fa-fw menu-icon fa-solid fa-pen-to-square"></i> <span>All settings</span> <i class="fa-fw menu-icon fa-solid fa-pen-to-square"></i> <span>All settings</span>
</a> </a>
</li> </li>
@@ -177,7 +177,7 @@
</li> </li>
<!-- Tools --> <!-- Tools -->
<li class="menu-system treeview<? if in_array(scriptname, {'messages', 'gravity', 'search', 'taillog', 'network'}) then ?> active<? end ?>"> <li class="menu-system treeview<? if in_array(scriptname, {'messages', 'gravity', 'search', 'taillog', 'network'}) then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>#"> <a href="<?=webhome?>#">
<i class="fa fa-fw menu-icon fa-tools"></i> <span>Tools</span> <i class="fa fa-fw menu-icon fa-tools"></i> <span>Tools</span>
<span class="warning-count hidden"></span> <span class="warning-count hidden"></span>
<span class="pull-right-container"> <span class="pull-right-container">
@@ -187,14 +187,14 @@
<ul class="treeview-menu"> <ul class="treeview-menu">
<!-- Pi-hole diagnosis --> <!-- Pi-hole diagnosis -->
<li class="<? if scriptname == 'messages' then ?> active<? end ?>"> <li class="<? if scriptname == 'messages' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>messages"> <a href="<?=webhome?>messages">
<i class="fa fa-fw menu-icon fa-file-medical-alt"></i> <span>Pi-hole diagnosis</span> <i class="fa fa-fw menu-icon fa-file-medical-alt"></i> <span>Pi-hole diagnosis</span>
<span class="pull-right-container warning-count hidden"></span> <span class="pull-right-container warning-count hidden"></span>
</a> </a>
</li> </li>
<!-- Tail log files --> <!-- Tail log files -->
<li class="treeview <? if scriptname == 'taillog' then ?> active<? end ?>"> <li class="treeview <? if scriptname == 'taillog' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>#"> <a href="<?=webhome?>#">
<i class="fa-fw menu-icon fa-solid fa-list-ul"></i> <span>Tail log files</span> <i class="fa-fw menu-icon fa-solid fa-list-ul"></i> <span>Tail log files</span>
<span class="pull-right-container"> <span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
@@ -203,19 +203,19 @@
<ul class="treeview-menu"> <ul class="treeview-menu">
<!-- Tail pihole.log --> <!-- Tail pihole.log -->
<li class="<? if scriptname == 'taillog' and GET("file") == "dnsmasq" then ?> active<? end ?>"> <li class="<? if scriptname == 'taillog' and GET("file") == "dnsmasq" then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>taillog?file=dnsmasq"> <a href="<?=webhome?>taillog?file=dnsmasq">
<i class="fa-fw menu-icon fa-solid fa-list-ul"></i> pihole.log <i class="fa-fw menu-icon fa-solid fa-list-ul"></i> pihole.log
</a> </a>
</li> </li>
<!-- Tail FTL.log --> <!-- Tail FTL.log -->
<li class="<? if scriptname == 'taillog' and GET("file") == "ftl" then ?> active<? end ?>"> <li class="<? if scriptname == 'taillog' and GET("file") == "ftl" then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>taillog?file=ftl"> <a href="<?=webhome?>taillog?file=ftl">
<i class="fa-fw menu-icon fa-solid fa-list-ul"></i> FTL.log <i class="fa-fw menu-icon fa-solid fa-list-ul"></i> FTL.log
</a> </a>
</li> </li>
<!-- Tail webserver.log --> <!-- Tail webserver.log -->
<li class="<? if scriptname == 'taillog' and GET("file") == "webserver" then ?> active<? end ?>"> <li class="<? if scriptname == 'taillog' and GET("file") == "webserver" then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>taillog?file=webserver"> <a href="<?=webhome?>taillog?file=webserver">
<i class="fa-fw menu-icon fa-solid fa-list-ul"></i> webserver.log <i class="fa-fw menu-icon fa-solid fa-list-ul"></i> webserver.log
</a> </a>
</li> </li>
@@ -223,19 +223,19 @@
</li> </li>
<!-- Run gravity.sh --> <!-- Run gravity.sh -->
<li class="<? if scriptname == 'gravity' then ?> active<? end ?>"> <li class="<? if scriptname == 'gravity' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>gravity"> <a href="<?=webhome?>gravity">
<i class="fa fa-fw menu-icon fa-arrow-circle-down"></i> <span>Update Gravity</span> <i class="fa fa-fw menu-icon fa-arrow-circle-down"></i> <span>Update Gravity</span>
</a> </a>
</li> </li>
<!-- Query Lists --> <!-- Query Lists -->
<li class="<? if scriptname == 'search' then ?> active<? end ?>"> <li class="<? if scriptname == 'search' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>search"> <a href="<?=webhome?>search">
<i class="fa fa-fw menu-icon fa-search"></i> <span>Search Adlists</span> <i class="fa fa-fw menu-icon fa-search"></i> <span>Search Adlists</span>
</a> </a>
</li> </li>
<!-- Network --> <!-- Network -->
<li class="<? if scriptname == 'network' then ?> active<? end ?>"> <li class="<? if scriptname == 'network' then ?> active<? end ?>">
<a href="<?=pihole.webhome()?>network"> <a href="<?=webhome?>network">
<i class="fa fa-fw menu-icon fa-network-wired"></i> <span>Network</span> <i class="fa fa-fw menu-icon fa-network-wired"></i> <span>Network</span>
</a> </a>
</li> </li>
@@ -245,7 +245,7 @@
<!-- Donate button --> <!-- Donate button -->
<li class="header text-uppercase">Donate</li> <li class="header text-uppercase">Donate</li>
<li class="menu-donate"> <li class="menu-donate">
<a href="<?=pihole.webhome()?>https://pi-hole.net/donate/" target="_blank"> <a href="<?=webhome?>https://pi-hole.net/donate/" target="_blank">
<i class="fas fa-fw menu-icon fa-donate"></i> <span>Donate</span> <i class="fas fa-fw menu-icon fa-donate"></i> <span>Donate</span>
</a> </a>
</li> </li>