Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-27 05:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,381 Commits 19 Branches 112 Tags
6da7d9eaa4c898c71c4e2a6e10da5bafb0bb4161
Commit Graph

86 Commits

Author SHA1 Message Date
DL6ER
6da7d9eaa4 Merge branch 'devel' into checkfilesbeforereading 2016-12-21 17:40:17 +01:00
DL6ER
e188cb6fbc Revert "Merge pull request #267 from pi-hole/folderStructure" 
This reverts commit fba3d10fa4, reversing
changes made to 4ee75f4167.
 2016-12-21 17:16:52 +01:00
DL6ER
bb2c2e2244 Moved more private files out of the root directory 2016-12-20 12:52:19 +01:00
DL6ER
da12f6f16d Change the "none" to "nothing" 2016-12-19 10:44:04 +01:00
Promofaux
70a8eee23a nothing to see here... 2016-12-19 09:19:16 +00:00
Adam Warner
83f17c180e Dear Adam, When you refactor part of a function out to another function.. remember to call it from the original function. It will not work if you do not. Kind Regards, Adam. 2016-12-15 11:01:20 +00:00
Adam Warner
b036b75d29 reduce complexity of getAllQueries 2016-12-15 10:45:15 +00:00
Adam Warner
9874708b1e Merge pull request #243 from pi-hole/fixTheQueryLog 
check if domain is blocked or not by checking it against list.preEven…
 2016-12-14 19:07:30 +00:00
DL6ER
bc462626e1 Remove unused variable 2016-12-14 13:33:27 +01:00
DL6ER
52a2e65875 New gravity count logic 2016-12-14 13:27:10 +01:00
DL6ER
e59e126453 Speed up function getGravityDomains() 2016-12-14 11:37:50 +01:00
DL6ER
bbdb675d7b Reimplement API_QUERY_LOG_SHOW actions + remove obsolete if statement 2016-12-14 10:34:13 +01:00
Promofaux
a3316f9fe7 check if domain is blocked or not by checking it against list.preEventHorizon 2016-12-13 23:13:16 +00:00
DL6ER
6f780ab5fe Check for flag none 2016-12-12 22:15:39 +01:00
DL6ER
621c8083c8 Apply API_QUERY_LOG_SHOW to API result 2016-12-12 13:37:58 +01:00
DL6ER
19573aece7 Merge pull request #232 from pi-hole/excludedomains 
Be able to exclude certain domains / clients
 2016-12-11 20:24:29 +01:00
DL6ER
0ac06710c1 Renamed variables since they do not only affect the webUI but the whole API 2016-12-11 19:31:57 +01:00
DL6ER
158704de92 Extended to Top Clients 2016-12-09 15:42:03 +01:00
DL6ER
5e61c9c814 Generalized function 2016-12-09 15:40:57 +01:00
DL6ER
57e814a5ee Added function excludeDomainsfromList($array) 2016-12-09 15:38:50 +01:00
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