Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-27 13:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,134 Commits 20 Branches 112 Tags
22a99bdbcf663849d1d3fadffedc60eefe71f3d6
Commit Graph

66 Commits

Author SHA1 Message Date
Björn Bohman
22a99bdbcf Let getAllQueries() return ordered JSON hash. 
Make getAllQueries() take an optionally argument that can be any of:

* orderByClientDomainTime
* orderByClientTimeDomain
* orderByTimeClientDomain
* orderByTimeDomainClient
* orderByDomainClientTime
* orderByDomainTimeClient
* ANY THING ELSE

If argument is one of orderBy* make getAllQueries() return with JSON
hash that is structured by the way the argument sets.

This does not break the originally function of getAllQueries() and is backwards compatible.
 2016-12-08 10:58:42 +01:00
DL6ER
9179a20fa2 Don't show " read " 2016-12-06 08:39:24 +01:00
DL6ER
bc8ac73cfa Made gravityCount() faster 2016-12-05 13:40:56 +01:00
DL6ER
6b1d6d19ac Add function countBlockedQueries() 2016-12-05 13:30:24 +01:00
DL6ER
0a9a55fe3a Improve speed of getSummaryData() 2016-12-05 13:07:36 +01:00
DL6ER
6ba4d591af Merge branch 'devel' into moredetailedgraph 2016-11-17 11:03:41 +01:00
DL6ER
fa220266e0 Merge branch 'devel' into moredetailedgraph 2016-11-17 10:56:00 +01:00
Adam Warner
894ae02b94 Update data.php 
Reflect var name changes in development branch of pihole
 2016-11-16 21:32:48 +00:00
Mcat12
38fae41608 Merge pull request #194 from DL6ER/queryblacklist 
Add possibility to black-/whitelist entries on the Queries page.
 2016-11-14 07:08:09 -05:00
DL6ER
025c22c287 Add possibility to blacklist/whitelist entries on the Queries page. 2016-11-13 18:57:25 +01:00
DL6ER
ff85963df4 Refined algorithm used for the index generation + added some explaination 2016-11-09 15:54:41 +01:00
DL6ER
843d1fbef9 Added functions getOverTimeData10mins() and overTime10mins($entries) 2016-11-09 15:04:20 +01:00
Adam Warner
745fa9c94b Same logic as https://github.com/pi-hole/pi-hole/pull/891 2016-11-03 08:27:19 +00:00
Mcat12
5ec12a91dd Stop PHP from crashing if there aren't enough queries to make a graph 2016-10-30 20:07:17 -04:00
Adam Warner
b9f186befb Revert "set default time zone for date" 2016-10-18 15:52:58 +01:00
Promofaux
9b67c1b986 add Hostname check to Forward Destination array. Closes Feature request in #551 2016-10-17 21:33:34 +01:00
Promofaux
16422460bf change data.php IPv6 check to reflect new variable name in setupVars.conf 2016-10-17 18:55:58 +01:00
Adam Warner
5be14ad6e2 Merge pull request #156 from akoebbe/performance-improvements 
Performance improvements
 2016-10-17 18:54:03 +01:00
Andrew Koebbe
cfb3f5070a Improved performance by not reading the log file in to memory 
Fixed the ForwardDestinations not setting the first value for a domain as 1
Fixed a bug where when no ads blocked the alignTimeArrays would error on the min and max calls
 2016-10-09 11:22:00 -05:00
Jakob Ackermann
91683a62ee keep recent format of date 
just output a 'T' insted of the Timezone
 2016-10-09 17:46:37 +02:00
Jakob Ackermann
0197ca79fd use the date command for the other dates as well 
trim against leading space from %k (range of ' 0' to '23') and
strtolower for AM/PM that %p outputs as uppercase, while 'a' (-> am/pm)
was used before
 2016-10-09 05:54:32 +02:00
Jakob Ackermann
b73d6e0329 set default time zone for date 
this prevents basic error messages from php(-cgi) for not setting the
timezone and then using UTC as default
 2016-10-04 17:57:34 +02:00
