Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-21 10:17:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,925 Commits 27 Branches 113 Tags
c9f5c9500a30e7cc6cd6faef4c4550338600a8ee
Commit Graph

2925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DL6ER
c9f5c9500a Directly modify gravity tables from the lists pages. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:55:08 +02:00
DL6ER
bc7aef744c "pihole --whiteregex" has been renamed to "pihole --white-regex". Similar for "--whitewild" -> "--white-wild". 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:13:53 +02:00
DL6ER
13f07f9d87 Switch the teleporter to only interact with gravity.db directly. This avoids any need for escaping regexes and just seems to be the right thing to do. Ensure that we flush a table only once (in case multiple files add to the same table). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-24 23:15:19 +02:00
DL6ER
eac87f139f pihole-FTL only needs to be reloaded not restarted when the lists have been updated. This is much faster than a hard restart. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-24 22:19:28 +02:00
DL6ER
3cfb226757 Reload only ONCE not after EACH imported file. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-24 22:14:48 +02:00
DL6ER
72057cfa26 Close database connection at the end of a table recovery. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-24 22:14:07 +02:00
DL6ER
72c0233436 Add option to flush tables during import (defaults to true). By unchecking this box, users can import (= only add) other lists without loosing the present content. Conflict management is done through INSERT OR IGNORE which will silently skip entries that violate the UNIQUE constraint. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-24 21:15:32 +02:00
DL6ER
1ddf36a752 Archive and restore full tables instead of only domains. Use JSON as backup file format. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-24 21:10:19 +02:00
DL6ER
cd2daa3239 Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-24 19:41:04 +02:00
DL6ER
3ebf766240 Simplify add() in list.js. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 21:43:12 +02:00
DL6ER
b7fe518159 Remove heading when list goes empty. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 21:38:58 +02:00
DL6ER
31d0b32103 Only show headings when we have domains for the respective list (regex / exact). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 21:35:42 +02:00
DL6ER
dfcfafd6d9 Implement whitelist regex support to web interface. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 21:15:50 +02:00
Mark Drobnak
483a3aee27 Merge pull request #980 from pi-hole/fix/duplicate-static-dhcp-hostnames 
Prevent static DHCP leases from having duplicate hostnames
 2019-07-10 12:52:38 -04:00
Mcat12
c5b25f23e5 Add missing break 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-09 20:37:05 -07:00
Mcat12
bc85bcda7b Prevent static DHCP leases from having duplicate hostnames 
Fixes #979

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-09 20:35:15 -07:00
Mark Drobnak
77845474d8 Merge pull request #968 from pi-hole/new/domain_groups_enabled_status 
Lists: Highlight if domains are disabled
 2019-07-07 17:18:42 -04:00
DL6ER
eeb4598925 Fix hardcoded table name. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-07 22:40:34 +02:00
Mark Drobnak
f18e287150 Merge pull request #977 from lightswitch05/feature/batch-audit-requests 
Feature: Batch audit requests
 2019-07-07 14:58:02 -04:00
DL6ER
8698ce1b9c Do not return query string in get.php. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-07 10:19:20 +02:00
Mark Drobnak
7470119396 Merge pull request #978 from pi-hole/fix/audit_log 
Audit log: Should use $domains
 2019-07-06 19:46:29 -04:00
DL6ER
dab155c2bf We need to use \$domains instead of \$domain when addin domains to the audit log. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 17:14:24 +02:00
Daniel
12e0ce2f4c Improve audit logic to batch requests. 
Signed-off-by: Daniel <daniel@developerdan.com>
 2019-07-05 10:23:27 -04:00
DL6ER
e3f76a46d2 Use GROUP BY instead of DISTINCT as we pairs or(domain,1) and (domain,0) are distinct as well where we actually want to only GROUP BY domain. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 11:49:44 +02:00
DL6ER
4cc54ee407 Group assignment has changed in the database. Adapt the code accordignly. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 11:24:22 +02:00
DL6ER
f407edfb6d Merge pull request #972 from pi-hole/fix/query-log-filtering-when-disabled 
Don't show the "Click to ..." tooltip when filtering is disabled
 2019-07-04 22:14:09 +02:00
