Commit Graph

20 Commits

Author SHA1 Message Date
marank
b597a0fcbb Merge branch 'devel' into devel 2020-06-21 12:20:33 +02:00
Adam Warner
c949516ee1 make use of utils.escapeHtml on the JS side of things, and html_entity_decode/htmlentities in PHP
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-06-13 18:50:36 +01:00
Matthias rank
212da94228 Added token verification
Moved CNAME functions to func.php
Added teleporter support
Fixed CNAME and DNS file declaration (filename was declarated in seperate file, therefore trying to read those files from func.php failed)
Fixed error and success response functions in func.php (calling addCustomDNSEntry and addCustomCNAMEEntry repeatedly from teleporter failed because of error function defined inside of those functions)

Signed-off-by: Matthias Rank <development@m-rank.de>
2020-05-21 14:48:13 +02:00
Jack'lul
e12ebcbd08 Trim user input where applicable
Signed-off-by: Jack'lul <jacklulcat@gmail.com>
2020-05-14 18:01:36 +02:00
DL6ER
ac3c178ce9 Add import for Local DNS Records.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 20:23:26 +02:00
Samu Voutilainen
39ec67829b Execute pihole through wrapper
All different exec() calls basically just calls sudo pihole,
with various different syntaxes. Using a wrapper function
allows sanitization of arguments for better safety.

Signed-off-by: Samu Voutilainen <smar@smar.fi>
2020-04-17 07:55:16 +03:00
Adam Warner
54610496a1 Merge pull request #1035 from Mograine/master
Add ability to manage custom DNS records
2019-11-29 13:28:56 +00:00
Mograine
192ad7ce8b Allow to use same Domain for IPv4/IPv6
Signed-off-by: Mograine <ghiot.pierre@gmail.com>
2019-10-28 13:18:08 +01:00
DL6ER
cd2daa3239 Review comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-24 19:41:04 +02:00
Mark Drobnak
02cc5fad15 Write newline after wildcard
This makes the web interface add wildcards in the same way as the CLI.

Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2018-09-01 19:34:25 -04:00
DL6ER
7c9f09db0e Directly write imported regex file to disk instead of useing bash callbacks
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-07-15 12:56:40 +02:00
DL6ER
3e4613caf0 Move function add_regex($regex) to func.php
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-07-15 12:48:46 +02:00
Mcat12
862db2ba9e Use hash_equals in password.php (and move it to funcs.php)
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-01-19 17:52:06 -05:00
DL6ER
94bdb18fe1 Fix domain validation function (#538) 2017-07-01 21:38:04 +10:00
DL6ER
d4bcede042 Accept underscores when validating domain names (#533) 2017-06-30 17:43:30 +10:00
DL6ER
d7fdaf9273 Fix whitespace caused by added license headers 2017-02-19 21:19:02 +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
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
Mcat12
d1da1de597 Move PHP scripts to scripts folder 2016-12-19 19:44:51 -05:00