From: Hannu Nyman Date: Sun, 6 Aug 2023 19:18:47 +0000 (+0300) Subject: luci-mod-admin-mini: Remove the broken ancient mini version X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=aebbafe1778799b77ec0ffaf53732589055ac147;p=project%2Fluci.git luci-mod-admin-mini: Remove the broken ancient mini version Remove the old mini version that has been marked BROKEN at least since 2015 when LuCI build system was reorgnised in a major way. The module is not compatible with the current stuff. Signed-off-by: Hannu Nyman --- diff --git a/modules/luci-mod-admin-mini/Makefile b/modules/luci-mod-admin-mini/Makefile deleted file mode 100644 index de00489926..0000000000 --- a/modules/luci-mod-admin-mini/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2008-2014 The LuCI Team -# -# This is free software, licensed under the Apache License, Version 2.0 . -# - -include $(TOPDIR)/rules.mk - -LUCI_TITLE:=LuCI Essentials - stripped down and user-friendly -LUCI_DEPENDS:=+luci-base +luci-compat @BROKEN - -include ../../luci.mk - -# call BuildPackage - OpenWrt buildroot signature - diff --git a/modules/luci-mod-admin-mini/luasrc/controller/mini/index.lua b/modules/luci-mod-admin-mini/luasrc/controller/mini/index.lua deleted file mode 100644 index 6228ad7c8d..0000000000 --- a/modules/luci-mod-admin-mini/luasrc/controller/mini/index.lua +++ /dev/null @@ -1,39 +0,0 @@ --- Copyright 2008 Steven Barth --- Copyright 2008 Jo-Philipp Wich --- Licensed to the public under the Apache License 2.0. - -module("luci.controller.mini.index", package.seeall) - -function index() - local root = node() - if not root.lock then - root.target = alias("mini") - root.index = true - end - - entry({"about"}, template("about")) - - local page = entry({"mini"}, alias("mini", "index"), _("Essentials"), 10) - page.sysauth = "root" - page.sysauth_authenticator = "htmlauth" - page.index = true - - entry({"mini", "index"}, alias("mini", "index", "index"), _("Overview"), 10).index = true - entry({"mini", "index", "index"}, form("mini/index"), _("General"), 1).ignoreindex = true - entry({"mini", "index", "luci"}, cbi("mini/luci", {autoapply=true}), _("Settings"), 10) - entry({"mini", "index", "logout"}, call("action_logout"), _("Logout")) -end - -function action_logout() - local dsp = require "luci.dispatcher" - local utl = require "luci.util" - if dsp.context.authsession then - utl.ubus("session", "destroy", { - ubus_rpc_session = dsp.context.authsession - }) - dsp.context.urltoken.stok = nil - end - - luci.http.header("Set-Cookie", "sysauth=; path=" .. dsp.build_url()) - luci.http.redirect(luci.dispatcher.build_url()) -end diff --git a/modules/luci-mod-admin-mini/luasrc/controller/mini/network.lua b/modules/luci-mod-admin-mini/luasrc/controller/mini/network.lua deleted file mode 100644 index 92506e54f2..0000000000 --- a/modules/luci-mod-admin-mini/luasrc/controller/mini/network.lua +++ /dev/null @@ -1,12 +0,0 @@ --- Copyright 2008 Steven Barth --- Copyright 2008 Jo-Philipp Wich --- Licensed to the public under the Apache License 2.0. - -module("luci.controller.mini.network", package.seeall) - -function index() - entry({"mini", "network"}, alias("mini", "network", "index"), _("Network"), 20).index = true - entry({"mini", "network", "index"}, cbi("mini/network", {autoapply=true}), _("General"), 1) - entry({"mini", "network", "wifi"}, cbi("mini/wifi", {autoapply=true}), _("Wireless"), 10) - entry({"mini", "network", "dhcp"}, cbi("mini/dhcp", {autoapply=true}), _("DHCP"), 20) -end diff --git a/modules/luci-mod-admin-mini/luasrc/controller/mini/system.lua b/modules/luci-mod-admin-mini/luasrc/controller/mini/system.lua deleted file mode 100644 index b23193a170..0000000000 --- a/modules/luci-mod-admin-mini/luasrc/controller/mini/system.lua +++ /dev/null @@ -1,235 +0,0 @@ --- Copyright 2008 Steven Barth --- Copyright 2008 Jo-Philipp Wich --- Licensed to the public under the Apache License 2.0. - -module("luci.controller.mini.system", package.seeall) - -function index() - entry({"mini", "system"}, alias("mini", "system", "index"), _("System"), 40).index = true - entry({"mini", "system", "index"}, cbi("mini/system", {autoapply=true}), _("General"), 1) - entry({"mini", "system", "passwd"}, form("mini/passwd"), _("Admin Password"), 10) - entry({"mini", "system", "backup"}, call("action_backup"), _("Backup / Restore"), 80) - entry({"mini", "system", "upgrade"}, call("action_upgrade"), _("Flash Firmware"), 90) - entry({"mini", "system", "reboot"}, call("action_reboot"), _("Reboot"), 100) -end - -function action_backup() - local reset_avail = os.execute([[grep '"rootfs_data"' /proc/mtd >/dev/null 2>&1]]) == 0 - local restore_cmd = "gunzip | tar -xC/ >/dev/null 2>&1" - local backup_cmd = "tar -c %s | gzip 2>/dev/null" - - local restore_fpi - luci.http.setfilehandler( - function(meta, chunk, eof) - if not restore_fpi then - restore_fpi = io.popen(restore_cmd, "w") - end - if chunk then - restore_fpi:write(chunk) - end - if eof then - restore_fpi:close() - end - end - ) - - local upload = luci.http.formvalue("archive") - local backup = luci.http.formvalue("backup") - local reset = reset_avail and luci.http.formvalue("reset") - - if upload and #upload > 0 then - luci.template.render("mini/applyreboot") - luci.sys.reboot() - elseif backup then - local reader = ltn12_popen(backup_cmd:format(_keep_pattern())) - luci.http.header('Content-Disposition', 'attachment; filename="backup-%s-%s.tar.gz"' % { - luci.sys.hostname(), os.date("%Y-%m-%d")}) - luci.http.prepare_content("application/x-targz") - luci.ltn12.pump.all(reader, luci.http.write) - elseif reset then - luci.template.render("mini/applyreboot") - luci.util.exec("mtd -r erase rootfs_data") - else - luci.template.render("mini/backup", {reset_avail = reset_avail}) - end -end - -function action_reboot() - local reboot = luci.http.formvalue("reboot") - luci.template.render("mini/reboot", {reboot=reboot}) - if reboot then - luci.sys.reboot() - end -end - -function action_upgrade() - require("luci.model.uci") - - local tmpfile = "/tmp/firmware.img" - - local function image_supported() - -- XXX: yay... - return ( 0 == os.execute( - ". /lib/functions.sh; " .. - "include /lib/upgrade; " .. - "platform_check_image %q >/dev/null" - % tmpfile - ) ) - end - - local function image_checksum() - return (luci.sys.exec("md5sum %q" % tmpfile):match("^([^%s]+)")) - end - - local function storage_size() - local size = 0 - if nixio.fs.access("/proc/mtd") then - for l in io.lines("/proc/mtd") do - local d, s, e, n = l:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+"([^%s]+)"') - if n == "linux" then - size = tonumber(s, 16) - break - end - end - elseif nixio.fs.access("/proc/partitions") then - for l in io.lines("/proc/partitions") do - local x, y, b, n = l:match('^%s*(%d+)%s+(%d+)%s+([^%s]+)%s+([^%s]+)') - if b and n and not n:match('[0-9]') then - size = tonumber(b) * 1024 - break - end - end - end - return size - end - - - -- Install upload handler - local file - luci.http.setfilehandler( - function(meta, chunk, eof) - if not nixio.fs.access(tmpfile) and not file and chunk and #chunk > 0 then - file = io.open(tmpfile, "w") - end - if file and chunk then - file:write(chunk) - end - if file and eof then - file:close() - end - end - ) - - - -- Determine state - local keep_avail = true - local step = tonumber(luci.http.formvalue("step") or 1) - local has_image = nixio.fs.access(tmpfile) - local has_support = image_supported() - local has_platform = nixio.fs.access("/lib/upgrade/platform.sh") - local has_upload = luci.http.formvalue("image") - - -- This does the actual flashing which is invoked inside an iframe - -- so don't produce meaningful errors here because the the - -- previous pages should arrange the stuff as required. - if step == 4 then - if has_platform and has_image and has_support then - -- Mimetype text/plain - luci.http.prepare_content("text/plain") - luci.http.write("Starting luci-flash...\n") - - -- Now invoke sysupgrade - local keepcfg = keep_avail and luci.http.formvalue("keepcfg") == "1" - local flash = ltn12_popen("/sbin/luci-flash %s %q" %{ - keepcfg and "-k %q" % _keep_pattern() or "", tmpfile - }) - - luci.ltn12.pump.all(flash, luci.http.write) - - -- Make sure the device is rebooted - luci.sys.reboot() - end - - - -- - -- This is step 1-3, which does the user interaction and - -- image upload. - -- - - -- Step 1: file upload, error on unsupported image format - elseif not has_image or not has_support or step == 1 then - -- If there is an image but user has requested step 1 - -- or type is not supported, then remove it. - if has_image then - nixio.fs.unlink(tmpfile) - end - - luci.template.render("mini/upgrade", { - step=1, - bad_image=(has_image and not has_support or false), - keepavail=keep_avail, - supported=has_platform - } ) - - -- Step 2: present uploaded file, show checksum, confirmation - elseif step == 2 then - luci.template.render("mini/upgrade", { - step=2, - checksum=image_checksum(), - filesize=nixio.fs.stat(tmpfile).size, - flashsize=storage_size(), - keepconfig=(keep_avail and luci.http.formvalue("keepcfg") == "1") - } ) - - -- Step 3: load iframe which calls the actual flash procedure - elseif step == 3 then - luci.template.render("mini/upgrade", { - step=3, - keepconfig=(keep_avail and luci.http.formvalue("keepcfg") == "1") - } ) - end -end - -function _keep_pattern() - local kpattern = "" - local files = luci.model.uci.cursor():get_all("luci", "flash_keep") - if files then - kpattern = "" - for k, v in pairs(files) do - if k:sub(1,1) ~= "." and nixio.fs.glob(v)() then - kpattern = kpattern .. " " .. v - end - end - end - return kpattern -end - -function ltn12_popen(command) - - local fdi, fdo = nixio.pipe() - local pid = nixio.fork() - - if pid > 0 then - fdo:close() - local close - return function() - local buffer = fdi:read(2048) - local wpid, stat = nixio.waitpid(pid, "nohang") - if not close and wpid and stat == "exited" then - close = true - end - - if buffer and #buffer > 0 then - return buffer - elseif close then - fdi:close() - return nil - end - end - elseif pid == 0 then - nixio.dup(fdo, nixio.stdout) - fdi:close() - fdo:close() - nixio.exec("/bin/sh", "-c", command) - end -end diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua deleted file mode 100644 index 0743ece978..0000000000 --- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua +++ /dev/null @@ -1,97 +0,0 @@ --- Copyright 2008 Steven Barth --- Copyright 2008 Jo-Philipp Wich --- Licensed to the public under the Apache License 2.0. - -local uci = require "luci.model.uci".cursor() -local sys = require "luci.sys" -local wa = require "luci.tools.webadmin" -local fs = require "nixio.fs" - -m = Map("dhcp", "DHCP") - -s = m:section(TypedSection, "dhcp", "DHCP-Server") -s.anonymous = true -s.addremove = false -s.dynamic = false - -s:depends("interface", "lan") - -enable = s:option(ListValue, "ignore", translate("enable"), "") -enable:value(0, translate("enable")) -enable:value(1, translate("disable")) - -start = s:option(Value, "start", translate("First leased address")) -start.rmempty = true -start:depends("ignore", "0") - - -limit = s:option(Value, "limit", translate("Number of leased addresses"), "") -limit:depends("ignore", "0") - -function limit.cfgvalue(self, section) - local value = Value.cfgvalue(self, section) - - if value then - return tonumber(value) + 1 - end -end - -function limit.write(self, section, value) - value = tonumber(value) - 1 - return Value.write(self, section, value) -end - -limit.rmempty = true - -time = s:option(Value, "leasetime") -time:depends("ignore", "0") -time.rmempty = true - - -local leasefn, leasefp, leases -uci:foreach("dhcp", "dnsmasq", - function(section) - leasefn = section.leasefile - end -) -local leasefp = leasefn and fs.access(leasefn) and io.lines(leasefn) -if leasefp then - leases = {} - for lease in leasefp do - table.insert(leases, luci.util.split(lease, " ")) - end -end - -if leases then - v = m:section(Table, leases, translate("Active Leases")) - name = v:option(DummyValue, 4, translate("Hostname")) - function name.cfgvalue(self, ...) - local value = DummyValue.cfgvalue(self, ...) - return (value == "*") and "?" or value - end - ip = v:option(DummyValue, 3, translate("IPv4-Address")) - mac = v:option(DummyValue, 2, translate("MAC-Address")) - ltime = v:option(DummyValue, 1, translate("Lease time remaining")) - function ltime.cfgvalue(self, ...) - local value = DummyValue.cfgvalue(self, ...) - return wa.date_format(os.difftime(tonumber(value), os.time())) - end -end - -s2 = m:section(TypedSection, "host", translate("Static Leases")) -s2.addremove = true -s2.anonymous = true -s2.template = "cbi/tblsection" - -name = s2:option(Value, "name", translate("Hostname")) -mac = s2:option(Value, "mac", translate("MAC-Address")) -ip = s2:option(Value, "ip", translate("IPv4-Address")) - -sys.host_hints(function(m, v4, v6, name) - if m and v4 then - ip:value(v4) - mac:value(m, "%s (%s)" %{ m, name or v4 }) - end -end) - -return m diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/index.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/index.lua deleted file mode 100644 index 9ecee1a267..0000000000 --- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/index.lua +++ /dev/null @@ -1,4 +0,0 @@ --- Copyright 2008 Steven Barth --- Licensed to the public under the Apache License 2.0. - -return Template("mini/index") diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/luci.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/luci.lua deleted file mode 100644 index a1ef0fe73f..0000000000 --- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/luci.lua +++ /dev/null @@ -1,37 +0,0 @@ --- Copyright 2008 Steven Barth --- Copyright 2008 Jo-Philipp Wich --- Licensed to the public under the Apache License 2.0. - -require "luci.config" -local fs = require "nixio.fs" - -m = Map("luci", translate("Web UI"), translate("Here you can customize the settings and the functionality of LuCI.")) - --- force reload of global luci config namespace to reflect the changes -function m.commit_handler(self) - package.loaded["luci.config"] = nil - require "luci.config" -end - - -c = m:section(NamedSection, "main", "core", translate("General")) - -l = c:option(ListValue, "lang", translate("Language")) -l:value("auto") - -local i18ndir = luci.i18n.i18ndir .. "base." -for k, v in luci.util.kspairs(luci.config.languages) do - local file = i18ndir .. k:gsub("_", "-") - if k:sub(1, 1) ~= "." and fs.access(file .. ".lmo") then - l:value(k, v) - end -end - -t = c:option(ListValue, "mediaurlbase", translate("Design")) -for k, v in pairs(luci.config.themes) do - if k:sub(1, 1) ~= "." then - t:value(v, k) - end -end - -return m diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/network.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/network.lua deleted file mode 100644 index 7bc4df859b..0000000000 --- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/network.lua +++ /dev/null @@ -1,219 +0,0 @@ --- Copyright 2008 Steven Barth --- Copyright 2008 Jo-Philipp Wich --- Licensed to the public under the Apache License 2.0. - -local wa = require "luci.tools.webadmin" -local sys = require "luci.sys" -local fs = require "nixio.fs" -local nx = require "nixio" - -local has_pptp = fs.access("/usr/sbin/pptp") -local has_pppoe = fs.glob("/usr/lib/pppd/*/rp-pppoe.so")() - -local network = luci.model.uci.cursor_state():get_all("network") - -local netstat = {} -local ifaces = {} - -local k, v -for k, v in ipairs(nx.getifaddrs()) do - if v.family == "packet" then - local d = v.data - d[1] = d.rx_bytes - d[2] = d.rx_packets - d[3] = d.rx_errors - d[4] = d.rx_dropped - d[5] = 0 - d[6] = 0 - d[7] = 0 - d[8] = d.multicast - d[9] = d.tx_bytes - d[10] = d.tx_packets - d[11] = d.tx_errors - d[12] = d.tx_dropped - d[13] = 0 - d[14] = d.collisions - d[15] = 0 - d[16] = 0 - netstat[v.name] = d - end -end - -for k, v in pairs(network) do - if v[".type"] == "interface" and k ~= "loopback" then - table.insert(ifaces, v) - end -end - -m = Map("network", translate("Network")) -s = m:section(Table, ifaces, translate("Status")) -s.parse = function() end - -s:option(DummyValue, ".name", translate("Network")) - -hwaddr = s:option(DummyValue, "_hwaddr", - translate("MAC-Address"), translate("Hardware Address")) -function hwaddr.cfgvalue(self, section) - local ix = self.map:get(section, "ifname") or "" - local mac = fs.readfile("/sys/class/net/" .. ix .. "/address") - - if not mac then - mac = luci.util.exec("ifconfig " .. ix) - mac = mac and mac:match(" ([A-F0-9:]+)%s*\n") - end - - if mac and #mac > 0 then - return mac:upper() - end - - return "?" -end - - -s:option(DummyValue, "ipaddr", translate("IPv4-Address")) - -s:option(DummyValue, "netmask", translate("IPv4-Netmask")) - - -txrx = s:option(DummyValue, "_txrx", - translate("Traffic"), translate("transmitted / received")) - -function txrx.cfgvalue(self, section) - local ix = self.map:get(section, "ifname") - - local rx = netstat and netstat[ix] and netstat[ix][1] - rx = rx and wa.byte_format(tonumber(rx)) or "-" - - local tx = netstat and netstat[ix] and netstat[ix][9] - tx = tx and wa.byte_format(tonumber(tx)) or "-" - - return string.format("%s / %s", tx, rx) -end - -errors = s:option(DummyValue, "_err", - translate("Errors"), translate("TX / RX")) - -function errors.cfgvalue(self, section) - local ix = self.map:get(section, "ifname") - - local rx = netstat and netstat[ix] and netstat[ix][3] - local tx = netstat and netstat[ix] and netstat[ix][11] - - rx = rx and tostring(rx) or "-" - tx = tx and tostring(tx) or "-" - - return string.format("%s / %s", tx, rx) -end - - - -s = m:section(NamedSection, "lan", "interface", translate("Local Network")) -s.addremove = false -s:option(Value, "ipaddr", translate("IPv4-Address")) - -nm = s:option(Value, "netmask", translate("IPv4-Netmask")) -nm:value("255.255.255.0") -nm:value("255.255.0.0") -nm:value("255.0.0.0") - -gw = s:option(Value, "gateway", translate("IPv4-Gateway") .. translate(" (optional)")) -gw.rmempty = true -dns = s:option(Value, "dns", translate("DNS-Server") .. translate(" (optional)")) -dns.rmempty = true - - -s = m:section(NamedSection, "wan", "interface", translate("Internet Connection")) -s.addremove = false -p = s:option(ListValue, "proto", translate("Protocol")) -p.override_values = true -p:value("none", "disabled") -p:value("static", translate("manual")) -p:value("dhcp", translate("automatic")) -if has_pppoe then p:value("pppoe", "PPPoE") end -if has_pptp then p:value("pptp", "PPTP") end - -function p.write(self, section, value) - -- Always set defaultroute to PPP and use remote dns - -- Overwrite a bad variable behaviour in OpenWrt - if value == "pptp" or value == "pppoe" then - self.map:set(section, "peerdns", "1") - self.map:set(section, "defaultroute", "1") - end - return ListValue.write(self, section, value) -end - -if not ( has_pppoe and has_pptp ) then - p.description = translate("You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support") -end - - -ip = s:option(Value, "ipaddr", translate("IPv4-Address")) -ip:depends("proto", "static") - -nm = s:option(Value, "netmask", translate("IPv4-Netmask")) -nm:depends("proto", "static") - -gw = s:option(Value, "gateway", translate("IPv4-Gateway")) -gw:depends("proto", "static") -gw.rmempty = true - -dns = s:option(Value, "dns", translate("DNS-Server")) -dns:depends("proto", "static") -dns.rmempty = true - -usr = s:option(Value, "username", translate("Username")) -usr:depends("proto", "pppoe") -usr:depends("proto", "pptp") - -pwd = s:option(Value, "password", translate("Password")) -pwd.password = true -pwd:depends("proto", "pppoe") -pwd:depends("proto", "pptp") - - --- Allow user to set MSS correction here if the UCI firewall is installed --- This cures some cancer for providers with pre-war routers -if fs.access("/etc/config/firewall") then - mssfix = s:option(Flag, "_mssfix", - translate("Clamp Segment Size"), translate("Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.")) - mssfix.rmempty = false - - function mssfix.cfgvalue(self) - local value - m.uci:foreach("firewall", "forwarding", function(s) - if s.src == "lan" and s.dest == "wan" then - value = s.mtu_fix - end - end) - return value - end - - function mssfix.write(self, section, value) - m.uci:foreach("firewall", "forwarding", function(s) - if s.src == "lan" and s.dest == "wan" then - m.uci:set("firewall", s[".name"], "mtu_fix", value) - m:chain("firewall") - end - end) - end -end - -kea = s:option(Flag, "keepalive", translate("automatically reconnect")) -kea:depends("proto", "pppoe") -kea:depends("proto", "pptp") -kea.rmempty = true -kea.enabled = "10" - - -cod = s:option(Value, "demand", translate("disconnect when idle for"), "s") -cod:depends("proto", "pppoe") -cod:depends("proto", "pptp") -cod.rmempty = true - -srv = s:option(Value, "server", translate("PPTP-Server")) -srv:depends("proto", "pptp") -srv.rmempty = true - - - -return m diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua deleted file mode 100644 index b7b40e25d0..0000000000 --- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua +++ /dev/null @@ -1,35 +0,0 @@ --- Copyright 2008 Steven Barth --- Copyright 2008 Jo-Philipp Wich --- Licensed to the public under the Apache License 2.0. - -f = SimpleForm("password", translate("Admin Password"), translate("Change the password of the system administrator (User root)")) - -pw1 = f:field(Value, "pw1", translate("Password")) -pw1.password = true -pw1.rmempty = false - -pw2 = f:field(Value, "pw2", translate("Confirmation")) -pw2.password = true -pw2.rmempty = false - -function pw2.validate(self, value, section) - return pw1:formvalue(section) == value and value -end - -function f.handle(self, state, data) - if state == FORM_VALID then - local stat = luci.sys.user.setpasswd("root", data.pw1) == 0 - - if stat then - f.message = translate("Password successfully changed") - else - f.errmessage = translate("Unknown Error") - end - - data.pw1 = nil - data.pw2 = nil - end - return true -end - -return f diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/system.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/system.lua deleted file mode 100644 index b621ad0731..0000000000 --- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/system.lua +++ /dev/null @@ -1,76 +0,0 @@ --- Copyright 2008 Steven Barth --- Licensed to the public under the Apache License 2.0. - -require("luci.sys") -require("luci.sys.zoneinfo") -require("luci.tools.webadmin") -require("luci.util") - - -m = Map("system", translate("System"), translate("Here you can configure the basic aspects of your device like its hostname or the timezone.")) - -s = m:section(TypedSection, "system", "") -s.anonymous = true -s.addremove = false - - -local sysinfo = luci.util.ubus("system", "info") or { } -local boardinfo = luci.util.ubus("system", "board") or { } - -local uptime = sysinfo.uptime or 0 -local loads = sysinfo.load or { 0, 0, 0 } -local memory = sysinfo.memory or { - total = 0, - free = 0, - buffered = 0, - shared = 0 -} - -s:option(DummyValue, "_system", translate("Model")).value = boardinfo.model or "?" -s:option(DummyValue, "_cpu", translate("System")).value = boardinfo.system or "?" - -s:option(DummyValue, "_la", translate("Load")).value = - string.format("%.2f, %.2f, %.2f", loads[1] / 65535.0, loads[2] / 65535.0, loads[3] / 65535.0) - -s:option(DummyValue, "_memtotal", translate("Memory")).value = - string.format("%.2f MB (%.0f%% %s, %.0f%% %s)", - tonumber(memory.total) / 1024 / 1024, - 100 * memory.buffered / memory.total, - tostring(translate("buffered")), - 100 * memory.free / memory.total, - tostring(translate("free")) -) - -s:option(DummyValue, "_systime", translate("Local Time")).value = - os.date("%c") - -s:option(DummyValue, "_uptime", translate("Uptime")).value = - luci.tools.webadmin.date_format(tonumber(uptime)) - -hn = s:option(Value, "hostname", translate("Hostname")) - -function hn.write(self, section, value) - Value.write(self, section, value) - luci.sys.hostname(value) -end - - -tz = s:option(ListValue, "zonename", translate("Timezone")) -tz:value("UTC") - -for i, zone in ipairs(luci.sys.zoneinfo.TZ) do - tz:value(zone[1]) -end - -function tz.write(self, section, value) - local function lookup_zone(title) - for _, zone in ipairs(luci.sys.zoneinfo.TZ) do - if zone[1] == title then return zone[2] end - end - end - - AbstractValue.write(self, section, value) - self.map.uci:set("system", section, "timezone", lookup_zone(value) or "GMT0") -end - -return m diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua deleted file mode 100644 index a588164375..0000000000 --- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua +++ /dev/null @@ -1,351 +0,0 @@ --- Copyright 2008 Steven Barth --- Copyright 2008 Jo-Philipp Wich --- Licensed to the public under the Apache License 2.0. - --- Data init -- - -local fs = require "nixio.fs" -local sys = require "luci.sys" -local uci = require "luci.model.uci".cursor() - -if not uci:get("network", "wan") then - uci:section("network", "interface", "wan", {proto="none", ifname=" "}) - uci:save("network") - uci:commit("network") -end - -local wlcursor = luci.model.uci.cursor_state() -local wireless = wlcursor:get_all("wireless") -local wifidevs = {} -local ifaces = {} - -for k, v in pairs(wireless) do - if v[".type"] == "wifi-iface" then - table.insert(ifaces, v) - end -end - -wlcursor:foreach("wireless", "wifi-device", - function(section) - table.insert(wifidevs, section[".name"]) - end) - - --- Main Map -- - -m = Map("wireless", translate("Wireless"), translate("Here you can configure installed wifi devices.")) -m:chain("network") - - --- Status Table -- -s = m:section(Table, ifaces, translate("Networks")) - -link = s:option(DummyValue, "_link", translate("Link")) -function link.cfgvalue(self, section) - local ifname = self.map:get(section, "ifname") - local iwinfo = sys.wifi.getiwinfo(ifname) - return iwinfo and "%d/%d" %{ iwinfo.quality, iwinfo.quality_max } or "-" -end - -essid = s:option(DummyValue, "ssid", "ESSID") - -bssid = s:option(DummyValue, "_bsiid", "BSSID") -function bssid.cfgvalue(self, section) - local ifname = self.map:get(section, "ifname") - local iwinfo = sys.wifi.getiwinfo(ifname) - return iwinfo and iwinfo.bssid or "-" -end - -channel = s:option(DummyValue, "channel", translate("Channel")) -function channel.cfgvalue(self, section) - return wireless[self.map:get(section, "device")].channel -end - -protocol = s:option(DummyValue, "_mode", translate("Protocol")) -function protocol.cfgvalue(self, section) - local mode = wireless[self.map:get(section, "device")].mode - return mode and "802." .. mode -end - -mode = s:option(DummyValue, "mode", translate("Mode")) -encryption = s:option(DummyValue, "encryption", translate("Encr.")) - -power = s:option(DummyValue, "_power", translate("Power")) -function power.cfgvalue(self, section) - local ifname = self.map:get(section, "ifname") - local iwinfo = sys.wifi.getiwinfo(ifname) - return iwinfo and "%d dBm" % iwinfo.txpower or "-" -end - -scan = s:option(Button, "_scan", translate("Scan")) -scan.inputstyle = "find" - -function scan.cfgvalue(self, section) - return self.map:get(section, "ifname") or false -end - --- WLAN-Scan-Table -- - -t2 = m:section(Table, {}, translate("WLAN-Scan"), translate("Wifi networks in your local environment")) - -function scan.write(self, section) - m.autoapply = false - t2.render = t2._render - local ifname = self.map:get(section, "ifname") - local iwinfo = sys.wifi.getiwinfo(ifname) - if iwinfo then - local _, cell - for _, cell in ipairs(iwinfo.scanlist) do - t2.data[#t2.data+1] = { - Quality = "%d/%d" %{ cell.quality, cell.quality_max }, - ESSID = cell.ssid, - Address = cell.bssid, - Mode = cell.mode, - ["Encryption key"] = cell.encryption.enabled and "On" or "Off", - ["Signal level"] = "%d dBm" % cell.signal, - ["Noise level"] = "%d dBm" % iwinfo.noise - } - end - end -end - -t2._render = t2.render -t2.render = function() end - -t2:option(DummyValue, "Quality", translate("Link")) -essid = t2:option(DummyValue, "ESSID", "ESSID") -function essid.cfgvalue(self, section) - return self.map:get(section, "ESSID") -end - -t2:option(DummyValue, "Address", "BSSID") -t2:option(DummyValue, "Mode", translate("Mode")) -chan = t2:option(DummyValue, "channel", translate("Channel")) -function chan.cfgvalue(self, section) - return self.map:get(section, "Channel") - or self.map:get(section, "Frequency") - or "-" -end - -t2:option(DummyValue, "Encryption key", translate("Encr.")) - -t2:option(DummyValue, "Signal level", translate("Signal")) - -t2:option(DummyValue, "Noise level", translate("Noise")) - - - -if #wifidevs < 1 then - return m -end - --- Config Section -- - -s = m:section(NamedSection, wifidevs[1], "wifi-device", translate("Devices")) -s.addremove = false - -en = s:option(Flag, "disabled", translate("enable")) -en.rmempty = false -en.enabled = "0" -en.disabled = "1" - -function en.cfgvalue(self, section) - return Flag.cfgvalue(self, section) or "0" -end - - -local hwtype = m:get(wifidevs[1], "type") - -ch = s:option(Value, "channel", translate("Channel")) -for i=1, 14 do - ch:value(i, i .. " (2.4 GHz)") -end - - -s = m:section(TypedSection, "wifi-iface", translate("Local Network")) -s.anonymous = true -s.addremove = false - -s:option(Value, "ssid", translate("Network Name (ESSID)")) - -bssid = s:option(Value, "bssid", translate("BSSID")) -bssid.datatype = "macaddr" - -local devs = {} -luci.model.uci.cursor():foreach("wireless", "wifi-device", - function (section) - table.insert(devs, section[".name"]) - end) - -if #devs > 1 then - device = s:option(DummyValue, "device", translate("Device")) -else - s.defaults.device = devs[1] -end - -mode = s:option(ListValue, "mode", translate("Mode")) -mode.override_values = true -mode:value("ap", translate("Provide (Access Point)")) -mode:value("adhoc", translate("Independent (Ad-Hoc)")) -mode:value("sta", translate("Join (Client)")) - -function mode.write(self, section, value) - if value == "sta" then - local oldif = m.uci:get("network", "wan", "ifname") - if oldif and oldif ~= " " then - m.uci:set("network", "wan", "_ifname", oldif) - end - m.uci:set("network", "wan", "ifname", " ") - - self.map:set(section, "network", "wan") - else - if m.uci:get("network", "wan", "_ifname") then - m.uci:set("network", "wan", "ifname", m.uci:get("network", "wan", "_ifname")) - end - self.map:set(section, "network", "lan") - end - - return ListValue.write(self, section, value) -end - -encr = s:option(ListValue, "encryption", translate("Encryption")) -encr.override_values = true -encr:value("none", "No Encryption") -encr:value("wep", "WEP") - -if hwtype == "mac80211" then - local supplicant = fs.access("/usr/sbin/wpa_supplicant") - local hostapd = fs.access("/usr/sbin/hostapd") - - if hostapd and supplicant then - encr:value("psk", "WPA-PSK") - encr:value("psk2", "WPA2-PSK") - encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode") - encr:value("wpa", "WPA-Radius", {mode="ap"}, {mode="sta"}) - encr:value("wpa2", "WPA2-Radius", {mode="ap"}, {mode="sta"}) - elseif hostapd and not supplicant then - encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"}) - encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"}) - encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"}) - encr:value("wpa", "WPA-Radius", {mode="ap"}) - encr:value("wpa2", "WPA2-Radius", {mode="ap"}) - encr.description = translate( - "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " .. - "and ad-hoc mode) to be installed." - ) - elseif not hostapd and supplicant then - encr:value("psk", "WPA-PSK", {mode="sta"}) - encr:value("psk2", "WPA2-PSK", {mode="sta"}) - encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"}) - encr:value("wpa", "WPA-EAP", {mode="sta"}) - encr:value("wpa2", "WPA2-EAP", {mode="sta"}) - encr.description = translate( - "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " .. - "and ad-hoc mode) to be installed." - ) - else - encr.description = translate( - "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " .. - "and ad-hoc mode) to be installed." - ) - end -elseif hwtype == "broadcom" then - encr:value("psk", "WPA-PSK") - encr:value("psk2", "WPA2-PSK") - encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode") -end - -key = s:option(Value, "key", translate("Key")) -key:depends("encryption", "wep") -key:depends("encryption", "psk") -key:depends("encryption", "psk2") -key:depends("encryption", "psk+psk2") -key:depends("encryption", "psk-mixed") -key:depends({mode="ap", encryption="wpa"}) -key:depends({mode="ap", encryption="wpa2"}) -key.rmempty = true -key.password = true - -server = s:option(Value, "server", translate("Radius-Server")) -server:depends({mode="ap", encryption="wpa"}) -server:depends({mode="ap", encryption="wpa2"}) -server.rmempty = true - -port = s:option(Value, "port", translate("Radius-Port")) -port:depends({mode="ap", encryption="wpa"}) -port:depends({mode="ap", encryption="wpa2"}) -port.rmempty = true - - -if hwtype == "mac80211" then - nasid = s:option(Value, "nasid", translate("NAS ID")) - nasid:depends({mode="ap", encryption="wpa"}) - nasid:depends({mode="ap", encryption="wpa2"}) - nasid.rmempty = true - - eaptype = s:option(ListValue, "eap_type", translate("EAP-Method")) - eaptype:value("TLS") - eaptype:value("TTLS") - eaptype:value("PEAP") - eaptype:depends({mode="sta", encryption="wpa"}) - eaptype:depends({mode="sta", encryption="wpa2"}) - - cacert = s:option(FileUpload, "ca_cert", translate("Path to CA-Certificate")) - cacert:depends({mode="sta", encryption="wpa"}) - cacert:depends({mode="sta", encryption="wpa2"}) - - privkey = s:option(FileUpload, "priv_key", translate("Path to Private Key")) - privkey:depends({mode="sta", eap_type="TLS", encryption="wpa2"}) - privkey:depends({mode="sta", eap_type="TLS", encryption="wpa"}) - - privkeypwd = s:option(Value, "priv_key_pwd", translate("Password of Private Key")) - privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa2"}) - privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa"}) - - - auth = s:option(Value, "auth", translate("Authentication")) - auth:value("PAP") - auth:value("CHAP") - auth:value("MSCHAP") - auth:value("MSCHAPV2") - auth:depends({mode="sta", eap_type="PEAP", encryption="wpa2"}) - auth:depends({mode="sta", eap_type="PEAP", encryption="wpa"}) - auth:depends({mode="sta", eap_type="TTLS", encryption="wpa2"}) - auth:depends({mode="sta", eap_type="TTLS", encryption="wpa"}) - - - identity = s:option(Value, "identity", translate("Identity")) - identity:depends({mode="sta", eap_type="PEAP", encryption="wpa2"}) - identity:depends({mode="sta", eap_type="PEAP", encryption="wpa"}) - identity:depends({mode="sta", eap_type="TTLS", encryption="wpa2"}) - identity:depends({mode="sta", eap_type="TTLS", encryption="wpa"}) - - password = s:option(Value, "password", translate("Password")) - password:depends({mode="sta", eap_type="PEAP", encryption="wpa2"}) - password:depends({mode="sta", eap_type="PEAP", encryption="wpa"}) - password:depends({mode="sta", eap_type="TTLS", encryption="wpa2"}) - password:depends({mode="sta", eap_type="TTLS", encryption="wpa"}) -end - - -if hwtype == "broadcom" then - iso = s:option(Flag, "isolate", translate("AP-Isolation"), translate("Prevents Client to Client communication")) - iso.rmempty = true - iso:depends("mode", "ap") - - hide = s:option(Flag, "hidden", translate("Hide ESSID")) - hide.rmempty = true - hide:depends("mode", "ap") -end - -if hwtype == "mac80211" then - bssid:depends({mode="adhoc"}) -end - -if hwtype == "broadcom" then - bssid:depends({mode="wds"}) - bssid:depends({mode="adhoc"}) -end - - -return m diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm deleted file mode 100644 index d33a2ca291..0000000000 --- a/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm +++ /dev/null @@ -1,13 +0,0 @@ -<%# - Copyright 2008 Steven Barth - Copyright 2008 Jo-Philipp Wich - Licensed to the public under the Apache License 2.0. --%> - -<%+header%> -