DL6ER
7d9206c2cd Merge pull request #975 from pi-hole/fix/settings-page-adlists 
Use the renamed adlist table when getting adlists
 2019-07-04 22:13:20 +02:00
DL6ER
d7c337b30c Merge pull request #976 from pi-hole/fix/teleporter-gravity-db 
Upgrade the exporter/importer (teleporter) to use the gravity database
 2019-07-04 22:12:28 +02:00
Mcat12
8819825dc8 Upgrade the exporter/importer (teleporter) to use the gravity database 
Also fixed the content type of the tar.gz archive from zip to gzip.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-04 12:31:02 -07:00
Mcat12
86ba703ef5 Use the renamed adlist table when getting adlists 
This fixes an error shown on the settings page.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-04 11:28:01 -07:00
Mark Drobnak
4e1df1664c Merge pull request #951 from pi-hole/new/arp-flush 
Add button for pihole arpflush on Pi-hole settings page
 2019-07-04 14:10:29 -04:00
DL6ER
2e2896add3 Merge pull request #964 from pi-hole/new/networktable_ip_neigh 
Add IPv6 support for network table
 2019-07-04 11:44:10 +02:00
Mark Drobnak
00d9b3d9c4 Merge pull request #974 from pi-hole/fix/admin-email-validation 
Prevent command injection via admin email
 2019-07-02 21:49:26 -04:00
Mcat12
f7905167c0 Prevent command injection via admin email 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-01 20:17:10 -07:00
Mcat12
8157fa5c8e Don't show the "Click to ..." tooltip when filtering is disabled 
Fixes #971

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-06-28 20:14:05 -07:00
Mark Drobnak
392802687d Merge pull request #900 from pi-hole/tweak/long_term_data_padding 
Always show the full requested range in the long-term API results
 2019-06-16 17:32:22 -04:00
DL6ER
5f28a3816d Pass group_enabled boolean to web interface and show if entry was disabled due to group setting. Although the current web interface does not support group-based management, this may aid in debugging if users interact the database directly. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-16 20:08:24 +02:00
DL6ER
fb96e6ff21 Reposition parseDBData() to simplify diff output 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-16 14:08:26 +02:00
DL6ER
7c4dee6f2d Simplify getGraphData and round and to match the requested . 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-16 14:06:52 +02:00
DL6ER
99a53fcfd4 Remove fallback to ip column in network table as we removed this column in DB version 5. There will always be a corresponding entry for each device in the network table. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-16 12:30:36 +02:00
DL6ER
9ba59b9ef3 Merge branch 'devel' into new/networktable_ip_neigh 2019-06-16 12:28:18 +02:00
Mark Drobnak
91c9865b70 Merge pull request #967 from pi-hole/fix/clarify_advanced_dns_settings_text 
Clarify that the router does not always have to be the DHCP server
 2019-06-16 00:20:54 -04:00
Mark Drobnak
889c5d5143 Merge pull request #966 from pi-hole/fix/clients_over_time_privacy_level_3 
Hide clients over time graph is no data is available
 2019-06-16 00:19:33 -04:00
DL6ER
2f5f95dba1 Clarify that the router does not always have to be the DHCP server. Fixes #893 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-15 17:47:07 +02:00
DL6ER
d616a1180a Check data before converting. This allows us to detect if there is no data for the graph so we can hide it. Fixes #932 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-15 17:20:49 +02:00
DL6ER
1096179245 Fix (almost) endless loop when there are no (or no blocked) queries in the selected interval. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-15 16:24:00 +02:00
DL6ER
d2ce57b48b Check IP field not entire object 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-15 15:58:12 +02:00
DL6ER
764a0b1a3a If a device is unknown in the network_addresses table, we fall back to the IP address stored in the network table. This might be the case for devices that have not been seen since a long time. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-15 08:52:47 +02:00
DL6ER
cbd8eb6148 Remove variable $ipaddr 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-15 08:45:31 +02:00
DL6ER
f0458e518a Disable ordering by IP address as this is not really meaningful if we have multiple IPs in each row 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-14 19:19:53 +02:00