Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 20:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,894 Commits 19 Branches 112 Tags
8819825dc8a7b8b0326433a4fa55377eede62ced
Commit Graph

801 Commits

Author SHA1 Message Date
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
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
Mcat12
f7905167c0 Prevent command injection via admin email 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-01 20:17:10 -07:00
DL6ER
9ba59b9ef3 Merge branch 'devel' into new/networktable_ip_neigh 2019-06-16 12:28:18 +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
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
DL6ER
425b6ba5a7 Show at only the three most recent IP addresses for each device. The hover text of contains all IP addresses. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-14 19:17:52 +02:00
DL6ER
43fa24fbea Glue needs to be the first argument of implode 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 22:11:13 +02:00
DL6ER
72abc5dad4 Add button for pihole arpflush on Pi-hole settings page 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 22:05:13 +02:00
DL6ER
611db2b4a9 Add source URL to the JS file 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 17:27:31 +02:00
DL6ER
0e2d30dd11 Also show "N/A" if the name column is NULL 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 12:48:53 +02:00
DL6ER
dddc791052 Move ip-address-sorting into its own file 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 12:44:09 +02:00
DL6ER
5f79025cc9 Add IP address sorting for the network table, based on https://datatables.net/plug-ins/sorting/ip-address 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 12:30:55 +02:00
DL6ER
09eb4f5dc3 Check fields against null before trying to obtain their lengths. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 12:24:43 +02:00
Mark Drobnak
2e27a29c76 Merge pull request #938 from pi-hole/fix/query_table_aditional_sorting_by_id 
Fix sorting of queries with identical timestamps
 2019-05-22 15:40:24 -04:00
Dan Schaper
a25195636c Merge pull request #939 from pi-hole/release/v4.3 
Update Dev with v4.3 fixes
 2019-05-21 17:45:25 -07:00
DL6ER
468cd0ccfd Move dataIndex definition into dataSrc function 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-10 22:02:52 +02:00
DL6ER
6d896f9892 Use Array.map() instead of looping over elements and pushing the content to a new array 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-09 20:10:32 +02:00
DL6ER
1d5b212d93 Apply the same changes also for the database query list 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-06 07:44:11 +02:00
DL6ER
ce88417d55 Use the render option of the columns definition to specify how and when the date string is shown. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-06 07:41:13 +02:00
DL6ER
7afa31c6d1 Merge branch 'release/v4.3' into fix/query_table_aditional_sorting_by_id 2019-05-05 20:34:27 +02:00
DL6ER
c4df1bcced Remove extra ID column, this is intentionally done in a separate commit 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-05 13:51:23 +02:00
DL6ER
0590127865 Ensure correct sorting of queries even if they happened withing the same second. Fixes #934 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-05 13:50:33 +02:00
DL6ER
72c734fbe1 Show added as well as modified dates in the tooltip 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-05 13:00:42 +02:00
Adam Warner
0d0d44939d Set "orderable" to false on last column, as sorting does not work here! 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-05-02 21:58:14 +01:00
DL6ER
ced7174c37 Modify adlists subpage of the settings page to sources the lists from the gravity database. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-28 20:42:50 +02:00
DL6ER
406a946b24 Add new file scripts/pi-hole/php/database.php 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-26 18:32:33 +02:00
DL6ER
8b0ee8f4fa Reduce code duplication 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-26 18:29:05 +02:00
DL6ER
cedc59ba78 Show date added 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-25 16:06:24 +02:00
DL6ER
d8613aa53b Show comments when available 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-25 15:48:26 +02:00
DL6ER
506644b671 Rewrite web interface to allow interaction with database-based lists 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-25 15:02:39 +02:00
DL6ER
4923a7576c Remove another mentioning of data-mask 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-12 16:01:35 +02:00
DL6ER
a00e887930 Remove jQuery inputmask 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-10 17:12:35 +02:00
Mcat12
24a22bcb55 Fix security issue when using list functionality via api.php 
Remote code execution could have been triggered by activating some list
functionality (add and remove) via api.php.

