1402 Commits (ebbb7168a4c288e61eac30da1c0fe3df71386b22)

Author	SHA1	Message	Date
DL6ER	0e14d11a20	Merge branch 'development' into new/gravitydb	5 years ago
Adam Warner	a145f1d931	Be more verbose with debug script output ... If output of `git status -s` is non-null display changes if output of `git diff` is non-null, display diff Signed-off-by: Adam Warner <adamw@rner.email>	5 years ago
Nils Bergmann	cd9fadbc44	Remove protocol determination ... No protocol determination is neede, if you just use double slash. Signed-off-by: Nils Bergmann <nilsbergmann@noim.io>	5 years ago
DL6ER	5ca1bfc11c	Delete /dev/shm/FTL-* files on (re)start of pihole-FTL ... Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	644ec36e64	Review comments ... Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	9984647ebb	After renaming column in regex, it also needs to be renamed in vw_regex ... Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	c3c60e10f1	Rename regex field from domain to filter because this described better what it is ... Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	8a2363621d	Rename fields from DateAdded to dateadded ... Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	dbbf21071b	Invert logic to use ENABLED instead of DISABLED. We make sure to set "enabled = 1 WHERE enabled IS NULL" in gravity_store_in_database() ... Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
Mcat12	7a19d24058	Remove user/group from dnsmasq config ... In the case that FTL is started under root, dnsmasq changes the user to pihole due to this setting. The shared memory is created before this switch, and may cause issues such as failing to delete or reallocate the shared memory. These config lines were necessary before dnsmasq became part of FTL, but now since dnsmasq runs under FTL, we can configure the user/group through FTL. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
DL6ER	93f1859bab	Store regex in gravity.db as well ... Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	dcf0a605cf	Use views for all tables and set disabled column to false for those tables that support it ... Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	710036adae	Add DISABLED field to white- and blacklist defaulting to false. The two views respect the DISABLED fields for both lists. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	09c4c88a6d	Create and fill gravity.db during pihole -g ... Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
Mcat12	26f2410fe6	Change /var/run/shm to /dev/shm ... The /var directory may not exist (does not exist on Fedora 29), and is simply a symlink to /dev/shm. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
Mcat12	5c4ee23795	Fix missed start_service -> restart_service call ... start_service was changed to restart_service. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
DL6ER	87800a3659	Merge pull request #2570 from pi-hole/tweak/wpad ... Add wpad vulnerability fix as suggested by dnsmasq.conf.example	6 years ago
Mark Drobnak	a3cee67a61	Merge pull request #2571 from pi-hole/tweak/debug/shm ... List content of /var/run/shm in debugger	6 years ago
DL6ER	5ffc8c7443	List content of /var/run/shm in debugger ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	04fd296ffe	Add wpad vulnerability fix as suggested by dnsmasq.conf.example ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Mark Drobnak	ed5869646f	Use source instead of dot for setupVars ... Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>	6 years ago
Mcat12	be2d494fcf	Don't show web version in pihole -v output if not installed ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	1cad069050	Add privacy level 4 to all privacy level code ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Dan Schaper	916b2920be	Merge pull request #2525 from pi-hole/release/v4.1 ... Release/v4.1 to Development	6 years ago
Dan Schaper	9f672593bc	Update advanced/Scripts/webpage.sh ... Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>	6 years ago
DL6ER	a285ae65fb	Backend changes for DHCPv4 rapid commit support ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	d0125d5aad	Suppress warning if Pi-hole is not used as DHCP server (/etc/pihole/dhcp.leases is not present in this case) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Mcat12	9d59da8974	Remove dnsmasq checks from debugger ... This also fixes an issue where the port checks weren't running (`compare_port_to_service_assigned`). Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mark Drobnak	bbb759c684	Merge pull request #2477 from bcambl/debug_init_service_check ... fix debug service check via sysvinit	6 years ago
Mark Drobnak	f1a7bc9ecd	Merge pull request #2481 from pi-hole/revert-2468-lighttpd-conf-enhancements ... Revert "lighttpd conf enhancements"	6 years ago
Dan Schaper	a986f53134	Merge pull request #2436 from pi-hole/fix/password-read-error ... Fix error when reading in new password	6 years ago
Mcat12	28cbf45d1d	Add explanatory comment for include_shell ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Dan Schaper	72829be281	Remove shellcheck overrides ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Adam Warner	d57f9906bd	read -r -a, not read -a -r ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	3d4fea6510	Move -r to before the -p ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	f670644954	Revert "lighttpd conf enhancements"	6 years ago
bcambl	3ec84553ef	fix debug service check via sysvinit ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
Mark Drobnak	a301d4381f	Merge pull request #2472 from pi-hole/fix-webpwexpansion ... Prevent BASH from expanding Web Password	6 years ago
Mark Drobnak	49b8ad7e94	Merge pull request #2470 from jeremysherriff/patch-1 ... Silence updateGravity cron job unless errors occur	6 years ago
WaLLy3K	180d29c7b3	Prevent BASH from expanding Web Password ... * Resolves issue #2471 Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	6 years ago
Mark Drobnak	a23ba91681	Merge pull request #2468 from gstrauss/lighttpd-conf-enhancements ... lighttpd conf enhancements	6 years ago
jeremysherriff	d3ac8bb6f8	Silence updateGravity job unless errors occur ... No need for append/logrotate as we are only interested in the latest output Signed-off-by: jeremysherriff <jeremysherriff@gmail.com>	6 years ago
Mark Drobnak	f87f3b9199	Merge pull request #2467 from pi-hole/fix/dnsmasq-license ... Update dnsmasq config license	6 years ago
Glenn Strauss	67bdcbcf19	lighttpd: slightly more efficient sample config ... Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>	6 years ago
Glenn Strauss	69b2a5a876	lighttpd: use file glob for optional external.conf ... lighttpd 1.4.50 config parse will error if include_shell exits non-zero and pi-hole sample config: include_shell "cat external.conf 2>/dev/null" is an error if external.conf does not exist Replace with: include "external*.conf" file glob supported since lighttpd 1.4.40 and is not an error if there is no file which matches the file glob Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>	6 years ago
WaLLy3K	7f92671765	Update dnsmasq config license ... * Also updated "separate config" text Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	6 years ago
Mark Drobnak	85dceb12a1	Use curl -s instead of -q ... See #2416 Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>	6 years ago
Mcat12	d55012f724	Append versions (after the first) instead of overwriting in updatecheck ... Fixes an issue brought up in #2435 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	7c6eecc9c8	Ignore shellcheck warning ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	e4cbf5023a	Fix error when reading in new password ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mark Drobnak	46356d3027	Merge pull request #2434 from pi-hole/fix/2200 ... Only check web versions if web interface is installed	6 years ago
Mark Drobnak	958a263437	Merge pull request #2431 from pi-hole/fix/use_PHP_comments_in_pihole-FTL.conf_template ... Improve pihole-FTL.conf template	6 years ago
Mark Drobnak	a89ae82270	Merge pull request #2430 from pi-hole/chrono-lc-all ... Fix invalid numbers in Chronometer	6 years ago
Mark Drobnak	cedc39bf09	Merge pull request #2426 from mrmajik45/master ... Read without -r will mangle backslashes. (Fix)	6 years ago
Adam Warner	0627e68078	Shellcheck is not a fan of sourcing scripts it does not know about. Add Directive to stop shellcheck from checking this. ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	7d78f6314a	Source Setupvars file and only check local/remote Web branch/version if the web interface is installed. ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
mrmajik45	0f509f4a34	Update piholeDebug.sh	6 years ago
DL6ER	b043000044	Improve template by removing it. PHP cannot digest comments starting in "#" as of v7.0.0 ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	c338eab3c6	According to the PHP documentation, PHP 7.0.0+ does not longer recognize hash marks (#) as comments. As FTL has been trained to understand PHP-style (comment lines start with ";") as well, we switch to using them. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
WaLLy3K	24e1dc92ba	Resolve issue #2428 ... Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	6 years ago
mrmajik45	00f98543ad	read without -r will mangle backslashes.	6 years ago
mrmajik45	8684356b44	read without -r will mangle backslashes.	6 years ago
Mark Drobnak	dac27f1f18	Only get the first gateway for chronometer ... Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>	6 years ago
Mark Drobnak	6f276ae4bb	Merge pull request #2299 from nullr0ute/net-tools ... Use ip route rather than old net-tools route in chronometer.sh	6 years ago
Mark Drobnak	ec29829550	Merge pull request #2388 from Sh4d1/ipv6_brackets ... Remove external Ipv6 brackets in servername if any	6 years ago
DL6ER	40656641b6	Merge branch 'development' into tweak/reload_on_enable_disable	6 years ago
DL6ER	45bf4b02e7	Ensure that when pihole-FTL is launched as user root, it will drop permissions as soon as this is possible. We tell pihole-FTL to change UID/GID to pihole:pihole instead of the default nobody:nogroup. This default causes conflicts with our SQLite3 database. See that corresponding pull request for further details. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Patrik Cyvoct	85cf98888d	Merge remote-tracking branch 'origin/development' into ipv6_brackets ... Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>	6 years ago
Patrik Cyvoct	048e5bb9a2	Remove external ipv6 brackets if any in servername ... Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>	6 years ago
DL6ER	b9d47d0dd2	Merge pull request #2378 from pi-hole/fix/pihole-FTL-no-caps ... Start pihole-FTL as root if capabilities are not supported by the system	6 years ago
DL6ER	940c9c3bae	Merge pull request #2383 from pi-hole/feature/privacy-level-4 ... Add support for privacy level 4	6 years ago
Mcat12	f141b9f778	Add support for privacy level 4 ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
DL6ER	1dca1efbc6	Don't use extra query logging ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	ec2426b24d	Add clarifying comments ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	5cd3b11391	Start pihole-FTL as root if capabilities are not supported by the system ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	d30b565d98	Touch dhcp.leases to ensure it exists. There are some systems out there where the installer didn't finish on the first run and some users don't have this file being created. Although /etc/pihole should be owned by pihole:pihole, pihole-FTL sometimes fails to open this file and - if this is the case and DHCP is enabled - refuses to start altogether. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	ca309d3b28	Restart pihole-FTL after log flushing to force reloading history. Fixes #2339 ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	165affc39b	list.sh writes into blacklist.txt not black.list so does not need to account for a possibly changed list location ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	f794018e0c	Acknowledge temporary file if disabled for "pihole -b" command ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	94e4ed6644	Add facility to add multiple audit list entries at once and to nuke audit list ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
WaLLy3K	eef948d797	Fix header newlines ... * Added \\n to each $xxx_ver_str, resolving issue #2325 Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	6 years ago
Mcat12	e4e22fb58e	Fix permissive regex ... The `\.?` is too permissive, letting in anything that ends in the domain Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	7086a400e8	Use simpler regex format for wildcards ... Use `\.?domain\.com$` instead of `((^)|(\.))domain\.com$` Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Dan Schaper	af2ec61965	Convert [] to () ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	94b7c8eb59	Added header for file. Not using standard Pi-hole copyright header. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	f2c675cff6	Formatted pihole-FTL.conf for readability. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	b79ff05e29	Move template files to own subdir. Include pihole-FTL.conf in templates. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Adam Warner	9b1356ad01	Revert #2282 ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Peter Robinson	45521b377a	Use ip route rather than old net-tools route in chronometer.sh ... The only use of net-tools is the use of route in chronometer.sh so instead use the same method as used in piholeDebug.sh to get the default gateway so there's no need to depend on net-tools anylonger. Signed-off-by: Peter Robinson <pbrobinson@gmail.com>	6 years ago
Mcat12	03e5a78d8f	Merge remote-tracking branch 'origin/FTLDNS' into development ... # Conflicts: # advanced/Scripts/piholeDebug.sh	6 years ago
Dan Schaper	ba7782f867	Space/Tab piholeDebug.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	c5091b0e49	Space/Tab wildcard_regex_converter.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	b54e32f0ca	Space/Tab webpage.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	328e7738d5	Space/Tab version.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	aca359c2e2	Space/Tab updatecheck.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	1cd40dc9e5	Space/Tab update.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	dc9407281f	Space/Tab setupLCD.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	8f727c1f35	Space/Tab query.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	a08ea28feb	Space/Tab piholeLogFlush.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	c5535dd9a0	Space/Tab piholeCheckout.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	3519cc5e44	Space/Tab list.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	d251bbbb05	Space/Tab chronometer.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	76c5b4a06b	Merge pull request #2118 from pi-hole/fix/debug-shellcheck ... fix some shellcheck/stickler compaints in debug script	6 years ago
RamSet	56b04017e7	Port 53 check updated with 4 spaces. ... Signed-off-by: RamSet <RamSet@gmail.com>	6 years ago
Dan Schaper	f42a57088f	Merge pull request #2280 from rrobgill/development ... Add regex option to autocomplete	6 years ago
Rob Gill	c5b9d99b48	Add regex option to autocomplete ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Mcat12	f8d4c36f6d	Add back --wild list.sh help and use -- for long params like --regex ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Dan Schaper	dbc82cfb6a	Merge pull request #2236 from pi-hole/new/regex-lists ... Use regex lists instead of wildcards for blocking	6 years ago
Mcat12	941a766aa3	Replace -wild and -regex with --wild and --regex ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	1b276a74fe	Display all lines of a list, even if there is no newline at the end ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	8084c4b2a3	Fix regex period substitution due to switching to bashism ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	1ca852191f	Fix stickler complaints ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	af5fc6547a	Fix echoing wrong domain when converting wildcard ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	70f2b26c86	Escape periods in wildcard converted regex filters. ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	cfd95dbe87	Fix incorrect variable usage ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	c5bb404d6a	Emulate wildcard blacklisting via -wild and move regex to -regex ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	d21298c156	Add back conditional forwarding to webpage.sh ... This was accidentally removed in a previous PR. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	4763969c8f	Move processWildcards to query.sh ... Closes #2255 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	f868052062	Fix incorrect variable string substitution ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	0f4968d75c	Merge remote-tracking branch 'origin/development' into new/regex-lists	6 years ago
Mcat12	3077c22e4f	Change help strings from wildcard to regex blacklist ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	0decc37b5a	Appease stickler ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	4a953b66e0	Make removing regex domains work correctly ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	8435eeed4d	Don't validate regex domains ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	cffb4de83b	Use strict grep instead of regex for duplicates ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	868948509a	Split declaration and assignment of random_url ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mark Drobnak	e71492a2b3	Update debug script for simple list format ... Gravity is now just a list of domains, not IP addresses and domains separated by a space. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
DL6ER	2809579dd7	Refine regex filter generation ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	c7afe3e9a4	Please stickler by making clear that the variable regexFile is declared outside of this routine ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	cd026cd865	Add comment where regexList is defined ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	bc705aac03	Add automated wildcard list -> regex filter conversion ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Rob Gill	23adbf9540	remove quotes ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	a7347238e6	$adListsList replace filename in text ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	bf55666492	Appease stickler. ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	8ab0b0e460	colfile ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	b8e1849cec	wildcardlist ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	45a8eda49b	Stop grep leak in query ... Fix grep error leak from #1805 Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	d61fd01d61	Split queryFunc() into query.sh ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Alex Villarreal	e422f4154f	Clean error message on successful response ... Signed-off-by: Alejandro Villarreal <alex@alexvy86.com>	6 years ago
Rob Gill	cabb06230c	--json not --jason ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
DL6ER	d254d6075a	First step from wildcards to regex lists for blocking ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Rob Gill	8004080643	Additional command-line completion ... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Mark Drobnak	d232f08933	Merge pull request #2208 from pi-hole/tweak/checkout ... Don't run the installer when doing ftl checkout, instead just run the…	6 years ago
Adam Warner	f5541860bc	Don't run the installer when doing ftl checkout, instead just run the ftl install functions ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Rob Gill	83ff0055b6	Test and indicate status ... This added function tests if pihole-FTL is running when the sysV. Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Mark Drobnak	ab45360808	Merge pull request #1954 from ryanknapper/adlist.lists ... Prevent redundant entries from being added to Adlists.list	6 years ago
Mark Drobnak	9fd70cbdf9	Merge pull request #2057 from pi-hole/fix/debug-empty-ports ... debug script: fix empty ports on some systems	6 years ago
Mark Drobnak	3f3254a4df	Merge pull request #2176 from rrobgill/php5fix ... Fix block page crash on PHP 5.4	6 years ago
Mark Drobnak	f568012b9d	Merge pull request #2070 from pi-hole/new/debug-locale ... Get user locale when debugging	6 years ago
Rob Gill	382c19024f	oh stickler bot... ... accidentally a space Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	9379487942	changes as requested ... changes as requested Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	5e99baf7b9	Update index.php ... thanks stickler-ci ....... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	31951dae4c	Update index.php ... Avoiding calling empty() on a function allows this to work under PHP5. Making the check for blocklist generation in this way instead is compatible with both PHP5 and PHP7. Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
DL6ER	2ef76d5e31	Remove LOCAL_DNS_PORT support ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Adam Warner	a6e4b0fea5	- Test for existence of remote non-master branch of FTL before attemtping to check for update ... - Move some functions from checkout to basic-install - provide helpful error message on downlaod not existing Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
MichaIng	43f19034b9	"INSTALL_WEB" renamed to "INSTALL_WEB_INTERFACE" #2115 ... + Small fix, as due to PR https://github.com/pi-hole/pi-hole/pull/2115 variable "INSTALL_WEB" was renamed into "INSTALL_WEB_INTERFACE".	6 years ago
Adam Warner	ceaf4bc6bc	Some extra code made it's way into the dev branch. Not entirely sure how that happened... related to #2115 ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Dan	acfc49fd41	Merge branch 'development' into Install-Web-Server	6 years ago
DL6ER	ce35509a40	Change command to "pihole -a localdnsport X" ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	24b8b4e904	Add backend changes for supporting a local recursive DNS server ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Adam Warner	6977f655e3	fix a typo ... comment out some unused variables, but not deleting them in case there is a plan for them in future... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	e6fc9dc75d	disable 2016 in two places and declare local variables ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	b57b3f4588	Disable SC2001 for generation of `the_os` ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	776ae92416	fix some shellcheck/stickler compaints in debug script ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	6ba53c1ac0	Merge branch 'development' into FTLDNS	6 years ago
Mark Drobnak	d4870b3854	Merge pull request #2053 from pi-hole/tweak/debug-logs ... Get head and tail of pihole-FTL.log during debug process	6 years ago
Adam Warner	bca23dd896	Allow passing of --check-only to update script. ... Don't run installer for updating web files, it's handled by getGitFiles. I think this works... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Daniel (Fourdee)	3a483a1b20	install_web_server ... + Splits web interface and server into two variables. + Option to disable forced install of Lighttpd.	6 years ago
Adam Warner	310d33b8ee	Merge dev > FTLDNS fix merge conflicts ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	8b5dcc3872	Match change made by 7edab27 to prevent merge conflict ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Ludovic Rousseau	7edab27e53	Stylistic change to use an explicit if/then/fi ... Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	6 years ago
Ludovic Rousseau	9b3531f634	Fix stylistic issue ... Expand variable using ${FTLconf} Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	6 years ago
Ludovic Rousseau	d8f85a8981	Avoid a "No such file or directory" error ... Check the file /etc/pihole/pihole-FTL.conf exists before trying to use it. without the patch I get, each day, in my logs: sed: can't read /etc/pihole/pihole-FTL.conf: No such file or directory I use a variable FTLconf to not repeat the file name twice. Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	6 years ago
Ludovic Rousseau	3b229489c2	Fix regex to find DBFILE= from configuration file ... The regex ^\s^.DBFILE\s*=\s* does not work to match "DBFILE=" I don't know what the second '^' is used for. With the change I now have the results: DBFILE=/foo/bar -> /foo/bar DBFILE=/foo/bar -> /foo/bar # DBFILE=/foo/bar -> /etc/pihole/pihole-FTL.db xDBFILE=/foo/bar -> /etc/pihole/pihole-FTL.db Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	6 years ago
Jacob Salmela	5ffc3561ed	implement dschapers suggestions--better command, less subshells, and finer formatting ... Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	6 years ago
Dan Schaper	250b445eee	Split declaration and population for stickler. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
DL6ER	82d5afe996	Silence error in log flush subroutine when no pihole-FTL.conf can be found ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	6086614274	Add "-l, privacylevel" description to "pihole -a" ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Adam Warner	6bb4780d32	Merge pull request #2077 from pi-hole/tweak/FTLDNSExperiments ... FTLDNS tweaks	6 years ago
Adam Warner	631f5b4848	Change order of updatable components to match the end output ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
DL6ER	4941e0f8ad	Backend changes needed to be able to set the privacy level ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Adam Warner	f37b2bc7c1	move call to `get_binary_name` into `FTLcheckUpdate()` to avoid having to run that first ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	56278c6394	Fix shellcheck complaints ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	b1d6c03190	Break out binary name funtion to it's own function ... Remove duplicate code. get_binary_name is now in the install script Add some "version" checking to ftl download when using an alt branch, uses checksum Greatly simplify update process. Source pihole-FTL version checker from basic-install.sh Always run install script to finalise changes. Install script now outputs versions after an update (This is a Squash of previous work into one commit) Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Mark Drobnak	bb9a18ef08	Merge pull request #1987 from ryanknapper/patch-1 ... Proper output for debug CPU detection	6 years ago
Jacob Salmela	1a275ba184	debug user locale; improve function to parse variables and files ... Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	6 years ago
Mark Drobnak	971e6f2664	Merge pull request #2064 from Perflyst/chronometer-1 ... Add RaspberryPi 3B+ to Chronometer	6 years ago
Dan Schaper	34d84522dd	Merge pull request #2054 from theLMGN/patch-1 ... Link to the admin panel on the splash page.	6 years ago
Perflyst	3390fbf238	Add RaspberryPi 3B+ ... Signed-off-by: Perflyst <mail@perflyst.de>	6 years ago
Jacob Salmela	68c27eb2a1	add label to x-header so you know which one is being evaluated ... Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	6 years ago
Jacob Salmela	143e75d213	fix empty ports on some systems ... Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	6 years ago
DL6ER	295ac49f83	Add capability CAP_NET_RAW to allow pihole-FTL to use RAW sockets for being able to create an ICMPv6 socket for IPv6 handling in the DHCP service ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Adam Warner	fbab930cb1	Allow install script to install FTL instead of the checkout script. Utilises the /etc/pihole/ftlbranch file. ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Leo MG Nesfield (LMGN)	bfcbd72e4b	Link to the admin panel on the splash page.	6 years ago
Jacob Salmela	d9d3caec22	new head tail function and get head tail of pihole-FTL.log instead of just head ... Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	6 years ago
Jacob Salmela	7159ecb632	reduce ping times for faster script completion ... Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	6 years ago
Adam Warner	5584a9ce5d	Merge branch 'development' into FTLDNS	6 years ago
Adam Warner	76cb129d3c	don't forget `master` and `development` branches! ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	246d5cd587	store checked out FTL branch in /etc/pihole/ftlbranch ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Ryan Knapper	5ecfc58e5f	Require exact match ... Updated to require an exact match to reduce false-positives, as suggested by DL6ER. Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>	6 years ago
DL6ER	56a2924a33	Unprivileged processes are subject to full permission checking based on the process's credentials, we have to explicitly allow pihole-FTL to bind to ports < 1024 (port 53 for DNS) and for various advanced network-related operations (to allow for handling DHCP requests) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	09886a3f11	Add resolveconf config to pihole-FTL.service ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	b87bcc8f5f	Modifications in pihole-FTL.service for FTLDNS ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Ryan Knapper	c17d95bfed	Proper output for debug CPU detection ... Inserted "log_write" to properly output CPU detection lines. Signed-off-by: Ryan Knapper (ryanknapper@gmail.com>	6 years ago
Mark Drobnak	f14184df30	Merge pull request #1982 from LudovicRousseau/master ... Create blacklist.txt if not existant	6 years ago
Ludovic Rousseau	47bbea9ba7	Use " " to protect parameter substitution ... Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	6 years ago
Mark Drobnak	7265935cd4	Merge pull request #1915 from ryanknapper/development ... Add conditional forwarding options to webpage.sh	6 years ago
Ludovic Rousseau	b7891f92a5	Create blacklist.txt if not existant ... Closes: https://github.com/pi-hole/pi-hole/issues/1888 Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	6 years ago
DL6ER	5465ac9ba0	Merge pull request #1929 from pi-hole/fix/flushDB ... pihole -f: Flush database	6 years ago
DL6ER	b8eaa9a527	Use double quotes to precent globbing and word splitting ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	5d274008db	Use possibly user-defined database location when flushing ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Mcat12	8a42ef431b	Fix Javascript warning when no password is set ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	2cf1f0e8fc	Hide the password input when there is no password ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Ryan Knapper	f2b3752f3d	lan to local ... Reduced differences. Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>	6 years ago
Ryan Knapper	36945a67d0	Prevent redundant entries in to adlists.list ... Grep ${args[3]} and only add if grep -c -eq 0 Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>	6 years ago
Mcat12	1a5c86d32e	Revert "Hide password textbox if there is no password" ... This reverts commit 009fa2f1b7.	7 years ago
Mcat12	c7219fbdff	Merge remote-tracking branch 'origin/development' into tweak/block-page-no-password	7 years ago
DL6ER	4c249a1186	Flush most recent 24 hours from FTL's database ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	158ea1d43b	Add sqlite3 dependency ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	52cc8e2fcf	Use "lan" as fallback TLD for DHCP generated domains ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
ryanknapper	607664c860	Update webpage.sh ... Updated webpage.sh to include conditional forwarding options.	7 years ago
Adam Warner	80307a3bcd	Remove update line from cron ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Vasilis Gerakaris	939806f021	piholeDebug.sh: Correct typo mistake ... Signed-off-by: Vasilis Gerakaris <vgerak@gmail.com> **By submitting this pull request, I confirm the following:** `{please fill any appropriate checkboxes, e.g: [X]}` - [x] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md), as well as this entire template. - [x] I have made only one major change in my proposed changes. - [] I have commented my proposed changes within the code. - [] I have tested my proposed changes, and have included unit tests where possible. - [] I am willing to help maintain this change if there are issues with it later. - [x] I give this submission freely and claim no ownership. - [x] It is compatible with the [EUPL 1.2 license](https://opensource.org/licenses/EUPL-1.1) - [x] I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html))	7 years ago
DL6ER	793bdd9743	No need for cat | sed here as we source setupVars.conf, so we can use interface="${PIHOLE_INTERFACE}" ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	9d50f52bb2	Add fallback interface for DNS listening behavior in case PIHOLE_INTERFACE is not set in setupVars.conf ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	4efb533d2e	Create directories /etc/{var,log}/pihole on startup of pihole-FTL and set proper ownership ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	afa2e9c2f7	Exchange hard-coded domain "localhost" by hard-coded address "127.0.0.1" ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	a4c8f1a0a4	Merge pull request #1859 from pi-hole/new/extra-logging ... Enable dnsmasq's extra logging feature	7 years ago
Adam Warner	8e0d76b63b	initiated -> initialized ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
DL6ER	cca8412921	Use "echo -n" to avoid haveing newlines in the files ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	d15a5ad5c1	Add required documentation in the source code ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	8ed75dd176	Add extra entry to the end of the saved branches and versions such that PHP's explode() subroutine can correctly disentangle the first three entries and does not get confused by the newline character at the end of the FTL version/branch... ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
Dan Schaper	8ca0582afc	Merge branch 'release/v3.2.1' into fix/DNSSEC_trustanchor	7 years ago
DL6ER	5c2dcb5e74	Enable dnsmasq's extra logging feature ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	be0c457445	Sleep 30 seconds after reboot to be sure that the system is ready ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	3c04dbb4ed	Update remote version at 17:59 as well as on reboot ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	cfca367eef	Quickly verified in dnsmasq's source code: It has to be "trust-anchor" (with "-") ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	8a243c5872	Insert also old trust anchor ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	b30b3f3aeb	Update DNSSEC trust anchor ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
Mark Drobnak	e3fa06d7ff	Merge pull request #1829 from keithbentrup/development ... Must send HTTP headers before html	7 years ago
Dan Schaper	423280cee1	Merge pull request #1817 from jjssoftware/development ... pihole.log permissions	7 years ago
Keith Bentrup	45ab2a3d7a	send HTTP headers before HTML ... Signed-off-by: Keith Bentrup <keith@keithbentrup.com>	7 years ago
DL6ER	05d015169c	Check for local version and branches every 10 minutes, check for remote versions only once a day ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
Jacob Salmela	28bed0041e	remove comment ... Signed-off-by: Jacob Salmela <github@decoy.email>	7 years ago
Jacob Salmela	6f03e30151	fixes #1537 by checking if systemctl is found ... Signed-off-by: Jacob Salmela <github@decoy.email>	7 years ago
Joe	6ecd93d0c9	pihole.log permissions ... This change makes pihole more friendly to the non-existence of the pihole.log file. This can help with systems that are configured to mount /var/log as a tmpfs volume. It may also help with systems where the pihole.log file is accidentally/unintentionally removed. Further discussion around the details of this change are in https://github.com/pi-hole/pi-hole/issues/1798	7 years ago
Adam Warner	a9a40ca46c	Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead. ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	162a7b56fe	force mode is no longer referenced. Regression. Same with `domToRemoveList` ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
WaLLy3K	2dc1851892	Allow passwords with spaces ... e.g: `pihole -a -p "foo bar"` Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
Jacob Salmela	9631519eb1	Merge pull request #1752 from pi-hole/new/bashupdatechecker ... Add bash / cron based update checker for Pi-hole	7 years ago
DL6ER	90efa3b610	Simplify git subroutines ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
Mcat12	009fa2f1b7	Hide password textbox if there is no password	7 years ago
Adam Warner	5221767a70	Merge pull request #1735 from bcambl/debug_selinux ... add SELinux checks to debug script	7 years ago
DL6ER	9492ff26c6	Merge pull request #1747 from pi-hole/tweak/gravity_update_time ... Randomize gravity update time	7 years ago
DL6ER	0db76aada0	Silence errors when directory to be checked does not exist (system may have been installed without a web interface!) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	9be854031f	Don't store FTL branch until the next release of FTL which supports returning the branch in an easy way ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	709851503f	Use "pihole-FTL branch" to get FTL's branch ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	6ca47dc3b3	Add bash / cron based update checker for Pi-hole	7 years ago
WaLLy3K	2390b80359	Silence non-numeric domains_being_blocked output ... * Round $cpu_mhz to 1 decimal place * Remove ".0" from $cpu_freq * Silence non-numeric domains_being_blocked output * Use "Core" and "Web" as appropriate Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
DL6ER	85d159bdd1	Randomize gravity update time ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
bcambl	0f868f7649	remove un-used DONE variable ... (still available via sourced COL_TABLE on line 29)	7 years ago
bcambl	31730e7197	add missing colors to COL_TABLE fallback	7 years ago
bcambl	7d76db00ac	update 'SELinux not detected' message	7 years ago
bcambl	8aceb8bf53	replace deprecated colors in debug script ... - COL_LIGHT_GREEN -> COL_GREEN - COL_LIGHT_RED -> COL_RED - COL_LIGHT_PURPLE -> COL_PURPLE	7 years ago
bcambl	a17d1be7a4	simplify selinux debug variables	7 years ago
bcambl	1e6cc63abe	add SELinux checking to debug script	7 years ago
WaLLy3K	3e727c5e5d	Merge pull request #1721 from pi-hole/fix/lightyconf ... Add comment for include_shell feature	7 years ago
DL6ER	e0edac32c7	Merge pull request #1728 from pi-hole/new/nuke_lists ... Add nuclear option to list.sh	7 years ago
WaLLy3K	e4b3bc4209	Minor spacing corrections ... Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	51b09efceb	Fix minor typo ... Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	2dabacd024	Fix minor typo ... Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	0613dcc87b	Merge pull request #1692 from andofrjando/cors_mixed_content_fix ... Fix for bug on block page (#1416) caused by CORS mixed content when behind reverse proxy using SSL	7 years ago
WaLLy3K	d59a2a4cfc	Merge pull request #1729 from pi-hole/fix/email-help-argument ... Allow emails which include `-h` in them (Fix for #1691)	7 years ago
WaLLy3K	2c091f3a3c	Merge branch 'development' into cors_mixed_content_fix	7 years ago
WaLLy3K	cfcdc53185	Merge pull request #1722 from pi-hole/fix/bpfqdn ... Improve FQDN Authorized Hosts functionality (Fix for #1416)	7 years ago
WaLLy3K	bd33018660	Shellcheck OR validation ... Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
Mcat12	e7589945a2	Disable password field if no password is set ... For someone to actually whitelist a domain without a password, more changes will be needed on the PHP side.	7 years ago
Mcat12	67a5594909	Allow emails which include `-h` in them ... For example, mcat12@pi-hole.net would previously spit out the help message	7 years ago
DL6ER	70ad656af0	Save backup as ".bck~" to prevent reading of the file by dnsmasq ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	f22b83d379	Create a backup before emptying the list ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	114f84c948	Add --nuke option to list.sh that can be used e.g. by Teleporter to empty out lists before importing new content ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
WaLLy3K	43e1121618	Match current style of Web Interface ... * Remove border from about menu Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	97dd1b4cf3	Improve FQDN Authorized Hosts functionality ... * Use inverse if statement, instead of IF/ELSE when checking setupVars.conf * Remove $svFQDN * Add or elaborate on more comments * Add $serverName to $authorizedHosts if admin has specified `setenv.add-environment = ("fqdn" => "true")` within lighttpd's external.conf * e.g: `$HTTP["host"] == "pihole.domain.com" { setenv.add-environment = ("fqdn" => "true") }` * Move "No exact results" check to top of exception handling * Remove unnecessary IF/ELSE when handling $queryAds error Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	288635abc9	Add comment for include_shell feature ... * Capitalise first letter for Lighttpd * Fix spacing * Add comment for include_shell feature	7 years ago
Celly	3f20981aab	Update access rules to block all root '.' files	7 years ago
Celly	f54a812ad5	Update access rules to block all root '.' files	7 years ago
andofrjando	6323d5afed	Use PHP short echo tag to avoid Codacy expecting an escaping function	7 years ago
Celly	e3e3b4da58	Add in some exclusions form some leaky files in the admin	7 years ago
Adam Warner	ef1ce7d4d6	Merge pull request #1631 from pi-hole/tweak/gravity ... Clean up and optimise Gravity	7 years ago
DL6ER	ee2169dd13	Merge branch 'development' into tweak/gravity	7 years ago
WaLLy3K	11282aaca3	Decrease `local-ttl` to 2 ... * Decreasing value should benefit clients when whitelisting blocked sites, [as per this discussion](https://github.com/pi-hole/pi-hole/pull/1698#issuecomment-331134576).	7 years ago
WaLLy3K	f3cc8c71c4	Merge pull request #1691 from pi-hole/new/adminemail ... Add `pihole -a email` functionality for Block Page contact email	7 years ago
WaLLy3K	500a755250	Delete superseded file ... * Functionality is reproduced from within the Block Page	7 years ago
andofrjando	5e48b3f7f7	Fix one mistake where `$proto` would not be created if `$_SERVER['HTTPS']` exists but is not set to `on`	7 years ago
andofrjando	00d62b3423	This fixes the following bug: ... If Pi-Hole is behind a reverse proxy that uses SSL, then the block page will not load resources such as `blockingpage.css` and `jquery.min.js` as the insecure `http://` is hard coded. Browsers will block attempts to load insecure resources if the page is loaded of SSL. The fix is acheived by checking `$_SERVER['HTTPS']` and setting the variable `$proto` to either `http` or `https`. The harcoded `http` is replaced by the contents of this variable.	7 years ago
WaLLy3K	28063aa7f7	Add administrative contact address functionality ... * Disable shellcheck for SC1090	7 years ago
WaLLy3K	c458e4a93b	Merge pull request #1420 from WaLLy3K/new/https ... Disable Let's Encrypt HTTPS & shift functions to block page	7 years ago
WaLLy3K	e7ae62ba76	Merge pull request #1416 from WaLLy3K/blockpage2 ... Block Page 2.0	7 years ago
WaLLy3K	34ae4844fa	Merge branch 'development' into tweak/gravity	7 years ago
DL6ER	b8fedf76cd	Merge pull request #1572 from pi-hole/gedetil-development ... Add web frontend shutdown command	7 years ago