From 97ff4a156ff1aa6a4d2ab65ab13d12b4eb2651e2 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 15 Jul 2008 08:47:36 +0000 Subject: [PATCH] Split up admin-core into admin-core and admin-full, preparing admin-mini --- contrib/package/luci/Makefile | 42 +++++++++++++--- modules/admin-full/Makefile | 2 + .../luasrc/controller/admin/index.lua | 0 .../luasrc/controller/admin/network.lua | 0 .../luasrc/controller/admin/services.lua | 0 .../luasrc/controller/admin/status.lua | 0 .../luasrc/controller/admin/system.lua | 0 .../luasrc/controller/admin/uci.lua | 0 .../luasrc/controller/admin/wifi.lua | 0 .../luasrc/model/cbi/admin_index/luci.lua | 0 .../luasrc/model/cbi/admin_network/dhcp.lua | 0 .../luasrc/model/cbi/admin_network/ifaces.lua | 0 .../luasrc/model/cbi/admin_network/ptp.lua | 0 .../luasrc/model/cbi/admin_network/routes.lua | 0 .../luasrc/model/cbi/admin_network/vlan.lua | 0 .../model/cbi/admin_services/dnsmasq.lua | 0 .../model/cbi/admin_services/dropbear.lua | 0 .../luasrc/model/cbi/admin_services/httpd.lua | 0 .../luasrc/model/cbi/admin_system/fstab.lua | 0 .../luasrc/model/cbi/admin_system/system.lua | 0 .../luasrc/model/cbi/admin_wifi/devices.lua | 0 .../luasrc/model/cbi/admin_wifi/networks.lua | 0 .../luasrc/view/admin_index/index.htm | 0 .../luasrc/view/admin_network/index.htm | 0 .../luasrc/view/admin_services/index.htm | 0 .../luasrc/view/admin_status/index.htm | 0 .../luasrc/view/admin_status/iwscan.htm | 0 .../luasrc/view/admin_status/routes.htm | 0 .../luasrc/view/admin_status/syslog.htm | 0 .../luasrc/view/admin_system/editor.htm | 0 .../luasrc/view/admin_system/index.htm | 0 .../luasrc/view/admin_system/ipkg.htm | 0 .../luasrc/view/admin_system/packages.htm | 0 .../luasrc/view/admin_system/passwd.htm | 0 .../luasrc/view/admin_system/reboot.htm | 0 .../luasrc/view/admin_system/sshkeys.htm | 0 .../luasrc/view/admin_system/upgrade.htm | 0 .../luasrc/view/admin_uci/apply.htm | 0 .../luasrc/view/admin_uci/changes.htm | 0 .../luasrc/view/admin_uci/revert.htm | 0 .../luasrc/view/admin_wifi/index.htm | 0 modules/admin-mini/Makefile | 2 + .../admin-mini/luasrc/controller/index.lua | 49 +++++++++++++++++++ 43 files changed, 89 insertions(+), 6 deletions(-) create mode 100644 modules/admin-full/Makefile rename modules/{admin-core => admin-full}/luasrc/controller/admin/index.lua (100%) rename modules/{admin-core => admin-full}/luasrc/controller/admin/network.lua (100%) rename modules/{admin-core => admin-full}/luasrc/controller/admin/services.lua (100%) rename modules/{admin-core => admin-full}/luasrc/controller/admin/status.lua (100%) rename modules/{admin-core => admin-full}/luasrc/controller/admin/system.lua (100%) rename modules/{admin-core => admin-full}/luasrc/controller/admin/uci.lua (100%) rename modules/{admin-core => admin-full}/luasrc/controller/admin/wifi.lua (100%) rename modules/{admin-core => admin-full}/luasrc/model/cbi/admin_index/luci.lua (100%) rename modules/{admin-core => admin-full}/luasrc/model/cbi/admin_network/dhcp.lua (100%) rename modules/{admin-core => admin-full}/luasrc/model/cbi/admin_network/ifaces.lua (100%) rename modules/{admin-core => admin-full}/luasrc/model/cbi/admin_network/ptp.lua (100%) rename modules/{admin-core => admin-full}/luasrc/model/cbi/admin_network/routes.lua (100%) rename modules/{admin-core => admin-full}/luasrc/model/cbi/admin_network/vlan.lua (100%) rename modules/{admin-core => admin-full}/luasrc/model/cbi/admin_services/dnsmasq.lua (100%) rename modules/{admin-core => admin-full}/luasrc/model/cbi/admin_services/dropbear.lua (100%) rename modules/{admin-core => admin-full}/luasrc/model/cbi/admin_services/httpd.lua (100%) rename modules/{admin-core => admin-full}/luasrc/model/cbi/admin_system/fstab.lua (100%) rename modules/{admin-core => admin-full}/luasrc/model/cbi/admin_system/system.lua (100%) rename modules/{admin-core => admin-full}/luasrc/model/cbi/admin_wifi/devices.lua (100%) rename modules/{admin-core => admin-full}/luasrc/model/cbi/admin_wifi/networks.lua (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_index/index.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_network/index.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_services/index.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_status/index.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_status/iwscan.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_status/routes.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_status/syslog.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_system/editor.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_system/index.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_system/ipkg.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_system/packages.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_system/passwd.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_system/reboot.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_system/sshkeys.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_system/upgrade.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_uci/apply.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_uci/changes.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_uci/revert.htm (100%) rename modules/{admin-core => admin-full}/luasrc/view/admin_wifi/index.htm (100%) create mode 100644 modules/admin-mini/Makefile create mode 100644 modules/admin-mini/luasrc/controller/index.lua diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 2c30695e75..e369acfc43 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -286,7 +286,7 @@ endef define Package/luci-mod-admin-core $(call Package/luci/webtemplate) DEPENDS+=+luci-web +luci-cbi +luci-theme-openwrt +luci-i18n-english - TITLE:=Administration module + TITLE:=Administration core module endef define Package/luci-mod-admin-core/install @@ -294,9 +294,31 @@ define Package/luci-mod-admin-core/install endef +define Package/luci-mod-admin-mini + $(call Package/luci/webtemplate) + DEPENDS+=+luci-mod-admin-core + TITLE:=Simplified Administration module +endef + +define Package/luci-mod-admin-mini/install + $(call Package/luci/install/template,$(1),modules/admin-mini) +endef + + +define Package/luci-mod-admin-full + $(call Package/luci/webtemplate) + DEPENDS+=+luci-mod-admin-core + TITLE:=Full featured Administration module +endef + +define Package/luci-mod-admin-full/install + $(call Package/luci/install/template,$(1),modules/admin-full) +endef + + define Package/luci-mod-freifunk $(call Package/luci/fftemplate) - DEPENDS:=+luci-mod-admin-core + DEPENDS:=+luci-mod-admin-full TITLE:=LuCI Freifunk module endef @@ -325,7 +347,7 @@ endef define Package/luci-app-firewall $(call Package/luci/webtemplate) - DEPENDS+=+luci-mod-admin-core + DEPENDS+=+luci-mod-admin-full TITLE:=Firewall and Portforwarding application endef @@ -340,7 +362,7 @@ endef define Package/luci-app-olsr $(call Package/luci/webtemplate) - DEPENDS+=+luci-mod-admin-core +olsrd-mod-txtinfo + DEPENDS+=+luci-mod-admin-full +olsrd-mod-txtinfo TITLE:=OLSR configuration and status module endef @@ -351,7 +373,7 @@ endef define Package/luci-app-qos $(call Package/luci/webtemplate) - DEPENDS+=+luci-mod-admin-core +qos-scripts + DEPENDS+=+luci-mod-admin-full +qos-scripts TITLE:=Quality of Service configuration module endef @@ -377,7 +399,7 @@ endef define Package/luci-app-statistics $(call Package/luci/webtemplate) - DEPENDS+=+luci-mod-admin-core +collectd +collectd-mod-rrdtool1 +rrdtool1 + DEPENDS+=+luci-mod-admin-full +collectd +collectd-mod-rrdtool1 +rrdtool1 TITLE:=LuCI Statistics Application endef @@ -516,6 +538,12 @@ endif ifneq ($(CONFIG_PACKAGE_luci-mod-admin-core),) PKG_SELECTED_MODULES+=modules/admin-core endif +ifneq ($(CONFIG_PACKAGE_luci-mod-admin-mini),) + PKG_SELECTED_MODULES+=modules/admin-mini +endif +ifneq ($(CONFIG_PACKAGE_luci-mod-admin-full),) + PKG_SELECTED_MODULES+=modules/admin-full +endif ifneq ($(CONFIG_PACKAGE_luci-mod-freifunk),) PKG_SELECTED_MODULES+=modules/freifunk endif @@ -592,6 +620,8 @@ $(eval $(call BuildPackage,luci-ff-berlin)) $(eval $(call BuildPackage,luci-ff-augsburg)) $(eval $(call BuildPackage,luci-mod-admin-core)) +#$(eval $(call BuildPackage,luci-mod-admin-mini)) +$(eval $(call BuildPackage,luci-mod-admin-full)) $(eval $(call BuildPackage,luci-mod-freifunk)) $(eval $(call BuildPackage,luci-app-ffwizard-leipzig)) diff --git a/modules/admin-full/Makefile b/modules/admin-full/Makefile new file mode 100644 index 0000000000..81a96f6a83 --- /dev/null +++ b/modules/admin-full/Makefile @@ -0,0 +1,2 @@ +include ../../build/config.mk +include ../../build/module.mk \ No newline at end of file diff --git a/modules/admin-core/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua similarity index 100% rename from modules/admin-core/luasrc/controller/admin/index.lua rename to modules/admin-full/luasrc/controller/admin/index.lua diff --git a/modules/admin-core/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua similarity index 100% rename from modules/admin-core/luasrc/controller/admin/network.lua rename to modules/admin-full/luasrc/controller/admin/network.lua diff --git a/modules/admin-core/luasrc/controller/admin/services.lua b/modules/admin-full/luasrc/controller/admin/services.lua similarity index 100% rename from modules/admin-core/luasrc/controller/admin/services.lua rename to modules/admin-full/luasrc/controller/admin/services.lua diff --git a/modules/admin-core/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua similarity index 100% rename from modules/admin-core/luasrc/controller/admin/status.lua rename to modules/admin-full/luasrc/controller/admin/status.lua diff --git a/modules/admin-core/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua similarity index 100% rename from modules/admin-core/luasrc/controller/admin/system.lua rename to modules/admin-full/luasrc/controller/admin/system.lua diff --git a/modules/admin-core/luasrc/controller/admin/uci.lua b/modules/admin-full/luasrc/controller/admin/uci.lua similarity index 100% rename from modules/admin-core/luasrc/controller/admin/uci.lua rename to modules/admin-full/luasrc/controller/admin/uci.lua diff --git a/modules/admin-core/luasrc/controller/admin/wifi.lua b/modules/admin-full/luasrc/controller/admin/wifi.lua similarity index 100% rename from modules/admin-core/luasrc/controller/admin/wifi.lua rename to modules/admin-full/luasrc/controller/admin/wifi.lua diff --git a/modules/admin-core/luasrc/model/cbi/admin_index/luci.lua b/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua similarity index 100% rename from modules/admin-core/luasrc/model/cbi/admin_index/luci.lua rename to modules/admin-full/luasrc/model/cbi/admin_index/luci.lua diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/dhcp.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua similarity index 100% rename from modules/admin-core/luasrc/model/cbi/admin_network/dhcp.lua rename to modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua similarity index 100% rename from modules/admin-core/luasrc/model/cbi/admin_network/ifaces.lua rename to modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/ptp.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ptp.lua similarity index 100% rename from modules/admin-core/luasrc/model/cbi/admin_network/ptp.lua rename to modules/admin-full/luasrc/model/cbi/admin_network/ptp.lua diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/routes.lua b/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua similarity index 100% rename from modules/admin-core/luasrc/model/cbi/admin_network/routes.lua rename to modules/admin-full/luasrc/model/cbi/admin_network/routes.lua diff --git a/modules/admin-core/luasrc/model/cbi/admin_network/vlan.lua b/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua similarity index 100% rename from modules/admin-core/luasrc/model/cbi/admin_network/vlan.lua rename to modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua diff --git a/modules/admin-core/luasrc/model/cbi/admin_services/dnsmasq.lua b/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua similarity index 100% rename from modules/admin-core/luasrc/model/cbi/admin_services/dnsmasq.lua rename to modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua diff --git a/modules/admin-core/luasrc/model/cbi/admin_services/dropbear.lua b/modules/admin-full/luasrc/model/cbi/admin_services/dropbear.lua similarity index 100% rename from modules/admin-core/luasrc/model/cbi/admin_services/dropbear.lua rename to modules/admin-full/luasrc/model/cbi/admin_services/dropbear.lua diff --git a/modules/admin-core/luasrc/model/cbi/admin_services/httpd.lua b/modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua similarity index 100% rename from modules/admin-core/luasrc/model/cbi/admin_services/httpd.lua rename to modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua diff --git a/modules/admin-core/luasrc/model/cbi/admin_system/fstab.lua b/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua similarity index 100% rename from modules/admin-core/luasrc/model/cbi/admin_system/fstab.lua rename to modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua diff --git a/modules/admin-core/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua similarity index 100% rename from modules/admin-core/luasrc/model/cbi/admin_system/system.lua rename to modules/admin-full/luasrc/model/cbi/admin_system/system.lua diff --git a/modules/admin-core/luasrc/model/cbi/admin_wifi/devices.lua b/modules/admin-full/luasrc/model/cbi/admin_wifi/devices.lua similarity index 100% rename from modules/admin-core/luasrc/model/cbi/admin_wifi/devices.lua rename to modules/admin-full/luasrc/model/cbi/admin_wifi/devices.lua diff --git a/modules/admin-core/luasrc/model/cbi/admin_wifi/networks.lua b/modules/admin-full/luasrc/model/cbi/admin_wifi/networks.lua similarity index 100% rename from modules/admin-core/luasrc/model/cbi/admin_wifi/networks.lua rename to modules/admin-full/luasrc/model/cbi/admin_wifi/networks.lua diff --git a/modules/admin-core/luasrc/view/admin_index/index.htm b/modules/admin-full/luasrc/view/admin_index/index.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_index/index.htm rename to modules/admin-full/luasrc/view/admin_index/index.htm diff --git a/modules/admin-core/luasrc/view/admin_network/index.htm b/modules/admin-full/luasrc/view/admin_network/index.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_network/index.htm rename to modules/admin-full/luasrc/view/admin_network/index.htm diff --git a/modules/admin-core/luasrc/view/admin_services/index.htm b/modules/admin-full/luasrc/view/admin_services/index.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_services/index.htm rename to modules/admin-full/luasrc/view/admin_services/index.htm diff --git a/modules/admin-core/luasrc/view/admin_status/index.htm b/modules/admin-full/luasrc/view/admin_status/index.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_status/index.htm rename to modules/admin-full/luasrc/view/admin_status/index.htm diff --git a/modules/admin-core/luasrc/view/admin_status/iwscan.htm b/modules/admin-full/luasrc/view/admin_status/iwscan.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_status/iwscan.htm rename to modules/admin-full/luasrc/view/admin_status/iwscan.htm diff --git a/modules/admin-core/luasrc/view/admin_status/routes.htm b/modules/admin-full/luasrc/view/admin_status/routes.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_status/routes.htm rename to modules/admin-full/luasrc/view/admin_status/routes.htm diff --git a/modules/admin-core/luasrc/view/admin_status/syslog.htm b/modules/admin-full/luasrc/view/admin_status/syslog.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_status/syslog.htm rename to modules/admin-full/luasrc/view/admin_status/syslog.htm diff --git a/modules/admin-core/luasrc/view/admin_system/editor.htm b/modules/admin-full/luasrc/view/admin_system/editor.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_system/editor.htm rename to modules/admin-full/luasrc/view/admin_system/editor.htm diff --git a/modules/admin-core/luasrc/view/admin_system/index.htm b/modules/admin-full/luasrc/view/admin_system/index.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_system/index.htm rename to modules/admin-full/luasrc/view/admin_system/index.htm diff --git a/modules/admin-core/luasrc/view/admin_system/ipkg.htm b/modules/admin-full/luasrc/view/admin_system/ipkg.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_system/ipkg.htm rename to modules/admin-full/luasrc/view/admin_system/ipkg.htm diff --git a/modules/admin-core/luasrc/view/admin_system/packages.htm b/modules/admin-full/luasrc/view/admin_system/packages.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_system/packages.htm rename to modules/admin-full/luasrc/view/admin_system/packages.htm diff --git a/modules/admin-core/luasrc/view/admin_system/passwd.htm b/modules/admin-full/luasrc/view/admin_system/passwd.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_system/passwd.htm rename to modules/admin-full/luasrc/view/admin_system/passwd.htm diff --git a/modules/admin-core/luasrc/view/admin_system/reboot.htm b/modules/admin-full/luasrc/view/admin_system/reboot.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_system/reboot.htm rename to modules/admin-full/luasrc/view/admin_system/reboot.htm diff --git a/modules/admin-core/luasrc/view/admin_system/sshkeys.htm b/modules/admin-full/luasrc/view/admin_system/sshkeys.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_system/sshkeys.htm rename to modules/admin-full/luasrc/view/admin_system/sshkeys.htm diff --git a/modules/admin-core/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_system/upgrade.htm rename to modules/admin-full/luasrc/view/admin_system/upgrade.htm diff --git a/modules/admin-core/luasrc/view/admin_uci/apply.htm b/modules/admin-full/luasrc/view/admin_uci/apply.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_uci/apply.htm rename to modules/admin-full/luasrc/view/admin_uci/apply.htm diff --git a/modules/admin-core/luasrc/view/admin_uci/changes.htm b/modules/admin-full/luasrc/view/admin_uci/changes.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_uci/changes.htm rename to modules/admin-full/luasrc/view/admin_uci/changes.htm diff --git a/modules/admin-core/luasrc/view/admin_uci/revert.htm b/modules/admin-full/luasrc/view/admin_uci/revert.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_uci/revert.htm rename to modules/admin-full/luasrc/view/admin_uci/revert.htm diff --git a/modules/admin-core/luasrc/view/admin_wifi/index.htm b/modules/admin-full/luasrc/view/admin_wifi/index.htm similarity index 100% rename from modules/admin-core/luasrc/view/admin_wifi/index.htm rename to modules/admin-full/luasrc/view/admin_wifi/index.htm diff --git a/modules/admin-mini/Makefile b/modules/admin-mini/Makefile new file mode 100644 index 0000000000..81a96f6a83 --- /dev/null +++ b/modules/admin-mini/Makefile @@ -0,0 +1,2 @@ +include ../../build/config.mk +include ../../build/module.mk \ No newline at end of file diff --git a/modules/admin-mini/luasrc/controller/index.lua b/modules/admin-mini/luasrc/controller/index.lua new file mode 100644 index 0000000000..eb58e00422 --- /dev/null +++ b/modules/admin-mini/luasrc/controller/index.lua @@ -0,0 +1,49 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- +module("luci.controller.admin.index", package.seeall) + +function index() + luci.i18n.loadc("admin-core") + local i18n = luci.i18n.translate + + local root = node() + if not root.target then + root.target = alias("admin") + end + + entry({"about"}, template("about")).i18n = "admin-core" + + local page = node("admin") + page.target = alias("admin", "index") + page.title = i18n("administration", "Administration") + page.order = 10 + page.i18n = "admin-core" + page.sysauth = "root" + + local page = node("admin", "index") + page.target = template("admin_index/index") + page.title = i18n("overview", "Übersicht") + page.order = 10 + + local page = node("admin", "index", "luci") + page.target = cbi("admin_index/luci") + page.title = i18n("a_i_ui", "Oberfläche") + + entry({"admin", "logout"}, call("action_logout"), i18n("logout")) +end + +function action_logout() + luci.http.header("Set-Cookie", "sysauth=; path=/") + luci.http.redirect(luci.dispatcher.build_url()) +end \ No newline at end of file -- 2.30.2