diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2008-07-02 20:24:35 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2008-07-02 20:24:35 +0000 |
| commit | 7947f17ad4ba8e0b3c41a9ace736e005c66017c2 (patch) | |
| tree | af1b0f5d6fa2ef8a01454403592b4e4d245a15c2 | |
| parent | ed1007285faee68e39640bf3e2c59726c37eb943 (diff) | |
| download | acf-alpine-baselayout-7947f17ad4ba8e0b3c41a9ace736e005c66017c2.tar.bz2 acf-alpine-baselayout-7947f17ad4ba8e0b3c41a9ace736e005c66017c2.tar.xz | |
Changed logfiles to use controllerfunctions and standard html-lsp files.
git-svn-id: svn://svn.alpinelinux.org/acf/alpine-baselayout/trunk@1270 ab2d0c66-481e-0410-8bed-d214d4d58bed
| -rw-r--r-- | logfiles-controller.lua | 16 | ||||
| -rw-r--r-- | logfiles-model.lua | 12 | ||||
| -rw-r--r-- | logfiles-status-html.lsp | 9 | ||||
| l---------[-rw-r--r--] | logfiles-view-html.lsp | 21 |
4 files changed, 15 insertions, 43 deletions
diff --git a/logfiles-controller.lua b/logfiles-controller.lua index 400756e..dc22115 100644 --- a/logfiles-controller.lua +++ b/logfiles-controller.lua @@ -9,23 +9,11 @@ status = function (self ) end delete = function (self) - local filetodelete = self.clientdata.name or "" - local deletestatus = self.model.delete(filetodelete) - if (deletestatus.errtxt) then - return deletestatus - else - redirect(self) - end + return self:redirect_to_referrer(self.model.delete(self.clientdata.name or "")) end view = function (self) - local filetoview = self.clientdata.name or "" - local content = self.model.get_filedetails(filetoview) - if (filetoview ~= "") and content then - return content - else - redirect(self) - end + return self.model.get_filedetails(self.clientdata.name or "") end download = function (self) diff --git a/logfiles-model.lua b/logfiles-model.lua index 6ef6a1d..2ac4f5d 100644 --- a/logfiles-model.lua +++ b/logfiles-model.lua @@ -1,13 +1,14 @@ -- acf model for displaying logfiles module (..., package.seeall) require("fs") +require("modelfunctions") -- Function to get detailed information on a specific file. local function file_info ( path ) -- Check if file is in use local st = fs.stat(path) - local size = st.size - local lastmod = st.mtime + local size = st.size or "0" + local lastmod = st.mtime or "---" local file_inuse = io.popen("fuser " .. path ) local fileinuseresult = file_inuse:read("*a") or "unknown" file_inuse:close() @@ -64,11 +65,14 @@ get_filedetails = function (path) local available_files = get() for i,file in ipairs(available_files.value) do if ( file.value.filename.value == path ) then - filedetails = file - filedetails.value.filecontent = cfe({ type="longtext", value=fs.read_file(path), label="File content" }) + filedetails = modelfunctions.getfiledetails(path) break end end + if not filedetails then + filedetails = modelfunctions.getfiledetails("") + filedetails.value.filename.value = path + end return filedetails end diff --git a/logfiles-status-html.lsp b/logfiles-status-html.lsp index 8ba5113..d7cbe6c 100644 --- a/logfiles-status-html.lsp +++ b/logfiles-status-html.lsp @@ -1,7 +1,8 @@ -<? local view = ... ?> +<? local view, viewlibrary, page_info, session = ... ?> +<? require("viewfunctions") ?> + +<? displaycommandresults({"delete"}, session) ?> -<html> -<body> <h1>Available Logfiles</h1> <TABLE> @@ -30,5 +31,3 @@ </TR> <? end ?> </TABLE> -</body> -</html> diff --git a/logfiles-view-html.lsp b/logfiles-view-html.lsp index 4d30f14..15b1930 100644..120000 --- a/logfiles-view-html.lsp +++ b/logfiles-view-html.lsp @@ -1,20 +1 @@ -<? local view = ... ?> - -<h1>LOGFILE</h1> - -<h2>Details</h2> - -<dl> -<dt>File name</dt> -<dd><?= view.value.filename.value ?></dd> - -<dt>File size</dt> -<dd><?= view.value.filesize.value ?></dd> - -<dt>Last modified</dt> -<dd><?= view.value.mtime.value ?></dd> -</dl> - -<h2>Content</h2> -<textarea name=""><? io.write(view.value.filecontent.value) ?></textarea> - +../filedetails-html.lsp
\ No newline at end of file |