Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-22 02:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,504 Commits 23 Branches 113 Tags
ea817bf508fe4c0893283d69367be48faae71dfd
Commit Graph

116 Commits

Author SHA1 Message Date
DL6ER
bc57793761 Remove debug statement 2016-12-28 16:55:59 +01:00
DL6ER
f0b4d0f27d Apply the same fix for function getOverTimeData() 2016-12-28 13:52:24 +00:00
DL6ER
0c40cacc83 Provide a minimal valid array if there have are no blocked queries at all. Otherwise the output of the API is inconsistent. 2016-12-28 13:48:28 +00:00
DL6ER
6760225bf6 Merge branch 'devel' into fix/clienthostnames 2016-12-27 23:55:59 +01:00
DL6ER
2b333ff2ab Give IP and hostname to Query Log page if resolveIP feature is enabled for Top Clients 2016-12-27 22:50:24 +00:00
DL6ER
335977fc26 Fixed indentation + overwrite $showPermitted to false it privacy mode is enabled 2016-12-27 22:15:06 +00:00
DL6ER
0c7857eed8 Call function setShowBlockedPermitted() only once + immediately return empty array when nothing to be shown (don't show blocked entries + privacy Mode enabled) 2016-12-27 22:11:21 +00:00
DL6ER
271f445eb8 Merge branch 'devel' into privacymode 2016-12-27 22:07:36 +00:00
DL6ER
1009dba240 100% non-blocking using our awesome API 2016-12-23 13:39:29 +01:00
DL6ER
2b2c3bbf27 Merge pull request #264 from pi-hole/overhaulGetBlockesQueries 
New logic for API functions getBlockedQueries() and countBlockedQueries()
 2016-12-23 11:52:30 +01:00
DL6ER
a608193759 Merge branch 'devel' into privacymode 
Conflicts:
	data.php
 2016-12-22 19:37:41 +01:00
DL6ER
41cd38256d Merge branch 'devel' into clienthosts 
Conflicts:
	data.php
 2016-12-22 19:36:23 +01:00
DL6ER
a1d8874ea3 Merge branch 'devel' into overhaulGetBlockesQueries 2016-12-22 16:45:09 +01:00
Mcat12
c530e58eb9 Remove unnecssary import 
When api.php imports data, it already has imported func.php
 2016-12-21 12:31:08 -05:00
Mcat12
977c026868 Use checkfile on get.php 
Move checkfile to funcs.php to be used by more scripts
 2016-12-21 12:24:48 -05:00
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
ef9e5cb9bd Merge branch 'devel' into overhaulGetBlockesQueries 2016-12-20 23:24:05 +01:00
DL6ER
815c4a7173 make function getBlockedQueries(\SplFileObject $log) compatible with extra logging format of dnsmasq 2016-12-20 23:23:41 +01:00
DL6ER
b01d8293db Improved comments 2016-12-20 21:40:19 +01:00
DL6ER
d89fb7a0e0 Have to modify the correct array for this to work... 2016-12-20 21:38:51 +01:00
DL6ER
be5a6cb5df Use only one array, no additional loops 2016-12-20 21:31:49 +01:00
DL6ER
b298f1ab06 Loop over $whiteList, simplified code slightly 2016-12-20 21:19:49 +01:00
Mcat12
f9a601c5b0 Avoid array_merge 
Simply unset and set when applying whitelist and blacklist
 2016-12-20 13:38:42 -05:00
Mcat12
4b7f20cfae Take into account the whitelist and blacklist 2016-12-20 13:11:15 -05:00
DL6ER
bb2c2e2244 Moved more private files out of the root directory 2016-12-20 12:52:19 +01:00
DL6ER
10ef50a6eb Removed another $hostname = ... 2016-12-19 11:59:09 +01:00
DL6ER
c04c8f93a0 Don't need to get $hostname anymore 2016-12-19 11:56:06 +01:00
DL6ER
2d7ef8fd9a == to === 2016-12-19 11:46:25 +01:00
DL6ER
a30d8918c4 Removed preg_replace 2016-12-19 11:43:59 +01:00
DL6ER
42e9644a3f Greatly simplified function countBlockedQueries() 2016-12-19 11:38:04 +01:00
DL6ER
5cbc20f477 Simplified function getBlockedQueries() 2016-12-19 11:36:58 +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
DL6ER
dbbc1a770b Add privacy mode 2016-12-16 17:32:44 +01: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