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

1 files changed, 15 insertions, 11 deletions

diff --git a/fetchmail-model.lua b/fetchmail-model.lua
index 16b0cad..8cb0cc0 100644
--- a/fetchmail-model.lua
+++ b/fetchmail-model.lua
@@ -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()