Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result

[oweals/luci.git] / modules / luci-mod-system / luasrc / controller / admin / system.lua

diff --git a/modules/luci-mod-system/luasrc/controller/admin/system.lua b/modules/luci-mod-system/luasrc/controller/admin/system.lua
index 68ca88b980ca4f81733aad04672e064bc5b19a50..d6e1dc781590a823862da9926a8b4a52c3ed329d 100644 (file)
--- a/modules/luci-mod-system/luasrc/controller/admin/system.lua
+++ b/modules/luci-mod-system/luasrc/controller/admin/system.lua
@@ -7,22 +7,26 @@ module("luci.controller.admin.system", package.seeall)
 function index()
        local fs = require "nixio.fs"
 
-       entry({"admin", "system", "system"}, cbi("admin_system/system"), _("System"), 1)
-       entry({"admin", "system", "clock_status"}, post_on({ set = true }, "action_clock_status"))
+       entry({"admin", "system", "system"}, view("system/system"), _("System"), 1)
 
-       entry({"admin", "system", "admin"}, cbi("admin_system/admin"), _("Administration"), 2)
-       entry({"admin", "system", "startup"}, form("admin_system/startup"), _("Startup"), 45)
-       entry({"admin", "system", "crontab"}, form("admin_system/crontab"), _("Scheduled Tasks"), 46)
+       entry({"admin", "system", "admin"}, firstchild(), _("Administration"), 2)
+       entry({"admin", "system", "admin", "password"}, view("system/password"), _("Router Password"), 1)
+
+       if fs.access("/etc/config/dropbear") then
+               entry({"admin", "system", "admin", "dropbear"}, view("system/dropbear"), _("SSH Access"), 2)
+               entry({"admin", "system", "admin", "sshkeys"}, view("system/sshkeys"), _("SSH-Keys"), 3)
+       end
+
+       entry({"admin", "system", "startup"}, view("system/startup"), _("Startup"), 45)
+       entry({"admin", "system", "crontab"}, view("system/crontab"), _("Scheduled Tasks"), 46)
 
        if fs.access("/sbin/block") and fs.access("/etc/config/fstab") then
-               entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), _("Mount Points"), 50)
-               entry({"admin", "system", "fstab", "mount"}, cbi("admin_system/fstab/mount"), nil).leaf = true
-               entry({"admin", "system", "fstab", "swap"},  cbi("admin_system/fstab/swap"),  nil).leaf = true
+               entry({"admin", "system", "mounts"}, view("system/mounts"), _("Mount Points"), 50)
        end
 
        local nodes, number = fs.glob("/sys/class/leds/*")
        if number > 0 then
-               entry({"admin", "system", "leds"}, cbi("admin_system/leds"), _("<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"), 60)
+               entry({"admin", "system", "leds"}, view("system/leds"), _("<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"), 60)
        end
 
        entry({"admin", "system", "flashops"}, call("action_flashops"), _("Backup / Flash Firmware"), 70)
@@ -39,22 +43,6 @@ function index()
        entry({"admin", "system", "reboot", "call"}, post("action_reboot"))
 end
 
-function action_clock_status()
-       local set = tonumber(luci.http.formvalue("set"))
-       if set ~= nil and set > 0 then
-               local date = os.date("*t", set)
-               if date then
-                       luci.sys.call("date -s '%04d-%02d-%02d %02d:%02d:%02d'" %{
-                               date.year, date.month, date.day, date.hour, date.min, date.sec
-                       })
-                       luci.sys.call("/etc/init.d/sysfixtime restart")
-               end
-       end
-
-       luci.http.prepare_content("application/json")
-       luci.http.write_json({ timestring = os.date("%c") })
-end
-
 local function image_supported(image)
        return (os.execute("sysupgrade -T %q >/dev/null" % image) == 0)
 end
@@ -264,22 +252,6 @@ function action_reset()
        http.redirect(luci.dispatcher.build_url('admin/system/flashops'))
 end
 
-function action_passwd()
-       local p1 = luci.http.formvalue("pwd1")
-       local p2 = luci.http.formvalue("pwd2")
-       local stat = nil
-
-       if p1 or p2 then
-               if p1 == p2 then
-                       stat = luci.sys.user.setpasswd("root", p1)
-               else
-                       stat = 10
-               end
-       end
-
-       luci.template.render("admin_system/passwd", {stat=stat})
-end
-
 function action_reboot()
        luci.sys.reboot()
 end