Adam Hill
b372c2e3d2 Fixes #150 
During the beginning of the month with the log having two spaces between Month & Day we get 9 values back instead of 8.  Stripping double spaces fixes.  E.G. `Oct  1` comapred to `Sep 26`
 2016-10-01 10:18:52 -05:00
Promofaux
55df44edf3 change $ipv6 value to read from /etc/pihole/setupVars.conf instead of /etc/pihole/.useIPV6 2016-09-16 23:59:59 +01:00
Promofaux
f53a77301f in findAds: ensure count($exploded) == 8 2016-09-16 23:42:13 +01:00
Promofaux
b35b0dd7a6 Actually set status to "" before checking it! 2016-09-16 23:23:54 +01:00
Adam Warner
f319ec6cfa Suppress pi.hole and hostname pulled from /etc/hostname from the stats, as they're not really ads. 2016-09-06 09:08:12 +01:00
Promofaux
e79dc2bb0e Split $host at any whitespace, not just tab. 
addresses : https://github.com/pi-hole/pi-hole/issues/484
 2016-04-28 20:22:27 +01:00
Promofaux
861be94589 actually limit list of sources to 10. 2016-04-18 22:46:49 +01:00
Promofaux
51b13087ca Switch display order of Hostname IP to be Hostname (IP) 2016-04-16 14:46:44 +01:00
Promofaux
f45d42ca63 Changes to data.php to allow showing Top 10 clients in table 2016-04-16 14:21:34 +01:00
Promofaux
8d03e0c2b5 Merge branch 'devel' of github.com:pi-hole/AdminLTE into HostNames 2016-04-16 14:14:07 +01:00
Promofaux
fa8cec8fa7 add extra check to getAllQueries so that reads of gravity.list are not counted as pi-holed 2016-04-16 02:50:15 +01:00
Promofaux
4499e2f3b9 Remove erroneous space after hostname 2016-04-16 01:07:33 +01:00
Promofaux
c9e840efa9 Add hostname check to Top Clients graph and Query Log page 2016-04-16 00:56:30 +01:00
Promofaux
02f6517b55 Add ability to check for local hostnames 2016-04-16 00:55:19 +01:00
Promofaux
ad2715e23f Increase complexity of FindAds filter. Removes 'bad name' and host file reload lines from the log whilst parsing 2016-04-15 23:40:40 +01:00
Promofaux
77de621d25 possible fix lighttpd for error where $status was undefined 2016-04-15 21:27:32 +01:00
Promofaux
52281939eb Create seperate filter for get all queries, as it was messing up the main page. 2016-04-15 21:04:08 +01:00
Promofaux
1028d164dc revamp the getAllQueries function. The filter now includes the 'forwarded' and '/etc/pihole/gravity.list' lines. Super Zoomy! 2016-04-15 20:40:32 +01:00
Promofaux
6ebe481351 Rename function to make more sense. 2016-04-15 19:12:50 +01:00
Justin Theberge
b540ace987 relevant names 2016-04-06 10:19:07 -04:00
Justin Theberge
63539fa16a fix linecount 2016-04-06 09:48:50 -04:00
Justin Theberge
096bc06d65 Fix for high CPU usage caused by "PHP Warning" flooding the journal. 
PHP Warning:  fgets() expects parameter 1 to be resource, boolean was given
 2016-04-05 08:59:03 -04:00
Adam Warner
4297718527 Merge pull request #64 from pi-hole/apiChanges 
More API improvements
 2016-03-31 23:45:28 +01:00
Promofaux
ba10330960 PHP no longer falls over when reading in a large number of domains from the blocklist 2016-03-31 23:26:19 +01:00
Mcat12
5394118fb6 Fixed status indicator 
Was still using old indexing
 2016-03-17 20:37:18 -04:00
Mcat12
edeaaabbe3 Merge branch 'devel' into fixQueryLog 
Conflicts:
	data.php
 2016-03-16 20:55:45 -04:00
Mcat12
b37ed3fa51 Actually fixed query log this time 
Maybe
 2016-03-16 20:35:37 -04:00
Promofaux
e61c189bcc Vastly improve checking for domain in gravity.list (think 30+ seconds down to 1) 2016-03-08 19:09:38 +00:00