Make webpage.sh fully library style

advanced/Scripts/webpage.sh

@@ -9,8 +9,6 @@
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 
-args=("$@")
-
 readonly setupVars="/etc/pihole/setupVars.conf"
 readonly dnsmasqconfig="/etc/dnsmasq.d/01-pihole.conf"
 readonly dhcpconfig="/etc/dnsmasq.d/02-pihole-dhcp.conf"
@@ -275,7 +273,11 @@ ResolutionSettings() {
 	fi
 }
 
-case "${args[1]}" in
+main() {
+
+	args=("$@")
+
+	case "${args[1]}" in
 		"-p" | "password"   ) SetWebPassword;;
 		"-c" | "celsius"    ) unit="C"; SetTemperatureUnit;;
 		"-f" | "fahrenheit" ) unit="F"; SetTemperatureUnit;;
@@ -294,11 +296,12 @@ case "${args[1]}" in
 		"privacymode"       ) SetPrivacyMode;;
 		"resolve"           ) ResolutionSettings;;
 		*                   ) helpFunc;;
-esac
+	esac
 
-shift
+	shift
 
-if [[ $# = 0 ]]; then
+	if [[ $# = 0 ]]; then
 		helpFunc
-fi
+	fi
 
+}

pihole

@@ -23,7 +23,8 @@ if [[ ! $EUID -eq 0 ]];then
 fi
 
 webpageFunc() {
-  /opt/pihole/webpage.sh "$@"
+  source /opt/pihole/webpage.sh
+  main "$@"
   exit 0
 }