update

2025-01-09 06:07:44 +08:00 · 2021-04-07 11:15:32 +00:00 · 2021-04-07 11:15:32 +00:00 · 358064ad83
commit 358064ad83
parent 2dbae734dc
126 changed files with 25 additions and 4411 deletions
--- a/immpackages/admin/bpytop/Makefile
+++ b/immpackages/admin/bpytop/Makefile
@ -12,14 +12,14 @@ PKG_VERSION:=1.0.63
 PKG_RELEASE:=$(AUTORELEASE)

 PYPI_NAME:=bpytop
-PKG_HASH:=21d4c87ceae7c9152e8c8094f50843c6174e47a94649dcbecda63c4190168762
+PKG_HASH:=skip

 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE

-include ../../lang/python/pypi.mk
+include $(TOPDIR)/feeds/packages/lang/python/pypi.mk
 include $(INCLUDE_DIR)/package.mk
-include ../../lang/python/python3-package.mk
+include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk

 define Package/bpytop
  SECTION:=admin
--- a/immpackages/utils/cpulimit/Makefile
+++ b/immpackages/utils/cpulimit/Makefile
--- a/immpackages/utils/cpulimit/src/Makefile
+++ b/immpackages/utils/cpulimit/src/Makefile
--- a/immpackages/utils/cpulimit/src/cpulimit.c
+++ b/immpackages/utils/cpulimit/src/cpulimit.c
--- a/immpackages/utils/cpulimit/src/list.c
+++ b/immpackages/utils/cpulimit/src/list.c
--- a/immpackages/utils/cpulimit/src/list.h
+++ b/immpackages/utils/cpulimit/src/list.h
--- a/immpackages/utils/cpulimit/src/memrchr.c
+++ b/immpackages/utils/cpulimit/src/memrchr.c
--- a/immpackages/utils/cpulimit/src/process_group.c
+++ b/immpackages/utils/cpulimit/src/process_group.c
--- a/immpackages/utils/cpulimit/src/process_group.h
+++ b/immpackages/utils/cpulimit/src/process_group.h
--- a/immpackages/utils/cpulimit/src/process_iterator.c
+++ b/immpackages/utils/cpulimit/src/process_iterator.c
--- a/immpackages/utils/cpulimit/src/process_iterator.h
+++ b/immpackages/utils/cpulimit/src/process_iterator.h
--- a/immpackages/utils/cpulimit/src/process_iterator_apple.c
+++ b/immpackages/utils/cpulimit/src/process_iterator_apple.c
--- a/immpackages/utils/cpulimit/src/process_iterator_freebsd.c
+++ b/immpackages/utils/cpulimit/src/process_iterator_freebsd.c
--- a/immpackages/utils/cpulimit/src/process_iterator_linux.c
+++ b/immpackages/utils/cpulimit/src/process_iterator_linux.c
--- a/immpackages/utils/cpulimit/src/process_iterator_solaris.c
+++ b/immpackages/utils/cpulimit/src/process_iterator_solaris.c
--- a/immpackages/utils/filebrowser/Makefile
+++ b/immpackages/utils/filebrowser/Makefile
@ -34,7 +34,7 @@ GO_PKG_LDFLAGS_X:= \
 	$(GO_PKG)/v2/version.Version=$(PKG_VERSION)

 include $(INCLUDE_DIR)/package.mk
-include ../../lang/golang/golang-package.mk
+include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk

 define Package/filebrowser
  SECTION:=utils
--- a/immpackages/utils/filebrowser/files/filebrowser.config
+++ b/immpackages/utils/filebrowser/files/filebrowser.config
--- a/immpackages/utils/filebrowser/files/filebrowser.init
+++ b/immpackages/utils/filebrowser/files/filebrowser.init
--- a/immpackages/net/gost/Makefile
+++ b/immpackages/net/gost/Makefile
@ -14,7 +14,7 @@ PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/ginuerzh/gost/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=d94b570a7a84094376b8c299d740528f51b540d9162f1db562247a15a89340bf
+PKG_HASH:=skip

 PKG_LICENSE:=MIT
 PKG_LICENSE_FILE:=LICENSE
@ -33,7 +33,7 @@ GO_PKG_BUILD_PKG:=github.com/ginuerzh/gost/cmd/gost
 GO_PKG_LDFLAGS:=-s -w

 include $(INCLUDE_DIR)/package.mk
-include ../../lang/golang/golang-package.mk
+include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk

 define Package/gost
 	SECTION:=net