Thanks to Kacper Szurek for finding this bug.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-03-02 13:51:29 -08:00
Mark Drobnak
16d06d6948 Merge pull request #918 from pi-hole/new/fine_grained_externally_blocked_status 
Long-term queries: Request all externally blocked variants when the checkbox is enabled
 2019-02-22 21:53:24 -05:00
DL6ER
e0947d69ab Long-term queries: Request all externally blocked variants when the checkbox is enabled 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-22 21:26:36 +01:00
Mark Drobnak
e4d80b5e24 Merge pull request #909 from pi-hole/new/fine_grained_externally_blocked_status 
Implement finer grained external blocking displaying
 2019-02-17 14:14:49 -05:00
DL6ER
f728fd980d DNSSEC UNKNOWN is not an error, it is also shown for queries that are imported from the database 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-17 18:40:57 +01:00
DL6ER
635bdfb717 Undo removal of slice operations 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-17 11:52:14 +01:00
DL6ER
e433e90308 Remove dead code from scripts/pi-hole/js/index.js 
Removed:
- updateForwardedOverTime();
- updateQueryTypesOverTime();
- slicing on overTime data

Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-11 00:52:24 +01:00
DL6ER
8796583818 Implement finer grained external blocking displaying 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-04 17:45:30 +01:00
Mcat12
2ba8787261 Merge branch 'release/v4.2' into devel 
# Conflicts:
#	scripts/pi-hole/js/db_graph.js
 2019-02-03 11:24:19 -08:00
DL6ER
adf44443b7 Merge branch 'release/v4.2' into fix/long-term-stats-datetime 2019-01-28 18:48:11 +01:00
Mcat12
f19a538e7f Clarify wording of DNSSEC Unknown status 
Previously, unknown DNSSEC status was marked with a question mark. FTL
loads queries from the database and sets the DNSSEC status to unknown,
because that information is not stored in the database:
https://github.com/pi-hole/FTL/pull/461

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-01-26 13:11:08 -08:00
DL6ER
a975576616 Long-term data: Show date range only after user chose a valid range. Fixes #897 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-22 23:30:36 +01:00
DL6ER
8ae36a0dcb Fill daterange field with initialization (now-6d -> now) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-20 11:36:39 +01:00
Mark Drobnak
991be959d3 Update scripts/pi-hole/php/savesettings.php 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-19 22:35:12 +01:00
Michael Epstein
6447879562 Fix a PHP error generated by "Query Lists". 
Example:
2019/01/18 00:56:46 [error] 19780#19780: *20783 FastCGI sent in stderr: "PHP message: PHP Notice:  ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush in /var/www/html/admin/scripts/pi-hole/php/queryads.php on line 9" while reading response header from upstream, client: xxx.xxx.xx.xx, server: some.server.lan, request: "GET /admin/scripts/pi-hole/php/queryads.php?domain=windows& HTTP/1.1", upstream: "fastcgi://unix:/run/php/pihole.sock:", host: "some.server.lan", referrer: "https://some.server.lan/admin/queryads.php"

Signed-off-by: Michael Epstein <mepstein@mediabox.cl>
 2019-01-18 01:25:59 -03:00
Michael Epstein
84f6f3dae6 - Fix the delete of blacklist/whitelist records under NGINX + PHP-FPM 
- Fix multiple php warning/error messages when this scripts are executed from AJAX requests

Example errors/warnings:

2019/01/15 13:22:22 [error] 1408#1408: *2535 FastCGI sent in stderr: "PHP message: PHP Notice:  Undefined variable: api in /var/www/html/admin/scripts/pi-hole/php/sub.php on line 16
PHP message: PHP Warning:  Cannot modify header information - headers already sent by (output started at /var/www/html/admin/scripts/pi-hole/php/sub.php:8) in /var/www/html/admin/scripts/pi-hole/php/auth.php on line 81
PHP message: PHP Warning:  session_start(): Cannot start session when headers already sent in /var/www/html/admin/scripts/pi-hole/php/auth.php on line 93

Signed-off-by: Michael Epstein <mepstein@mediabox.cl>
 2019-01-16 01:51:54 -03:00