389 Commits

Author	SHA1	Message	Date
DL6ER	480211033d	Detect if blocking page is loaded within frame or iframe. If so, hide everything	2016-12-06 14:05:02 +01:00
DL6ER	ca9321624c	Added padding for ad list results	2016-12-05 14:40:48 +01:00
DL6ER	40f18df90f	Simplified CSS, removed external contents	2016-12-05 14:39:07 +01:00
DL6ER	0d63cfd6c3	Add 1x1 pixel GIF image. Can apparently be used to trick some of the please-don't-use-adblocker pages as many of them contain code like if ($('Ad').height() == 0) { prevent access to this page; }	2016-12-05 12:34:30 +01:00
DL6ER	3d6b22de6c	Update index.php to include more detailed output	2016-12-05 12:12:01 +01:00
DL6ER	fc233fcdd3	Fixed typo	2016-12-05 12:10:05 +01:00
DL6ER	20370d4348	Update CSS file	2016-12-05 11:26:21 +01:00
DL6ER	0f90671241	Updated index.php to use CSS file unter admin/	2016-12-05 10:51:41 +01:00
DL6ER	a866c4e388	Place blockingpage.css (former index.css) unter admin/ so we can load it also from some blocked sub-directories	2016-12-05 10:50:19 +01:00
DL6ER	e7241a989c	Include CSS file	2016-12-04 22:20:51 +01:00
DL6ER	6e788668f9	Updated index.php	2016-12-04 22:17:33 +01:00
DL6ER	b246dba7e7	Rename index.html to index.php	2016-12-04 21:41:26 +01:00
Mcat12	f98de3d5db	Merge pull request #941 from DL6ER/caseinsensitive ... Improvements for black-/whitelist scripts	2016-12-04 14:33:10 -05:00
DL6ER	78cb43d0dc	Revert "Simplified EscapeRegexp()" ... This reverts commit 509cfd15f2.	2016-12-03 00:32:37 +01:00
DL6ER	509cfd15f2	Simplified EscapeRegexp()	2016-12-02 14:17:34 +01:00
DL6ER	2061daa902	Don't forget to escape also the slash "/"	2016-12-02 14:11:17 +01:00
DL6ER	629ca970a1	Changed from single quoted filter expression to double quotes as reqeusted by codacy	2016-12-02 14:08:54 +01:00
DL6ER	c8ad6f23a8	Properly escape any special characters before using them in regexp manner	2016-12-02 12:57:04 +01:00
Dan Schaper	925c80edd4	Catch more 1's ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2016-12-01 15:10:06 -08:00
Dan Schaper	2ec4acfe52	Begin fixing exit values. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2016-12-01 12:21:08 -08:00
DL6ER	7b26b308ad	No need for echo and pipe here!	2016-11-21 15:50:05 +01:00
DL6ER	4c10634d85	Convert domain names to lower case before checking validity of the domain	2016-11-21 15:49:11 +01:00
Adam Warner	de4401823e	Merge pull request #924 from DL6ER/webpage.sh ... Add webpage.sh	2016-11-20 21:43:44 +00:00
DL6ER	f50cbe74cb	Changed -web (webpage) to -a (admin)	2016-11-20 15:15:27 +01:00
DL6ER	33b6fe72da	Extended help text	2016-11-19 21:57:42 +01:00
DL6ER	733919be4a	Implement possibility to remove password using "pihole -web -p"	2016-11-19 21:50:15 +01:00
Dan Schaper	68cb0782c0	Add countdown timer	2016-11-18 13:27:06 -08:00
Dan Schaper	0f4c8d4923	Set default timeout to 60 seconds	2016-11-17 11:00:11 -08:00
Dan Schaper	6d2c5b2312	Add debug timeoute	2016-11-17 10:58:58 -08:00
Dan Schaper	a95ce11ca6	Add debug timeoute	2016-11-17 10:39:51 -08:00
DL6ER	88c161769d	Capitalized variable names.	2016-11-16 22:33:28 +01:00
DL6ER	01bf1ae92d	Compute double hashes to avoid rainbow table vulnerability	2016-11-16 22:13:47 +01:00
DL6ER	9193c71cff	Minor change	2016-11-16 21:36:19 +01:00
DL6ER	db278d81e4	Added webpage.sh	2016-11-16 21:34:43 +01:00
Adam Warner	b191cd73a7	Update piholeDebug.sh ... wording	2016-11-15 13:28:18 +00:00
Jacob Salmela	ca56ca5bd8	promo-tweak ... Better logic introduced by @PromoFaux	2016-11-06 11:16:48 -06:00
Jacob Salmela	a0f0dff88e	replace hardcoded interface with var ... setupVars.conf is already sourced, so we just need to replace the hardcoded value with the variable name.	2016-11-06 08:18:57 -06:00
Dan Schaper	8c08e9e473	Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count ... Bugfix/chronometer domain count	2016-11-03 13:55:29 -07:00
Adam Warner	4300759287	Fix logic. If both v6 and v4 divide by two, else dont.	2016-11-03 08:01:25 +00:00
Promofaux	d7d6d6f991	Update to use new Var name	2016-11-02 21:46:30 +00:00
Promofaux	2f976504e8	switch out -eq for ==	2016-11-02 20:06:21 +00:00
Dan Schaper	4b7b859db9	Gotta catch 'em all...'	2016-11-02 12:29:55 -07:00
Dan Schaper	f7d0de53bb	Compare string to string.	2016-11-02 12:11:34 -07:00
Dan Schaper	603ec997ba	Remove testing block.	2016-11-02 12:09:33 -07:00
Dan Schaper	f7266ef4c8	Version remote check returns -1 on failure to detect curl silent failing. Update detects loss of contact to GitHub or fallthrough condition and reports to user.	2016-11-02 12:07:59 -07:00
Dan Schaper	3d43e1568c	Use explicit calls for function to self-document	2016-11-02 11:39:22 -07:00
Dan Schaper	c1a3f003e8	Rename the only utilty function left that didn't say repo	2016-11-02 11:18:13 -07:00
Dan Schaper	3f61aea7fc	Utility functions fully quiet now. Calling functions have the echos.	2016-11-02 11:09:53 -07:00
Dan Schaper	bd68db51e0	ShellCheck split local declaration and assignment.	2016-11-02 11:01:50 -07:00
Dan Schaper	b8a5ed710e	Take echos out of utility functions and move up a level.	2016-11-02 10:51:09 -07:00