X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fcontroller%2Fadmin%2Fsystem.lua;h=6cf951a154240da1126813725b25e8e95bbc6efe;hp=9abdb2ababf6a3626b146a9a8e1acac750def4a8;hb=e31fcb11e0e54a1d71067f30b95a92f0e816fc08;hpb=76982655fa433edd885bbb80bbe74e82fca527e2

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 9abdb2aba..6cf951a15 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -17,58 +17,18 @@ 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)
-end
-
-function action_editor()
-	local file = luci.http.formvalue("file", "")
-	local data = luci.http.formvalue("data")
-	local err  = nil
-	local msg  = nil
-	local stat = true
-	
-	if file and data then
-		stat, err = luci.fs.writefile(file, data)
-	end
-	
-	if not stat then
-		err = luci.util.split(err, " ")
-		table.remove(err, 1)
-		msg = table.concat(err, " ")
-	end
-	
-	local cnt, err = luci.fs.readfile(file)
-	if cnt then
-		cnt = luci.util.pcdata(cnt)
-	end
-	luci.template.render("admin_system/editor", {fn=file, cnt=cnt, msg=msg})	
-end
-
-function action_ipkg()
-	local file = "/etc/ipkg.conf"
-	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/ipkg", {cnt=cnt, msg=err})	
+	entry({"admin", "system"}, alias("admin", "system", "system"), i18n("system"), 30)
+	entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("system"), 1)
+	entry({"admin", "system", "packages"}, call("action_packages"), i18n("a_s_packages"), 10)
+	entry({"admin", "system", "packages", "ipkg"}, form("admin_system/ipkg"), i18n("a_s_p_ipkg"))
+	entry({"admin", "system", "passwd"}, form("admin_system/passwd"), i18n("a_s_changepw"), 20)
+	entry({"admin", "system", "sshkeys"}, form("admin_system/sshkeys"), i18n("a_s_sshkeys"), 30)
+	entry({"admin", "system", "processes"}, form("admin_system/processes"), i18n("process_head"), 45)
+	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_packages()
@@ -126,7 +86,7 @@ function action_packages()
 	
 	
 	-- Package info
-	local info = luci.model.ipkg.info(query)
+	local info = luci.model.ipkg.info(query and "*"..query.."*")
 	info = info or {}
 	local pkgs = {}
 	
@@ -219,32 +179,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 broadcom = os.execute('grep brcm_ /lib/upgrade/platform.sh >/dev/null 2>&1') == 0
+	 
 	local keep_avail = not broadcom
 
 	local file
@@ -274,7 +216,7 @@ end
 
 function _keep_pattern()
 	local kpattern = ""
-	local files = luci.model.uci.get_all("luci", "flash_keep")
+	local files = luci.model.uci.cursor():get_all("luci", "flash_keep")
 	if files then
 		kpattern = ""
 		for k,v in pairs(files) do