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,30 +273,35 @@ ResolutionSettings() {
 	fi
 }
 
-case "${args[1]}" in
+main() {
-	"-p" | "password"   ) SetWebPassword;;
+
-	"-c" | "celsius"    ) unit="C"; SetTemperatureUnit;;
+	args=("$@")
-	"-f" | "fahrenheit" ) unit="F"; SetTemperatureUnit;;
+
-	"-k" | "kelvin"     ) unit="K"; SetTemperatureUnit;;
+	case "${args[1]}" in
-	"setdns"            ) SetDNSServers;;
+		"-p" | "password"   ) SetWebPassword;;
-	"setexcludedomains" ) SetExcludeDomains;;
+		"-c" | "celsius"    ) unit="C"; SetTemperatureUnit;;
-	"setexcludeclients" ) SetExcludeClients;;
+		"-f" | "fahrenheit" ) unit="F"; SetTemperatureUnit;;
-	"reboot"            ) Reboot;;
+		"-k" | "kelvin"     ) unit="K"; SetTemperatureUnit;;
-	"restartdns"        ) RestartDNS;;
+		"setdns"            ) SetDNSServers;;
-	"setquerylog"       ) SetQueryLogOptions;;
+		"setexcludedomains" ) SetExcludeDomains;;
-	"enabledhcp"        ) EnableDHCP;;
+		"setexcludeclients" ) SetExcludeClients;;
-	"disabledhcp"       ) DisableDHCP;;
+		"reboot"            ) Reboot;;
-	"layout"            ) SetWebUILayout;;
+		"restartdns"        ) RestartDNS;;
-	"-h" | "--help"     ) helpFunc;;
+		"setquerylog"       ) SetQueryLogOptions;;
-	"domainname"        ) SetDHCPDomainName;;
+		"enabledhcp"        ) EnableDHCP;;
-	"privacymode"       ) SetPrivacyMode;;
+		"disabledhcp"       ) DisableDHCP;;
-	"resolve"           ) ResolutionSettings;;
+		"layout"            ) SetWebUILayout;;
-	*                   ) helpFunc;;
+		"-h" | "--help"     ) helpFunc;;
-esac
+		"domainname"        ) SetDHCPDomainName;;
-
+		"privacymode"       ) SetPrivacyMode;;
-shift
+		"resolve"           ) ResolutionSettings;;
-
+		*                   ) helpFunc;;
-if [[ $# = 0 ]]; then
+	esac
-	helpFunc
+
-fi
+	shift
+
+	if [[ $# = 0 ]]; then
+		helpFunc
+	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
 }