Fixed login form

[project/luci.git] / modules / admin-full / luasrc / controller / admin / system.lua

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 9abdb2a..cf39483 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -17,16 +17,17 @@ function index()
        luci.i18n.loadc("admin-core")
        local i18n = luci.i18n.translate
        
-       entry({"admin", "system"}, template("admin_system/index"), i18n("system", "System"), 30)
-       entry({"admin", "system", "packages"}, call("action_packages"), i18n("a_s_packages", "Paketverwaltung"), 10)
-       entry({"admin", "system", "packages", "ipkg"}, call("action_ipkg"), i18n("a_s_p_ipkg", "IPKG-Konfiguration"))
-       entry({"admin", "system", "passwd"}, call("action_passwd"), i18n("a_s_changepw", "Passwort ändern"), 20)
-       entry({"admin", "system", "sshkeys"}, call("action_sshkeys"), i18n("a_s_sshkeys", "SSH-Schlüssel"), 30)
-       entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("system", "System"), 40)
-       entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("a_s_fstab", "Einhängepunkte"), 50)
-       entry({"admin", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 60)
-       entry({"admin", "system", "upgrade"}, call("action_upgrade"), i18n("a_s_flash", "Firmwareupgrade"), 70)
-       entry({"admin", "system", "reboot"}, call("action_reboot"), i18n("reboot", "Neu starten"), 80)
+       entry({"admin", "system"}, template("admin_system/index"), i18n("system"), 30)
+       entry({"admin", "system", "packages"}, call("action_packages"), i18n("a_s_packages"), 10)
+       entry({"admin", "system", "packages", "ipkg"}, call("action_ipkg"), i18n("a_s_p_ipkg"))
+       entry({"admin", "system", "passwd"}, call("action_passwd"), i18n("a_s_changepw"), 20)
+       entry({"admin", "system", "sshkeys"}, form("admin_system/sshkeys"), i18n("a_s_sshkeys"), 30)
+       entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("system"), 40)
+       entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("a_s_fstab"), 50)
+       entry({"admin", "system", "leds"}, cbi("admin_system/leds"), i18n("leds", "LEDs"), 60)
+       entry({"admin", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 70)
+       entry({"admin", "system", "upgrade"}, call("action_upgrade"), i18n("a_s_flash"), 80)
+       entry({"admin", "system", "reboot"}, call("action_reboot"), i18n("reboot"), 90)
 end
 
 function action_editor()
@@ -219,33 +220,14 @@ function action_reboot()
        end
 end
 
-function action_sshkeys()
-       local file = "/etc/dropbear/authorized_keys"
-       local data = luci.http.formvalue("data")
-       local stat = nil
-       local err  = nil
-       
-       if data then
-               stat, err = luci.fs.writefile(file, data)
-       end     
-       
-       local cnt  = luci.fs.readfile(file)     
-       if cnt then
-               cnt = luci.util.pcdata(cnt)
-       end
-       
-       luci.template.render("admin_system/sshkeys", {cnt=cnt, msg=err})        
-end
-
 function action_upgrade()
        require("luci.model.uci")
 
        local ret  = nil
        local plat = luci.fs.mtime("/lib/upgrade/platform.sh")
-       local broadcom = os.execute('grep brcm_ /lib/upgrade/platform.sh >/dev/null 2>&1') == 0
        local tmpfile = "/tmp/firmware.img"
        
-       local keep_avail = not broadcom
+       local keep_avail = true
 
        local file
        luci.http.setfilehandler(