<%:System%>

-
-

<% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %>

-

<%:Please wait: Device rebooting...%>

- -<%+footer%> \ No newline at end of file diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm deleted file mode 100644 index efc6aa72f7..0000000000 --- a/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm +++ /dev/null @@ -1,32 +0,0 @@ -<%# - Copyright 2008 Steven Barth - Copyright 2008 Jo-Philipp Wich - Licensed to the public under the Apache License 2.0. --%> - -<%+header%> -

<%:System%>

-

<%:Backup / Restore%>

-

<%:Here you can backup and restore your configuration and - if possible - reset this device to the default settings.%>

-
-
- -
- -
- -
-
<%:Backup Archive%>:
-
- -
-
- -
-
-<%+footer%> diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm deleted file mode 100644 index 621e3cbe89..0000000000 --- a/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm +++ /dev/null @@ -1,13 +0,0 @@ -<%# - Copyright 2008 Steven Barth - Copyright 2008 Jo-Philipp Wich - Licensed to the public under the Apache License 2.0. --%> - -

<%:Hello!%>

-

<%_This is the administration area of LuCI.%>

-

<%_LuCI is a free, flexible, and user friendly graphical interface for configuring OpenWrt.%>
-<%:On the following pages you can adjust all important settings of this device.%>

-

<%:As we always want to improve this interface we are looking forward to your feedback and suggestions.%>