--- a/immpackages/net/gost/files/gost.config
+++ b/immpackages/net/gost/files/gost.config
--- a/immpackages/net/gost/files/gost.init
+++ b/immpackages/net/gost/files/gost.init
--- a/immluci/applications/luci-app-adguardhome/Makefile
+++ b/immluci/applications/luci-app-adguardhome/Makefile
@ -1,58 +0,0 @@
-# Copyright (C) 2018-2019 Lienol
-#
-# This is free software, licensed under the Apache License, Version 2.0 .
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luci-app-adguardhome
-PKG_VERSION:=1.8
-PKG_RELEASE:=12
-PKG_MAINTAINER:=<https://github.com/rufengsuixing/luci-app-adguardhome>
-
-LUCI_TITLE:=LuCI app for AdGuardHome
-LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+ca-certs +curl +wget-ssl +PACKAGE_$(PKG_NAME)_INCLUDE_binary:adguardhome
-LUCI_DESCRIPTION:=LuCI support for AdGuardHome
-
-define Package/$(PKG_NAME)/config
-config PACKAGE_$(PKG_NAME)_INCLUDE_binary
-	bool "Include Binary File"
-	default y
-endef
-
-PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_binary
-
-define Package/luci-app-adguardhome/conffiles
-/usr/share/AdGuardHome/links.txt
-/etc/config/AdGuardHome
-endef
-
-define Package/luci-app-adguardhome/postinst
-#!/bin/sh
-	/etc/init.d/AdGuardHome enable >/dev/null 2>&1
-	enable=$(uci get AdGuardHome.AdGuardHome.enabled 2>/dev/null)
-	if [ "$enable" == "1" ]; then
-		/etc/init.d/AdGuardHome reload
-	fi
-	rm -f /tmp/luci-indexcache
-	rm -f /tmp/luci-modulecache/*
-exit 0
-endef
-
-define Package/luci-app-adguardhome/prerm
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-     /etc/init.d/AdGuardHome disable
-     /etc/init.d/AdGuardHome stop
-uci -q batch <<-EOF >/dev/null 2>&1
-	delete ucitrack.@AdGuardHome[-1]
-	commit ucitrack
-EOF
-fi
-exit 0
-endef
-
-include ../../luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature
--- a/immluci/applications/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua
+++ b/immluci/applications/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua
@ -1,127 +0,0 @@
-module("luci.controller.AdGuardHome",package.seeall)
-local fs=require"nixio.fs"
-local http=require"luci.http"
-local uci=require"luci.model.uci".cursor()
-function index()
-entry({"admin", "services", "AdGuardHome"},alias("admin", "services", "AdGuardHome", "base"),_("AdGuard Home"), 10).dependent = true
-entry({"admin","services","AdGuardHome","base"},cbi("AdGuardHome/base"),_("Base Setting"),1).leaf = true
-entry({"admin","services","AdGuardHome","log"},form("AdGuardHome/log"),_("Log"),2).leaf = true
-entry({"admin","services","AdGuardHome","manual"},cbi("AdGuardHome/manual"),_("Manual Config"),3).leaf = true
-entry({"admin","services","AdGuardHome","status"},call("act_status")).leaf=true
-entry({"admin", "services", "AdGuardHome", "check"}, call("check_update"))
-entry({"admin", "services", "AdGuardHome", "doupdate"}, call("do_update"))
-entry({"admin", "services", "AdGuardHome", "getlog"}, call("get_log"))
-entry({"admin", "services", "AdGuardHome", "dodellog"}, call("do_dellog"))
-entry({"admin", "services", "AdGuardHome", "reloadconfig"}, call("reload_config"))
-entry({"admin", "services", "AdGuardHome", "gettemplateconfig"}, call("get_template_config"))
-end
-function get_template_config()
-	local b
-	local d=""
-	for cnt in io.lines("/tmp/resolv.conf.d/resolv.conf.auto") do
-		b=string.match (cnt,"^[^#]*nameserver%s+([^%s]+)$")
-		if (b~=nil) then
-			d=d.."  - "..b.."\n"
-		end
-	end
-	local f=io.open("/usr/share/AdGuardHome/AdGuardHome_template.yaml", "r+")
-	local tbl = {}
-	local a=""
-	while (1) do
-    	a=f:read("*l")
-		if (a=="#bootstrap_dns") then
-			a=d
-		elseif (a=="#upstream_dns") then
-			a=d
-		elseif (a==nil) then
-			break
-		end
-		table.insert(tbl, a)
-	end
-	f:close()
-	http.prepare_content("text/plain; charset=utf-8")
-	http.write(table.concat(tbl, "\n"))
-end
-function reload_config()
-	fs.remove("/tmp/AdGuardHometmpconfig.yaml")
-	http.prepare_content("application/json")
-	http.write('')
-end
-function act_status()
-	local e={}
-	local binpath=uci:get("AdGuardHome","AdGuardHome","binpath")
-	e.running=luci.sys.call("pgrep "..binpath.." >/dev/null")==0
-	e.redirect=(fs.readfile("/var/run/AdGredir")=="1")
-	http.prepare_content("application/json")
-	http.write_json(e)
-end
-function do_update()
-	fs.writefile("/var/run/lucilogpos","0")
-	http.prepare_content("application/json")
-	http.write('')
-	local arg
-	if luci.http.formvalue("force") == "1" then
-		arg="force"
-	else
-		arg=""
-	end
-	if fs.access("/var/run/update_core") then
-		if arg=="force" then
-			luci.sys.exec("kill $(pgrep /usr/share/AdGuardHome/update_core.sh) ; sh /usr/share/AdGuardHome/update_core.sh "..arg.." >/tmp/AdGuardHome_update.log 2>&1 &")
-		end
-	else
-		luci.sys.exec("sh /usr/share/AdGuardHome/update_core.sh "..arg.." >/tmp/AdGuardHome_update.log 2>&1 &")
-	end
-end
-function get_log()
-	local logfile=uci:get("AdGuardHome","AdGuardHome","logfile")
-	if (logfile==nil) then
-		http.write("no log available\n")
-		return
-	elseif (logfile=="syslog") then
-		if not fs.access("/var/run/AdGuardHomesyslog") then
-			luci.sys.exec("(/usr/share/AdGuardHome/getsyslog.sh &); sleep 1;")
-		end
-		logfile="/tmp/AdGuardHometmp.log"
-		fs.writefile("/var/run/AdGuardHomesyslog","1")
-	elseif not fs.access(logfile) then
-		http.write("")
-		return
-	end
-	http.prepare_content("text/plain; charset=utf-8")
-	local fdp
-	if fs.access("/var/run/lucilogreload") then
-		fdp=0
-		fs.remove("/var/run/lucilogreload")
-	else
-		fdp=tonumber(fs.readfile("/var/run/lucilogpos")) or 0
-	end
-	local f=io.open(logfile, "r+")
-	f:seek("set",fdp)
-	local a=f:read(2048000) or ""
-	fdp=f:seek()
-	fs.writefile("/var/run/lucilogpos",tostring(fdp))
-	f:close()
-	http.write(a)
-end
-function do_dellog()
-	local logfile=uci:get("AdGuardHome","AdGuardHome","logfile")
-	fs.writefile(logfile,"")
-	http.prepare_content("application/json")
-	http.write('')
-end
-function check_update()
-	http.prepare_content("text/plain; charset=utf-8")
-	local fdp=tonumber(fs.readfile("/var/run/lucilogpos")) or 0
-	local f=io.open("/tmp/AdGuardHome_update.log", "r+")
-	f:seek("set",fdp)
-	local a=f:read(2048000) or ""
-	fdp=f:seek()
-	fs.writefile("/var/run/lucilogpos",tostring(fdp))
-	f:close()
-if fs.access("/var/run/update_core") then
-	http.write(a)
-else
-	http.write(a.."\0")
-end
-end
--- a/immluci/applications/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua
+++ b/immluci/applications/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua
@ -1,304 +0,0 @@
-require("luci.sys")
-require("luci.util")
-require("io")
-local m,s,o,o1
-local fs=require"nixio.fs"
-local uci=require"luci.model.uci".cursor()
-local configpath=uci:get("AdGuardHome","AdGuardHome","configpath") or "/etc/AdGuardHome.yaml"
-local binpath=uci:get("AdGuardHome","AdGuardHome","binpath") or "/usr/bin/AdGuardHome"
-httpport=uci:get("AdGuardHome","AdGuardHome","httpport") or "3000"
-m = Map("AdGuardHome", "AdGuard Home")
-m.description = translate("Free and open source, powerful network-wide ads & trackers blocking DNS server.")
-m:section(SimpleSection).template  = "AdGuardHome/AdGuardHome_status"
-
-s = m:section(TypedSection, "AdGuardHome")
-s.anonymous=true
-s.addremove=false
---- enable
-o = s:option(Flag, "enabled", translate("Enable"))
-o.default = 0
-o.optional = false
---- httpport
-o =s:option(Value,"httpport",translate("Browser management port"))
-o.placeholder=3000
-o.default=3000
-o.datatype="port"
-o.optional = false
-o.description = translate("<input type=\"button\" style=\"width:210px;border-color:Teal; text-align:center;font-weight:bold;color:Green;\" value=\"AdGuardHome Web:"..httpport.."\" onclick=\"window.open('http://'+window.location.hostname+':"..httpport.."/')\"/>")
---- update warning not safe
-local binmtime=uci:get("AdGuardHome","AdGuardHome","binmtime") or "0"
-local e=""
-if not fs.access(configpath) then
-	e=e.." "..translate("no config")
-end
-if not fs.access(binpath) then
-	e=e.." "..translate("no core")
-else
-	local version=uci:get("AdGuardHome","AdGuardHome","version")
-	local testtime=fs.stat(binpath,"mtime")
-	if testtime~=tonumber(binmtime) or version==nil then
-		local tmp=luci.sys.exec(binpath.." --version | grep -m 1 -E 'v[0-9.]+' -o ")
-		version=string.sub(tmp, 1)
-		if version=="" then version="core error" end
-		uci:set("AdGuardHome","AdGuardHome","version",version)
-		uci:set("AdGuardHome","AdGuardHome","binmtime",testtime)
-		uci:save("AdGuardHome")
-	end
-	e=version..e
-end
-o=s:option(Button,"restart",translate("Update"))
-o.inputtitle=translate("Update core version")
-o.template = "AdGuardHome/AdGuardHome_check"
-o.showfastconfig=(not fs.access(configpath))
-o.description=string.format(translate("core version:").."<strong><font id=\"updateversion\" color=\"green\">%s </font></strong>",e)
---- port warning not safe
-local port=luci.sys.exec("awk '/  port:/{printf($2);exit;}' "..configpath.." 2>nul")
-if (port=="") then port="?" end
---- Redirect
-o = s:option(ListValue, "redirect", port..translate("Redirect"), translate("AdGuardHome redirect mode"))
-o.placeholder = "none"
-o:value("none", translate("none"))
-o:value("dnsmasq-upstream", translate("Run as dnsmasq upstream server"))
-o:value("redirect", translate("Redirect 53 port to AdGuardHome"))
-o:value("exchange", translate("Use port 53 replace dnsmasq"))
-o.default     = "none"
-o.optional = true
---- bin path
-o = s:option(Value, "binpath", translate("Bin Path"), translate("AdGuardHome Bin path if no bin will auto download"))
-o.default     = "/usr/bin/AdGuardHome"
-o.datatype    = "string"
-o.optional = false
-o.rmempty=false
-o.validate=function(self, value)
-if value=="" then return nil end
-if fs.stat(value,"type")=="dir" then
-	fs.rmdir(value)
-end
-if fs.stat(value,"type")=="dir" then
-	if (m.message) then
-	m.message =m.message.."\nerror!bin path is a dir"
-	else
-	m.message ="error!bin path is a dir"
-	end
-	return nil
-end
-return value
-end
--- upx
-o = s:option(ListValue, "upxflag", translate("use upx to compress bin after download"))
-o:value("", translate("none"))
-o:value("-1", translate("compress faster"))
-o:value("-9", translate("compress better"))
-o:value("--best", translate("compress best(can be slow for big files)"))
-o:value("--brute", translate("try all available compression methods & filters [slow]"))
-o:value("--ultra-brute", translate("try even more compression variants [very slow]"))
-o.default     = ""
-o.description=translate("bin use less space,but may have compatibility issues")
-o.rmempty = true
---- config path
-o = s:option(Value, "configpath", translate("Config Path"), translate("AdGuardHome config path"))
-o.default     = "/etc/AdGuardHome.yaml"
-o.datatype    = "string"
-o.optional = false
-o.rmempty=false
-o.validate=function(self, value)
-if value==nil then return nil end
-if fs.stat(value,"type")=="dir" then
-	fs.rmdir(value)
-end
-if fs.stat(value,"type")=="dir" then
-	if m.message then
-	m.message =m.message.."\nerror!config path is a dir"
-	else
-	m.message ="error!config path is a dir"
-	end
-	return nil
-end
-return value
-end
---- work dir
-o = s:option(Value, "workdir", translate("Work dir"), translate("AdGuardHome work dir include rules,audit log and database"))
-o.default     = "/etc/AdGuardHome"
-o.datatype    = "string"
-o.optional = false
-o.rmempty=false
-o.validate=function(self, value)
-if value=="" then return nil end
-if fs.stat(value,"type")=="reg" then
-	if m.message then
-	m.message =m.message.."\nerror!work dir is a file"
-	else
-	m.message ="error!work dir is a file"
-	end
-	return nil
-end
-if string.sub(value, -1)=="/" then
-	return string.sub(value, 1, -2)
-else
-	return value
-end
-end
---- log file
-o = s:option(Value, "logfile", translate("Runtime log file"), translate("AdGuardHome runtime Log file if 'syslog': write to system log;if empty no log"))
-o.datatype    = "string"
-o.rmempty = true
-o.validate=function(self, value)
-if fs.stat(value,"type")=="dir" then
-	fs.rmdir(value)
-end
-if fs.stat(value,"type")=="dir" then
-	if m.message then
-	m.message =m.message.."\nerror!log file is a dir"
-	else
-	m.message ="error!log file is a dir"
-	end
-	return nil
-end
-return value
-end
---- debug
-o = s:option(Flag, "verbose", translate("Verbose log"))
-o.default = 0
-o.optional = true
---- gfwlist
-local a=luci.sys.call("grep -m 1 -q programadd "..configpath)
-if (a==0) then
-a="Added"
-else
-a="Not added"
-end
-o=s:option(Button,"gfwdel",translate("Del gfwlist"),translate(a))
-o.optional = true
-o.inputtitle=translate("Del")
-o.write=function()
-	luci.sys.exec("sh /usr/share/AdGuardHome/gfw2adg.sh del 2>&1")
-	luci.http.redirect(luci.dispatcher.build_url("admin","services","AdGuardHome"))
-end
-o=s:option(Button,"gfwadd",translate("Add gfwlist"),translate(a))
-o.optional = true
-o.inputtitle=translate("Add")
-o.write=function()
-	luci.sys.exec("sh /usr/share/AdGuardHome/gfw2adg.sh 2>&1")
-	luci.http.redirect(luci.dispatcher.build_url("admin","services","AdGuardHome"))
-end
-o = s:option(Value, "gfwupstream", translate("Gfwlist upstream dns server"), translate("Gfwlist domain upstream dns service")..translate(a))
-o.default     = "tcp://208.67.220.220:5353"
-o.datatype    = "string"
-o.optional = true
---- chpass
-o = s:option(Value, "hashpass", translate("Change browser management password"), translate("Press load culculate model and culculate finally save/apply"))
-o.default     = ""
-o.datatype    = "string"
-o.template = "AdGuardHome/AdGuardHome_chpass"
-o.optional = true
---- upgrade protect
-o = s:option(MultiValue, "upprotect", translate("Keep files when system upgrade"))
-o:value("$binpath",translate("core bin"))
-o:value("$configpath",translate("config file"))
-o:value("$logfile",translate("log file"))
-o:value("$workdir/data/sessions.db",translate("sessions.db"))
-o:value("$workdir/data/stats.db",translate("stats.db"))
-o:value("$workdir/data/querylog.json",translate("querylog.json"))
-o:value("$workdir/data/filters",translate("filters"))
-o.widget = "checkbox"
-o.default = nil
-o.optional=true
---- wait net on boot
-o = s:option(Flag, "waitonboot", translate("On boot when network ok restart"))
-o.default = 1
-o.optional = true
---- backup workdir on shutdown
-local workdir=uci:get("AdGuardHome","AdGuardHome","workdir") or "/etc/AdGuardHome"
-o = s:option(MultiValue, "backupfile", translate("Backup workdir files when shutdown"))
-o1 = s:option(Value, "backupwdpath", translate("Backup workdir path"))
-local name
-o:value("filters","filters")
-o:value("stats.db","stats.db")
-o:value("querylog.json","querylog.json")
-o:value("sessions.db","sessions.db")
-o1:depends ("backupfile", "filters")
-o1:depends ("backupfile", "stats.db")
-o1:depends ("backupfile", "querylog.json")
-o1:depends ("backupfile", "sessions.db")
-for name in fs.glob(workdir.."/data/*")
-do
-	name=fs.basename (name)
-	if name~="filters" and name~="stats.db" and name~="querylog.json" and name~="sessions.db" then
-		o:value(name,name)
-		o1:depends ("backupfile", name)
-	end
-end
-o.widget = "checkbox"
-o.default = nil
-o.optional=false
-o.description=translate("Will be restore when workdir/data is empty")
----backup workdir path
-
-o1.default     = "/etc/AdGuardHome"
-o1.datatype    = "string"
-o1.optional = false
-o1.validate=function(self, value)
-if fs.stat(value,"type")=="reg" then
-	if m.message then
-	m.message =m.message.."\nerror!backup dir is a file"
-	else
-	m.message ="error!backup dir is a file"
-	end
-	return nil
-end
-if string.sub(value,-1)=="/" then
-	return string.sub(value, 1, -2)
-else
-	return value
-end
-end
-
----Crontab
-o = s:option(MultiValue, "crontab", translate("Crontab task"),translate("Please change time and args in crontab"))
-o:value("autoupdate",translate("Auto update core"))
-o:value("cutquerylog",translate("Auto tail querylog"))
-o:value("cutruntimelog",translate("Auto tail runtime log"))
-o:value("autohost",translate("Auto update ipv6 hosts and restart adh"))
-o:value("autogfw",translate("Auto update gfwlist and restart adh"))
-o.widget = "checkbox"
-o.default = nil
-o.optional=true
-
----downloadpath
-o = s:option(TextValue, "downloadlinks",translate("Download links for update"))
-o.optional = false
-o.rows = 4
-o.wrap = "soft"
-o.cfgvalue = function(self, section)
-	return fs.readfile("/usr/share/AdGuardHome/links.txt")
-end
-o.write = function(self, section, value)
-	fs.writefile("/usr/share/AdGuardHome/links.txt", value:gsub("\r\n", "\n"))
-end
-fs.writefile("/var/run/lucilogpos","0")
-function m.on_commit(map)
-	if (fs.access("/var/run/AdGserverdis")) then
-		io.popen("/etc/init.d/AdGuardHome reload &")
-		return
-	end
-	local ucitracktest=uci:get("AdGuardHome","AdGuardHome","ucitracktest")
-	if ucitracktest=="1" then
-		return
-	elseif ucitracktest=="0" then
-		io.popen("/etc/init.d/AdGuardHome reload &")
-	else
-		if (fs.access("/var/run/AdGlucitest")) then
-			uci:set("AdGuardHome","AdGuardHome","ucitracktest","0")
-			io.popen("/etc/init.d/AdGuardHome reload &")
-		else
-			fs.writefile("/var/run/AdGlucitest","")
-			if (ucitracktest=="2") then
-				uci:set("AdGuardHome","AdGuardHome","ucitracktest","1")
-			else
-				uci:set("AdGuardHome","AdGuardHome","ucitracktest","2")
-			end
-		end
-		uci:save("AdGuardHome")
-	end
-end
-return m
--- a/immluci/applications/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/log.lua
+++ b/immluci/applications/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/log.lua
@ -1,16 +0,0 @@
-local fs=require"nixio.fs"
-local uci=require"luci.model.uci".cursor()
-local f,t
-f=SimpleForm("logview")
-f.reset = false
-f.submit = false
-t=f:field(TextValue,"conf")
-t.rmempty=true
-t.rows=20
-t.template="AdGuardHome/log"
-t.readonly="readonly"
-local logfile=uci:get("AdGuardHome","AdGuardHome","logfile") or ""
-t.timereplace=(logfile~="syslog" and logfile~="" )
-t.pollcheck=logfile~=""
-fs.writefile("/var/run/lucilogreload","")
-return f
--- a/immluci/applications/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/manual.lua
+++ b/immluci/applications/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/manual.lua
@ -1,97 +0,0 @@
-local m, s, o
-local fs = require "nixio.fs"
-local uci=require"luci.model.uci".cursor()
-local sys=require"luci.sys"
-require("string")
-require("io")
-require("table")
-function gen_template_config()
-	local b
-	local d=""
-	for cnt in io.lines("/tmp/resolv.conf.d/resolv.conf.auto") do
-		b=string.match (cnt,"^[^#]*nameserver%s+([^%s]+)$")
-		if (b~=nil) then
-			d=d.."  - "..b.."\n"
-		end
-	end
-	local f=io.open("/usr/share/AdGuardHome/AdGuardHome_template.yaml", "r+")
-	local tbl = {}
-	local a=""
-	while (1) do
-    	a=f:read("*l")
-		if (a=="#bootstrap_dns") then
-			a=d
-		elseif (a=="#upstream_dns") then
-			a=d
-		elseif (a==nil) then
-			break
-		end
-		table.insert(tbl, a)
-	end
-	f:close()
-	return table.concat(tbl, "\n")
-end
-m = Map("AdGuardHome")
-local configpath = uci:get("AdGuardHome","AdGuardHome","configpath")
-local binpath = uci:get("AdGuardHome","AdGuardHome","binpath")
-s = m:section(TypedSection, "AdGuardHome")
-s.anonymous=true
-s.addremove=false
--- config
-o = s:option(TextValue, "escconf")
-o.rows = 66
-o.wrap = "off"
-o.rmempty = true
-o.cfgvalue = function(self, section)
-	return  fs.readfile("/tmp/AdGuardHometmpconfig.yaml") or fs.readfile(configpath) or gen_template_config() or ""
-end
-o.validate=function(self, value)
-    fs.writefile("/tmp/AdGuardHometmpconfig.yaml", value:gsub("\r\n", "\n"))
-	if fs.access(binpath) then
-		if (sys.call(binpath.." -c /tmp/AdGuardHometmpconfig.yaml --check-config 2> /tmp/AdGuardHometest.log")==0) then
-			return value
-		end
-	else
-		return value
-	end
-	luci.http.redirect(luci.dispatcher.build_url("admin","services","AdGuardHome","manual"))
-	return nil
-end
-o.write = function(self, section, value)
-	fs.move("/tmp/AdGuardHometmpconfig.yaml",configpath)
-end
-o.remove = function(self, section, value)
-	fs.writefile(configpath, "")
-end
--- js and reload button
-o = s:option(DummyValue, "")
-o.anonymous=true
-o.template = "AdGuardHome/yamleditor"
-if not fs.access(binpath) then
-	o.description=translate("WARNING!!! no bin found apply config will not be test")
-end
--- log
-if (fs.access("/tmp/AdGuardHometmpconfig.yaml")) then
-local c=fs.readfile("/tmp/AdGuardHometest.log")
-if (c~="") then
-o = s:option(TextValue, "")
-o.readonly=true
-o.rows = 5
-o.rmempty = true
-o.name=""
-o.cfgvalue = function(self, section)
-	return fs.readfile("/tmp/AdGuardHometest.log")
-end
-end
-end
-function m.on_commit(map)
-	local ucitracktest=uci:get("AdGuardHome","AdGuardHome","ucitracktest")
-	if ucitracktest=="1" then
-		return
-	elseif ucitracktest=="0" then
-		io.popen("/etc/init.d/AdGuardHome reload &")
-	else
-		fs.writefile("/var/run/AdGlucitest","")
-	end
-end
-return m
--- a/immluci/applications/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm
+++ b/immluci/applications/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm
@ -1,78 +0,0 @@
-<%+cbi/valueheader%>
-<%local fs=require"nixio.fs"%>
-<input type="button" class="cbi-button cbi-button-apply" id="apply_update_button" value="<%:Update core version%>" onclick=" return apply_update() "/>
-<input type="button" class="cbi-button cbi-button-apply" id="apply_forceupdate_button" value="<%:Force update%>" onclick=" return apply_forceupdate()" style="display:none"/>
-<% if self.showfastconfig then %>
-<input type="button" class="cbi-button cbi-button-apply" id="to_configpage" value="<%:Fast config%>" onclick="location.href='<%=url([[admin]], [[services]], [[AdGuardHome]], [[manual]])%>'"/>
-<%end%>
-<div id="logview" style="display:none">
-<input type="checkbox" id="reversetag" value="reverse" onclick=" return reverselog()" style="vertical-align:middle;height: auto;"><%:reverse%></input>
-<textarea id="cbid.logview.1.conf" class="cbi-input-textarea" style="width: 100%;display:block;" data-update="change" rows="5" cols="60" readonly="readonly" > </textarea>
-</div>
-<script type="text/javascript">//<![CDATA[
-var updatebtn = document.getElementById('apply_update_button');
-var forceupdatebtn = document.getElementById('apply_forceupdate_button');
-var islogreverse = false;
-function apply_forceupdate(){
-	XHR.get('<%=url([[admin]], [[services]], [[AdGuardHome]], [[doupdate]])%>',{ force: 1 },function(x, data){}
-		);
-	updatebtn.disabled = true;
-	poll_check();
-	return
-}
-function reverselog(){
-	var lv = document.getElementById('cbid.logview.1.conf');
-	lv.innerHTML=lv.innerHTML.split('\n').reverse().join('\n')
-	if (islogreverse){
-	islogreverse=false;
-	}else{
-	islogreverse=true;
-	}
-	return
-}
-function apply_update(){
-	XHR.get('<%=url([[admin]], [[services]], [[AdGuardHome]], [[doupdate]])%>',null,function(x, data){}
-		);
-	updatebtn.disabled = true;
-	updatebtn.value    = '<%:Check...%>';
-	forceupdatebtn.style.display="inline"
-	poll_check();
-	return
-}
-function poll_check(){
-var tag = document.getElementById('logview');
-	tag.style.display="block"
-XHR.poll(3, '<%=url([[admin]], [[services]], [[AdGuardHome]], [[check]])%>', null,
-	function(x, data) {
-		var lv = document.getElementById('cbid.logview.1.conf');
-		if (x.responseText && lv) {
-			if (x.responseText=="\u0000"){
-				for(j = 0,len=this.XHR._q.length; j < len; j++) {
-					if (this.XHR._q[j].url == '<%=url([[admin]], [[services]], [[AdGuardHome]], [[check]])%>'){
-						this.XHR._q.splice(j,1);
-						updatebtn.disabled = false;
-						updatebtn.value    = '<%:Updated%>';
-						break;
-					}
-				}
-				return	
-			}
-			if (islogreverse){
-				lv.innerHTML = x.responseText.split('\n').reverse().join('\n')+lv.innerHTML;
-			}else{
-				lv.innerHTML += x.responseText;
-			}
-		}
-	}
-);}
-<% if fs.access("/var/run/update_core") then %>
-	updatebtn.disabled = true;
-	updatebtn.value    = '<%:Check...%>';
-	forceupdatebtn.style.display="inline"
-	poll_check();
-<%elseif fs.access("/var/run/update_core_error") then %>
-	poll_check();
-<%end%>
-//]]>
-</script>
-<%+cbi/valuefooter%>
--- a/immluci/applications/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm
+++ b/immluci/applications/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm
@ -1,49 +0,0 @@
-<%+cbi/valueheader%>
-<script type="text/javascript">//<![CDATA[
-function chpass(btn)
-	{
-		btn.disabled = true;
-		btn.value    = '<%:loading...%>';
-		if (typeof bcryptloaded == 'undefined' ){
-		var theHead = document.getElementsByTagName('head').item(0);
-		//创建脚本的dom对象实例
-		var myScript = document.createElement('script');
-		myScript.src = '<%=resource%>/twin-bcrypt.min.js';            //指定脚本路径
-		myScript.type = 'text/javascript';    //指定脚本类型
-		myScript.defer = true;                //程序下载完后再解析和执行
-		theHead.appendChild(myScript);
-		bcryptloaded=1;
-		btn.value    = '<%:Culculate%>';
-		btn.disabled = false;
-		return
-		}
-		var lv = document.getElementById('cbid.AdGuardHome.AdGuardHome.hashpass');
-		if (lv.value != ""){
-		var hash = TwinBcrypt.hashSync(lv.value);
-		lv.value=hash;
-		btn.value    = '<%:Please save/apply%>';
-		}else{
-		btn.value    = '<%:is empty%>';
-		btn.disabled = false;
-		}
-	}
-//]]>
-</script> 
-		<input data-update="change"<%=
-		attr("id", cbid) ..
-		attr("name", cbid) ..
-		attr("type", self.password and "password" or "text") ..
-		attr("class", self.password and "cbi-input-password" or "cbi-input-text") ..
-		attr("value", self:cfgvalue(section) or self.default) ..
-		ifattr(self.size, "size") ..
-		ifattr(self.placeholder, "placeholder") ..
-		ifattr(self.readonly, "readonly") ..
-		ifattr(self.maxlength, "maxlength") ..
-		ifattr(self.datatype, "data-type", self.datatype) ..
-		ifattr(self.datatype, "data-optional", self.optional or self.rmempty) ..
-		ifattr(self.combobox_manual, "data-manual", self.combobox_manual) ..
-		ifattr(#self.keylist > 0, "data-choices", { self.keylist, self.vallist })
-	%> />
-	<% if self.password then %><img src="<%=resource%>/cbi/reload.gif" style="vertical-align:middle" title="<%:Reveal/hide password%>" onclick="var e = document.getElementById('<%=cbid%>'); e.type = (e.type=='password') ? 'text' : 'password';" /><% end %>
-	<input type="button" class="cbi-button cbi-button-apply" id="cbid.AdGuardHome.AdGuardHome.applychpass" value="<%:Load culculate model%>" onclick="return chpass(this)"/>
-<%+cbi/valuefooter%>
--- a/immluci/applications/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm
+++ b/immluci/applications/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm
@ -1,27 +0,0 @@
-<script type="text/javascript">//<![CDATA[
-XHR.poll(3, '<%=url([[admin]], [[services]], [[AdGuardHome]], [[status]])%>', null,
-	function(x, data) {
-		var tb = document.getElementById('AdGuardHome_status');
-		if (data && tb) {
-			if (data.running) {
-				tb.innerHTML = '<em><b><font color=green>AdGuardHome <%:RUNNING%></font></b></em>';
-			} else {
-				tb.innerHTML = '<em><b><font color=red>AdGuardHome <%:NOT RUNNING%></font></b></em>';
-			}
-			if (data.redirect)
-			{
-				tb.innerHTML+='<em><b><font color=green><%:Redirected%></font></b></em>'
-			} else {
-				tb.innerHTML+='<em><b><font color=red><%:Not redirect%></font></b></em>'	
-			}
-		}
-	}
-);
-//]]>
-</script>
-<style>.mar-10 {margin-left: 50px; margin-right: 10px;}</style>
-<fieldset class="cbi-section">
-	<p id="AdGuardHome_status">
-		<em><%:Collecting data...%></em>
-	</p>
-</fieldset>
--- a/immluci/applications/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm
+++ b/immluci/applications/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm
@ -1,110 +0,0 @@
-<%+cbi/valueheader%>
-<input type="checkbox" name="NAME" value="reverse" onclick=" return reverselog()" style="vertical-align:middle;height: auto;" checked><%:reverse%></input>
-<%if self.timereplace then%>
-<input type="checkbox" name="NAME" value="localtime" onclick=" return chlogtime()" style="vertical-align:middle;height: auto;" checked><%:localtime%></input><br>
-<%end%>
-<textarea id="cbid.logview.1.conf" class="cbi-input-textarea" style="width: 100%;display:inline" data-update="change" rows="32" cols="60" readonly="readonly" > </textarea>
-<input type="button" class="cbi-button cbi-button-apply" id="apply_update_button" value="<%:dellog%>" onclick=" return apply_del_log() "/>
-<input type="button" class="cbi-button cbi-button-apply" value="<%:download log%>" style=" display:inline;" onclick=" return download_log()" />
-<script type="text/javascript">//<![CDATA[
-var islogreverse = true;
-var isutc2local = <%=tostring(self.timereplace)%>;
-function createAndDownloadFile(fileName, content) {
-    var aTag = document.createElement('a');
-    var blob = new Blob([content]);
-    aTag.download = fileName;
-    aTag.href = URL.createObjectURL(blob);
-    aTag.click();
-    URL.revokeObjectURL(blob);
-}
-function download_log(){
-	var lv = document.getElementById('cbid.logview.1.conf');
-	var dt = new Date();
-	var timestamp = (dt.getMonth()+1)+"-"+dt.getDate()+"-"+dt.getHours()+"_"+dt.getMinutes();
-	createAndDownloadFile("AdGuardHome"+timestamp+".log",lv.innerHTML)
-	return
-}
-function apply_del_log(){
-	XHR.get('<%=url([[admin]], [[services]], [[AdGuardHome]], [[dodellog]])%>',null,function(x, data){
-	var lv = document.getElementById('cbid.logview.1.conf');
-		lv.innerHTML="";
-	}
-		);
-	return
-}
-function chlogtime(){
-	var lv = document.getElementById('cbid.logview.1.conf');
-	if (isutc2local){
-	lv.innerHTML=line_toUTC(lv.innerHTML).join('\n');
-	isutc2local=false;
-	}else{
-	lv.innerHTML=line_tolocal(lv.innerHTML).join('\n');
-	isutc2local=true;
-	}
-	return
-}
-function reverselog(){
-	var lv = document.getElementById('cbid.logview.1.conf');
-	lv.innerHTML=lv.innerHTML.split('\n').reverse().join('\n')
-	if (islogreverse){
-	islogreverse=false;
-	}else{
-	islogreverse=true;
-	}
-	return
-}
-function p(s) {
-        return s < 10 ? '0' + s: s;
-}
-function line_tolocal(str){
-var strt=new Array();
-str.trim().split('\n').forEach(function(v, i) {
-var dt = new Date(v.substring(0,19)+" UTC");
-if (dt != "Invalid Date"){
-  strt[i]=dt.getFullYear()+"/"+p(dt.getMonth()+1)+"/"+p(dt.getDate())+" "+p(dt.getHours())+":"+p(dt.getMinutes())+":"+p(dt.getSeconds())+v.substring(19);
-}else{
-  strt[i]=v;}})
-return strt
-}
-function line_toUTC(str){
-var strt=new Array();
-str.trim().split('\n').forEach(function(v, i) {
-var dt = new Date(v.substring(0,19))
-if (dt != "Invalid Date"){
-  strt[i]=dt.getUTCFullYear()+"/"+p(dt.getUTCMonth()+1)+"/"+p(dt.getUTCDate())+" "+p(dt.getUTCHours())+":"+p(dt.getUTCMinutes())+":"+p(dt.getUTCSeconds())+v.substring(19);
-}else{
-  strt[i]=v;}})
-return strt
-}
-function poll_check(){
-XHR.poll(3, '<%=url([[admin]], [[services]], [[AdGuardHome]], [[getlog]])%>', null,
-	function(x, data) {
-		var lv = document.getElementById('cbid.logview.1.conf');
-		if (x.responseText && lv) {
-			if (isutc2local)
-			{
-				var lines=line_tolocal(x.responseText);
-				if (islogreverse){
-					lv.innerHTML = lines.reverse().join('\n')+lv.innerHTML;
-				}else{
-					lv.innerHTML += lines.join('\n');
-				}
-			}else{
-				if (islogreverse){
-					lv.innerHTML = x.responseText.split('\n').reverse().join('\n')+lv.innerHTML;
-				}else{
-					lv.innerHTML += x.responseText;
-				}
-			}
-		}
-	}
-);}
-<%if self.pollcheck then%>
-poll_check();
-<%else%>
-var lv = document.getElementById('cbid.logview.1.conf');
-lv.innerHTML="<%:Please add log path in config to enable log%>"
-<%end%>
-//]]>
-</script>	
-<%+cbi/valuefooter%>
--- a/immluci/applications/luci-app-adguardhome/luasrc/view/AdGuardHome/yamleditor.htm
+++ b/immluci/applications/luci-app-adguardhome/luasrc/view/AdGuardHome/yamleditor.htm
@ -1,39 +0,0 @@
-<%+cbi/valueheader%>
-<script src="/luci-static/resources/codemirror/lib/codemirror.js"></script>
-<link rel="stylesheet" href="/luci-static/resources/codemirror/lib/codemirror.css"/>
-<script src="/luci-static/resources/codemirror/mode/yaml/yaml.js"></script>
-<link rel="stylesheet" href="/luci-static/resources/codemirror/theme/dracula.css"/>
-<link rel="stylesheet" href="/luci-static/resources/codemirror/addon/fold/foldgutter.css"/>
-<script src="/luci-static/resources/codemirror/addon/fold/foldcode.js"></script>
-<script src="/luci-static/resources/codemirror/addon/fold/foldgutter.js"></script>
-<script src="/luci-static/resources/codemirror/addon/fold/indent-fold.js"></script>
-<script type="text/javascript">//<![CDATA[
-var editor = CodeMirror.fromTextArea(document.getElementById("cbid.AdGuardHome.AdGuardHome.escconf"), {
-mode: "text/yaml",    //实现groovy代码高亮
-styleActiveLine: true,
-lineNumbers: true,	//显示行号
-theme: "dracula",	//设置主题
-lineWrapping: true,	//代码折叠
-foldGutter: true,
-gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
-matchBrackets: true //括号匹配
-}
-);
-function reload_config(){
-	XHR.get('<%=url([[admin]], [[services]], [[AdGuardHome]], [[reloadconfig]])%>', null,
-	function(x, data) {
-	location.reload();
-	});}
-function use_template(){
-	XHR.get('<%=url([[admin]], [[services]], [[AdGuardHome]], [[gettemplateconfig]])%>', null,
-	function(x, data) {
-	editor.setValue(x.responseText)
-	});}
-//]]>
-</script> 
-<%fs=require"nixio.fs"%>
-<%if fs.access("/tmp/AdGuardHometmpconfig.yaml") then%>
-<input type="button" id="apply_update_button" value="<%:Reload Config%>" onclick=" return reload_config() "/>
-<%end%>
-<input type="button" id="template_button" value="<%:Use template%>" onclick=" return use_template() "/>
-<%+cbi/valuefooter%>
--- a/immluci/applications/luci-app-adguardhome/po/zh_Hans/adguardhome.po
+++ b/immluci/applications/luci-app-adguardhome/po/zh_Hans/adguardhome.po
@ -1,408 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: zh_Hans\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:27
-msgid ""
-"<input type=\"button\" style=\"width:210px;border-color:Teal; text-align:"
-"center;font-weight:bold;color:Green;\" value=\"AdGuardHome Web:"
-msgstr ""
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua:6
-msgid "AdGuard Home"
-msgstr ""
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:67
-msgid "AdGuardHome Bin path if no bin will auto download"
-msgstr "AdGuardHome 执行文件路径 如果没有执行文件将自动下载"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:99
-msgid "AdGuardHome config path"
-msgstr "AdGuardHome 配置文件路径"
-
-#
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:58
-msgid "AdGuardHome redirect mode"
-msgstr "AdGuardHome重定向模式"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:142
-msgid ""
-"AdGuardHome runtime Log file if 'syslog': write to system log;if empty no log"
-msgstr "AdGuardHome 运行日志 如果填syslog将写入系统日志；如果空则不记录日志"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:120
-msgid "AdGuardHome work dir include rules,audit log and database"
-msgstr "AdGuardHome 工作目录包含规则，审计日志和数据库"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:179
-msgid "Add"
-msgstr "添加"
-
-# hide div
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:177
-msgid "Add gfwlist"
-msgstr "加入gfw列表"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:259
-msgid "Auto tail querylog"
-msgstr "自动截短查询日志"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:260
-msgid "Auto tail runtime log"
-msgstr "自动截短运行日志"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:258
-msgid "Auto update core"
-msgstr "自动升级核心"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:262
-msgid "Auto update gfwlist and restart adh"
-msgstr "自动更新gfw列表并重启adh"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:261
-msgid "Auto update ipv6 hosts and restart adh"
-msgstr "自动更新ipv6主机并重启adh"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:212
-msgid "Backup workdir files when shutdown"
-msgstr "在关机时备份工作目录文件"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:213
-msgid "Backup workdir path"
-msgstr "工作目录备份路径"
-
-# /cgi-bin/luci/admin/services/AdGuardHome
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua:7
-msgid "Base Setting"
-msgstr "基础设置"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:67
-msgid "Bin Path"
-msgstr "执行文件路径"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:22
-msgid "Browser management port"
-msgstr "网页管理端口"
-
-# hide div
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:189
-msgid "Change browser management password"
-msgstr "改变网页登录密码"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm:37
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm:70
-msgid "Check..."
-msgstr "检查中..."
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm:25
-msgid "Collecting data..."
-msgstr "获取数据中..."
-
-#
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:99
-msgid "Config Path"
-msgstr "配置文件路径"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:257
-msgid "Crontab task"
-msgstr "计划任务"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm:16
-msgid "Culculate"
-msgstr "计算"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:172
-msgid "Del"
-msgstr "删除"
-
-# hide div
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:170
-msgid "Del gfwlist"
-msgstr "删除gfw列表"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:268
-msgid "Download links for update"
-msgstr "升级用的下载链接"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:18
-msgid "Enable"
-msgstr "启用"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm:6
-msgid "Fast config"
-msgstr "快速配置"
-
-# button hide
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm:4
-msgid "Force update"
-msgstr "强制更新"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:11
-msgid ""
-"Free and open source, powerful network-wide ads & trackers blocking DNS "
-"server."
-msgstr "免费开源，功能强大的全网络广告和跟踪程序拦截DNS服务器"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:184
-msgid "Gfwlist domain upstream dns service"
-msgstr "gfw列表域名上游服务器"
-
-# hide div
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:184
-msgid "Gfwlist upstream dns server"
-msgstr "gfw列表上游服务器"
-
-#
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:195
-msgid "Keep files when system upgrade"
-msgstr "系统升级时保留文件"
-
-# #button change
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm:48
-msgid "Load culculate model"
-msgstr "载入计算模块"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua:8
-msgid "Log"
-msgstr "日志"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua:9
-msgid "Manual Config"
-msgstr "手动设置"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm:9
-msgid "NOT RUNNING"
-msgstr "未运行"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm:15
-msgid "Not redirect"
-msgstr "未重定向"
-
-#
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:207
-msgid "On boot when network ok restart"
-msgstr "开机后网络准备好时重启"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm:106
-msgid "Please add log path in config to enable log"
-msgstr "请在设置里填写日志路径以启用日志"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:257
-msgid "Please change time and args in crontab"
-msgstr "请在计划任务中修改时间和参数"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm:24
-msgid "Please save/apply"
-msgstr "请提交"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:189
-msgid "Press load culculate model and culculate finally save/apply"
-msgstr "按载入计算模块 然后计算 最后保存/提交"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm:7
-msgid "RUNNING"
-msgstr "运行中"
-
-#
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:58
-msgid "Redirect"
-msgstr "重定向"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:62
-msgid "Redirect 53 port to AdGuardHome"
-msgstr "重定向53端口到AdGuardHome"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm:13
-msgid "Redirected"
-msgstr "已重定向"
-
-# hide button
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/yamleditor.htm:36
-msgid "Reload Config"
-msgstr "重新载入配置"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm:47
-msgid "Reveal/hide password"
-msgstr ""
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:61
-msgid "Run as dnsmasq upstream server"
-msgstr "作为dnsmasq的上游服务器"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:142
-msgid "Runtime log file"
-msgstr "运行日志"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:49
-msgid "Update"
-msgstr "更新"
-
-# button change
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:50
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm:3
-msgid "Update core version"
-msgstr "更新核心版本"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm:54
-msgid "Updated"
-msgstr "已更新"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:63
-msgid "Use port 53 replace dnsmasq"
-msgstr "使用53端口替换dnsmasq"
-
-# /cgi-bin/luci//admin/services/AdGuardHome/manual/
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/yamleditor.htm:38
-msgid "Use template"
-msgstr "使用模板"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:160
-msgid "Verbose log"
-msgstr "详细日志"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/manual.lua:71
-msgid "WARNING!!! no bin found apply config will not be test"
-msgstr "警告！！！未找到执行文件，提交配置将不会进行校验"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:234
-msgid "Will be restore when workdir/data is empty"
-msgstr "在工作目录/data为空的时候恢复"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:120
-msgid "Work dir"
-msgstr "工作目录"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:96
-msgid "bin use less space,but may have compatibility issues"
-msgstr "减小执行文件空间占用，但是可能压缩后有兼容性问题"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:92
-msgid "compress best(can be slow for big files)"
-msgstr "最好的压缩(大文件可能慢)"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:91
-msgid "compress better"
-msgstr "更好的压缩"
-
-# inlist
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:90
-msgid "compress faster"
-msgstr "快速压缩"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:197
-msgid "config file"
-msgstr "配置文件"
-
-# checkbox
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:196
-msgid "core bin"
-msgstr "核心执行文件"
-
-#
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:53
-msgid "core version:"
-msgstr "核心版本:"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm:7
-msgid "dellog"
-msgstr "删除日志"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm:8
-msgid "download log"
-msgstr "下载日志"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:202
-msgid "filters"
-msgstr ""
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm:26
-msgid "is empty"
-msgstr "为空"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm:6
-msgid "loading..."
-msgstr "载入中"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm:4
-msgid "localtime"
-msgstr "本地时间"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:198
-msgid "log file"
-msgstr "日志文件"
-
-# description change
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:32
-msgid "no config"
-msgstr "没有配置文件"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:35
-msgid "no core"
-msgstr "没有核心"
-
-# inlist
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:60
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:89
-msgid "none"
-msgstr "无"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:201
-msgid "querylog.json"
-msgstr "审计日志.json"
-
-# /cgi-bin/luci/admin/services/AdGuardHome/log/
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm:9
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm:2
-msgid "reverse"
-msgstr "逆序"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:199
-msgid "sessions.db"
-msgstr ""
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:200
-msgid "stats.db"
-msgstr ""
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:93
-msgid "try all available compression methods & filters [slow]"
-msgstr "尝试所有可能的压缩方法和过滤器[慢]"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:94
-msgid "try even more compression variants [very slow]"
-msgstr "尝试更多变体压缩手段[很慢]"
-
-#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:88
-msgid "use upx to compress bin after download"
-msgstr "下载后使用upx压缩执行文件"
-
-#~ msgid "Added"
-#~ msgstr "已添加"
-
-#~ msgid "Not added"
-#~ msgstr "未添加"
-
-# unused
-#~ msgid "Change browser management username"
-#~ msgstr "改变网页登录用户名"
-
-#~ msgid "Username"
-#~ msgstr "用户名"
-
-#~ msgid "Check Config"
-#~ msgstr "检查配置"
-
-#~ msgid "unknown"
-#~ msgstr "未知"
-
-#~ msgid "Keep database when system upgrade"
-#~ msgstr "系统升级时保留数据"
-
-#~ msgid "Boot delay until network ok"
-#~ msgstr "开机时直到网络准备好再启动"
--- a/immluci/applications/luci-app-adguardhome/root/etc/config/AdGuardHome
+++ b/immluci/applications/luci-app-adguardhome/root/etc/config/AdGuardHome
@ -1,11 +0,0 @@
-config AdGuardHome 'AdGuardHome'
-	option enabled '0'
-	option httpport '3000'
-	option redirect 'none'
-	option configpath '/etc/AdGuardHome.yaml'
-	option workdir '/etc/AdGuardHome'
-	option logfile '/tmp/AdGuardHome.log'
-	option verbose '0'
-	option binpath '/usr/bin/AdGuardHome'
-	option upxflag ''
-
--- a/immluci/applications/luci-app-adguardhome/root/etc/init.d/AdGuardHome
+++ b/immluci/applications/luci-app-adguardhome/root/etc/init.d/AdGuardHome
@ -1,632 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-USE_PROCD=1
-
-START=95
-STOP=01
-
-CONFIGURATION=AdGuardHome
-CRON_FILE=/etc/crontabs/root
-
-extra_command "do_redirect" "0 or 1"
-extra_command "testbackup" "backup or restore"
-extra_command "test_crontab"
-extra_command "force_reload"
-extra_command "isrunning"
-
-set_forward_dnsmasq()
-{
-	local PORT="$1"
-	addr="127.0.0.1#$PORT"
-	OLD_SERVER="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`"
-	echo $OLD_SERVER | grep "^$addr" >/dev/null 2>&1
-	if [ $? -eq 0 ]; then
-		return
-	fi
-	uci delete dhcp.@dnsmasq[0].server 2>/dev/null
-	uci add_list dhcp.@dnsmasq[0].server=$addr
-	for server in $OLD_SERVER; do
-		if [ "$server" = "$addr" ]; then
-			continue
-		fi
-		uci add_list dhcp.@dnsmasq[0].server=$server
-	done
-	uci delete dhcp.@dnsmasq[0].resolvfile 2>/dev/null
-	uci set dhcp.@dnsmasq[0].noresolv=1
-	uci commit dhcp
-	/etc/init.d/dnsmasq restart
-}
-
-stop_forward_dnsmasq()
-{
-	local OLD_PORT="$1"
-	addr="127.0.0.1#$OLD_PORT"
-	OLD_SERVER="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`"
-	echo $OLD_SERVER | grep "^$addr" >/dev/null 2>&1
-	if [ $? -ne 0 ]; then
-		return
-	fi
-
-	uci del_list dhcp.@dnsmasq[0].server=$addr 2>/dev/null
-	addrlist="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`"
-	if [ -z "$addrlist" ] ; then
-		uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto 2>/dev/null
-		uci delete dhcp.@dnsmasq[0].noresolv 2>/dev/null
-	fi
-	uci commit dhcp
-	/etc/init.d/dnsmasq restart
-}
-
-set_iptable()
-{
-	local ipv6_server=$1
-	local tcp_server=$2
-	uci -q batch <<-EOF >/dev/null 2>&1
-	delete firewall.AdGuardHome
-	set firewall.AdGuardHome=include
-	set firewall.AdGuardHome.type=script
-	set firewall.AdGuardHome.path=/usr/share/AdGuardHome/firewall.start
-	set firewall.AdGuardHome.reload=1
-	commit firewall
-EOF
-
-	IPS="`ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F : '{print $2}'`"
-	for IP in $IPS
-	do
-		if [ "$tcp_server" == "1" ]; then
-			iptables -t nat -A PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT >/dev/null 2>&1
-		fi
-		iptables -t nat -A PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT >/dev/null 2>&1
-	done
-
-	if [ "$ipv6_server" == 0 ]; then
-		return
-	fi
-
-	IPS="`ifconfig | grep "inet6 addr" | grep -v " fe80::" | grep -v " ::1" | grep "Global" | awk '{print $3}'`"
-	for IP in $IPS
-	do
-		if [ "$tcp_server" == "1" ]; then
-			ip6tables -t nat -A PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT >/dev/null 2>&1
-		fi
-		ip6tables -t nat -A PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT >/dev/null 2>&1
-	done
-}
-
-clear_iptable()
-{
-	uci -q batch <<-EOF >/dev/null 2>&1
-	delete firewall.AdGuardHome
-	commit firewall
-EOF
-	local OLD_PORT="$1"
-	local ipv6_server=$2
-	IPS="`ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F : '{print $2}'`"
-	for IP in $IPS
-	do
-		iptables -t nat -D PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
-		iptables -t nat -D PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
-	done
-
-	if [ "$ipv6_server" == 0 ]; then
-		return
-	fi
-	echo "warn ip6tables nat mod is needed"
-	IPS="`ifconfig | grep "inet6 addr" | grep -v " fe80::" | grep -v " ::1" | grep "Global" | awk '{print $3}'`"
-	for IP in $IPS
-	do
-		ip6tables -t nat -D PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
-		ip6tables -t nat -D PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
-	done
-}
-
-service_triggers() {
-	procd_add_reload_trigger "$CONFIGURATION"
-	[ "$(uci get AdGuardHome.AdGuardHome.redirect)" == "redirect" ] && procd_add_reload_trigger firewall
-}
-
-isrunning(){
-	config_load "${CONFIGURATION}"
-	_isrunning
-	local r=$?
-	([ "$r" == "0" ] && echo "running") || ([ "$r" == "1" ] && echo "not run" ) || echo "no bin"
-	return $r
-}
-
-_isrunning(){
-	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
-	[ ! -f "$binpath" ] && return 2
-	pgrep $binpath 2>&1 >/dev/null && return 0
-	return 1
-}
-
-force_reload(){
-	config_load "${CONFIGURATION}"
-	_isrunning && procd_send_signal "$CONFIGURATION" || start
-}
-
-get_tz()
-{
-	SET_TZ=""
-
-	if [ -e "/etc/localtime" ]; then
-		return
-	fi
-
-	for tzfile in /etc/TZ /var/etc/TZ
-	do
-		if [ ! -e "$tzfile" ]; then
-			continue
-		fi
-
-		tz="`cat $tzfile 2>/dev/null`"
-	done
-
-	if [ -z "$tz" ]; then
-		return
-	fi
-
-	SET_TZ=$tz
-}
-
-rm_port53()
-{
-	local AdGuardHome_PORT=$(config_editor "dns.port" "" "$configpath" "1")
-	dnsmasq_port=$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)
-	if [ -z "$dnsmasq_port" ]; then
-	dnsmasq_port="53"
-	fi
-	if [ "$dnsmasq_port" == "$AdGuardHome_PORT" ]; then
-		if [ "$dnsmasq_port" == "53" ]; then
-			dnsmasq_port="1745"
-		fi
-	elif [ "$dnsmasq_port" == "53" ]; then
-		return
-	fi
-	config_editor "dns.port" "$dnsmasq_port" "$configpath"
-	uci set dhcp.@dnsmasq[0].port="53"
-	uci commit dhcp
-	/etc/init.d/dnsmasq reload
-}
-
-use_port53()
-{
-	local AdGuardHome_PORT=$(config_editor "dns.port" "" "$configpath" "1")
-	dnsmasq_port=$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)
-	if [ -z "$dnsmasq_port" ]; then
-		dnsmasq_port="53"
-	fi
-	if [ "$dnsmasq_port" == "$AdGuardHome_PORT" ]; then
-		if [ "$dnsmasq_port" == "53" ]; then
-			AdGuardHome_PORT="1745"
-		fi
-	elif [ "$AdGuardHome_PORT" == "53" ]; then
-		return
-	fi
-	config_editor "dns.port" "53" "$configpath"
-	uci set dhcp.@dnsmasq[0].port="$AdGuardHome_PORT"
-	uci commit dhcp
-	/etc/init.d/dnsmasq reload
-}
-
-do_redirect()
-{
-	config_load "${CONFIGURATION}"
-	_do_redirect $1
-}
-
-_do_redirect()
-{
-	local section="$CONFIGURATION"
-	args=""
-	ipv6_server=1
-	tcp_server=0
-	enabled=$1
-	if [ "$enabled" == "1" ]; then
-		echo -n "1">/var/run/AdGredir
-	else
-		echo -n "0">/var/run/AdGredir
-	fi
-	config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
-	AdGuardHome_PORT=$(config_editor "dns.port" "" "$configpath" "1")
-	if [ -z "$AdGuardHome_PORT" ]; then
-		AdGuardHome_PORT="0"
-	fi
-	config_get "redirect" "$section" "redirect" "none"
-	config_get "old_redirect" "$section" "old_redirect" "none"
-	config_get "old_port" "$section" "old_port" "0"
-	config_get "old_enabled" "$section" "old_enabled" "0"
-	uci get dhcp.@dnsmasq[0].port >/dev/null 2>&1 || uci set dhcp.@dnsmasq[0].port="53" >/dev/null 2>&1
-	if [ "$old_enabled" = "1" -a "$old_redirect" == "exchange" ]; then
-		AdGuardHome_PORT=$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)
-	fi
-
-	if [ "$old_redirect" != "$redirect" ] || [ "$old_port" != "$AdGuardHome_PORT" ] || [ "$old_enabled" = "1" -a "$enabled" = "0" ]; then
-		if [ "$old_redirect" != "none" ]; then
-			if [  "$old_redirect" == "redirect" -a "$old_port" != "0" ]; then
-				clear_iptable "$old_port" "$ipv6_server"
-			elif [ "$old_redirect" == "dnsmasq-upstream" ]; then
-				stop_forward_dnsmasq "$old_port"
-			elif [ "$old_redirect" == "exchange" ]; then
-				rm_port53
-			fi
-		fi
-	elif [ "$old_enabled" = "1" -a "$enabled" = "1" ]; then
-		if [  "$old_redirect" == "redirect" -a "$old_port" != "0" ]; then
-			clear_iptable "$old_port" "$ipv6_server"
-		fi
-	fi
-	uci delete AdGuardHome.@AdGuardHome[0].old_redirect 2>/dev/null
-	uci delete AdGuardHome.@AdGuardHome[0].old_port 2>/dev/null
-	uci delete AdGuardHome.@AdGuardHome[0].old_enabled 2>/dev/null
-	uci add_list AdGuardHome.@AdGuardHome[0].old_redirect="$redirect" 2>/dev/null
-	uci add_list AdGuardHome.@AdGuardHome[0].old_port="$AdGuardHome_PORT" 2>/dev/null
-	uci add_list AdGuardHome.@AdGuardHome[0].old_enabled="$enabled" 2>/dev/null
-	uci commit AdGuardHome
-	[ "$enabled" == "0" ] && return 1
-	if [ "$AdGuardHome_PORT" == "0" ]; then
-		return 1
-	fi
-	if [ "$redirect" = "redirect" ]; then
-		set_iptable $ipv6_server $tcp_server
-	elif [ "$redirect" = "dnsmasq-upstream" ]; then
-		set_forward_dnsmasq "$AdGuardHome_PORT"
-	elif [ "$redirect" == "exchange" -a "$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)" == "53" ]; then
-		use_port53
-	fi
-}
-
-get_filesystem()
-{
-# print out path filesystem
-    echo $1 | awk '
-    BEGIN{
-    while (("mount"| getline ret) > 0)
-    {
-    split(ret,d);
-    fs[d[3]]=d[5];
-    m=index(d[1],":")
-    if (m==0)
-    {
-        pt[d[3]]=d[1]
-    }else{
-        pt[d[3]]=substr(d[1],m+1)
-    }}}{
-    split($0,d,"/");
-    if ("/" in fs)
-    {
-    result1=fs["/"];
-    }
-    if ("/" in pt)
-    {
-    result2=pt["/"];
-    }
-    for (i=2;i<=length(d);i++)
-    {
-       p[i]=p[i-1]"/"d[i];
-       if (p[i] in fs)
-        {
-        result1=fs[p[i]];
-        result2=pt[p[i]];
-        }
-    }
-    if (result2 in fs){
-        result=fs[result2]}
-    else{
-        result=result1}
-    print(result);}'
-}
-
-config_editor()
-{
-	awk -v yaml="$1" -v value="$2" -v file="$3" -v ro="$4" '
-	BEGIN{split(yaml,part,"\.");s="";i=1;l=length(part);}
-    {
-        if (match($0,s""part[i]":"))
-        {
-            if (i==l)
-            {
-                split($0,t,": ");
-				if (ro==""){
-				system("sed -i '\''"FNR"c \\"t[1]": "value"'\'' "file);
-				}else{
-				print(t[2]);
-				}
-				exit;
-            }
-            s=s"[- ]{2}";
-            i++;
-        }
-    }' $3
-}
-
-boot_service() {
-	rm /var/run/AdGserverdis >/dev/null 2>&1
-	config_load "${CONFIGURATION}"
-	config_get waitonboot $CONFIGURATION waitonboot "0"
-	config_get_bool enabled $CONFIGURATION enabled 0
-	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
-	[ -f "$binpath" ] && start_service
-	if [ "$enabled" == "1" ] && [ "$waitonboot" == "1" ]; then
-		procd_open_instance "waitnet"
-		procd_set_param command "/usr/share/AdGuardHome/waitnet.sh"
-		procd_close_instance
-		echo "no net start pinging"
-	fi
-}
-
-testbackup(){
-	config_load "${CONFIGURATION}"
-	if [ "$1" == "backup" ]; then
-		backup
-	elif [ "$1" == "restore" ]; then
-		restore
-	fi
-}
-
-restore()
-{
-	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
-	config_get backupwdpath $CONFIGURATION backupwdpath "/etc/AdGuardHome"
-	cp -u -r -f $backupwdpath/data $workdir
-}
-
-backup() {
-	config_get backupwdpath $CONFIGURATION backupwdpath "/etc/AdGuardHome"
-	mkdir -p $backupwdpath/data
-	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
-	config_get backupfile $CONFIGURATION backupfile ""
-	for one in $backupfile;
-	do
-		while :
-		do
-			if [ -d "$backupwdpath/data/$one" ]; then
-				cpret=$(cp -u -r -f $workdir/data/$one $backupwdpath/data 2>&1)
-			else
-				cpret=$(cp -u -r -f $workdir/data/$one $backupwdpath/data/$one 2>&1)
-			fi
-			echo "$cpret"
-			echo "$cpret" | grep "no space left on device"
-			if [ "$?" == "0" ]; then
-				echo "磁盘已满,删除log重试中"
-				del_querylog && continue
-				rm -f -r $backupwdpath/data/filters
-				rm -f -r $workdir/data/filters && continue
-				echo "backup failed"
-			fi
-			break
-		done
-	done
-}
-
-start_service() {
-	# Reading config
-	rm /var/run/AdGserverdis >/dev/null 2>&1
-	config_load "${CONFIGURATION}"
-	# update password
-	config_get hashpass $CONFIGURATION hashpass ""
-	config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
-	if [ -n "$hashpass" ]; then
-		config_editor "users.password" "$hashpass" "$configpath"
-		uci set $CONFIGURATION.$CONFIGURATION.hashpass=""
-	fi
-	local enabled
-	config_get_bool enabled $CONFIGURATION enabled 0
-	# update crontab
-	do_crontab
-	if [ "$enabled" == "0" ]; then
-		_do_redirect 0
-		return
-	fi
-	#what need to do before reload
-	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
-
-	config_get backupfile $CONFIGURATION backupfile ""
-	mkdir -p $workdir/data
-	if [ -n "$backupfile" ] && [ ! -d "$workdir/data" ]; then
-		restore
-	fi
-	# for overlay data-stk-oo not suppport
-	local cwdfs=$(get_filesystem $workdir)
-	echo "workdir is a $cwdfs filesystem"
-	if [ "$cwdfs" == "jffs2" ]; then
-		echo "fs error ln db to tmp $workdir $cwdfs"
-		logger "AdGuardHome" "warning db redirect to tmp"
-		touch $workdir/data/stats.db
-		if [ ! -L $workdir/data/stats.db ]; then
-		mv -f $workdir/data/stats.db /tmp/stats.db 2>/dev/null
-		ln -s /tmp/stats.db $workdir/data/stats.db 2>/dev/null
-		fi
-		touch $workdir/data/sessions.db
-		if [ ! -L $workdir/data/sessions.db ]; then
-		mv -f $workdir/data/sessions.db /tmp/sessions.db 2>/dev/null
-		ln -s /tmp/sessions.db $workdir/data/sessions.db 2>/dev/null
-		fi
-	fi
-	local ADDITIONAL_ARGS=""
-	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
-
-	mkdir -p ${binpath%/*}
-	ADDITIONAL_ARGS="$ADDITIONAL_ARGS -c $configpath"
-	ADDITIONAL_ARGS="$ADDITIONAL_ARGS -w $workdir"
-	config_get httpport $CONFIGURATION httpport 3000
-	ADDITIONAL_ARGS="$ADDITIONAL_ARGS -p $httpport"
-
-	# hack to save config file when upgrade system
-	config_get upprotect $CONFIGURATION upprotect ""
-	eval upprotect=${upprotect// /\\\\n}
-	echo -e "$upprotect">/lib/upgrade/keep.d/luci-app-adguardhome
-
-	config_get logfile $CONFIGURATION logfile ""
-	if [ -n "$logfile" ]; then
-		ADDITIONAL_ARGS="$ADDITIONAL_ARGS -l $logfile"
-	fi
-
-	if [ ! -f "$binpath" ]; then
-		_do_redirect 0
-		/usr/share/AdGuardHome/update_core.sh 2>&1 >/tmp/AdGuardHome_update.log &
-		exit 0
-	fi
-
-	config_get_bool verbose $CONFIGURATION verbose 0
-	if [ "$verbose" -eq 1 ]; then
-		ADDITIONAL_ARGS="$ADDITIONAL_ARGS -v"
-	fi
-
-	procd_open_instance
-	get_tz
-	if [ -n "$SET_TZ" ]; then
-		procd_set_param env TZ="$SET_TZ"
-	fi
-	procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
-	procd_set_param limits core="unlimited" nofile="65535 65535"
-	procd_set_param stderr 1
-	procd_set_param command $binpath $ADDITIONAL_ARGS
-	procd_set_param file "$configpath" "/etc/hosts" "/etc/config/AdGuardHome"
-	procd_close_instance
-	if [ -f "$configpath" ]; then
-		_do_redirect 1
-	else
-		_do_redirect 0
-		config_get "redirect" "AdGuardHome" "redirect" "none"
-		if [ "$redirect" != "none" ]; then
-			procd_open_instance "waitconfig"
-			procd_set_param command "/usr/share/AdGuardHome/watchconfig.sh"
-			procd_close_instance
-			echo "no config start watching"
-		fi
-	fi
-	echo "AdGuardHome service enabled"
-	echo "luci enable switch=$enabled"
-	(sleep 10 && [ -z "$(pgrep $binpath)" ] && logger "AdGuardHome" "no process in 10s cancel redirect" && _do_redirect 0 )&
-}
-
-reload_service()
-{
-	rm /var/run/AdGlucitest >/dev/null 2>&1
-	echo "AdGuardHome reloading"
-	start
-}
-
-del_querylog(){
-	local btarget=$(ls $backupwdpath/data | grep -F "querylog.json" | sort -r | head -n 1)
-	local wtarget=$(ls $workdir/data | grep -F "querylog.json" | sort -r | head -n 1)
-	if [ "$btarget"x == "$wtarget"x ]; then
-		[ -z "$btarget" ] && return 1
-		rm -f $workdir/data/$wtarget
-		rm -f $backupwdpath/data/$btarget
-		return 0
-	fi
-	if [ "$btarget" \> "$wtarget" ]; then
-		rm -f $backupwdpath/data/$btarget
-		return 0
-	else
-		rm -f $workdir/data/$wtarget
-		return 0
-	fi
-}
-
-stop_service()
-{
-	config_load "${CONFIGURATION}"
-	_do_redirect 0
-	do_crontab
-	if [ "$1" != "nobackup" ]; then
-		config_get backupfile $CONFIGURATION backupfile "0"
-		if [ -n "$backupfile" ]; then
-			backup
-		fi
-	fi
-	echo "AdGuardHome service disabled"
-	touch /var/run/AdGserverdis
-}
-
-boot() {
-	rc_procd boot_service "$@"
-	if eval "type service_started" 2>/dev/null >/dev/null; then
-		service_started
-	fi
-}
-
-test_crontab(){
-	config_load "${CONFIGURATION}"
-	do_crontab
-}
-
-do_crontab(){
-	config_get_bool enabled $CONFIGURATION enabled 0
-	config_get crontab $CONFIGURATION crontab ""
-	local findstr default cronenable replace commit
-	local cronreload=0
-	local commit=0
-	findstr="/usr/share/AdGuardHome/update_core.sh"
-	default="30 3 * * * /usr/share/AdGuardHome/update_core.sh 2>&1"
-	[ "$enabled" == "0" ] || [ "${crontab//autoupdate/}" == "$crontab" ] && cronenable=0 || cronenable=1
-	crontab_editor
-
-	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
-	config_get lastworkdir $CONFIGURATION lastworkdir "/etc/AdGuardHome"
-	findstr="/usr/share/AdGuardHome/tailto.sh [0-9]* \$(uci get AdGuardHome.AdGuardHome.workdir)/data/querylog.json"
-	#[ -n "$lastworkdir" ] && findstr="/usr/share/AdGuardHome/tailto.sh [0-9]* $lastworkdir/data/querylog.json" && [ "$lastworkdir" != "$workdir" ] && replace="${lastworkdir//\//\\/}/${workdir//\//\\/}"
-	default="0 * * * * /usr/share/AdGuardHome/tailto.sh 2000 \$(uci get AdGuardHome.AdGuardHome.workdir)/data/querylog.json"
-	[ "$enabled" == "0" ] || [ "${crontab//cutquerylog/}" == "$crontab" ] && cronenable=0 || cronenable=1
-	crontab_editor
-	#[ "$lastworkdir" != "$workdir" ] && uci set AdGuardHome.AdGuardHome.lastworkdir="$workdir" && commit=1
-
-	config_get logfile $CONFIGURATION logfile ""
-	config_get lastlogfile $CONFIGURATION lastlogfile ""
-	findstr="/usr/share/AdGuardHome/tailto.sh [0-9]* \$(uci get AdGuardHome.AdGuardHome.logfile)"
-	default="30 3 * * * /usr/share/AdGuardHome/tailto.sh 2000 \$(uci get AdGuardHome.AdGuardHome.logfile)"
-	#[ -n "$lastlogfile" ] && findstr="/usr/share/AdGuardHome/tailto.sh [0-9]* $lastlogfile" && [ -n "$logfile" ] && [ "$lastlogfile" != "$logfile" ] && replace="${lastlogfile//\//\\/}/${logfile//\//\\/}"
-	[ "$logfile" == "syslog" ] || [ "$logfile" == "" ] || [ "$enabled" == "0" ] || [ "${crontab//cutruntimelog/}" == "$crontab" ] && cronenable=0 || cronenable=1
-	crontab_editor
-	#[ -n "$logfile" ] && [ "$lastlogfile" != "$logfile" ] && uci set AdGuardHome.AdGuardHome.lastlogfile="$logfile" && commit=1
-
-	findstr="/usr/share/AdGuardHome/addhost.sh"
-	default="0 * * * * /usr/share/AdGuardHome/addhost.sh"
-	[ "$enabled" == "0" ] || [ "${crontab//autohost/}" == "$crontab" ] && cronenable=0 || cronenable=1
-	crontab_editor
-	[ "$cronenable" == "0" ] && /usr/share/AdGuardHome/addhost.sh "del" "noreload" || /usr/share/AdGuardHome/addhost.sh "" "noreload"
-
-	findstr="/usr/share/AdGuardHome/gfw2adg.sh"
-	default="30 3 * * * /usr/share/AdGuardHome/gfw2adg.sh"
-	[ "$enabled" == "0" ] || [ "${crontab//autogfw/}" == "$crontab" ] && cronenable=0 || cronenable=1
-	crontab_editor
-	[ "$cronreload" -gt 0 ] && /etc/init.d/cron restart
-	#[ "$commit" -gt 0 ] && uci commit AdGuardHome
-}
-
-crontab_editor(){
-	#usage input:
-	#findstr=
-	#default=
-	#cronenable=
-	#replace="${last//\//\\/}/${now//\//\\/}"
-	#output:cronreload:if >1 please /etc/init.d/cron restart manual
-	local testline reload
-	local line="$(grep "$findstr" $CRON_FILE)"
-	[ -n "$replace" ] && [ -n "$line" ] && eval testline="\${line//$replace}" && [ "$testline" != "$line" ] && line="$testline" && reload="1" && replace=""
-	if [ "${line:0:1}" != "#" ]; then
-		if [ $cronenable -eq 1 ]; then
-			[ -z "$line" ] && line="$default" && reload="1"
-			if [ -n "$reload" ]; then
-				sed -i "\,$findstr,d" $CRON_FILE
-				echo "$line" >> $CRON_FILE
-				cronreload=$((cronreload+1))
-			fi
-		elif [ -n "$line" ]; then
-			sed -i "\,$findstr,d" $CRON_FILE
-			echo "#$line" >> $CRON_FILE
-			cronreload=$((cronreload+1))
-		fi
-	else
-		if [ $cronenable -eq 1 ]; then
-			sed -i "\,$findstr,d" $CRON_FILE
-			echo "${line:1}" >> $CRON_FILE
-			cronreload=$((cronreload+1))
-		elif [ -z "$reload" ]; then
-			sed -i "\,$findstr,d" $CRON_FILE
-			echo "$line" >> $CRON_FILE
-		fi
-	fi
-}
--- a/immluci/applications/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome
+++ b/immluci/applications/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome
@ -1,12 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null 2>&1
-	delete ucitrack.@AdGuardHome[-1]
-	add ucitrack AdGuardHome
-	set ucitrack.@AdGuardHome[-1].init=AdGuardHome
-	commit ucitrack
-	delete AdGuardHome.AdGuardHome.ucitracktest
-EOF
-
-rm -f /tmp/luci-indexcache
-exit 0
--- a/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/AdGuardHome_template.yaml
+++ b/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/AdGuardHome_template.yaml
@ -1,109 +0,0 @@
-#提交就可以直接用的配置模板文件
-#a template config can be use with a apply
-bind_host: 0.0.0.0
-bind_port: 3000
-users:
- name: root
-  password: $2y$10$FfeQavihMUiXCuJhHuQwy.6EOXDvkXb/S50qI5fXizqarNT/ShhQm
-language: ""
-rlimit_nofile: 0
-dns:
-  bind_host: 0.0.0.0
-  port: 5553
-  statistics_interval: 1
-  protection_enabled: true
-  filtering_enabled: true
-  filters_update_interval: 24
-  blocking_mode: nxdomain
-  blocked_response_ttl: 10
-  querylog_enabled: false
-  querylog_interval: 1
-  ratelimit: 0
-  ratelimit_whitelist: []
-  refuse_any: false
-  bootstrap_dns:
-#bootstrap_dns
-  all_servers: false
-  allowed_clients: []
-  disallowed_clients: []
-  blocked_hosts: []
-  parental_block_host: ""
-  safebrowsing_block_host: ""
-  blocked_services: []
-  cache_size: 4194304
-  parental_sensitivity: 13
-  parental_enabled: false
-  safesearch_enabled: false
-  safebrowsing_enabled: false
-  safebrowsing_cache_size: 1048576
-  safesearch_cache_size: 1048576
-  parental_cache_size: 1048576
-  cache_time: 30
-  rewrites: []
-  upstream_dns:
-#upstream_dns
-tls:
-  enabled: false
-  server_name: ""
-  force_https: false
-  port_https: 443
-  port_dns_over_tls: 853
-  certificate_chain: ""
-  private_key: ""
-  certificate_path: ""
-  private_key_path: ""
-filters:
- enabled: true
-  url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
-  name: AdGuard Simplified Domain Names filter
-  id: 1
- enabled: true
-  url: https://adaway.org/hosts.txt
-  name: AdAway
-  id: 2
- enabled: false
-  url: https://hosts-file.net/ad_servers.txt
-  name: hpHosts - Ad and Tracking servers only
-  id: 3
- enabled: true
-  url: https://www.malwaredomainlist.com/hostslist/hosts.txt
-  name: MalwareDomainList.com Hosts List
-  id: 4
- enabled: false
-  url: https://raw.githubusercontent.com/vokins/yhosts/master/data/tvbox.txt
-  name: tvbox
-  id: 1575018007
- enabled: true
-  url: https://hosts.nfz.moe/full/hosts
-  name: neoHosts full
-  id: 1575618240
- enabled: false
-  url: https://hosts.nfz.moe/basic/hosts
-  name: neoHosts basic
-  id: 1575618241
- enabled: false
-  url: http://sbc.io/hosts/hosts
-  name: StevenBlack host basic
-  id: 1575618242
- enabled: false
-  url: http://sbc.io/hosts/alternates/fakenews-gambling-porn-social/hosts
-  name: StevenBlack host+fakenews + gambling + porn + social
-  id: 1575618243
- enabled: false
-  url: https://cdn.jsdelivr.net/gh/privacy-protection-tools/anti-AD/anti-ad-easylist.txt
-  name: anti-AD(Adblock+neohosts+yhosts+cjxlist+adhlist)
-  id: 1577113202
-user_rules: []
-dhcp:
-  enabled: false
-  interface_name: ""
-  gateway_ip: ""
-  subnet_mask: ""
-  range_start: ""
-  range_end: ""
-  lease_duration: 86400
-  icmp_timeout_msec: 1000
-clients: []
-log_file: ""
-verbose: false
-schema_version: 5
--- a/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/addhost.sh
+++ b/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/addhost.sh
@ -1,35 +0,0 @@
-#!/bin/sh
-
-checkmd5(){
-local nowmd5=$(md5sum /etc/hosts)
-nowmd5=${nowmd5%% *}
-local lastmd5=$(uci get AdGuardHome.AdGuardHome.hostsmd5 2>/dev/null)
-if [ "$nowmd5" != "$lastmd5" ]; then
-	uci set AdGuardHome.AdGuardHome.hostsmd5="$nowmd5"
-	uci commit AdGuardHome
-	[ "$1" == "noreload" ] || /etc/init.d/AdGuardHome reload
-fi
-}
-
-[ "$1" == "del" ] && sed -i '/programaddstart/,/programaddend/d' /etc/hosts && checkmd5 "$2" && exit 0
-/usr/bin/awk 'BEGIN{
-while ((getline < "/tmp/dhcp.leases") > 0)
-{
-    a[$2]=$4;
-}
-while (("ip -6 neighbor show | grep -v fe80" | getline) > 0)
-{
-    if (a[$5]) {print $1" "a[$5] >"/tmp/tmphost"; }
-}
-print "#programaddend" >"/tmp/tmphost";
-}'
-grep programaddstart /etc/hosts >/dev/null 2>&1
-if [ "$?" == "0" ]; then
-	sed -i '/programaddstart/,/programaddend/c\#programaddstart' /etc/hosts
-	sed -i '/programaddstart/'r/tmp/tmphost /etc/hosts
-else
-	echo "#programaddstart" >>/etc/hosts
-	cat /tmp/tmphost >> /etc/hosts
-fi
-rm /tmp/tmphost
-checkmd5 "$2"
--- a/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/firewall.start
+++ b/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/firewall.start
@ -1,8 +0,0 @@
-#!/bin/sh
-
-AdGuardHome_enable=$(uci get AdGuardHome.AdGuardHome.enabled)
-redirect=$(uci get AdGuardHome.AdGuardHome.redirect)
-
-if [ $AdGuardHome_enable -eq 1 -a "$redirect" == "redirect" ]; then
-	/etc/init.d/AdGuardHome do_redirect 1
-fi
--- a/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/getsyslog.sh
+++ b/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/getsyslog.sh
@ -1,20 +0,0 @@
-#!/bin/sh
-
-PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-logread -e AdGuardHome > /tmp/AdGuardHometmp.log
-logread -e AdGuardHome -f >> /tmp/AdGuardHometmp.log &
-pid=$!
-echo "1">/var/run/AdGuardHomesyslog
-while true
-do
-	sleep 12
-	watchdog=$(cat /var/run/AdGuardHomesyslog)
-	if [ "$watchdog"x == "0"x ]; then
-		kill $pid
-		rm /tmp/AdGuardHometmp.log
-		rm /var/run/AdGuardHomesyslog
-		exit 0
-	else
-		echo "0">/var/run/AdGuardHomesyslog
-	fi
-done
--- a/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/gfw2adg.sh
+++ b/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/gfw2adg.sh
@ -1,89 +0,0 @@
-#!/bin/sh
-
-PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-
-checkmd5(){
-local nowmd5=$(md5sum /tmp/adguard.list 2>/dev/null)
-nowmd5=${nowmd5%% *}
-local lastmd5=$(uci get AdGuardHome.AdGuardHome.gfwlistmd5 2>/dev/null)
-if [ "$nowmd5" != "$lastmd5" ]; then
-	uci set AdGuardHome.AdGuardHome.gfwlistmd5="$nowmd5"
-	uci commit AdGuardHome
-	[ "$1" == "noreload" ] || /etc/init.d/AdGuardHome reload
-fi
-}
-
-configpath=$(uci get AdGuardHome.AdGuardHome.configpath 2>/dev/null)
-[ "$1" == "del" ] && sed -i '/programaddstart/,/programaddend/d' $configpath && checkmd5 "$2" && exit 0
-gfwupstream=$(uci get AdGuardHome.AdGuardHome.gfwupstream 2>/dev/null)
-if [ -z $gfwupstream ]; then
-gfwupstream="tcp://208.67.220.220:5353"
-fi
-if [ ! -f "$configpath" ]; then
-	echo "please make a config first"
-	exit 1
-fi
-wget-ssl --no-check-certificate https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt -O- | base64 -d > /tmp/gfwlist.txt
-cat /tmp/gfwlist.txt | awk -v upst="$gfwupstream" 'BEGIN{getline;}{
-s1=substr($0,1,1);
-if (s1=="!")
-{next;}
-if (s1=="@"){
-    $0=substr($0,3);
-    s1=substr($0,1,1);
-    white=1;}
-else{
-    white=0;
-}
-
-if (s1=="|")
-    {s2=substr($0,2,1);
-    if (s2=="|")
-    {
-        $0=substr($0,3);
-        split($0,d,"/");
-        $0=d[1];
-    }else{
-        split($0,d,"/");
-        $0=d[3];
-    }}
-else{
-    split($0,d,"/");
-    $0=d[1];
-}
-star=index($0,"*");
-if (star!=0)
-{
-    $0=substr($0,star+1);
-    dot=index($0,".");
-    if (dot!=0)
-        $0=substr($0,dot+1);
-    else
-        next;
-    s1=substr($0,1,1);
-}
-if (s1==".")
-{fin=substr($0,2);}
-else{fin=$0;}
-if (index(fin,".")==0) next;
-if (index(fin,"%")!=0) next;
-if (index(fin,":")!=0) next;
-match(fin,"^[0-9\.]+")
-if (RSTART==1 && RLENGTH==length(fin)) {print "ipset add gfwlist "fin>"/tmp/doipset.sh";next;}
-if (fin=="" || finl==fin) next;
-finl=fin;
-if (white==0)
-    {print("  - '\''[/"fin"/]"upst"'\''");}
-else{
-    print("  - '\''[/"fin"/]#'\''");}
-}END{print("  - '\''[/programaddend/]#'\''")}' > /tmp/adguard.list
-grep programaddstart $configpath
-if [ "$?" == "0" ]; then
-	sed -i '/programaddstart/,/programaddend/c\  - '\''\[\/programaddstart\/\]#'\''' $configpath
-	sed -i '/programaddstart/'r/tmp/adguard.list $configpath
-else
-	sed -i '1i\  - '\''[/programaddstart/]#'\''' /tmp/adguard.list
-	sed -i '/upstream_dns:/'r/tmp/adguard.list $configpath
-fi
-checkmd5 "$2"
-rm -f /tmp/gfwlist.txt /tmp/adguard.list
--- a/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/links.txt
+++ b/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/links.txt
@ -1,3 +0,0 @@
-https://github.com/AdguardTeam/AdGuardHome/releases/download/${latest_ver}/AdGuardHome_linux_${Arch}.tar.gz
-https://static.adguard.com/adguardhome/release/AdGuardHome_linux_${Arch}.tar.gz
-#https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_${Arch}.tar.gz
--- a/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/tailto.sh
+++ b/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/tailto.sh
@ -1,5 +0,0 @@
-#!/bin/sh
-
-tail -n $1 "$2" > /var/run/tailtmp
-cat /var/run/tailtmp > "$2"
-rm /var/run/tailtmp
--- a/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/update_core.sh
+++ b/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/update_core.sh
@ -1,236 +0,0 @@
-#!/bin/bash
-
-PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-binpath=$(uci get AdGuardHome.AdGuardHome.binpath)
-if [ -z "$binpath" ]; then
-uci set AdGuardHome.AdGuardHome.binpath="/tmp/AdGuardHome/AdGuardHome"
-binpath="/tmp/AdGuardHome/AdGuardHome"
-fi
-mkdir -p ${binpath%/*}
-upxflag=$(uci get AdGuardHome.AdGuardHome.upxflag 2>/dev/null)
-
-check_if_already_running(){
-	running_tasks="$(ps |grep "AdGuardHome" |grep "update_core" |grep -v "grep" |awk '{print $1}' |wc -l)"
-	[ "${running_tasks}" -gt "2" ] && echo -e "\nA task is already running."  && EXIT 2
-}
-
-check_wgetcurl(){
-	which curl && downloader="curl -L -k --retry 2 --connect-timeout 20 -o" && return
-	which wget-ssl && downloader="wget-ssl --no-check-certificate -t 2 -T 20 -O" && return
-	[ -z "$1" ] && opkg update || (echo error opkg && EXIT 1)
-	[ -z "$1" ] && (opkg remove wget wget-nossl --force-depends ; opkg install wget ; check_wgetcurl 1 ;return)
-	[ "$1" == "1" ] && (opkg install curl ; check_wgetcurl 2 ; return)
-	echo error curl and wget && EXIT 1
-}
-
-check_latest_version(){
-	check_wgetcurl
-	latest_ver="$($downloader - https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest 2>/dev/null|grep -E 'tag_name' |grep -E 'v[0-9.]+' -o 2>/dev/null)"
-	if [ -z "${latest_ver}" ]; then
-		echo -e "\nFailed to check latest version, please try again later."  && EXIT 1
-	fi
-	now_ver="$($binpath -c /dev/null --check-config 2>&1| grep -m 1 -E 'v[0-9.]+' -o)"
-	if [ "${latest_ver}"x != "${now_ver}"x ] || [ "$1" == "force" ]; then
-		echo -e "Local version: ${now_ver}., cloud version: ${latest_ver}."
-		doupdate_core
-	else
-		echo -e "\nLocal version: ${now_ver}, cloud version: ${latest_ver}."
-		echo -e "You're already using the latest version."
-		if [ ! -z "$upxflag" ]; then
-			filesize=$(ls -l $binpath | awk '{ print $5 }')
-			if [ $filesize -gt 8000000 ]; then
-				echo -e "start upx may take a long time"
-				doupx
-				mkdir -p "/tmp/AdGuardHomeupdate/AdGuardHome" >/dev/null 2>&1
-				rm -fr /tmp/AdGuardHomeupdate/AdGuardHome/${binpath##*/}
-				/tmp/upx-${upx_latest_ver}-${Arch}_linux/upx $upxflag $binpath -o /tmp/AdGuardHomeupdate/AdGuardHome/${binpath##*/}
-				rm -rf /tmp/upx-${upx_latest_ver}-${Arch}_linux
-				/etc/init.d/AdGuardHome stop nobackup
-				rm $binpath
-				mv -f /tmp/AdGuardHomeupdate/AdGuardHome/${binpath##*/} $binpath
-				/etc/init.d/AdGuardHome start
-				echo -e "finished"
-			fi
-		fi
-		EXIT 0
-	fi
-}
-
-doupx(){
-	Archt="$(opkg info kernel | grep Architecture | awk -F "[ _]" '{print($2)}')"
-	case $Archt in
-	"i386")
-		Arch="i386"
-		;;
-	"i686")
-		Arch="i386"
-		echo -e "i686 use $Arch may have bug"
-		;;
-	"x86")
-		Arch="amd64"
-		;;
-	"mipsel")
-		Arch="mipsel"
-		;;
-	"mips64el")
-		Arch="mips64el"
-		Arch="mipsel"
-		echo -e "mips64el use $Arch may have bug"
-		;;
-	"mips")
-		Arch="mips"
-		;;
-	"mips64")
-		Arch="mips64"
-		Arch="mips"
-		echo -e "mips64 use $Arch may have bug"
-		;;
-	"arm")
-		Arch="arm"
-		;;
-	"armeb")
-		Arch="armeb"
-		;;
-	"aarch64")
-		Arch="arm64"
-		;;
-	"powerpc")
-		Arch="powerpc"
-		;;
-	"powerpc64")
-		Arch="powerpc64"
-		;;
-	*)
-		echo -e "error not support $Archt if you can use offical release please issue a bug"
-		EXIT 1
-		;;
-	esac
-	upx_latest_ver="$($downloader - https://api.github.com/repos/upx/upx/releases/latest 2>/dev/null|grep -E 'tag_name' |grep -E '[0-9.]+' -o 2>/dev/null)"
-	$downloader /tmp/upx-${upx_latest_ver}-${Arch}_linux.tar.xz "https://github.com/upx/upx/releases/download/v${upx_latest_ver}/upx-${upx_latest_ver}-${Arch}_linux.tar.xz" 2>&1
-	#tar xvJf
-	which xz || (opkg list | grep ^xz || opkg update && opkg install xz) || (echo "xz download fail" && EXIT 1)
-	mkdir -p /tmp/upx-${upx_latest_ver}-${Arch}_linux
-	xz -d -c /tmp/upx-${upx_latest_ver}-${Arch}_linux.tar.xz| tar -x -C "/tmp" >/dev/null 2>&1
-	if [ ! -e "/tmp/upx-${upx_latest_ver}-${Arch}_linux/upx" ]; then
-		echo -e "Failed to download upx."
-		EXIT 1
-	fi
-	rm /tmp/upx-${upx_latest_ver}-${Arch}_linux.tar.xz
-}
-
-doupdate_core(){
-	echo -e "Updating core..."
-	mkdir -p "/tmp/AdGuardHomeupdate"
-	rm -rf /tmp/AdGuardHomeupdate/* >/dev/null 2>&1
-	Archt="$(opkg info kernel | grep Architecture | awk -F "[ _]" '{print($2)}')"
-	case $Archt in
-	"i386")
-		Arch="386"
-		;;
-	"i686")
-		Arch="386"
-		;;
-	"x86")
-		Arch="amd64"
-		;;
-	"mipsel")
-		Arch="mipsle"
-		;;
-	"mips64el")
-		Arch="mips64le"
-		Arch="mipsle"
-		echo -e "mips64el use $Arch may have bug"
-		;;
-	"mips")
-		Arch="mips"
-		;;
-	"mips64")
-		Arch="mips64"
-		Arch="mips"
-		echo -e "mips64 use $Arch may have bug"
-		;;
-	"arm")
-		Arch="arm"
-		;;
-	"aarch64")
-		Arch="arm64"
-		;;
-	"powerpc")
-		Arch="ppc"
-		echo -e "error not support $Archt"
-		EXIT 1
-		;;
-	"powerpc64")
-		Arch="ppc64"
-		echo -e "error not support $Archt"
-		EXIT 1
-		;;
-	*)
-		echo -e "error not support $Archt if you can use offical release please issue a bug"
-		EXIT 1
-		;;
-	esac
-	echo -e "start download"
-	grep -v "^#" /usr/share/AdGuardHome/links.txt >/tmp/run/AdHlinks.txt
-	while read link
-	do
-		eval link="$link"
-		$downloader /tmp/AdGuardHomeupdate/${link##*/} "$link" 2>&1
-		if [ "$?" != "0" ]; then
-			echo "download failed try another download"
-			rm -f /tmp/AdGuardHomeupdate/${link##*/}
-		else
-			local success="1"
-			break
-		fi
-	done < "/tmp/run/AdHlinks.txt"
-	rm /tmp/run/AdHlinks.txt
-	[ -z "$success" ] && echo "no download success" && EXIT 1
-	if [ "${link##*.}" == "gz" ]; then
-		tar -zxf "/tmp/AdGuardHomeupdate/${link##*/}" -C "/tmp/AdGuardHomeupdate/"
-		if [ ! -e "/tmp/AdGuardHomeupdate/AdGuardHome" ]; then
-			echo -e "Failed to download core."
-			rm -rf "/tmp/AdGuardHomeupdate" >/dev/null 2>&1
-			EXIT 1
-		fi
-		downloadbin="/tmp/AdGuardHomeupdate/AdGuardHome/AdGuardHome"
-	else
-		downloadbin="/tmp/AdGuardHomeupdate/${link##*/}"
-	fi
-	chmod 755 $downloadbin
-	echo -e "download success start copy"
-	if [ -n "$upxflag" ]; then
-		echo -e "start upx may take a long time"
-		doupx
-		/tmp/upx-${upx_latest_ver}-${Arch}_linux/upx $upxflag $downloadbin
-		rm -rf /tmp/upx-${upx_latest_ver}-${Arch}_linux
-	fi
-	echo -e "start copy"
-	/etc/init.d/AdGuardHome stop nobackup
-	rm "$binpath"
-	mv -f "$downloadbin" "$binpath"
-	if [ "$?" == "1" ]; then
-		echo "mv failed maybe not enough space please use upx or change bin to /tmp/AdGuardHome"
-		EXIT 1
-	fi
-	/etc/init.d/AdGuardHome start
-	rm -rf "/tmp/AdGuardHomeupdate" >/dev/null 2>&1
-	echo -e "Succeeded in updating core."
-	echo -e "Local version: ${latest_ver}, cloud version: ${latest_ver}.\n"
-	EXIT 0
-}
-
-EXIT(){
-	rm /var/run/update_core 2>/dev/null
-	[ "$1" != "0" ] && touch /var/run/update_core_error
-	exit $1
-}
-
-main(){
-	check_if_already_running
-	check_latest_version $1
-}
-	trap "EXIT 1" SIGTERM SIGINT
-	touch /var/run/update_core
-	rm /var/run/update_core_error 2>/dev/null
-	main $1
--- a/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/waitnet.sh
+++ b/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/waitnet.sh
@ -1,35 +0,0 @@
-#!/bin/sh
-
-PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-count=0
-while :
-do
-	ping -c 1 -W 1 -q www.baidu.com 1>/dev/null 2>&1
-	if [ "$?" == "0" ]; then
-		/etc/init.d/AdGuardHome force_reload
-		break
-	fi
-	ping -c 1 -W 1 -q 202.108.22.5 1>/dev/null 2>&1
-	if [ "$?" == "0" ]; then
-		/etc/init.d/AdGuardHome force_reload
-		break
-	fi
-	sleep 5
-	ping -c 1 -W 1 -q www.google.com 1>/dev/null 2>&1
-	if [ "$?" == "0" ]; then
-		/etc/init.d/AdGuardHome force_reload
-		break
-	fi
-	ping -c 1 -W 1 -q 8.8.8.8 1>/dev/null 2>&1
-	if [ "$?" == "0" ]; then
-		/etc/init.d/AdGuardHome force_reload
-		break
-	fi
-	sleep 5
-	count=$((count+1))
-	if [ $count -gt 18 ]; then
-		/etc/init.d/AdGuardHome force_reload
-		break
-	fi
-done
-return 0
--- a/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/watchconfig.sh
+++ b/immluci/applications/luci-app-adguardhome/root/usr/share/AdGuardHome/watchconfig.sh
@ -1,13 +0,0 @@
-#!/bin/sh
-
-PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-configpath=$(uci get AdGuardHome.AdGuardHome.configpath)
-while :
-do
-	sleep 10
-	if [ -f "$configpath" ]; then
-		/etc/init.d/AdGuardHome do_redirect 1
-		break
-	fi
-done
-return 0
--- a/immluci/applications/luci-app-adguardhome/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json
+++ b/immluci/applications/luci-app-adguardhome/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json
@ -1,11 +0,0 @@
-{
-	"luci-app-adguardhome": {
-		"description": "Grant UCI access for luci-app-adguardhome",
-		"read": {
-			"uci": [ "AdGuardHome" ]
-		},
-		"write": {
-			"uci": [ "AdGuardHome" ]
-		}
-	}
-}
--- a/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldcode.js
+++ b/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldcode.js
@ -1 +0,0 @@
-!function(n){"object"==typeof exports&&"object"==typeof module?n(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],n):n(CodeMirror)}(function(n){"use strict";function e(e,o,i,t){if(i&&i.call){var l=i;i=null}else l=r(e,i,"rangeFinder");"number"==typeof o&&(o=n.Pos(o,0));var f=r(e,i,"minFoldSize");function d(n){var r=l(e,o);if(!r||r.to.line-r.from.line<f)return null;for(var i=e.findMarksAt(r.from),d=0;d<i.length;++d)if(i[d].__isFold&&"fold"!==t){if(!n)return null;r.cleared=!0,i[d].clear()}return r}var u=d(!0);if(r(e,i,"scanUp"))for(;!u&&o.line>e.firstLine();)o=n.Pos(o.line-1,0),u=d(!1);if(u&&!u.cleared&&"unfold"!==t){var a=function(n,e){var o=r(n,e,"widget");if("string"==typeof o){var i=document.createTextNode(o);(o=document.createElement("span")).appendChild(i),o.className="CodeMirror-foldmarker"}else o&&(o=o.cloneNode(!0));return o}(e,i);n.on(a,"mousedown",function(e){c.clear(),n.e_preventDefault(e)});var c=e.markText(u.from,u.to,{replacedWith:a,clearOnEnter:r(e,i,"clearOnEnter"),__isFold:!0});c.on("clear",function(o,r){n.signal(e,"unfold",e,o,r)}),n.signal(e,"fold",e,u.from,u.to)}}n.newFoldFunction=function(n,o){return function(r,i){e(r,i,{rangeFinder:n,widget:o})}},n.defineExtension("foldCode",function(n,o,r){e(this,n,o,r)}),n.defineExtension("isFolded",function(n){for(var e=this.findMarksAt(n),o=0;o<e.length;++o)if(e[o].__isFold)return!0}),n.commands.toggleFold=function(n){n.foldCode(n.getCursor())},n.commands.fold=function(n){n.foldCode(n.getCursor(),null,"fold")},n.commands.unfold=function(n){n.foldCode(n.getCursor(),null,"unfold")},n.commands.foldAll=function(e){e.operation(function(){for(var o=e.firstLine(),r=e.lastLine();o<=r;o++)e.foldCode(n.Pos(o,0),null,"fold")})},n.commands.unfoldAll=function(e){e.operation(function(){for(var o=e.firstLine(),r=e.lastLine();o<=r;o++)e.foldCode(n.Pos(o,0),null,"unfold")})},n.registerHelper("fold","combine",function(){var n=Array.prototype.slice.call(arguments,0);return function(e,o){for(var r=0;r<n.length;++r){var i=n[r](e,o);if(i)return i}}}),n.registerHelper("fold","auto",function(n,e){for(var o=n.getHelpers(e,"fold"),r=0;r<o.length;r++){var i=o[r](n,e);if(i)return i}});var o={rangeFinder:n.fold.auto,widget:"↔",minFoldSize:0,scanUp:!1,clearOnEnter:!0};function r(n,e,r){if(e&&void 0!==e[r])return e[r];var i=n.options.foldOptions;return i&&void 0!==i[r]?i[r]:o[r]}n.defineOption("foldOptions",null),n.defineExtension("foldOption",function(n,e){return r(this,n,e)})});
--- a/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldgutter.css
+++ b/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldgutter.css
@ -1 +0,0 @@
-.CodeMirror-foldmarker{color:blue;text-shadow:#b9f 1px 1px 2px,#b9f -1px -1px 2px,#b9f 1px -1px 2px,#b9f -1px 1px 2px;font-family:arial;line-height:.3;cursor:pointer}.CodeMirror-foldgutter{width:.7em}.CodeMirror-foldgutter-open,.CodeMirror-foldgutter-folded{cursor:pointer}.CodeMirror-foldgutter-open:after{content:"\25BE"}.CodeMirror-foldgutter-folded:after{content:"\25B8"}
--- a/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldgutter.js
+++ b/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldgutter.js
@ -1 +0,0 @@
-!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror"),require("./foldcode")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./foldcode"],t):t(CodeMirror)}(function(t){"use strict";t.defineOption("foldGutter",!1,function(o,e,r){r&&r!=t.Init&&(o.clearGutter(o.state.foldGutter.options.gutter),o.state.foldGutter=null,o.off("gutterClick",a),o.off("changes",d),o.off("viewportChange",u),o.off("fold",l),o.off("unfold",l),o.off("swapDoc",d)),e&&(o.state.foldGutter=new function(t){this.options=t,this.from=this.to=0}(function(t){!0===t&&(t={});null==t.gutter&&(t.gutter="CodeMirror-foldgutter");null==t.indicatorOpen&&(t.indicatorOpen="CodeMirror-foldgutter-open");null==t.indicatorFolded&&(t.indicatorFolded="CodeMirror-foldgutter-folded");return t}(e)),f(o),o.on("gutterClick",a),o.on("changes",d),o.on("viewportChange",u),o.on("fold",l),o.on("unfold",l),o.on("swapDoc",d))});var o=t.Pos;function e(t,e){for(var r=t.findMarks(o(e,0),o(e+1,0)),n=0;n<r.length;++n)if(r[n].__isFold){var i=r[n].find(-1);if(i&&i.line===e)return r[n]}}function r(t){if("string"==typeof t){var o=document.createElement("div");return o.className=t+" CodeMirror-guttermarker-subtle",o}return t.cloneNode(!0)}function n(t,n,f){var a=t.state.foldGutter.options,d=n-1,u=t.foldOption(a,"minFoldSize"),l=t.foldOption(a,"rangeFinder"),c="string"==typeof a.indicatorFolded&&i(a.indicatorFolded),s="string"==typeof a.indicatorOpen&&i(a.indicatorOpen);t.eachLine(n,f,function(n){++d;var i=null,f=n.gutterMarkers;if(f&&(f=f[a.gutter]),e(t,d)){if(c&&f&&c.test(f.className))return;i=r(a.indicatorFolded)}else{var p=o(d,0),m=l&&l(t,p);if(m&&m.to.line-m.from.line>=u){if(s&&f&&s.test(f.className))return;i=r(a.indicatorOpen)}}(i||f)&&t.setGutterMarker(n,a.gutter,i)})}function i(t){return new RegExp("(^|\\s)"+t+"(?:$|\\s)\\s*")}function f(t){var o=t.getViewport(),e=t.state.foldGutter;e&&(t.operation(function(){n(t,o.from,o.to)}),e.from=o.from,e.to=o.to)}function a(t,r,n){var i=t.state.foldGutter;if(i){var f=i.options;if(n==f.gutter){var a=e(t,r);a?a.clear():t.foldCode(o(r,0),f)}}}function d(t){var o=t.state.foldGutter;if(o){var e=o.options;o.from=o.to=0,clearTimeout(o.changeUpdate),o.changeUpdate=setTimeout(function(){f(t)},e.foldOnChangeTimeSpan||600)}}function u(t){var o=t.state.foldGutter;if(o){var e=o.options;clearTimeout(o.changeUpdate),o.changeUpdate=setTimeout(function(){var e=t.getViewport();o.from==o.to||e.from-o.to>20||o.from-e.to>20?f(t):t.operation(function(){e.from<o.from&&(n(t,e.from,o.from),o.from=e.from),e.to>o.to&&(n(t,o.to,e.to),o.to=e.to)})},e.updateViewportTimeSpan||400)}}function l(t,o){var e=t.state.foldGutter;if(e){var r=o.line;r>=e.from&&r<e.to&&n(t,r,r+1)}}});
--- a/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/indent-fold.js
+++ b/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/indent-fold.js
@ -1 +0,0 @@
-!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";function n(n,t){var i=n.getLine(t),o=i.search(/\S/);return-1==o||/\bcomment\b/.test(n.getTokenTypeAt(e.Pos(t,o+1)))?-1:e.countColumn(i,null,n.getOption("tabSize"))}e.registerHelper("fold","indent",function(t,i){var o=n(t,i.line);if(!(o<0)){for(var r=null,l=i.line+1,f=t.lastLine();l<=f;++l){var u=n(t,l);if(-1==u);else{if(!(u>o))break;r=l}}return r?{from:e.Pos(i.line,t.getLine(i.line).length),to:e.Pos(r,t.getLine(r).length)}:void 0}})});
--- a/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/lib/codemirror.css
+++ b/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/lib/codemirror.css
--- a/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/lib/codemirror.js
+++ b/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/lib/codemirror.js
--- a/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/mode/yaml/yaml.js
+++ b/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/mode/yaml/yaml.js
@ -1 +0,0 @@
-!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";e.defineMode("yaml",function(){var e=new RegExp("\\b(("+["true","false","on","off","yes","no"].join(")|(")+"))$","i");return{token:function(i,t){var r=i.peek(),n=t.escaped;if(t.escaped=!1,"#"==r&&(0==i.pos||/\s/.test(i.string.charAt(i.pos-1))))return i.skipToEnd(),"comment";if(i.match(/^('([^']|\\.)*'?|"([^"]|\\.)*"?)/))return"string";if(t.literal&&i.indentation()>t.keyCol)return i.skipToEnd(),"string";if(t.literal&&(t.literal=!1),i.sol()){if(t.keyCol=0,t.pair=!1,t.pairStart=!1,i.match(/---/))return"def";if(i.match(/\.\.\./))return"def";if(i.match(/\s*-\s+/))return"meta"}if(i.match(/^(\{|\}|\[|\])/))return"{"==r?t.inlinePairs++:"}"==r?t.inlinePairs--:"["==r?t.inlineList++:t.inlineList--,"meta";if(t.inlineList>0&&!n&&","==r)return i.next(),"meta";if(t.inlinePairs>0&&!n&&","==r)return t.keyCol=0,t.pair=!1,t.pairStart=!1,i.next(),"meta";if(t.pairStart){if(i.match(/^\s*(\||\>)\s*/))return t.literal=!0,"meta";if(i.match(/^\s*(\&|\*)[a-z0-9\._-]+\b/i))return"variable-2";if(0==t.inlinePairs&&i.match(/^\s*-?[0-9\.\,]+\s?$/))return"number";if(t.inlinePairs>0&&i.match(/^\s*-?[0-9\.\,]+\s?(?=(,|}))/))return"number";if(i.match(e))return"keyword"}return!t.pair&&i.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^,\[\]{}#&*!|>'"%@`])[^#]*?(?=\s*:($|\s))/)?(t.pair=!0,t.keyCol=i.indentation(),"atom"):t.pair&&i.match(/^:\s*/)?(t.pairStart=!0,"meta"):(t.pairStart=!1,t.escaped="\\"==r,i.next(),null)},startState:function(){return{pair:!1,pairStart:!1,keyCol:0,inlinePairs:0,inlineList:0,literal:!1,escaped:!1}},lineComment:"#",fold:"indent"}}),e.defineMIME("text/x-yaml","yaml"),e.defineMIME("text/yaml","yaml")});
--- a/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/theme/dracula.css
+++ b/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/codemirror/theme/dracula.css
@ -1 +0,0 @@
-.cm-s-dracula.CodeMirror,.cm-s-dracula .CodeMirror-gutters{background-color:#282a36 !important;color:#f8f8f2 !important;border:0}.cm-s-dracula .CodeMirror-gutters{color:#282a36}.cm-s-dracula .CodeMirror-cursor{border-left:solid thin #f8f8f0}.cm-s-dracula .CodeMirror-linenumber{color:#6d8a88}.cm-s-dracula .CodeMirror-selected{background:rgba(255,255,255,0.10)}.cm-s-dracula .CodeMirror-line::selection,.cm-s-dracula .CodeMirror-line>span::selection,.cm-s-dracula .CodeMirror-line>span>span::selection{background:rgba(255,255,255,0.10)}.cm-s-dracula .CodeMirror-line::-moz-selection,.cm-s-dracula .CodeMirror-line>span::-moz-selection,.cm-s-dracula .CodeMirror-line>span>span::-moz-selection{background:rgba(255,255,255,0.10)}.cm-s-dracula span.cm-comment{color:#6272a4}.cm-s-dracula span.cm-string,.cm-s-dracula span.cm-string-2{color:#f1fa8c}.cm-s-dracula span.cm-number{color:#bd93f9}.cm-s-dracula span.cm-variable{color:#50fa7b}.cm-s-dracula span.cm-variable-2{color:white}.cm-s-dracula span.cm-def{color:#50fa7b}.cm-s-dracula span.cm-operator{color:#ff79c6}.cm-s-dracula span.cm-keyword{color:#ff79c6}.cm-s-dracula span.cm-atom{color:#bd93f9}.cm-s-dracula span.cm-meta{color:#f8f8f2}.cm-s-dracula span.cm-tag{color:#ff79c6}.cm-s-dracula span.cm-attribute{color:#50fa7b}.cm-s-dracula span.cm-qualifier{color:#50fa7b}.cm-s-dracula span.cm-property{color:#66d9ef}.cm-s-dracula span.cm-builtin{color:#50fa7b}.cm-s-dracula span.cm-variable-3,.cm-s-dracula span.cm-type{color:#ffb86c}.cm-s-dracula .CodeMirror-activeline-background{background:rgba(255,255,255,0.1)}.cm-s-dracula .CodeMirror-matchingbracket{text-decoration:underline;color:white !important}
--- a/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/twin-bcrypt.min.js
+++ b/immluci/applications/luci-app-adguardhome/root/www/luci-static/resources/twin-bcrypt.min.js
--- a/immluci/applications/luci-app-airwhu/Makefile
+++ b/immluci/applications/luci-app-airwhu/Makefile
@ -1,13 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luci-app-airwhu
-PKG_VERSION=1.0
-PKG_RELEASE:=1
-LUCI_TITLE:=luci-app-airwhu
-LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+mentohust +kmod-ipt-nat6
-LUCI_DESCRIPTION:=LuCI web-interface for Ruijie 802.1X Client with IPv6 NAT.
-
-include ../../luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature
--- a/immluci/applications/luci-app-airwhu/luasrc/controller/airwhu.lua
+++ b/immluci/applications/luci-app-airwhu/luasrc/controller/airwhu.lua
@ -1,5 +0,0 @@
-module("luci.controller.airwhu", package.seeall)
-
-function index()
-        entry({"admin", "services", "AirWHU"}, cbi("airwhu"), _("AirWHU"), 100)
-        end
--- a/immluci/applications/luci-app-airwhu/luasrc/model/cbi/airwhu.lua
+++ b/immluci/applications/luci-app-airwhu/luasrc/model/cbi/airwhu.lua
@ -1,115 +0,0 @@
--[[
-
-LuCI - Lua Configuration Interface
-LICENSE under GPLv3.
-Copyright 2017 KyleRicardo[W.B.L.E. TeAm] <shaoyz714@126.com>
-
-]]
--
-require("luci.sys")
-require("luci.tools.webadmin")
-
-local IsOnAir = (luci.sys.call("pidof mentohust > /dev/null") == 0)  
-if IsOnAir then      
-    state_msg = "<b><font color=\"green\">" .. translate("Running") .. "</font></b>"  
-else  
-    state_msg = "<b><font color=\"red\">" .. translate("Not Running") .. "</font></b>"  
-end  
-
-m = Map("airwhu", translate("AirWHU"), translate("Configure Ruijie 802.1X client with IPv6 NAT based on Masquerade.") .. "<br /><br />" .. translate("Status") .. " : " .. state_msg)
-
-s = m:section(TypedSection, "switch", translate("Global Switch"), translate("Configure global 802.1X Authentication and IPv6-NAT on-off."))
-s.addremove = false
-s.anonymous = true
-
-s:option(Flag, "enableauth", translate("Enable 802.1X Auth"), translate("Enable or disable Ruijie 802.1X authentication."))
-tmp = s:option(Flag, "startwithboot", translate("Start with boot"), translate("Start Ruijie 802.1X Authentication based on MentoHUST when the router is booting."))
-tmp:depends("enableauth","1")
-s:option(Flag, "enableipv6", translate("Enable IPv6 NAT"), translate("Enable IPv6 NAT pass-through based on ip6tables MASQUERADE."))
-
-s = m:section(TypedSection, "auth", translate("Config Authentication"), translate("The options below are all of MentoHUST's arguments."))
-s.anonymous = true
-s.addremove = false
-
-ur = s:option(Value, "Username", translate("Username"))
-ur.rmempty = false
-
-pw = s:option(Value, "Password", translate("Password"))
-pw.password = true
-pw.rmempty = false
-
-wan_dev = luci.sys.exec("uci get network.wan.ifname")
-wan_dev = string.sub(wan_dev,1,string.len(wan_dev)-1)
-ifname = s:option(ListValue, "ifname", translate("Interfaces"))
-ifname:value(wan_dev)
-
-s:option(Value, "IP", translate("IP"), translate("default to localhost's IP")).default = "0.0.0.0"
-
-s:option(Value, "Mask", translate("Netmask"), translate("default to localhost's netmask")).default = "255.255.255.0"
-
-s:option(Value, "Gateway", translate("Gateway"), translate("default to 0.0.0.0")).default = "0.0.0.0"
-
-s:option(Value, "DNS", translate("DNS"), translate("default to 0.0.0.0")).default = "0.0.0.0"
-
-s:option(Value, "PingHost", translate("Ping host"), translate("default to 0.0.0.0,i.e. disable this function")).default = "0.0.0.0"
-
-s:option(Value, "Timeout", translate("Authenticate timeout(s)"), translate("default to 8s")).default = "8"
-
-s:option(Value, "EchoInterval", translate("Heartbeat timeout(s)"), translate("default to 30s")).default = "30"
-
-s:option(Value, "RestartWait", translate("Timeout on failure(s)"), translate("default to 15s")).default = "15"
-
-s:option(Value, "MaxFail", translate("Max failure times"), translate("0 means no limit,default to 8")).default = "8"
-
-t = s:option(ListValue, "StartMode", translate("mulcast address"), translate("default to 1"))
-t:value("0", translate("0(standard)"))
-t:value("1", translate("1(ruijjie)"))
-t:value("2", translate("2(saier)"))
-t.default = "1"
-
-t = s:option(ListValue, "DHCPMode", translate("DHCP type"), translate("default to 1"))
-t:value("0", translate("0(not in used)"))
-t:value("1", translate("1(secondary authenticate)"))
-t:value("2", translate("2(post authenticate)"))
-t:value("3", translate("3(pre authenticate)"))
-t.default = "1"
-
-t = s:option(ListValue, "DaemonMode", translate("run in daemon mode"), translate("default to 3"))
-t:value("0", translate("0(no)"))
-t:value("1", translate("1(yes,turn off output)"))
-t:value("2", translate("2(yes,persevere output)"))
-t:value("3", translate("3(yes,output to file)"))
-t.default = "3"
-
-s:option(Value, "ShowNotify", translate("display notification"), translate("0(no),1-20(yes),default to 0")).default = "0"
-
-s:option(Value, "Version", translate("client version"), translate("default to 0.00,compatible with xrgsu")).default = "0.00"
-
-tmp = s:option(Value, "DataFile", translate("customized data file"), translate("not in used by default"))
-tmp.rmempty = true
-
-script = s:option(Value, "DHCPScript", translate("DHCP script"), translate("use dhclient by default"))
-script.default = "udhcpc -i "..wan_dev
-
-local apply = luci.http.formvalue("cbi.apply")
-if apply then
-	if luci.sys.exec("uci get airwhu.@switch[0].enableauth") then
-		luci.sys.exec("/etc/init.d/mentohust restart")
-	else
-        	luci.sys.exec("/etc/init.d/mentohust stop")
-	end
-
-	if luci.sys.exec("uci get airwhu.@switch[0].startwithboot") then
-		luci.sys.exec("/etc/init.d/mentohust enable")
-	else
-        	luci.sys.exec("/etc/init.d/mentohust disable")
-	end
-	
-	if luci.sys.exec("uci get airwhu.@switch[0].enableipv6") then
-		luci.sys.exec("sh /bin/ipv6masq.sh install")
-	else
-		luci.sys.exec("sh /bin/ipv6masq.sh uninstall")
-	end
-end
-
-return m
--- a/immluci/applications/luci-app-airwhu/po/zh_Hans/luci-app-airwhu.po
+++ b/immluci/applications/luci-app-airwhu/po/zh_Hans/luci-app-airwhu.po
@ -1,250 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: zh-Hans\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:62
-msgid "0 means no limit,default to 8"
-msgstr "0表示无限制，默认为8"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:78
-msgid "0(no)"
-msgstr "0（不使用后台模式）"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:84
-msgid "0(no),1-20(yes),default to 0"
-msgstr "0（不使用），1-20（使用），默认为0"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:71
-msgid "0(not in used)"
-msgstr "0（不使用）"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:65
-msgid "0(standard)"
-msgstr "0（标准）"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:66
-msgid "1(ruijjie)"
-msgstr "1（锐捷）"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:72
-msgid "1(secondary authenticate)"
-msgstr "1（二次认证）"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:79
-msgid "1(yes,turn off output)"
-msgstr "1（后台模式，关闭输出）"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:73
-msgid "2(post authenticate)"
-msgstr "3（认证后）"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:67
-msgid "2(saier)"
-msgstr "2（赛尔）"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:80
-msgid "2(yes,persevere output)"
-msgstr "2（后台模式，保留输出）"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:74
-msgid "3(pre authenticate)"
-msgstr "3（认证前）"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:81
-msgid "3(yes,output to file)"
-msgstr "3（后台模式，输出到日志文件）"
-
-#: files/root/usr/lib/lua/luci/controller/airwhu.lua:4
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:19
-msgid "AirWHU"
-msgstr "AirWHU"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:56
-msgid "Authenticate timeout(s)"
-msgstr "认证超时（秒）"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:30
-msgid "Config Authentication"
-msgstr "配置认证参数"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:19
-msgid "Configure Ruijie 802.1X client with IPv6 NAT based on Masquerade."
-msgstr "配置基于IPv6 Masquerade技术的锐捷802.1X认证网络。"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:21
-msgid "Configure global 802.1X Authentication and IPv6-NAT on-off."
-msgstr "配置全局802.1X认证与IPv6 NAT开关。"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:91
-msgid "DHCP script"
-msgstr "DHCP脚本"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:70
-msgid "DHCP type"
-msgstr "DHCP方式"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:52
-msgid "DNS"
-msgstr "DNS服务器"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:25
-msgid "Enable 802.1X Auth"
-msgstr "开启锐捷认证"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:28
-msgid "Enable IPv6 NAT"
-msgstr "开启IPv6 NAT"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:28
-msgid "Enable IPv6 NAT pass-through based on ip6tables MASQUERADE."
-msgstr "开启基于ip6tables Masquerade技术的IPv6 NAT穿透。"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:25
-msgid "Enable or disable Ruijie 802.1X authentication."
-msgstr "打开或关闭锐捷802.1X认证。"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:50
-msgid "Gateway"
-msgstr "网关"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:21
-msgid "Global Switch"
-msgstr "全局开关"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:58
-msgid "Heartbeat timeout(s)"
-msgstr "心跳包超时（秒）"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:46
-msgid "IP"
-msgstr "IP地址"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:43
-msgid "Interfaces"
-msgstr "网卡"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:62
-msgid "Max failure times"
-msgstr "允许失败次数"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:48
-msgid "Netmask"
-msgstr "掩码"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:16
-msgid "Not Running"
-msgstr "未运行"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:37
-msgid "Password"
-msgstr "密码"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:54
-msgid "Ping host"
-msgstr "Ping主机"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:14
-msgid "Running"
-msgstr "运行中"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:26
-msgid ""
-"Start Ruijie 802.1X Authentication based on MentoHUST when the router is "
-"booting."
-msgstr "开机自动启动基于MentoHUST的锐捷802.1X认证客户端。"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:26
-msgid "Start with boot"
-msgstr "开机启动"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:19
-msgid "Status"
-msgstr "状态"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:30
-msgid "The options below are all of MentoHUST's arguments."
-msgstr "以下是全部的MentoHUST认证参数。"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:60
-msgid "Timeout on failure(s)"
-msgstr "失败等待（秒）"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:34
-msgid "Username"
-msgstr "用户名"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:86
-msgid "client version"
-msgstr "客户端版本号"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:88
-msgid "customized data file"
-msgstr "自定义数据文件"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:50
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:52
-msgid "default to 0.0.0.0"
-msgstr "默认为0.0.0.0"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:54
-msgid "default to 0.0.0.0,i.e. disable this function"
-msgstr "默认为0.0.0.0，即关闭该功能"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:86
-msgid "default to 0.00,compatible with xrgsu"
-msgstr "默认为0.00，表示兼容xrgsu"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:64
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:70
-msgid "default to 1"
-msgstr "默认为1"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:60
-msgid "default to 15s"
-msgstr "默认为15秒"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:77
-msgid "default to 3"
-msgstr "默认为3"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:58
-msgid "default to 30s"
-msgstr "默认为30秒"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:56
-msgid "default to 8s"
-msgstr "默认为8秒"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:46
-msgid "default to localhost's IP"
-msgstr "默认为localhost的IP地址"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:48
-msgid "default to localhost's netmask"
-msgstr "默认为localhost的掩码"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:84
-msgid "display notification"
-msgstr "显示通知"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:64
-msgid "mulcast address"
-msgstr "多播地址"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:88
-msgid "not in used by default"
-msgstr "默认不使用"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:77
-msgid "run in daemon mode"
-msgstr "后台运行模式"
-
-#: files/root/usr/lib/lua/luci/model/cbi/airwhu.lua:91
-msgid "use dhclient by default"
-msgstr "默认使用dhclient"
--- a/immluci/applications/luci-app-airwhu/root/bin/ipv6masq.sh
+++ b/immluci/applications/luci-app-airwhu/root/bin/ipv6masq.sh
@ -1,41 +0,0 @@
-#!/bin/sh /etc/rc.common
-#Author:KyleRicardo
-#Email:shaoyz714@126.com
-
-action=$1
-
-if [ "$action"x = "install"x ]; then 
-	uci delete network.globals.ula_prefix
-
-	uci set network.wan6.peerdns='0'
-	uci set network.wan6.dns='2001:da8:202:10::36'
-
-	uci delete network.lan.ip6assign
-	uci set network.lan.ip6addr='BABE:BABE:BABE:BABE::1/64'
-	uci set network.lan.ip6prefix='BABE:BABE:BABE:BABE::/64'
-
-	uci set dhcp.lan.ra_management='1'
-	uci set dhcp.lan.ra_default='1'
-
-	uci set $(uci show firewall|grep Allow-ICMPv6-Forward|sed -e 's/.name[^ ]*'//).enabled='0'
-
-	uci commit
-
-
-elif [ "$action"x = "uninstall"x ]; then 
-	uci set network.globals.ula_prefix='fdad:91b7:54bb::/48'
-
-	uci delete network.wan6.peerdns='0'
-	uci delete network.wan6.dns='2001:da8:202:10::36'
-
-	uci set network.lan.ip6assign='60'
-	uci delete network.lan.ip6addr='BABE:BABE:BABE:BABE::1/64'
-	uci delete network.lan.ip6prefix='BABE:BABE:BABE:BABE::/64'
-
-	uci delete dhcp.lan.ra_management='1'
-	uci delete dhcp.lan.ra_default='1'
-
-	uci delete $(uci show firewall|grep Allow-ICMPv6-Forward|sed -e 's/.name[^ ]*'//).enabled
-
-	uci commit
-fi
--- a/immluci/applications/luci-app-airwhu/root/etc/config/airwhu
+++ b/immluci/applications/luci-app-airwhu/root/etc/config/airwhu
@ -1,25 +0,0 @@
-
-config switch
-	option enableauth
-	option startwithboot
-	option enableipv6
-config auth
-	option Username
-	option Password
-	option ifname
-	option IP
-	option Mask
-	option Gateway
-	option DNS
-	option PingHost
-	option Timeout
-	option EchoInterval
-	option RestartWait
-	option MaxFail
-	option StartMode
-	option DHCPMode
-	option DaemonMode
-	option ShowNotify
-	option Version
-	option DataFile
-	option DHCPScript
--- a/immluci/applications/luci-app-airwhu/root/etc/hotplug.d/iface/99-ipv6nat
+++ b/immluci/applications/luci-app-airwhu/root/etc/hotplug.d/iface/99-ipv6nat
@ -1,56 +0,0 @@
-#!/bin/sh /etc/rc.common
-#Author:KyleRicardo
-#Email:shaoyz714@126.com
-
-
-[ "$ACTION" = ifup ] || exit 0
-iface=wan6
-[ -z "$iface" -o "$INTERFACE" = "$iface" ] || exit 0
-ip -6 route add `ip -6 route show default|sed -e 's/from [^ ]* //'`
-logger -t IPv6 "Add IPv6 default route."
-
-MAX_TRIES=99
-
-WAN6_NAME="wan6"
-
-WAN6_INTERFACE=$(uci get "network.$WAN6_NAME.ifname")
-#eth0.2 by default
-
-LAN_IP6PREFIX=$(uci get network.lan.ip6prefix)
-#e.g. aaaa:bbbb:cccc:dddd::/64
-
-#LAN_ULA_PREFIX=$(uci get network.globals.ula_prefix)
-#e.g. ddc2:d512:65f5::/48
-
-PROBE=0
-
-COUNT=1
-
-while [ $PROBE -eq 0 ]
-do
-if [ $COUNT -gt $MAX_TRIES ]
-then
-logger -t NAT6 "No IPv6 route found (reached retry limit $MAX_TRIES times)" && exit 1
-fi
-sleep 5
-logger -t NAT6 "Probing IPv6 route ($COUNT time)"
-COUNT=$((COUNT+1))
-PROBE=$(route -A inet6 | grep -c '::/0')
-done
-
-#ip6tables -t nat -I POSTROUTING -s "$LAN_ULA_PREFIX" -o "$WAN6_INTERFACE" -j MASQUERADE
-ip6tables -t nat -I POSTROUTING -s "$LAN_IP6PREFIX" -o "$WAN6_INTERFACE" -j MASQUERADE
-
-#WAN6_GATEWAY=$(route -A inet6 -e | grep "$WAN6_INTERFACE" | awk '/::\/0/{print $2; exit}')
-#get gateway from routing table. !!!Caution!!! May not work !
-WAN6_GATEWAY=$(ifconfig eth0.2 | grep 'Global' | awk '{print $3}'| awk -F':' '{print $1":"$2":"$3":"$4"::1"}')
-#caculate gateway from wan ipv6
-#WAN6_GATEWAY=$(tracepath6 -n tv.byr.cn | grep ' 1: ' | awk 'NR==1 {print $2}')
-#opkg install iputils-tracepath6 . change tv.byr.cn for faster site. e.g. ipv6.bjtu.edu.cn
-
-#route -A inet6 add 2000::/3 gw "$WAN6_GATEWAY" dev "$WAN6_INTERFACE"
-route -A inet6 add default gw "$WAN6_GATEWAY" dev "$WAN6_INTERFACE"
-
-logger -t NAT6 "Done with IPv6 settings"
-
-
--- a/immluci/applications/luci-app-airwhu/root/etc/init.d/mentohust
+++ b/immluci/applications/luci-app-airwhu/root/etc/init.d/mentohust
@ -1,49 +0,0 @@
-#!/bin/sh /etc/rc.common
-#Author:KyleRicardo
-#Email:shaoyz714@126.com
-
-START=65
-STOP=10
-
-start()
-{
-if [ $(uci get airwhu.@switch[0].enableauth) ] ;
-then
-	local Username=$(uci get airwhu.@auth[0].Username) 
-	local Password=$(uci get airwhu.@auth[0].Password) 
-	local ifname=$(uci get airwhu.@auth[0].ifname) 
-	local IP=$(uci get airwhu.@auth[0].IP) 
-	local Mask=$(uci get airwhu.@auth[0].Mask) 
-	local Gateway=$(uci get airwhu.@auth[0].Gateway) 
-	local DNS=$(uci get airwhu.@auth[0].DNS) 
-	local PingHost=$(uci get airwhu.@auth[0].PingHost) 
-	local Timeout=$(uci get airwhu.@auth[0].Timeout) 
-	local EchoInterval=$(uci get airwhu.@auth[0].EchoInterval) 
-	local RestartWait=$(uci get airwhu.@auth[0].RestartWait) 
-	local MaxFail=$(uci get airwhu.@auth[0].MaxFail) 
-	local StartMode=$(uci get airwhu.@auth[0].StartMode) 
-	local DHCPMode=$(uci get airwhu.@auth[0].DHCPMode) 
-	local DaemonMode=$(uci get airwhu.@auth[0].DaemonMode) 
-	local ShowNotify=$(uci get airwhu.@auth[0].ShowNotify) 
-	local Version=$(uci get airwhu.@auth[0].Version) 
-	local DataFile=$(uci get airwhu.@auth[0].DataFile) 
-	local DHCPScript=$(uci get airwhu.@auth[0].DHCPScript) 
-	mentohust -u$Username -p$Password -n$ifname -b$DaemonMode -a$StartMode -d$DaemonMode -c"$DHCPScript" -w>/dev/null 2>&1
-	#Temporarily designed only for whu. To be continued...
-else
-	stop
-fi
-
-}
-
-stop()
-{
-	sync
-	mentohust -k >/dev/null 2>&1
-}
-
-restart()
-{
-	stop
-	start
-}
--- a/immluci/applications/luci-app-airwhu/root/usr/share/rpcd/acl.d/luci-app-airwhu.json
+++ b/immluci/applications/luci-app-airwhu/root/usr/share/rpcd/acl.d/luci-app-airwhu.json
@ -1,11 +0,0 @@
-{
-	"luci-app-airwhu": {
-		"description": "Grant UCI access for luci-app-airwhu",
-		"read": {
-			"uci": [ "airwhu" ]
-		},
-		"write": {
-			"uci": [ "airwhu" ]
-		}
-	}
-}
--- a/immluci/applications/luci-app-gost/Makefile
+++ b/immluci/applications/luci-app-gost/Makefile
@ -1,21 +0,0 @@
-# Copyright (C) 2020 Openwrt.org
-#
-# This is a free software, use it under GNU General Public License v3.0.
-#
-# Created By ImmortalWrt
-# https://github.com/project-openwrt
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luci-app-gost
-PKG_VERSION:=1.0
-PKG_RELEASE:=1
-LUCI_TITLE:=LuCI support for Gost
-LUCI_DEPENDS:=+gost
-LUCI_PKGARCH:=all
-
-PKG_MAINTAINER:=ImmortalWrt
-
-include ../../luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature
--- a/immluci/applications/luci-app-gost/luasrc/controller/gost.lua
+++ b/immluci/applications/luci-app-gost/luasrc/controller/gost.lua
@ -1,23 +0,0 @@
-- This is a free software, use it under GNU General Public License v3.0.
-- Created By ImmortalWrt
-- https://github.com/immortalwrt
-
-module("luci.controller.gost", package.seeall)
-
-function index()
-	if not nixio.fs.access("/etc/config/gost") then
-		return
-	end
-
-	local page
-	page = entry({"admin", "services", "gost"}, cbi("gost"), _("Gost"), 100)
-	page.dependent = true
-	entry({"admin", "services", "gost", "status"},call("act_status")).leaf=true
-end
-
-function act_status()
-	local e={}
-	e.running=luci.sys.call("pgrep gost >/dev/null")==0
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(e)
-end
--- a/immluci/applications/luci-app-gost/luasrc/model/cbi/gost.lua
+++ b/immluci/applications/luci-app-gost/luasrc/model/cbi/gost.lua
@ -1,20 +0,0 @@
-- Created By ImmortalWrt
-- https://github.com/immortalwrt
-
-mp = Map("gost", translate("Gost"))
-mp.description = translate("A simple security tunnel written in Golang.")
-
-mp:section(SimpleSection).template = "gost/gost_status"
-
-s = mp:section(TypedSection, "gost")
-s.anonymous=true
-s.addremove=false
-
-enable = s:option(Flag, "enable", translate("Enable"))
-enable.default = 0
-enable.rmempty = false
-
-run_command = s:option(Value, "run_command", translate("Command"))
-run_command.rmempty = false
-
-return mp
--- a/immluci/applications/luci-app-gost/luasrc/view/gost/gost_status.htm
+++ b/immluci/applications/luci-app-gost/luasrc/view/gost/gost_status.htm
@ -1,22 +0,0 @@
-<script type="text/javascript">//<![CDATA[
-XHR.poll(3, '<%=url([[admin]], [[services]], [[gost]], [[status]])%>', null,
-	function(x, data) {
-		var tb = document.getElementById('gost_status');
-		if (data && tb) {
-			if (data.running) {
-				var links = '<em><b><font color=green>Gost <%:RUNNING%></font></b></em>';
-				tb.innerHTML = links;
-			} else {
-				tb.innerHTML = '<em><b><font color=red>Gost <%:NOT RUNNING%></font></b></em>';
-			}
-		}
-	}
-);
-//]]>
-</script>
-<style>.mar-10 {margin-left: 50px; margin-right: 10px;}</style>
-<fieldset class="cbi-section">
-	<p id="gost_status">
-		<em><%:Collecting data...%></em>
-	</p>
-</fieldset>
--- a/immluci/applications/luci-app-gost/po/zh_Hans/gost.po
+++ b/immluci/applications/luci-app-gost/po/zh_Hans/gost.po
@ -1,17 +0,0 @@
-msgid "Gost"
-msgstr "Gost"
-
-msgid "A simple security tunnel written in Golang."
-msgstr "GO语言实现的安全隧道。"
-
-msgid "RUNNING"
-msgstr "运行中"
-
-msgid "NOT RUNNING"
-msgstr "未运行"
-
-msgid "Enable"
-msgstr "启用"
-
-msgid "Command"
-msgstr "命令"
--- a/immluci/applications/luci-app-gost/root/etc/uci-defaults/gost
+++ b/immluci/applications/luci-app-gost/root/etc/uci-defaults/gost
@ -1,11 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
-	delete ucitrack.@gost[-1]
-	add ucitrack gost
-	set ucitrack.@gost[-1].init=gost
-	commit ucitrack
-EOF
-
-rm -f /tmp/luci-indexcache
-exit 0
--- a/immluci/applications/luci-app-gost/root/usr/share/rpcd/acl.d/luci-app-gost.json
+++ b/immluci/applications/luci-app-gost/root/usr/share/rpcd/acl.d/luci-app-gost.json
@ -1,11 +0,0 @@
-{
-	"luci-app-gost": {
-		"description": "Grant UCI access for luci-app-gost",
-		"read": {
-			"uci": [ "gost" ]
-		},
-		"write": {
-			"uci": [ "gost" ]
-		}
-	}
-}
--- a/immluci/applications/luci-app-mwol/Makefile
+++ b/immluci/applications/luci-app-mwol/Makefile
@ -1,18 +0,0 @@
-#
-# Copyright (C) 2019 mleaf <mleaf90@gmail.com>
-# 微信公众号【WiFi物联网】
-#
-# This is free software, licensed under the Apache License, Version 2.0 .
-#
-
-include $(TOPDIR)/rules.mk
-
-LUCI_TITLE:=LuCI Support for Mwol
-LUCI_DEPENDS:=+mwol
-LUCI_PKGARCH:=all
-PKG_VERSION:=1.0
-PKG_RELEASE:=2
-
-include ../../luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature
--- a/immluci/applications/luci-app-mwol/luasrc/controller/mwol.lua
+++ b/immluci/applications/luci-app-mwol/luasrc/controller/mwol.lua
@ -1,11 +0,0 @@
--Copyright (C) 2019 mleaf <mleaf90@gmail.com>
--微信公众号【WiFi物联网】
-module("luci.controller.mwol",package.seeall)
-
-function index()
-	if not nixio.fs.access("/etc/config/mwol") then
-		return
-	end
-	local page = entry({"admin", "services", "mwol"}, cbi("mwol"), _("Mwol"))
-	page.dependent = true
-end
--- a/immluci/applications/luci-app-mwol/luasrc/model/cbi/mwol.lua
+++ b/immluci/applications/luci-app-mwol/luasrc/model/cbi/mwol.lua
@ -1,139 +0,0 @@
--Copyright (C) 2019 mleaf <mleaf90@gmail.com>
--微信公众号【WiFi物联网】
-local NXFS = require "nixio.fs"
-local SYS  = require "luci.sys"
-local HTTP = require "luci.http"
-local DISP = require "luci.dispatcher"
-local Status,subTopic,pubTopic
-local m,s
-local e,mwol
-local encryption
-local sys = require "luci.sys"
-
-local mac=luci.sys.exec("uci -q get mwol.mwol_conf.id")
-
-m=Map("mwol",translate("Mqtt wake on lan"),translate("请关注微信公众号【WiFi物联网】获取更多信息: \
-<a href=\"http://www.mleaf.org/downloads/logo/201911171573997716658567.jpg\" target=\"_blank\">【WiFi物联网】</a>"))
-
-if SYS.call("pidof mwol >/dev/null") == 0 then
-	Status = translate("<strong><font color=\"green\">Mwol正在运行...</font></strong>")
-else
-	Status = translate("<strong><font color=\"red\">Mwol未运行...</font></strong>")
-end
-
-subTopic=string.format("<strong><font color=\"red\">Mwol订阅消息主题: /mwol/%s</font></strong>", mac)
-pubTopic=string.format("<strong><font color=\"red\">Mwol发布消息主题: /mwol/%s</font></strong>", mac)
-
--
-- LoRa Gateway config for gateway_conf
--
-mwol=m:section(TypedSection,"mwol","")
--mwol.addremove=false
-mwol.anonymous=true
-mwol.description = translate(string.format("%s<br /><br />%s<br><br />%s", Status, subTopic, pubTopic))
-
-mwol:tab("general",  translate("General Settings"))
-mwol:tab("encryptionSettings",  translate("Encryption Settings"))
-mwol:tab("ssl",  translate("SSL Settings"))
-
--
-- MQTT general 
--
-e = mwol:taboption("general", Flag, "enable")
-e.title = translate("Enable")
-e.default = 0
-e.rmempty = false
-
-e = mwol:taboption("general", Value, "hostname")
-e.title = translate("MQTT Server")
-e = mwol:taboption("general", Value, "port")
-e.title = translate("MQTT Port")
-
-host = mwol:taboption("general", Value, "presetmac", translate("Host to wake up"),
-	translate("Choose the host to wake up or enter a custom MAC address to use"))
-host.title = translate("Preset Mac")
-sys.net.mac_hints(function(mac, name)
-	host:value(mac, "%s (%s)" %{ mac, name })
-end)
-
-e = mwol:taboption("general", Value, "id")
-e.default = mac
-e.rmempty = false;
-e.title = translate("MQTT Topic Id")
-
--
-- MQTT Using encryption 
--
-encryption_enable = mwol:taboption("encryptionSettings", ListValue,"encryptionenable",translate("Enable"))
-encryption_enable.optional = false;
-encryption_enable.rmempty = false;
-encryption_enable.default = 0
-encryption_enable.datatype = "uinteger"
-encryption_enable:value(1, translate("True"))
-encryption_enable:value(0, translate("False"))
-
--
-- MQTT username
--
-encryption_username = mwol:taboption("encryptionSettings", Value,"username",translate("MQTT UserName"))
-encryption_username.optional = true;
-encryption_username.rmempty = true;
-encryption_username.default = "mleaf"
-encryption_username.datatype = "string"
-encryption_username:depends("encryptionenable", "1")
-
--
-- MQTT password
--
-encryption_password = mwol:taboption("encryptionSettings", Value,"password",translate("MQTT Password"))
-encryption_password.optional = true;
-encryption_password.rmempty = true;
-encryption_password.default = "www.mleaf.org"
-encryption_password.datatype = "string"
-encryption_password:depends("encryptionenable", "1")
-
--
-- MQTT Using SSL 
--
-ssl_enable = mwol:taboption("ssl", ListValue,"sslenable",translate("Enable"))
-ssl_enable.optional = false;
-ssl_enable.rmempty = false;
-ssl_enable.default = 0
-ssl_enable.datatype = "uinteger"
-ssl_enable:value(1, translate("True"))
-ssl_enable:value(0, translate("False"))
-
--
-- MQTT cafile
--
-cafile = mwol:taboption("ssl", Value,"cafile",translate("ca"),
-	translate("Edit the ca file path."))
-cafile.optional = true;
-cafile.rmempty = true;
-cafile.default = false
-cafile.datatype = "string"
-cafile:depends("sslenable", "1")
-
--
-- MQTT crtfile
--
-crtfile = mwol:taboption("ssl", Value,"crtfile",translate("crt"),
-	translate("Edit the crt file path."))
-crtfile.optional = true;
-crtfile.rmempty = true;
-crtfile.default = false
-crtfile.datatype = "string"
-crtfile:depends("sslenable", "1")
-
--
-- MQTT keyfile
--
-keyfile = mwol:taboption("ssl", Value,"keyfile",translate("key"),
-	translate("Edit the key file path."))
-keyfile.optional = true;
-keyfile.rmempty = true;
-keyfile.default = false
-keyfile.datatype = "string"
-keyfile:depends("sslenable", "1")
-
-return m
--- a/immluci/applications/luci-app-mwol/po/zh_Hans/mwol.po
+++ b/immluci/applications/luci-app-mwol/po/zh_Hans/mwol.po
@ -1,54 +0,0 @@
-
-msgid "Mwol Plus is Running"
-msgstr "Mwol正在运行"
-
-msgid "Mwol Plus is Not Running"
-msgstr "Mwol未运行"
-
-msgid "Mwol Sub Topic:"
-msgstr "Mwol订阅消息主题:"
-
-msgid "Mwol Pub Topic:"
-msgstr "Mwol发布消息主题:"
-
-msgid "General Settings"
-msgstr "通用设置"
-
-msgid "Encryption Settings"
-msgstr "加密设定"
-
-msgid "SSL Settings"
-msgstr "SSL证书设置"
-
-msgid "Enable"
-msgstr "开启"
-
-msgid "MQTT Server"
-msgstr "MQTT服务器"
-
-msgid "MQTT Port"
-msgstr "MQTT端口"
-
-msgid "Preset Mac"
-msgstr "预设MAC地址"
-
-msgid "Choose the host to wake up or enter a custom MAC address to use"
-msgstr "选择一个需要唤醒的主机或自定义唤醒主机的mac地址"
-
-msgid "MQTT Topic Id"
-msgstr "MQTT主题ID"
-
-msgid "MQTT UserName"
-msgstr "MQTT用户名"
-
-msgid "MQTT Password"
-msgstr "MQTT密码"
-
-msgid "Edit the ca file path."
-msgstr "编辑CA路径。"
-
-msgid "Edit the crt file path."
-msgstr "编辑CRT路径。"
-
-msgid "Edit the key file path."
-msgstr "编辑KEY路径。"
--- a/immluci/applications/luci-app-mwol/root/etc/uci-defaults/40_luci-mwol
+++ b/immluci/applications/luci-app-mwol/root/etc/uci-defaults/40_luci-mwol
@ -1,11 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
-	delete ucitrack.@mwol[-1]
-	add ucitrack mwol
-	set ucitrack.@mwol[-1].init=mwol
-	commit ucitrack
-EOF
-
-rm -f /tmp/luci-indexcache
-exit 0
--- a/immluci/applications/luci-app-mwol/root/usr/share/rpcd/acl.d/luci-app-mwol.json
+++ b/immluci/applications/luci-app-mwol/root/usr/share/rpcd/acl.d/luci-app-mwol.json
@ -1,11 +0,0 @@
-{
-	"luci-app-mwol": {
-		"description": "Grant UCI access for luci-app-mwol",
-		"read": {
-			"uci": [ "mwol" ]
-		},
-		"write": {
-			"uci": [ "mwol" ]
-		}
-	}
-}
--- a/immluci/applications/luci-app-naiveproxy/Makefile
+++ b/immluci/applications/luci-app-naiveproxy/Makefile
@ -1,21 +0,0 @@
-# Copyright (C) 2020 Openwrt.org
-#
-# This is a free software, use it under GNU General Public License v3.0.
-#
-# Created By ImmortalWrt
-# https://github.com/project-openwrt
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luci-app-naiveproxy
-PKG_VERSION:=1.0
-PKG_RELEASE:=1
-LUCI_TITLE:=LuCI support for NaiveProxy
-LUCI_DEPENDS:=+naiveproxy
-LUCI_PKGARCH:=all
-
-PKG_MAINTAINER:=CN_SZTL <cnsztl@immortalwrt.org>
-
-include ../../luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature
--- a/immluci/applications/luci-app-naiveproxy/luasrc/controller/naiveproxy.lua
+++ b/immluci/applications/luci-app-naiveproxy/luasrc/controller/naiveproxy.lua
@ -1,23 +0,0 @@
-- This is a free software, use it under GNU General Public License v3.0.
-- Created By ImmortalWrt
-- https://github.com/immortalwrt
-
-module("luci.controller.naiveproxy", package.seeall)
-
-function index()
-	if not nixio.fs.access("/etc/config/naiveproxy") then
-		return
-	end
-
-	local page
-	page = entry({"admin", "services", "naiveproxy"}, cbi("naiveproxy"), _("NaiveProxy"), 100)
-	page.dependent = true
-	entry({"admin", "services", "naiveproxy", "status"},call("act_status")).leaf=true
-end
-
-function act_status()
-	local e={}
-	e.running=luci.sys.call("pgrep naive >/dev/null")==0
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(e)
-end
--- a/immluci/applications/luci-app-naiveproxy/luasrc/model/cbi/naiveproxy.lua
+++ b/immluci/applications/luci-app-naiveproxy/luasrc/model/cbi/naiveproxy.lua
@ -1,28 +0,0 @@
-- Created By ImmortalWrt
-- https://github.com/immortalwrt
-
-mp = Map("naiveproxy", translate("NaiveProxy"))
-mp.description = translate("NaïveProxy uses Chrome's network stack to camouflage traffic with strong censorship resistance and low detectability. Reusing Chrome's stack also ensures best practices in performance and security.")
-
-mp:section(SimpleSection).template = "naiveproxy/naiveproxy_status"
-
-s = mp:section(TypedSection, "naiveproxy")
-s.anonymous=true
-s.addremove=false
-
-enable = s:option(Flag, "enable", translate("Enable"))
-enable.default = 0
-enable.rmempty = false
-
-listen_addr = s:option(Value, "listen_addr", translate("Listen Address"))
-listen_addr.description = translate("proto://[addr][:port]")
-listen_addr.rmempty = false
-
-server_addr = s:option(Value, "server_addr", translate("Server Address"))
-server_addr.description = translate("proto://user:pass@hostname[:port]")
-server_addr.rmempty = false
-
-extra_argument = s:option(Value, "extra_argument", translate("Extra Argument"))
-extra_argument.description = translate("Appends extra argument to NaiveProxy")
-
-return mp
--- a/immluci/applications/luci-app-naiveproxy/luasrc/view/naiveproxy/naiveproxy_status.htm
+++ b/immluci/applications/luci-app-naiveproxy/luasrc/view/naiveproxy/naiveproxy_status.htm
@ -1,22 +0,0 @@
-<script type="text/javascript">//<![CDATA[
-XHR.poll(3, '<%=url([[admin]], [[services]], [[naiveproxy]], [[status]])%>', null,
-	function(x, data) {
-		var tb = document.getElementById('gost_status');
-		if (data && tb) {
-			if (data.running) {
-				var links = '<em><b><font color=green>NaiveProxy <%:RUNNING%></font></b></em>';
-				tb.innerHTML = links;
-			} else {
-				tb.innerHTML = '<em><b><font color=red>NaiveProxy <%:NOT RUNNING%></font></b></em>';
-			}
-		}
-	}
-);
-//]]>
-</script>
-<style>.mar-10 {margin-left: 50px; margin-right: 10px;}</style>
-<fieldset class="cbi-section">
-	<p id="gost_status">
-		<em><%:Collecting data...%></em>
-	</p>
-</fieldset>
--- a/immluci/applications/luci-app-naiveproxy/po/en/naiveproxy.po
+++ b/immluci/applications/luci-app-naiveproxy/po/en/naiveproxy.po
@ -1,26 +0,0 @@
-msgid "NaiveProxy"
-msgstr ""
-
-msgid "NaïveProxy uses Chrome's network stack to camouflage traffic with strong censorship resistance and low detectability. Reusing Chrome's stack also ensures best practices in performance and security."
-msgstr ""
-
-msgid "RUNNING"
-msgstr ""
-
-msgid "NOT RUNNING"
-msgstr ""
-
-msgid "Enable"
-msgstr ""
-
-msgid "Listen Address"
-msgstr ""
-
-msgid "Server Address"
-msgstr ""
-
-msgid "Extra Argument"
-msgstr ""
-
-msgid "Appends extra argument to NaiveProxy"
-msgstr ""
--- a/immluci/applications/luci-app-naiveproxy/po/zh_Hans/naiveproxy.po
+++ b/immluci/applications/luci-app-naiveproxy/po/zh_Hans/naiveproxy.po
@ -1,26 +0,0 @@
-msgid "NaiveProxy"
-msgstr "NaiveProxy"
-
-msgid "NaïveProxy uses Chrome's network stack to camouflage traffic with strong censorship resistance and low detectability. Reusing Chrome's stack also ensures best practices in performance and security."
-msgstr "NaïveProxy 使用 Chrome 网络堆栈强大的反审查功能和低可检测性来伪装流量，同时确保在性能和安全方面达到最佳。"
-
-msgid "RUNNING"
-msgstr "运行中"
-
-msgid "NOT RUNNING"
-msgstr "未运行"
-
-msgid "Enable"
-msgstr "启用"
-
-msgid "Listen Address"
-msgstr "监听地址"
-
-msgid "Server Address"
-msgstr "服务器地址"
-
-msgid "Extra Argument"
-msgstr "额外参数"
-
-msgid "Appends extra argument to NaiveProxy"
-msgstr "追加额外参数到 NaiveProxy"
--- a/immluci/applications/luci-app-naiveproxy/root/etc/uci-defaults/naiveproxy
+++ b/immluci/applications/luci-app-naiveproxy/root/etc/uci-defaults/naiveproxy
@ -1,11 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
-	delete ucitrack.@naiveproxy[-1]
-	add ucitrack naiveproxy
-	set ucitrack.@naiveproxy[-1].init=naiveproxy
-	commit ucitrack
-EOF
-
-rm -f /tmp/luci-indexcache
-exit 0
--- a/immluci/applications/luci-app-naiveproxy/root/usr/share/rpcd/acl.d/luci-app-naiveproxy.json
+++ b/immluci/applications/luci-app-naiveproxy/root/usr/share/rpcd/acl.d/luci-app-naiveproxy.json
@ -1,11 +0,0 @@
-{
-	"luci-app-naiveproxy": {
-		"description": "Grant UCI access for luci-app-naiveproxy",
-		"read": {
-			"uci": [ "naiveproxy" ]
-		},
-		"write": {
-			"uci": [ "naiveproxy" ]
-		}
-	}
-}
--- a/immluci/applications/luci-app-turboacc/Makefile
+++ b/immluci/applications/luci-app-turboacc/Makefile
@ -1,49 +0,0 @@
-# Copyright (C) 2016 Openwrt.org
-#
-# This is free software, licensed under the Apache License, Version 2.0 .
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luci-app-turboacc
-PKG_VERSION:=1.0
-PKG_RELEASE:=2
-
-PKG_LICENSE:=GPLv3.0+
-
-LUCI_TITLE:=LuCI support for Flow Offload / Shortcut-FE
-LUCI_DEPENDS:=+pdnsd-alt \
-              +PACKAGE_$(PKG_NAME)_INCLUDE_shortcut-fe:kmod-fast-classifier \
-              +PACKAGE_$(PKG_NAME)_INCLUDE_flow-offload:kmod-ipt-offload \
-              +PACKAGE_$(PKG_NAME)_INCLUDE_bbr-cca:kmod-tcp-bbr \
-              +PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder:dnsforwarder
-LUCI_PKGARCH:=all
-
-define Package/$(PKG_NAME)/config
-config PACKAGE_$(PKG_NAME)_INCLUDE_flow-offload
-	bool "Include Flow Offload"
-	depends on PACKAGE_$(PKG_NAME)_INCLUDE_shortcut-fe=n
-	default y
-
-config PACKAGE_$(PKG_NAME)_INCLUDE_shortcut-fe
-	bool "Include Shortcut-FE"
-	default n
-
-config PACKAGE_$(PKG_NAME)_INCLUDE_bbr-cca
-	bool "Include BBR CCA"
-	default y
-
-config PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder
-	bool "Include DNSForwarder"
-	default n
-endef
-
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_shortcut-fe \
-	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_flow-offload \
-	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_bbr-cca \
-	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder
-
-include ../../luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature
--- a/immluci/applications/luci-app-turboacc/luasrc/controller/turboacc.lua
+++ b/immluci/applications/luci-app-turboacc/luasrc/controller/turboacc.lua
@ -1,40 +0,0 @@
-module("luci.controller.turboacc", package.seeall)
-
-function index()
-	if not nixio.fs.access("/etc/config/turboacc") then
-		return
-	end
-	local page
-	page = entry({"admin", "network", "turboacc"}, cbi("turboacc"), _("Turbo ACC Center"), 101)
-	page.i18n = "turboacc"
-	page.dependent = true
-	page.acl_depends = { "luci-app-turboacc" }
-	
-	entry({"admin", "network", "turboacc", "status"}, call("action_status"))
-end
-
-local function fastpath_status()
-	return luci.sys.call("{ [ -e /sys/module/xt_FLOWOFFLOAD/refcnt ] && [ x$(cat /sys/module/xt_FLOWOFFLOAD/refcnt 2>/dev/null) != x0 ]; } || lsmod | grep -q fast_classifier") == 0
-end
-
-local function bbr_status()
-	return luci.sys.call("[ x$(cat /proc/sys/net/ipv4/tcp_congestion_control 2>/dev/null) = xbbr ]") == 0
-end
-
-local function fullconebat_status()
-	return luci.sys.call("[ -e /sys/module/xt_FULLCONENAT/refcnt ] && [ x$(cat /sys/module/xt_FULLCONENAT/refcnt 2>/dev/null) != x0 ]") == 0
-end
-
-local function dnscaching_status()
-	return luci.sys.call("pgrep dnscache >/dev/null") == 0
-end
-
-function action_status()
-	luci.http.prepare_content("application/json")
-	luci.http.write_json({
-		fastpath_state = fastpath_status(),
-		bbr_state = bbr_status(),
-		fullconenat_state = fullconebat_status(),
-		dnscaching_state = dnscaching_status()
-	})
-end
--- a/immluci/applications/luci-app-turboacc/luasrc/model/cbi/turboacc.lua
+++ b/immluci/applications/luci-app-turboacc/luasrc/model/cbi/turboacc.lua
@ -1,87 +0,0 @@
-local kernel_version = luci.sys.exec("echo -n $(uname -r)")
-
-m = Map("turboacc")
-m.title	= translate("Turbo ACC Acceleration Settings")
-m.description = translate("Opensource Flow Offloading driver (Fast Path or Hardware NAT)")
-
-m:append(Template("turboacc/status"))
-
-s = m:section(TypedSection, "turboacc", "")
-s.addremove = false
-s.anonymous = true
-
-if nixio.fs.access("/lib/modules/" .. kernel_version .. "/xt_FLOWOFFLOAD.ko") then
-sw_flow = s:option(Flag, "sw_flow", translate("Software flow offloading"))
-sw_flow.default = 0
-sw_flow.description = translate("Software based offloading for routing/NAT")
-sw_flow:depends("sfe_flow", 0)
-end
-
-if luci.sys.call("cat /proc/cpuinfo | grep -q MT76") == 0 then
-hw_flow = s:option(Flag, "hw_flow", translate("Hardware flow offloading"))
-hw_flow.default = 0
-hw_flow.description = translate("Requires hardware NAT support. Implemented at least for mt76xx")
-hw_flow:depends("sw_flow", 1)
-end
-
-if nixio.fs.access("/lib/modules/" .. kernel_version .. "/fast-classifier.ko") then
-sfe_flow = s:option(Flag, "sfe_flow", translate("Shortcut-FE flow offloading"))
-sfe_flow.default = 0
-sfe_flow.description = translate("Shortcut-FE based offloading for routing/NAT")
-sfe_flow:depends("sw_flow", 0)
-end
-
-sfe_bridge = s:option(Flag, "sfe_bridge", translate("Bridge Acceleration"))
-sfe_bridge.default = 0
-sfe_bridge.description = translate("Enable Bridge Acceleration (may be functional conflict with bridge-mode VPN server)")
-sfe_bridge:depends("sfe_flow", 1)
-
-if nixio.fs.access("/proc/sys/net/ipv6") then
-sfe_ipv6 = s:option(Flag, "sfe_ipv6", translate("IPv6 Acceleration"))
-sfe_ipv6.default = 0
-sfe_ipv6.description = translate("Enable IPv6 Acceleration")
-sfe_ipv6:depends("sfe_flow", 1)
-end
-
-if nixio.fs.access("/lib/modules/" .. kernel_version .. "/tcp_bbr.ko") then
-bbr_cca = s:option(Flag, "bbr_cca", translate("BBR CCA"))
-bbr_cca.default = 0
-bbr_cca.description = translate("Using BBR CCA can improve TCP network performance effectively")
-end 
-
-if nixio.fs.access("/lib/modules/" .. kernel_version .. "/xt_FULLCONENAT.ko") then
-fullcone_nat = s:option(Flag, "fullcone_nat", translate("FullCone NAT"))
-fullcone_nat.default = 0
-fullcone_nat.description = translate("Using FullCone NAT can improve gaming performance effectively")
-end 
-
-dns_acc = s:option(Flag, "dns_acc", translate("DNS Acceleration"))
-dns_acc.default = 0
-dns_acc.rmempty = false
-dns_acc.description = translate("Using optimized DNS records for GoogleHosts (Don't use under Clash Fake-IP mode)")
-
-dns_caching = s:option(Flag, "dns_caching", translate("DNS Caching"))
-dns_caching.default = 0
-dns_caching.rmempty = false
-dns_caching.description = translate("Enable DNS Caching and anti ISP DNS pollution")
-
-dns_caching_mode = s:option(ListValue, "dns_caching_mode", translate("Resolve DNS Mode"), translate("Only PDNSD and DNSForwarder is supported now"))
-dns_caching_mode:value("1", translate("Using PDNSD to query and cache"))
-if nixio.fs.access("/usr/bin/dnsforwarder") then
-dns_caching_mode:value("2", translate("Using DNSForwarder to query and cache"))
-end
-dns_caching_mode.default = 1
-dns_caching_mode:depends("dns_caching", 1)
-
-dns_caching_v4_dns = s:option(Value, "dns_caching_v4_dns", translate("Upsteam IPv4 DNS Server"))
-dns_caching_v4_dns.default = "114.114.114.114,114.114.115.115,223.5.5.5,223.6.6.6,180.76.76.76,119.29.29.29,119.28.28.28,1.2.4.8,210.2.4.8"
-dns_caching_v4_dns.description = translate("Muitiple IPv4 DNS server can saperate with ','")
-dns_caching_v4_dns:depends("dns_caching_mode", 1)
-dns_caching_v4_dns:depends("dns_caching_mode", 2)
-
-dns_caching_v6_dns = s:option(Value, "dns_caching_v6_dns", translate("Upsteam IPv6 DNS Server"))
-dns_caching_v6_dns.default = "2001:4860:4860::8888,2001:4860:4860::8844,2001:2001::1111,2001:2001::1001,2400:da00::6666,240C::6666,240C::6644"
-dns_caching_v6_dns.description = translate("Muitiple IPv6 DNS server can saperate with ','")
-dns_caching_v6_dns:depends("dns_caching_mode", 2)
-
-return m
--- a/immluci/applications/luci-app-turboacc/luasrc/view/turboacc/status.htm
+++ b/immluci/applications/luci-app-turboacc/luasrc/view/turboacc/status.htm
@ -1,25 +0,0 @@
-<fieldset class="cbi-section">
-	<legend><%:Running Status%></legend>
-	<table width="100%" cellspacing="10" id="_turboacc_status_table">
-		<tr><td width="33%"><%:Flow Offloading%></td><td id="_fastpath_state"><em><%:Collecting data...%></em></td></tr>
-		<tr><td width="33%"><%:BBR CCA%></td><td id="_bbr_state"><em><%:Collecting data...%></em></td></tr>
-		<tr><td width="33%"><%:FullCone NAT%></td><td id="_fullconenat_state"><em><%:Collecting data...%></em></td></tr>
-		<tr><td width="33%"><%:DNS Caching%></td><td id="_dnscaching_state"><em><%:Collecting data...%></em></td></tr>
-	</table>
-</fieldset>
-
-<script type="text/javascript">//<![CDATA[
-	var fastpath_state = document.getElementById('_fastpath_state');
-	var bbr_state = document.getElementById('_bbr_state');
-	var fullconenat_state = document.getElementById('_fullconenat_state');
-	var dnscaching_state = document.getElementById('_dnscaching_state');
-	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "turboacc", "status")%>', null, function(x, status) {
-		if ( x && x.status == 200 ) {
-			fastpath_state.innerHTML = status.fastpath_state ? '<em><b><font color=green><%:RUNNING%></font></b></em>' : '<em><b><font color=red><%:NOT RUNNING%></font></b></em>';
-			bbr_state.innerHTML = status.bbr_state ? '<em><b><font color=green><%:RUNNING%></font></b></em>' : '<em><b><font color=red><%:NOT RUNNING%></font></b></em>';
-			fullconenat_state.innerHTML = status.fullconenat_state ? '<em><b><font color=green><%:RUNNING%></font></b></em>' : '<em><b><font color=red><%:NOT RUNNING%></font></b></em>';
-			dnscaching_state.innerHTML = status.dnscaching_state ? '<em><b><font color=green><%:RUNNING%></font></b></em>' : '<em><b><font color=red><%:NOT RUNNING%></font></b></em>';
-		}
-	});
-//]]>
-//]]></script>
--- a/immluci/applications/luci-app-turboacc/po/zh_Hans/turboacc.po
+++ b/immluci/applications/luci-app-turboacc/po/zh_Hans/turboacc.po
@ -1,107 +0,0 @@
-msgid "Turbo ACC Center"
-msgstr "Turbo ACC 网络加速"
-
-msgid "Turbo ACC Acceleration Settings"
-msgstr "Turbo ACC 网络加速设置"
-
-msgid "Linux Flow Offload Forwarding Engine Settings"
-msgstr "Linux Flow Offload Forwarding 转发加速引擎设置"
-
-msgid "Opensource Flow Offloading driver (Fast Path or Hardware NAT)"
-msgstr "开源流量分载驱动 (支持 Fast Path 或者 硬件 NAT)"
-
-msgid "Software flow offloading"
-msgstr "软件流量分载"
-
-msgid "Software based offloading for routing/NAT"
-msgstr "基于软件的 Routing/NAT 分载"
-
-msgid "Hardware flow offloading"
-msgstr "硬件流量分载"
-
-msgid "Requires hardware NAT support. Implemented at least for mt76xx"
-msgstr "需要硬件 NAT 支持。目前 mt76xx 已实现"
-
-msgid "Shortcut-FE flow offloading"
-msgstr "Shortcut-FE 流量分载"
-
-msgid "Shortcut-FE based offloading for routing/NAT"
-msgstr "基于 Shortcut-FE 的 Routing/NAT 分载"
-
-msgid "Bridge Acceleration"
-msgstr "桥接加速"
-
-msgid "Enable Bridge Acceleration (may be functional conflict with bridge-mode VPN server)"
-msgstr "启用桥接加速 (可能会和路由器上桥接模式的VPN服务器冲突)"
-
-msgid "IPv6 Acceleration"
-msgstr "IPv6 加速"
-
-msgid "Enable IPv6 Acceleration"
-msgstr "启用 IPv6 加速"
-
-msgid "BBR CCA"
-msgstr "BBR 拥塞控制算法"
-
-msgid "Using BBR CCA can improve TCP network performance effectively"
-msgstr "使用 BBR 拥塞控制算法可以有效提升 TCP 网络性能"
-
-msgid "FullCone NAT"
-msgstr "全锥形 NAT"
-
-msgid "Using FullCone NAT can improve gaming performance effectively"
-msgstr "使用全锥形 NAT 可以有效提升游戏体验"
-
-msgid "DNS Acceleration"
-msgstr "DNS 加速"
-
-msgid "Using optimized DNS records for GoogleHosts (Don't use under Clash Fake-IP mode)"
-msgstr "使用来自 GoogleHosts 的优质 DNS 记录（请勿在 Clash Fake-IP 模式下使用）"
-
-msgid "DNS Caching"
-msgstr "DNS 缓存"
-
-msgid "Enable DNS Caching and anti ISP DNS pollution"
-msgstr "启用 DNS 多线程查询、缓存，并防止 ISP 的 DNS 广告和域名劫持"
-
-msgid "Resolve DNS Mode"
-msgstr "DNS 解析方式"
-
-msgid "Only PDNSD and DNSForwarder is supported now"
-msgstr "目前仅支持 PDNSD 和 DNSForwarder"
-
-msgid "Using PDNSD to query and cache"
-msgstr "使用 PDNSD 解析"
-
-msgid "Using DNSForwarder to query and cache"
-msgstr "使用 DNSForwarder 解析"
-
-msgid "Upsteam IPv4 DNS Server"
-msgstr "上游 IPv4 DNS 服务器"
-
-msgid "Muitiple IPv4 DNS server can saperate with ','"
-msgstr "多个上游 IPv4 DNS 服务器请用 ',' 分隔（注意用英文逗号)"
-
-msgid "Upsteam IPv6 DNS Server"
-msgstr "上游 IPv6 DNS 服务器"
-
-msgid "Muitiple IPv6 DNS server can saperate with ','"
-msgstr "多个上游 IPv6 DNS 服务器请用 ',' 分隔（注意用英文逗号)"
-
-msgid "Running Status"
-msgstr "运行状态"
-
-msgid "Flow Offloading"
-msgstr "流量分载"
-
-msgid "BBR CCA"
-msgstr "BBR 拥塞控制算法"
-
-msgid "FullCone NAT"
-msgstr "全锥型 NAT"
-
-msgid "DNS Caching"
-msgstr "DNS 缓存"
-
-msgid "Open Web Interface"
-msgstr "打开 Web 界面"
--- a/immluci/applications/luci-app-turboacc/root/etc/config/turboacc
+++ b/immluci/applications/luci-app-turboacc/root/etc/config/turboacc
@ -1,14 +0,0 @@
-
-config turboacc 'config'
-	option sw_flow '1'
-	option hw_flow '1'
-	option sfe_flow '1'
-	option sfe_bridge '1'
-	option sfe_ipv6 '0'
-	option bbr_cca '1'
-	option fullcone_nat '1'
-	option dns_acc '0'
-	option dns_caching '0'
-	option dns_caching_mode '1'
-	option dns_caching_v4_dns '114.114.114.114,114.114.115.115,223.5.5.5,223.6.6.6,180.76.76.76,119.29.29.29,119.28.28.28,1.2.4.8,210.2.4.8'
-	option dns_caching_v6_dns '240c::6666,240c::6644,2001:da8::666,2001:da8:202:10::36,2001:da8:8000:1:202:120:2:100'
--- a/immluci/applications/luci-app-turboacc/root/etc/init.d/turboacc
+++ b/immluci/applications/luci-app-turboacc/root/etc/init.d/turboacc
@ -1,295 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (c) 2011-2015 OpenWrt.org
-
-START=90
-STOP=10
-
-restart_utils="true"
-
-inital_conf(){
-	config_load "turboacc"
-	config_get "sw_flow" "config" "sw_flow" "0"
-	config_get "hw_flow" "config" "hw_flow" "0"
-	config_get "sfe_flow" "config" "sfe_flow" "0"
-	config_get "sfe_bridge" "config" "sfe_bridge" "0"
-	config_get "sfe_ipv6" "config" "sfe_ipv6" "0"
-	config_get "bbr_cca" "config" "bbr_cca" "0"
-	config_get "fullcone_nat" "config" "fullcone_nat" "0"
-	config_get "dns_acc" "config" "dns_acc" "0"
-	config_get "dns_caching" "config" "dns_caching" "0"
-	config_get "dns_caching_mode" "config" "dns_caching_mode" "0"
-	config_get "dns_caching_v4_dns" "config" "dns_caching_v4_dns"
-	config_get "dns_caching_v6_dns" "config" "dns_caching_v6_dns"
-
-	[ ! -e "/lib/modules/$(uname -r)/xt_FLOWOFFLOAD.ko" ] && { sw_flow="0"; hw_flow="0"; }
-	[ ! -e "/lib/modules/$(uname -r)/fast-classifier.ko" ] && { sfe_flow="0"; sfe_bridge="0"; sfe_ipv6="0"; }
-	[ ! -e "/lib/modules/$(uname -r)/tcp_bbr.ko" ] && bbr_cca="0"
-	[ ! -e "/lib/modules/$(uname -r)/xt_FULLCONENAT.ko" ] && fullcone_nat="0"
-}
-
-start_pdnsd() {
-	[ -d "/var/etc" ] || mkdir -p "/var/etc"
-	cat > "/var/etc/dnscache.conf" <<EOF
-global {
-    perm_cache=1024;        # dns缓存大小，单位KB，建议不要写的太大
-    cache_dir="/var/dnscache";     # 缓存文件的位置
-    pid_file = /var/run/dnscache.pid;
-    server_ip = 127.0.0.1;        # pdnsd监听的网卡，0.0.0.0是全部网卡
-    server_port=5333;           # pdnsd监听的端口，不要和别的服务冲突即可
-    status_ctl = on;
-    paranoid=on;                  # 二次请求模式，如果请求主DNS服务器返回的是垃圾地址，就向备用服务器请求
-    query_method=udp_only;
-    neg_domain_pol = off;
-    par_queries = 400;          # 最多同时请求数
-    min_ttl = 1h;               # DNS结果最短缓存时间
-    max_ttl = 1w;               # DNS结果最长缓存时间
-    timeout = 10;               # DNS请求超时时间，单位秒
-}
-
-server {
-    label = "routine";
-    ip = ${dns_caching_v4_dns};     # 这里为主要上级 dns 的 ip 地址，建议填写一个当地最快的DNS地址
-    timeout = 5;              # DNS请求超时时间
-    reject = 74.125.127.102,  # 以下是脏IP，也就是DNS污染一般会返回的结果，如果收到如下DNS结果会触发二次请求（TCP协议一般不会碰到脏IP）
-        74.125.155.102,
-        74.125.39.102,
-        74.125.39.113,
-        209.85.229.138,
-        128.121.126.139,
-        159.106.121.75,
-        169.132.13.103,
-        192.67.198.6,
-        202.106.1.2,
-        202.181.7.85,
-        203.161.230.171,
-        203.98.7.65,
-        207.12.88.98,
-        208.56.31.43,
-        209.145.54.50,
-        209.220.30.174,
-        209.36.73.33,
-        211.94.66.147,
-        213.169.251.35,
-        216.221.188.182,
-        216.234.179.13,
-        243.185.187.39,
-        37.61.54.158,
-        4.36.66.178,
-        46.82.174.68,
-        59.24.3.173,
-        64.33.88.161,
-        64.33.99.47,
-        64.66.163.251,
-        65.104.202.252,
-        65.160.219.113,
-        66.45.252.237,
-        69.55.52.253,
-        72.14.205.104,
-        72.14.205.99,
-        78.16.49.15,
-        8.7.198.45,
-        93.46.8.89,
-        37.61.54.158,
-        243.185.187.39,
-        190.93.247.4,
-        190.93.246.4,
-        190.93.245.4,
-        190.93.244.4,
-        65.49.2.178,
-        189.163.17.5,
-        23.89.5.60,
-        49.2.123.56,
-        54.76.135.1,
-        77.4.7.92,
-        118.5.49.6,
-        159.24.3.173,
-        188.5.4.96,
-        197.4.4.12,
-        220.250.64.24,
-        243.185.187.30,
-        249.129.46.48,
-        253.157.14.165;
-    reject_policy = fail;
-}
-
-server {
-    label = "special";                  # 这个随便写
-    ip = 117.50.10.10,52.80.52.52,119.29.29.29; # 这里为备用DNS服务器的 ip 地址
-    port = 5353;                        # 推荐使用53以外的端口（DNS服务器必须支持
-    proxy_only = on;
-    timeout = 5;
-}
-
-source {
-	owner=localhost;
-//	serve_aliases=on;
-	file="/etc/hosts";
-}
-
-rr {
-	name=localhost;
-	reverse=on;
-	a=127.0.0.1;
-	owner=localhost;
-	soa=localhost,root.localhost,42,86400,900,86400,86400;
-}
-EOF
-
-	if [ ! -f "/var/dnscache/pdnsd.cache" ]; then
-		mkdir -p "/var/dnscache"
-		echo -ne "pd13\000\000\000\000" > "/var/dnscache/pdnsd.cache"
-		chown -R nobody.nogroup "/var/dnscache"
-	fi
-
-	[ -d "/var/sbin" ] || mkdir -p "/var/sbin" && cp -a "/usr/sbin/pdnsd" "/var/sbin/dnscache"
-	/var/sbin/dnscache -c "/var/etc/dnscache.conf" &
-	echo "PDNSD: Start DNS Caching"
-}
-
-start_dnsforwarder() {
-	mkdir -p "/var/run/dnscache"
-	cat > "/var/run/dnscache/dnscache.conf" <<EOF
-LogOn false
-LogFileThresholdLength 102400
-LogFileFolder /var/run/dnscache
-UDPLocal 127.0.0.1:5333
-UDPGroup ${dns_caching_v4_dns},${dns_caching_v6_dns} * on
-GroupFile
-BlockIP 243.185.187.39,46.82.174.68,37.61.54.158,93.46.8.89,59.24.3.173,203.98.7.65,8.7.198.45,78.16.49.15,159.106.121.75,69.63.187.12,31.13.76.8,31.13.64.49
-IPSubstituting
-BlockNegativeResponse false
-Hosts
-HostsUpdateInterval 18000
-HostsDownloadPath
-HostsScript
-HostsRetryInterval 30
-AppendHosts
-BlockIpv6WhenIpv4Exists false
-UseCache true
-CacheSize 1048576
-MemoryCache true
-CacheFile
-IgnoreTTL false
-OverrideTTL -1
-MultipleTTL 1
-ReloadCache false
-OverwriteCache false
-DisabledType
-DisabledDomain
-DisabledList
-DomainStatistic false
-DomainStatisticTempletFile
-StatisticUpdateInterval 29
-EOF
-
-	[ -d "/var/sbin" ] || mkdir -p "/var/sbin" && cp -a "/usr/bin/dnsforwarder" "/var/sbin/dnscache"
-	/var/sbin/dnscache -f "/var/run/dnscache/dnscache.conf" &
-	echo "DnsForwarder: Start DNS Caching"
-
-}
-
-stop_dnscache() {
-	killall -9 "dnscache" 2>"/dev/null"
-	kill -9 $(ps | grep dnscache-while.sh | grep -v "grep" | awk '{print $1}') 2>"/dev/null"
-	rm -rf "/var/dnscache" "/var/run/dnscache"
-	echo "Stop DNS Caching"
-}
-
-change_dns() {
- 	uci -q delete dhcp.@dnsmasq[0].server
-	uci add_list dhcp.@dnsmasq[0].server="127.0.0.1#5333"
-	uci set dhcp.@dnsmasq[0].noresolv="1"
-	uci commit dhcp
-
-}
-
-revert_dns() {
-	uci -q del_list dhcp.@dnsmasq[0].server="127.0.0.1#5333"
-	uci set dhcp.@dnsmasq[0].resolvfile="/tmp/resolv.conf.d/resolv.conf.auto"
-	uci set dhcp.@dnsmasq[0].noresolv="0"
-	uci commit dhcp
-}
-
-start(){
-	inital_conf
-
-	uci set firewall.@defaults[0].flow_offloading="${sw_flow}"
-	uci set firewall.@defaults[0].flow_offloading_hw="${hw_flow}"
-	uci set firewall.@defaults[0].fullcone="${fullcone_nat}"
-	uci commit firewall
-
-	[ "${sw_flow}" -ne "1" ] && [ "${sfe_flow}" -eq "1" ] && {
-		lsmod | grep -q fast_classifier || modprobe fast_classifier 2>"/dev/null"
-		echo "${sfe_bridge}" > "/sys/fast_classifier/skip_to_bridge_ingress" 2>"/dev/null"
-		if [ "${sfe_ipv6}" -eq "1" ]; then
-			[ ! -e "/dev/sfe_ipv6" ] && mknod "/dev/sfe_ipv6" "c" "$(cat "/sys/sfe_ipv6/debug_dev")" "0"
-		else
-			rm -f "/dev/sfe_ipv6"
-		fi
-}
-
-	if [ "${bbr_cca}" -eq "1" ];  then
-		sysctl -w net.ipv4.tcp_congestion_control="bbr"
-	else
-		sysctl -w net.ipv4.tcp_congestion_control="cubic"
-	fi	
-
-	[ "${dns_acc}" -eq "1" ] && {
-	mkdir -p "/tmp/dnsmasq.d"
-	wget-ssl -q -t "20" -T "5" "https://cdn.jsdelivr.net/gh/googlehosts/hosts@master/hosts-files/dnsmasq.conf" -O "/tmp/dnsmasq.d/dnsmasq-googlehosts.conf" &
-}
-
-	if [ "${dns_caching}" -eq "1" ];  then
-		stop_dnscache
-		sleep 1
-		rm -f "/var/log/dnscache.file"
-		if [ "${dns_caching_mode}" = "1" ];  then
-			start_pdnsd
-		elif [ "${dns_caching_mode}" = "2" ];  then
-			start_dnsforwarder
-		fi
-		change_dns
-		nohup "/usr/share/dnscache/dnscache-while.sh" > "/var/log/dnscache.file" 2>&1 &
-	else
-		stop_dnscache
-		revert_dns
-	fi
-
-	if [ "${restart_utils}" = "true" ]; then
-		/etc/init.d/dnsmasq restart >/dev/null 2>&1 && echo "DNSMASQ change"
-		/etc/init.d/firewall restart >/dev/null 2>&1
-	fi
-}
-
-stop(){
-	inital_conf
-
-	uci set firewall.@defaults[0].flow_offloading="${sw_flow}"
-	uci set firewall.@defaults[0].flow_offloading_hw="${hw_flow}"
-	uci set firewall.@defaults[0].fullcone="${fullcone_nat}"
-	uci commit firewall
-
-	[ "${sfe_flow}" -ne "1" ] && {
-		echo "0" > "/sys/fast_classifier/skip_to_bridge_ingress" 2>"/dev/null"
-		rm -f "/dev/sfe_ipv6"
-		rmmod "fast_classifier" 2>"/dev/null"
-}
-
-	[ "${dns_acc}" -eq "0" ] && rm -f "/tmp/dnsmasq.d/dnsmasq-googlehosts.conf"
-
-	stop_dnscache
-	revert_dns
-
-	if [ "${restart_utils}" = "true" ]; then
-		/etc/init.d/dnsmasq restart >/dev/null 2>&1 && echo "DNSMASQ revert"
-		/etc/init.d/firewall restart >/dev/null 2>&1
-	fi
-}
-
-restart(){
-	restart_utils="false"
-	stop
-	start
-	/etc/init.d/dnsmasq restart >/dev/null 2>&1 && echo "DNSMASQ restart"
-	/etc/init.d/firewall restart >/dev/null 2>&1
-}
--- a/immluci/applications/luci-app-turboacc/root/etc/uci-defaults/turboacc
+++ b/immluci/applications/luci-app-turboacc/root/etc/uci-defaults/turboacc
@ -1,10 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
-	delete ucitrack.@turboacc[-1]
-	add ucitrack turboacc
-	set ucitrack.@turboacc[-1].init=turboacc
-	commit ucitrack
-EOF
-
-exit 0
--- a/immluci/applications/luci-app-turboacc/root/usr/share/dnscache/dnscache-while.sh
+++ b/immluci/applications/luci-app-turboacc/root/usr/share/dnscache/dnscache-while.sh
@ -1,31 +0,0 @@
-#!/bin/sh
-
-sleeptime=60
-logfile="/var/log/dnscache.file"
-dns_caching="$(uci -q get turboacc.config.dns_caching)"
-dns_caching_mode="$(uci -q get turboacc.config.dns_caching_mode 2>/dev/null)"
-
-clean_log(){
-logrow="$(grep -c "" "${logfile}")"
-if [ "${logrow}" -ge "500" ];then
-    echo "${curtime} Log条数超限，清空处理！" > "${logfile}"
-fi
-}
-
-while [ "${dns_caching}" -eq "1" ];
-do
-	curtime="$(date "+%H:%M:%S")"
-	echo "${curtime} online!"
-	pidof dnscache>/dev/null || {
-		if [ "${dns_caching_mode}" = "1" ]; then
-			/var/sbin/dnscache -c "/var/etc/dnscache.conf" &
-		elif [ "${dns_caching_mode}" = "2" ]; then
-			/var/sbin/dnscache -f "/var/run/dnscache/dnscache.conf" &
-		fi
-		echo "${curtime} 重启服务！" >> ${logfile}
-}
-
-	clean_log
-	sleep "${sleeptime}"
-	continue
-done
--- a/immluci/applications/luci-app-turboacc/root/usr/share/rpcd/acl.d/luci-app-turboacc.json
+++ b/immluci/applications/luci-app-turboacc/root/usr/share/rpcd/acl.d/luci-app-turboacc.json
@ -1,11 +0,0 @@
-{
-	"luci-app-turboacc": {
-		"description": "Grant UCI access for luci-app-turboacc",
-		"read": {
-			"uci": [ "turboacc" ]
-		},
-		"write": {
-			"uci": [ "turboacc" ]
-		}
-	}
-}
--- a/immpackages/net/verysync/Makefile
+++ b/immpackages/net/verysync/Makefile
@ -1,65 +0,0 @@
-#
-# Copyright (C) 2021 ImmortalWrt
-# <https://immortalwrt.org>
-#
-# This is free software, licensed under the GNU General Public License v3.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-ifeq ($(ARCH),x86_64)
-	PKG_ARCH_VERYSYNC:=amd64
-endif
-ifeq ($(ARCH),mipsel)
-	PKG_ARCH_VERYSYNC:=mipsle
-endif
-ifeq ($(ARCH),mips)
-	PKG_ARCH_VERYSYNC:=mips
-endif
-ifeq ($(ARCH),i386)
-	PKG_ARCH_VERYSYNC:=386
-endif
-ifeq ($(ARCH),arm)
-	PKG_ARCH_VERYSYNC:=arm
-endif
-ifeq ($(ARCH),aarch64)
-	PKG_ARCH_VERYSYNC:=arm64
-endif
-ifeq ($(ARCH),powerpc64)
-	PKG_ARCH_VERYSYNC:=ppc64
-endif
-
-PKG_NAME:=verysync
-PKG_VERSION:=v2.4.3
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-linux-$(PKG_ARCH_VERYSYNC)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://dl.verysync.com/releases/$(PKG_VERSION)/
-PKG_HASH:=skip
-
-include $(INCLUDE_DIR)/package.mk
-
-TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
-
-define Package/verysync
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=A efficient data transmission tool
-	URL:=http://www.verysync.com
-endef
-
-define Package/verysync/description
-	Verysync is a efficient data transmission tool.
-endef
-
-define Build/Compile
-	true
-endef
-
-define Package/verysync/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/verysync-linux-$(PKG_ARCH_VERYSYNC)-$(PKG_VERSION)/verysync $(1)/usr/bin/verysync
-endef
-
-$(eval $(call BuildPackage,verysync))
--- a/immpackages/libs/jpcre2/Makefile
+++ b/immpackages/libs/jpcre2/Makefile
@ -10,7 +10,7 @@ PKG_RELEASE:=$(AUTORELEASE)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/jpcre2/jpcre2/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=668cbc6d2c0a065bb6abe8494d5a1bb3549a14cd956a44a2df9095045623ea47
+PKG_HASH:=skip

 PKG_LICENSE:=BSD 3-Clause
 PKG_LICENSE_FILES:=LICENSE
