diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Makefile | 4 | ||||
| -rw-r--r-- | app/acf_cli-controller.lua | 15 | ||||
| -rw-r--r-- | app/acf_www-controller.lua | 30 | ||||
| -rw-r--r-- | app/expert-html.lsp | 15 | ||||
| -rw-r--r-- | app/filedetails-html.lsp | 25 | ||||
| -rw-r--r-- | app/startstop-html.lsp | 23 | ||||
| -rw-r--r-- | app/status-html.lsp | 12 |
7 files changed, 96 insertions, 28 deletions
diff --git a/app/Makefile b/app/Makefile index ef25865..6a3664f 100644 --- a/app/Makefile +++ b/app/Makefile @@ -27,6 +27,10 @@ APP_DIST= \ welcome-html.lsp\ dispatcherror-html.lsp\ exception-html.lsp\ + status-html.lsp\ + startstop-html.lsp\ + filedetails-html.lsp\ + expert-html.lsp\ EXTRA_DIST=README Makefile DISTFILES=$(APP_DIST) $(EXTRA_DIST) diff --git a/app/acf_cli-controller.lua b/app/acf_cli-controller.lua index dad6b85..672af25 100644 --- a/app/acf_cli-controller.lua +++ b/app/acf_cli-controller.lua @@ -16,6 +16,7 @@ mvc.on_load = function (self, parent) -- this sets the package path for us and our children package.path= self.conf.libdir .. "?.lua;" .. package.path + require ("cfe") self.session = {} local x=require("session") @@ -38,20 +39,6 @@ exception_handler = function (self, message ) print(message) end --- create a Configuration Framework Entity (cfe) --- returns a table with at least "value", "type", and "label" -cfe = function ( optiontable ) - optiontable = optiontable or {} - me = { value="", - type="text", - label="" } - for key,value in pairs(optiontable) do - me[key] = value - end - return me -end - - -- syslog something logit = function ( ... ) os.execute ( "logger \"" .. ... .. "\"" ) diff --git a/app/acf_www-controller.lua b/app/acf_www-controller.lua index 55f529f..6b1bc6e 100644 --- a/app/acf_www-controller.lua +++ b/app/acf_www-controller.lua @@ -234,6 +234,7 @@ mvc.on_load = function (self, parent) -- this sets the package path for us and our children package.path= self.conf.libdir .. "?.lua;" .. package.path + require ("cfe") sessionlib=require ("session") @@ -464,21 +465,22 @@ redirect = function (self, str) error(self.conf) end -redirect_to_referrer = function(self) - error({type="redir_to_referrer"}) -end - --- create a Configuration Framework Entity (cfe) --- returns a table with at least "value", "type", and "label" -cfe = function ( optiontable ) - optiontable = optiontable or {} - me = { value="", - type="text", - label="" } - for key,value in pairs(optiontable) do - me[key] = value +-- If we've done something, cause a redirect to the referring page (assuming it's different) +-- Also handles retrieving the result of a previously redirected action +redirect_to_referrer = function(self, result) + -- If we have a result, then we did something, so we might have to redirect + if result then + local prefix, controller, action = self.parse_path_info(ENV.HTTP_REFERER) + if controller ~= self.conf.controller or action ~= self.conf.action then + self.sessiondata[self.conf.action.."result"] = result + error({type="redir_to_referrer"}) + end + -- If we don't have a result, then we might be a component redirected as above + elseif self.sessiondata[self.conf.action.."result"] then + result = self.sessiondata[self.conf.action.."result"] + self.sessiondata[self.conf.action.."result"] = nil end - return me + return result end -- FIXME - need to think more about this.. diff --git a/app/expert-html.lsp b/app/expert-html.lsp new file mode 100644 index 0000000..c4a76cd --- /dev/null +++ b/app/expert-html.lsp @@ -0,0 +1,15 @@ +<? local form, viewlibrary, page_info, session = ... ?> +<? require("viewfunctions") ?> + +<? if viewlibrary and viewlibrary.dispatch_component then + viewlibrary.dispatch_component("status") +end ?> + +<? +local func = haserl.loadfile(page_info.viewfile:gsub(page_info.prefix..page_info.controller..".*$", "/") .. "filedetails-html.lsp") +func(form, viewlibrary, page_info, session) +?> + +<? if viewlibrary and viewlibrary.dispatch_component then + viewlibrary.dispatch_component("startstop") +end ?> diff --git a/app/filedetails-html.lsp b/app/filedetails-html.lsp new file mode 100644 index 0000000..34c8803 --- /dev/null +++ b/app/filedetails-html.lsp @@ -0,0 +1,25 @@ +<? local form, viewlibrary, page_info = ... ?> +<? require("viewfunctions") ?> + +<H1>Configuration</H1> +<H2>Expert Configuration</H2> +<H3>File Details</H3> +<DL> +<? +displayitem(form.value.filename) +displayitem(form.value.filesize) +displayitem(form.value.mtime) +?> +</DL> + +<H3>File Content</H3> +<? if form.descr then ?><P CLASS='descr'><?= string.gsub(form.descr, "\n", "<BR>") ?></P><? end ?> +<? if form.errtxt then ?><P CLASS='error'><?= string.gsub(form.errtxt, "\n", "<BR>") ?></P><? end ?> +<form action="<?= page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action ?>" method="POST"> +<textarea name="filecontent"> +<?= form.value.filecontent.value ?> +</textarea> +<? if form.value.filecontent.errtxt then ?><P CLASS='error'><?= string.gsub(form.value.filecontent.errtxt, "\n", "<BR>") ?></P><? end ?> + +<DL><DT></DT><DD><input class="submit" type="submit" name="<?= form.option ?>" value="<?= form.option ?>"></DD></DL> +</form> diff --git a/app/startstop-html.lsp b/app/startstop-html.lsp new file mode 100644 index 0000000..c0ead72 --- /dev/null +++ b/app/startstop-html.lsp @@ -0,0 +1,23 @@ +<? local data, viewlibrary, page_info = ... ?> + +<H1>Management</H1> +<DL> +<form action="<?= page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action ?>" method="POST"> +<DT>Program control-panel</DT> +<DD> +<input class="submit" type="submit" name="action" value="Start" <? if data.value.status.value== "Enabled" then io.write("disabled") end ?>> +<input class="submit" type="submit" name="action" value="Stop" <? if data.value.status.value== "Disabled" then io.write("disabled") end ?>> +<input class="submit" type="submit" name="action" value="Restart" <? if data.value.status.value== "Disabled" then io.write("disabled") end ?>> +</DD> +</form> + +<? if data.value.result then ?> +<DT>Previous action result</DT> +<DD> +<? if data.value.result.descr then ?> +<P CLASS='descr'><?= string.gsub(data.value.result.descr, "\n", "<BR>") ?></P> +<? end if data.value.result.errtxt then ?> +<P CLASS='error'><?= string.gsub(data.value.result.errtxt, "\n", "<BR>") ?></P> +<? end end ?> +</DD> +</DL> diff --git a/app/status-html.lsp b/app/status-html.lsp new file mode 100644 index 0000000..6cb9eea --- /dev/null +++ b/app/status-html.lsp @@ -0,0 +1,12 @@ +<? local data = ... +require("viewfunctions") +?> + +<H1>System Info</H1> +<DL> +<? +displayitem(data.value.status) +displayitem(data.value.version) +displayitem(data.value.autostart) +?> +</DL> |