-

<%:And now have fun with your device!%>

-

<%_The LuCI Team%>

diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm deleted file mode 100644 index f70e7c92da..0000000000 --- a/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm +++ /dev/null @@ -1,25 +0,0 @@ -<%# - Copyright 2008 Steven Barth - Copyright 2008 Jo-Philipp Wich - Licensed to the public under the Apache License 2.0. --%> - -<%+header%> -

<%:System%>

-

<%:Reboot%>

-

<%:Reboots the operating system of your device%>

-<%- -local c = require("luci.model.uci").cursor():changes() -if c and next(c) then --%> -

<%:Warning: There are unsaved changes that will be lost while rebooting!%>

-<%- -end -if not reboot then --%> -

<%:Perform reboot%>

-<%- else -%> -

<%:Please wait: Device rebooting...%>

- -<%- end -%> -<%+footer%> \ No newline at end of file diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm deleted file mode 100644 index ef3e2e8d12..0000000000 --- a/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm +++ /dev/null @@ -1,96 +0,0 @@ -<%# - Copyright 2008 Steven Barth - Copyright 2008-2009 Jo-Philipp Wich - Licensed to the public under the Apache License 2.0. --%> - -<%+header%> - -

<%:System%>

-

<%:Flash Firmware%>

- -<% if step == 1 then %> - <% if supported then %> -
-

