Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-25 05:05:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,947 Commits 19 Branches 112 Tags
fe7f3d3873aa89c3fa698070147ff2ff03de63cd
Commit Graph

67 Commits

Author SHA1 Message Date
Mcat12
0fde8e0dca Add status API method 2017-03-24 16:27:37 -04:00
DL6ER
35dcb9b5ed Improve fallback handling of the dashboard for when FTL is not running 2017-03-24 15:30:03 +01:00
DL6ER
fb8f0a081e Move API functions that are neither FTL nor PHP specific (enable, disable) to api.php 2017-03-01 14:05:38 +01:00
DL6ER
7a73053bfd Merge branch 'devel' into new/FTL-integration 
Conflicts:
	api.php
 2017-02-28 13:49:34 +01:00
Mcat12
3b5578321a Merge pull request #413 from pi-hole/tweak/enable_disable_API 
Improve Enable/Disable through API
 2017-02-27 21:42:16 -05:00
DL6ER
e6d0dd4839 Add version/type parameters to API (will be used in the future to decide what backend is powering the frontend) (#414) 2017-02-27 23:12:39 +01:00
DL6ER
03550f36aa Merge branch 'devel' into tweak/enable_disable_API 2017-02-27 22:52:22 +01:00
DL6ER
8d59283d09 Small typo 2017-02-23 14:27:37 +01:00
DL6ER
616213d10b Improve Enable/Disable through API as often requested 2017-02-23 14:24:14 +01:00
DL6ER
a6a4c944b0 Several optimizations to the new FTL API 2017-02-23 14:20:26 +01:00
DL6ER
e422e820d1 Show disable timer across all devices 2017-02-22 15:44:07 +01:00
DL6ER
d7fdaf9273 Fix whitespace caused by added license headers 2017-02-19 21:19:02 +01:00
DL6ER
1975c261d0 Moved FTL API into own file as well 2017-02-19 14:52:28 +01:00
DL6ER
bbab9f8bfd Removed double license header in api.php 2017-02-19 14:24:23 +01:00
DL6ER
86bfa663f9 Merge branch 'devel' into new/FTL-integration 
Conflicts:
	scripts/pi-hole/php/auth.php
	scripts/pi-hole/php/password.php
 2017-02-19 14:20:56 +01:00
DL6ER
f88092175e Conflicts: 
api.php
	scripts/pi-hole/php/FTL.php
	scripts/pi-hole/php/auth.php
	scripts/pi-hole/php/password.php
 2017-02-19 14:17:52 +01:00
DL6ER
4f70973cbc EUPL license (#402) 
* Move whole project to EUPL, copy MIT license to scripts/vendor/ and style/vendor/

* Added header to main PHP files

* Modified scripts in scripts/pi-hole/php

* Added header to scripts/pi-hole/js files

* Added license header to our custom style script

* Slight reformulation
 2017-02-18 14:20:51 +01:00
DL6ER
aabff35bef Squashed commit of the following: 
- Dynamically fall back to PHP API functions to ensure API does always repond even if FTL is not runnung for some reason
- Update PHP API from current devel branch
- Increase flexibility in getQueryTypes API call
- Hide top ads list if nothing to display
- Proper display of activated privacy mode
- Remove spinner (would otherwise not be removed for zero results)
- Update tables every 10 seconds
- Update query types and forward destinations plots every 10 seconds
- More verbose output in top lists (total number next to percentage in tooltip)
- Implemented "recentBlocked" keyword for API
- Ensure compatibility with PHP5 version < 5.4
- Adjust output format of overTimeData10mins to comply with PHP API
- Further speedup of Query Log page by showing only the recent 10 minutes by default
- Hide temperature if FTL is not running and show FTL status
- Add information to Settings page
- Adjust error message when loading of query log failed
- Move processing of domainname, clientIP, clientname and time interval filters for the Query Log page to FTL for speed enhancement
- Generate link if pi.hole comes up in the Top Domains list
- Remove resolve DNS names option - this is now enabled by default (daemon will only do it once per day instead of PHP-API which did it on every reloading of the web interface)
- Add socket timeout of 10 seconds + modification to Settings page since FTL backend supports API_EXCLUDE_CLIENTS filtering with both IP addresses and host names (also mixed)
- Improved Query Log page
 2017-02-16 08:52:30 +01:00
DL6ER
9b799819bf Added header to main PHP files 2017-02-14 14:57:58 +01:00
DL6ER
aa31fd13fe Use is_numeric(...) for checking if is either or type int or double or a valid numeric string 2017-01-27 11:48:35 +01:00
Mcat12
96826da1f2 Return numbers as numbers in summaryRaw 2017-01-26 21:33:18 -05:00
Mcat12
cd198d0793 Require auth for tailLog 2017-01-14 18:03:57 -05:00
DL6ER
5cbfe6a5be Merge branch 'devel' into TopItems 2016-12-30 20:42:33 +00:00
Promofaux
8240e2d23b merge devel 2016-12-29 19:59:09 +00:00
DL6ER
dfa1737542 Be ablw to specify how many Top Items a user wants to see through the API call 2016-12-25 20:00:24 +01:00
DL6ER
0aed676e45 Merge branch 'devel' into new/tools 
Conflicts:
	header.php
 2016-12-24 00:30:35 +01:00
DL6ER
b2a39c5cb8 Be able to pass delay for automatic reactivation to API 2016-12-23 14:35:09 +01:00
DL6ER
1009dba240 100% non-blocking using our awesome API 2016-12-23 13:39:29 +01:00
DL6ER
e5a9826078 Moved more private files out of the root directory 2016-12-21 21:10:21 +01:00
Mcat12
2f65430a4d Move PHP scripts to scripts folder 2016-12-21 21:09:58 +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
42c9439d1e Merge branch 'devel' into folderStructure 2016-12-20 23:09:39 +01:00
DL6ER
be5a6cb5df Use only one array, no additional loops 2016-12-20 21:31:49 +01:00
DL6ER
bb2c2e2244 Moved more private files out of the root directory 2016-12-20 12:52:19 +01:00
Mcat12
d1da1de597 Move PHP scripts to scripts folder 2016-12-19 19:44:51 -05:00
Adam Warner
ee41a78bdd More codacy fixes (#256) 
* single quotes to double

* Avoid variables with short names like $a. Configured minimum length is 3.

* list_type > listType https://www.codacy.com/app/Pi-hole/AdminLTE/file/4753758893/issues/source?bid=3919163&fileBranchId=3919163#l30

* define `refresh` before it is used

* single to double quotes

* EsLint expects `{}` after `if`

* singlequotes to doublequotes

* https://www.codacy.com/app/Pi-hole/AdminLTE/file/4753758894/issues/source?bid=3919163&fileBranchId=3919163#l49

* Copy filterArray Function from api.php

* missed a single-quote

* single>double

* `===`, `==`

* single to double

* Usages come AFTER declarations

* missing semi

* function delcaration order change

* more codacy complaints
 2016-12-16 13:52:51 +00:00
DL6ER
c599c30763 Add API option to get gravity domains 2016-12-14 11:39:20 +01:00
Björn Bohman
1d36f664cf Send argument to getAllQueries() 
Send the value api.php is given for getAllQueries to getAllQueries().
This make getAllQueries() able to make decisions from the argument.
 2016-12-08 11:00:02 +01:00
Mcat12
cc6e029f78 Make sure the api doesn't enable and disable at the same time. 2016-12-04 13:32:17 -05:00
Mcat12
0dec4b8aa0 Protect Enable/Disable with a CSRF token check 
The token is now added for all pages.
 2016-12-04 13:16:45 -05:00
Mcat12
ee0913a7a2 Move enable/disable to API 
Also check CORS for all API calls. With the same import, we can
enable CSRF token checking on the API.
 2016-12-03 13:40:04 -05:00
DL6ER
22c32b269e Add ?jsonForceObject flag to enable JSON_FORCE_OBJECT 2016-11-24 16:48:11 +01:00
DL6ER
f0adb164d4 Merge branch 'devel' into auth 
Conflicts:
	api.php
	js/pihole/index.js
 2016-11-21 10:57:19 +01:00
DL6ER
f84d54558b Allow GET hash for API calls 2016-11-20 15:46:05 +01:00
DL6ER
e575988d37 Added some more comments in api.php 2016-11-19 12:56:50 +01:00
DL6ER
03ea07ec49 api.php?summaryRaw also accessible without auth token 2016-11-19 12:51:52 +01:00
DL6ER
8ecd218908 Many changes that are documented in PR #197 2016-11-18 21:31:30 +01:00
DL6ER
4372c2e25b Extend hash auth to API calls 2016-11-16 23:35:10 +01:00
DL6ER
3624b3ed85 Added new API call: overTimeData10mins 2016-11-09 15:02:05 +01:00
Rory M
26d54cfa9b Fix for XSS bug 
I actually tested this one! it works.
My apologies for the previous, non-working commits-- I had to refresh my knowledge of PHP.
 2016-04-22 14:27:21 +01:00