From 67a559490987ed700418693997697f2e8212a667 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Sat, 7 Oct 2017 16:06:16 -0400
Subject: [PATCH 1/2] Allow emails which include `-h` in them

For example, mcat12@pi-hole.net would previously spit out the help message
---
 advanced/Scripts/webpage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh
index b0957ab4..c352f236 100755
--- a/advanced/Scripts/webpage.sh
+++ b/advanced/Scripts/webpage.sh
@@ -418,7 +418,7 @@ Options:
 }
 
 SetAdminEmail() {
-  if [[ "${1}" == *"-h"* ]]; then
+  if [[ "${1}" == "-h" || "${1}" == "--help" ]]; then
     echo "Usage: pihole -a email <address>
 Example: 'pihole -a email admin@address.com'
 Set an administrative contact address for the Block Page

From bd330186604ce6053aca8da2a2d8647df057c211 Mon Sep 17 00:00:00 2001
From: WaLLy3K <WaLLy3K@users.noreply.github.com>
Date: Sun, 8 Oct 2017 12:16:05 +1100
Subject: [PATCH 2/2] Shellcheck OR validation

Signed off by WaLLy3K <wally3k@pi-hole.net>
---
 advanced/Scripts/webpage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh
index c352f236..d5c4d45e 100755
--- a/advanced/Scripts/webpage.sh
+++ b/advanced/Scripts/webpage.sh
@@ -418,7 +418,7 @@ Options:
 }
 
 SetAdminEmail() {
-  if [[ "${1}" == "-h" || "${1}" == "--help" ]]; then
+  if [[ "${1}" == "-h" ]] || [[ "${1}" == "--help" ]]; then
     echo "Usage: pihole -a email <address>
 Example: 'pihole -a email admin@address.com'
 Set an administrative contact address for the Block Page