Commit 3e9e04f4 authored by ttrask's avatar ttrask

Changed the way startstop works in core to add a list of allowed actions....

Changed the way startstop works in core to add a list of allowed actions. Modified all ACFs that don't use the standard functions to work with new library method.

git-svn-id: svn://svn.alpinelinux.org/acf/fetchmail/trunk@1730 ab2d0c66-481e-0410-8bed-d214d4d58bed
parent 89561999
......@@ -308,18 +308,22 @@ end
-- PUBLIC FUNCTIONS
function startstop_service(action)
local cmd
if action:lower() == "run" then
cmd = "/usr/bin/fetchmail -d0 -v -f "..configfile.." 2>&1"
elseif action:lower() == "test" then
cmd = "/usr/bin/fetchmail -d0 -v -k -f "..configfile.." 2>&1"
else
return modelfunctions.startstop_service(processname, action)
local result = modelfunctions.startstop_service(processname, action)
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"
elseif action:lower() == "test" then
cmd = "/usr/bin/fetchmail -d0 -v -k -f "..configfile.." 2>&1"
end
local f = io.popen(cmd)
result.value.result.value = f:read("*a")
f:close()
end
local f = io.popen(cmd)
cmdresult = f:read("*a")
f:close()
return cfe({ value=cmdresult, label="Start/Stop result" })
return result
end
function getstatus()
......
<% 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>
......@@ -18,14 +27,4 @@
<input class="submit" type="submit" name="action" value="Test" <% if data.value.status.value== "Running" then io.write("disabled") end %>>
</DD>
</form>
<% if data.value.result then %>
<DT>Previous action result</DT>
<DD>
<% 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 %>
</DD>
</DL>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment