diff --git a/package/ctcgfw/luci-app-appfilter/Makefile b/package/ctcgfw/luci-app-appfilter/Makefile index dfc32579ae..4d0ecc5041 100644 --- a/package/ctcgfw/luci-app-appfilter/Makefile +++ b/package/ctcgfw/luci-app-appfilter/Makefile @@ -1,17 +1,17 @@ - # # This is free software, licensed under the Apache License, Version 2.0 . # include $(TOPDIR)/rules.mk -include $(TOPDIR)/feeds/luci/luci.mk LUCI_TITLE:=Open App Filter Module LUCI_PKGARCH:=all LUCI_DEPENDS:=+appfilter PKG_NAME:=luci-app-appfilter -PKG_VERSION:=5.0 +PKG_VERSION:=5.0.1 PKG_RELEASE:=1 +include $(TOPDIR)/feeds/luci/luci.mk + # call BuildPackage - OpenWrt buildroot signature diff --git a/package/ctcgfw/luci-app-appfilter/luasrc/model/cbi/appfilter/appfilter.lua b/package/ctcgfw/luci-app-appfilter/luasrc/model/cbi/appfilter/appfilter.lua index e1c7a02347..3d9af1016d 100644 --- a/package/ctcgfw/luci-app-appfilter/luasrc/model/cbi/appfilter/appfilter.lua +++ b/package/ctcgfw/luci-app-appfilter/luasrc/model/cbi/appfilter/appfilter.lua @@ -36,6 +36,20 @@ s.anonymous = true um = s:option(DummyValue, "rule_data") +s=m:section(TypedSection,"time",translate("时间控制")) s.anonymous = true +hv = s:option(Value, "start_time", translate("开始时间")) hv.default="00:00" +hv.optional=false +hv = s:option(Value, "end_time", translate("结束时间")) hv.default="23:59" +hv.optional=false days = s:option(MultiValue, "days", "", translate("")) +days.widget="checkbox" days.size=10 +days:value("0", "周日"); +days:value("1", "周一"); +days:value("2", "周二"); +days:value("3", "周三"); +days:value("4", "周四"); +days:value("5", "周五"); +days:value("6", "周六"); + --um.value =rule_count .. " " .. translate("Records").. " "..version s = m:section(TypedSection, "appfilter", translate("App Filter Rules")) s.anonymous = true @@ -95,10 +109,7 @@ if class_fd then end -s=m:section(TypedSection,"user",translate("Select users")) -s.anonymous = true -users = s:option(MultiValue, "users", "", translate("Select at least one user, otherwise it will take effect for all users")) -users.widget="checkbox" + function get_hostname_by_mac(dst_mac) leasefile="/tmp/dhcp.leases" @@ -128,6 +139,10 @@ function get_cmd_result(command) fd:close() return result end + +s=m:section(TypedSection,"user",translate("Select users")) +s.anonymous = true +users = s:option(MultiValue, "users", "", translate("Select at least one user, otherwise it will take effect for all users")) users.widget="checkbox" --users.widget="select" users.size=1 diff --git a/package/ctcgfw/open-app-filter/Makefile b/package/ctcgfw/open-app-filter/Makefile index 3df4cf4a71..9df5306551 100644 --- a/package/ctcgfw/open-app-filter/Makefile +++ b/package/ctcgfw/open-app-filter/Makefile @@ -2,14 +2,14 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=open-app-filter -PKG_VERSION:=5.0 +PKG_VERSION:=5.0.1 PKG_RELEASE:=1 PKG_SOURCE_URL:=https://github.com/destan19/OpenAppFilter.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2021-03-04 -PKG_SOURCE_VERSION:=4483aab7d158031adc99b8669d5e7cf4f1023c14 -PKG_MIRROR_HASH:=07ba70f41ae62704b8698703f2f3a0b06d4317d4292297514a7ffa13ccecebfc +PKG_SOURCE_DATE:=2021-03-08 +PKG_SOURCE_VERSION:=59aa2a1f40ebee65e48c7fd5d28d6c2706e60145 +PKG_MIRROR_HASH:=a969d5a5c16e418844a63fc6d23facb5ad0327d0bcadc72814bbecc2f9c4a099 include $(INCLUDE_DIR)/package.mk @@ -32,7 +32,7 @@ endef define Package/appfilter SECTION:=net CATEGORY:=Network - DEPENDS:=+libubox-lua +kmod-oaf + DEPENDS:=+libblobmsg-json +libjson-c +libpthread +libubox +libubus +libuci +kmod-oaf TITLE:=App filter userspace module endef