- <%:Upload a sysupgrade-compatible image file to reflash the device.%> - <% if bad_image then %> -

-

<%:The uploaded image file does not - contain a supported format. Make sure that you choose the generic - image format for your platform. %>
- <% end %> -

-
- <%:Firmware image%>:
- - -
-
- <% if keepavail then -%> - - <%:Keep configuration files%> - <% end -%> - -
- -
-
- <% else %> -
<%_ Sorry. - A system upgrade is not supported on this platform.
- You need to manually flash your device. %>
- <% end %> -<% elseif step == 2 then %> -

- <%_ The flash image was uploaded. - Below is the checksum and file size listed, - compare them with the original file to ensure data integrity.
- Click "Proceed" below to start the flash procedure. %> - - <% if flashsize > 0 and filesize > flashsize then %> -

-

<%:It appears that you are trying to - flash an image that does not fit into the flash memory, please verify - the image file! %>
- <% end %> - -
-
    -
  • <%:Checksum%>: <%=checksum%>
    • -
  • <%:Size%>: <% - local w = require "luci.tools.webadmin" - write(w.byte_format(filesize)) - - if flashsize > 0 then - write(luci.i18n.translatef( - " (%s available)", - w.byte_format(flashsize) - )) - end - %>
    • -
-

-
-
- - " /> - -
-
- - " /> - -
-
-<% elseif step == 3 then %> -

<%_ The system is flashing now.
- DO NOT POWER OFF THE DEVICE!
- Wait a few minutes before you try to reconnect. - It might be necessary to renew the address of your computer to reach the device - again, depending on your settings. %>

- - -<% end %> -<%+footer%> -