--- a/immpackages/libs/libcron/Makefile
+++ b/immpackages/libs/libcron/Makefile
--- a/immpackages/net/mwol/Makefile
+++ b/immpackages/net/mwol/Makefile
--- a/immpackages/net/mwol/files/mwol.config
+++ b/immpackages/net/mwol/files/mwol.config
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				!function(n){"object"==typeof exports&&"object"==typeof module?n(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],n):n(CodeMirror)}(function(n){"use strict";function e(e,o,i,t){if(i&&i.call){var l=i;i=null}else l=r(e,i,"rangeFinder");"number"==typeof o&&(o=n.Pos(o,0));var f=r(e,i,"minFoldSize");function d(n){var r=l(e,o);if(!r\|\|r.to.line-r.from.line<f)return null;for(var i=e.findMarksAt(r.from),d=0;d<i.length;++d)if(i[d].__isFold&&"fold"!==t){if(!n)return null;r.cleared=!0,i[d].clear()}return r}var u=d(!0);if(r(e,i,"scanUp"))for(;!u&&o.line>e.firstLine();)o=n.Pos(o.line-1,0),u=d(!1);if(u&&!u.cleared&&"unfold"!==t){var a=function(n,e){var o=r(n,e,"widget");if("string"==typeof o){var i=document.createTextNode(o);(o=document.createElement("span")).appendChild(i),o.className="CodeMirror-foldmarker"}else o&&(o=o.cloneNode(!0));return o}(e,i);n.on(a,"mousedown",function(e){c.clear(),n.e_preventDefault(e)});var c=e.markText(u.from,u.to,{replacedWith:a,clearOnEnter:r(e,i,"clearOnEnter"),__isFold:!0});c.on("clear",function(o,r){n.signal(e,"unfold",e,o,r)}),n.signal(e,"fold",e,u.from,u.to)}}n.newFoldFunction=function(n,o){return function(r,i){e(r,i,{rangeFinder:n,widget:o})}},n.defineExtension("foldCode",function(n,o,r){e(this,n,o,r)}),n.defineExtension("isFolded",function(n){for(var e=this.findMarksAt(n),o=0;o<e.length;++o)if(e[o].__isFold)return!0}),n.commands.toggleFold=function(n){n.foldCode(n.getCursor())},n.commands.fold=function(n){n.foldCode(n.getCursor(),null,"fold")},n.commands.unfold=function(n){n.foldCode(n.getCursor(),null,"unfold")},n.commands.foldAll=function(e){e.operation(function(){for(var o=e.firstLine(),r=e.lastLine();o<=r;o++)e.foldCode(n.Pos(o,0),null,"fold")})},n.commands.unfoldAll=function(e){e.operation(function(){for(var o=e.firstLine(),r=e.lastLine();o<=r;o++)e.foldCode(n.Pos(o,0),null,"unfold")})},n.registerHelper("fold","combine",function(){var n=Array.prototype.slice.call(arguments,0);return function(e,o){for(var r=0;r<n.length;++r){var i=n[r](e,o);if(i)return i}}}),n.registerHelper("fold","auto",function(n,e){for(var o=n.getHelpers(e,"fold"),r=0;r<o.length;r++){var i=o[r](n,e);if(i)return i}});var o={rangeFinder:n.fold.auto,widget:"↔",minFoldSize:0,scanUp:!1,clearOnEnter:!0};function r(n,e,r){if(e&&void 0!==e[r])return e[r];var i=n.options.foldOptions;return i&&void 0!==i[r]?i[r]:o[r]}n.defineOption("foldOptions",null),n.defineExtension("foldOption",function(n,e){return r(this,n,e)})});
				`@ -1 +0,0 @@`
				`.CodeMirror-foldmarker{color:blue;text-shadow:#b9f 1px 1px 2px,#b9f -1px -1px 2px,#b9f 1px -1px 2px,#b9f -1px 1px 2px;font-family:arial;line-height:.3;cursor:pointer}.CodeMirror-foldgutter{width:.7em}.CodeMirror-foldgutter-open,.CodeMirror-foldgutter-folded{cursor:pointer}.CodeMirror-foldgutter-open:after{content:"\25BE"}.CodeMirror-foldgutter-folded:after{content:"\25B8"}`
				`@ -1 +0,0 @@`
				!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror"),require("./foldcode")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./foldcode"],t):t(CodeMirror)}(function(t){"use strict";t.defineOption("foldGutter",!1,function(o,e,r){r&&r!=t.Init&&(o.clearGutter(o.state.foldGutter.options.gutter),o.state.foldGutter=null,o.off("gutterClick",a),o.off("changes",d),o.off("viewportChange",u),o.off("fold",l),o.off("unfold",l),o.off("swapDoc",d)),e&&(o.state.foldGutter=new function(t){this.options=t,this.from=this.to=0}(function(t){!0===t&&(t={});null==t.gutter&&(t.gutter="CodeMirror-foldgutter");null==t.indicatorOpen&&(t.indicatorOpen="CodeMirror-foldgutter-open");null==t.indicatorFolded&&(t.indicatorFolded="CodeMirror-foldgutter-folded");return t}(e)),f(o),o.on("gutterClick",a),o.on("changes",d),o.on("viewportChange",u),o.on("fold",l),o.on("unfold",l),o.on("swapDoc",d))});var o=t.Pos;function e(t,e){for(var r=t.findMarks(o(e,0),o(e+1,0)),n=0;n<r.length;++n)if(r[n].__isFold){var i=r[n].find(-1);if(i&&i.line===e)return r[n]}}function r(t){if("string"==typeof t){var o=document.createElement("div");return o.className=t+" CodeMirror-guttermarker-subtle",o}return t.cloneNode(!0)}function n(t,n,f){var a=t.state.foldGutter.options,d=n-1,u=t.foldOption(a,"minFoldSize"),l=t.foldOption(a,"rangeFinder"),c="string"==typeof a.indicatorFolded&&i(a.indicatorFolded),s="string"==typeof a.indicatorOpen&&i(a.indicatorOpen);t.eachLine(n,f,function(n){++d;var i=null,f=n.gutterMarkers;if(f&&(f=f[a.gutter]),e(t,d)){if(c&&f&&c.test(f.className))return;i=r(a.indicatorFolded)}else{var p=o(d,0),m=l&&l(t,p);if(m&&m.to.line-m.from.line>=u){if(s&&f&&s.test(f.className))return;i=r(a.indicatorOpen)}}(i\|\|f)&&t.setGutterMarker(n,a.gutter,i)})}function i(t){return new RegExp("(^\|\\s)"+t+"(?:$\|\\s)\\s*")}function f(t){var o=t.getViewport(),e=t.state.foldGutter;e&&(t.operation(function(){n(t,o.from,o.to)}),e.from=o.from,e.to=o.to)}function a(t,r,n){var i=t.state.foldGutter;if(i){var f=i.options;if(n==f.gutter){var a=e(t,r);a?a.clear():t.foldCode(o(r,0),f)}}}function d(t){var o=t.state.foldGutter;if(o){var e=o.options;o.from=o.to=0,clearTimeout(o.changeUpdate),o.changeUpdate=setTimeout(function(){f(t)},e.foldOnChangeTimeSpan\|\|600)}}function u(t){var o=t.state.foldGutter;if(o){var e=o.options;clearTimeout(o.changeUpdate),o.changeUpdate=setTimeout(function(){var e=t.getViewport();o.from==o.to\|\|e.from-o.to>20\|\|o.from-e.to>20?f(t):t.operation(function(){e.from<o.from&&(n(t,e.from,o.from),o.from=e.from),e.to>o.to&&(n(t,o.to,e.to),o.to=e.to)})},e.updateViewportTimeSpan\|\|400)}}function l(t,o){var e=t.state.foldGutter;if(e){var r=o.line;r>=e.from&&r<e.to&&n(t,r,r+1)}}});
				`@ -1 +0,0 @@`
				!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";function n(n,t){var i=n.getLine(t),o=i.search(/\S/);return-1==o\|\|/\bcomment\b/.test(n.getTokenTypeAt(e.Pos(t,o+1)))?-1:e.countColumn(i,null,n.getOption("tabSize"))}e.registerHelper("fold","indent",function(t,i){var o=n(t,i.line);if(!(o<0)){for(var r=null,l=i.line+1,f=t.lastLine();l<=f;++l){var u=n(t,l);if(-1==u);else{if(!(u>o))break;r=l}}return r?{from:e.Pos(i.line,t.getLine(i.line).length),to:e.Pos(r,t.getLine(r).length)}:void 0}})});
				`@ -1 +0,0 @@`
				.cm-s-dracula.CodeMirror,.cm-s-dracula .CodeMirror-gutters{background-color:#282a36 !important;color:#f8f8f2 !important;border:0}.cm-s-dracula .CodeMirror-gutters{color:#282a36}.cm-s-dracula .CodeMirror-cursor{border-left:solid thin #f8f8f0}.cm-s-dracula .CodeMirror-linenumber{color:#6d8a88}.cm-s-dracula .CodeMirror-selected{background:rgba(255,255,255,0.10)}.cm-s-dracula .CodeMirror-line::selection,.cm-s-dracula .CodeMirror-line>span::selection,.cm-s-dracula .CodeMirror-line>span>span::selection{background:rgba(255,255,255,0.10)}.cm-s-dracula .CodeMirror-line::-moz-selection,.cm-s-dracula .CodeMirror-line>span::-moz-selection,.cm-s-dracula .CodeMirror-line>span>span::-moz-selection{background:rgba(255,255,255,0.10)}.cm-s-dracula span.cm-comment{color:#6272a4}.cm-s-dracula span.cm-string,.cm-s-dracula span.cm-string-2{color:#f1fa8c}.cm-s-dracula span.cm-number{color:#bd93f9}.cm-s-dracula span.cm-variable{color:#50fa7b}.cm-s-dracula span.cm-variable-2{color:white}.cm-s-dracula span.cm-def{color:#50fa7b}.cm-s-dracula span.cm-operator{color:#ff79c6}.cm-s-dracula span.cm-keyword{color:#ff79c6}.cm-s-dracula span.cm-atom{color:#bd93f9}.cm-s-dracula span.cm-meta{color:#f8f8f2}.cm-s-dracula span.cm-tag{color:#ff79c6}.cm-s-dracula span.cm-attribute{color:#50fa7b}.cm-s-dracula span.cm-qualifier{color:#50fa7b}.cm-s-dracula span.cm-property{color:#66d9ef}.cm-s-dracula span.cm-builtin{color:#50fa7b}.cm-s-dracula span.cm-variable-3,.cm-s-dracula span.cm-type{color:#ffb86c}.cm-s-dracula .CodeMirror-activeline-background{background:rgba(255,255,255,0.1)}.cm-s-dracula .CodeMirror-matchingbracket{text-decoration:underline;color:white !important}