diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2009-06-18 11:07:20 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2009-06-18 11:07:20 +0000 |
| commit | 93d0e53bc384255e46c379e211957e984fc5f8fb (patch) | |
| tree | 665ed0fa4452740f1b85f5095dd24b4c7b93b02c | |
| parent | eed04050845bf81ac5e5d114c2fb05ae8dfede47 (diff) | |
| download | acf-fetchmail-93d0e53bc384255e46c379e211957e984fc5f8fb.tar.bz2 acf-fetchmail-93d0e53bc384255e46c379e211957e984fc5f8fb.tar.xz | |
Removed non-functioning Run and Test buttons from startstop.
| -rw-r--r-- | fetchmail-model.lua | 12 | ||||
| l---------[-rw-r--r--] | fetchmail-startstop-html.lsp | 31 |
2 files changed, 11 insertions, 32 deletions
diff --git a/fetchmail-model.lua b/fetchmail-model.lua index 610b99c..d7a93e2 100644 --- a/fetchmail-model.lua +++ b/fetchmail-model.lua @@ -390,20 +390,28 @@ end function startstop_service(action) local result = modelfunctions.startstop_service(processname, action) + --[[ + -- Removed support for Run and Test because needs to run as fetchmail user due to init.d change + -- trying to run as user fetchmail caused problems where could not save session (no longer root?) + -- also, questioned reason for these functions because they will appear broken when working + -- because fetchmail takes so long to return table.insert(result.value.actions.value, "Run") table.insert(result.value.actions.value, "Test") if action and (action:lower() == "run" or action:lower() == "test") then result.value.result.errtxt = nil local cmd if action:lower() == "run" then - cmd = "/usr/bin/fetchmail -d0 -v -f "..configfile.." 2>&1" + cmd = "/usr/bin/fetchmail -d0 -v --nosyslog -f "..configfile.." 2>&1" elseif action:lower() == "test" then - cmd = "/usr/bin/fetchmail -d0 -v -k -f "..configfile.." 2>&1" + cmd = "/usr/bin/fetchmail -d0 -v -k --nosyslog -f "..configfile.." 2>&1" end + --posix.setpid("u", "fetchmail") local f = io.popen(cmd) result.value.result.value = f:read("*a") f:close() + --posix.setpid("u", "root") end + --]] return result end diff --git a/fetchmail-startstop-html.lsp b/fetchmail-startstop-html.lsp index 9454c5c..0ea2627 100644..120000 --- a/fetchmail-startstop-html.lsp +++ b/fetchmail-startstop-html.lsp @@ -1,30 +1 @@ -<% local data, viewlibrary, page_info = ... %> - -<H1>Management</H1> - -<% if data.value.result then %> -<H2>Previous action result</H2> -<% if data.value.result.value ~= "" then %> -<P CLASS='descr'><%= string.gsub(html.html_escape(data.value.result.value), "\n", "<BR>") %></P> -<% end if data.value.result.errtxt then %> -<P CLASS='error'><%= string.gsub(html.html_escape(data.value.result.errtxt), "\n", "<BR>") %></P> -<% end end %> - -<DL> -<form action="<%= html.html_escape(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"> -<input class="submit" type="submit" name="action" value="Stop"> -<input class="submit" type="submit" name="action" value="Restart"> -</DD> -<DT>Run once</DT> -<DD> -<input class="submit" type="submit" name="action" value="Run"> -</DD> -<DT>Test</DT> -<DD> -<input class="submit" type="submit" name="action" value="Test"> -</DD> -</form> -</DL> +../startstop-html.lsp
\ No newline at end of file |