From 0900531c71a3aa57b5e8aca2ce16e2ea7ba4c1f9 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Tue, 17 Mar 2009 20:39:56 +0000
Subject: 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/asterisk/trunk@1730 ab2d0c66-481e-0410-8bed-d214d4d58bed
---
 asterisk-model.lua          | 16 +---------------
 asterisk-startstop-html.lsp | 25 +------------------------
 2 files changed, 2 insertions(+), 39 deletions(-)
 mode change 100644 => 120000 asterisk-startstop-html.lsp

diff --git a/asterisk-model.lua b/asterisk-model.lua
index 297656e..4aa9f6e 100644
--- a/asterisk-model.lua
+++ b/asterisk-model.lua
@@ -28,22 +28,8 @@ get_status = function()
 	return modelfunctions.getstatus(processname, packagename, "Asterisk Status")
 end
 
--- local implementation to add reload actions
 function startstop_service(action)
-	local cmdresult = cfe({ label="Start/Stop result" })
-	
-	if (string.lower(action) == "start") or (string.lower(action) == "stop") or (string.lower(action) == "restart") or (string.lower(action) == "reload") then
-		local file = io.popen( "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin /etc/init.d/" .. 
-			processname .. " " .. string.lower(action) .. " 2>&1" )
-		if file ~= nil then
-			cmdresult.value = file:read( "*a" )
-			file:close()
-		end
-		posix.sleep(2)	-- Wait for the process to start|stop
-	else
-		cmdresult.errtxt = "Unknown command!"
-	end
-	return cmdresult
+	return modelfunctions.startstop_service(processname, action, {"start", "stop", "restart", "reload"})
 end
 
 get_file = function(filename)
diff --git a/asterisk-startstop-html.lsp b/asterisk-startstop-html.lsp
deleted file mode 100644
index c497c49..0000000
--- a/asterisk-startstop-html.lsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<% local data, viewlibrary, page_info = ... %>
-
-<H1>Management</H1>
-<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" <% if data.value.status.value== "Running" then io.write("disabled") end %>>
-<input class="submit" type="submit" name="action" value="Stop" <% if data.value.status.value== "Stopped" then io.write("disabled") end %>>
-<input class="submit" type="submit" name="action" value="Restart" <% if data.value.status.value== "Stopped" then io.write("disabled") end %>>
-<input class="submit" type="submit" name="action" value="Reload" <% if data.value.status.value== "Stopped" 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>
diff --git a/asterisk-startstop-html.lsp b/asterisk-startstop-html.lsp
new file mode 120000
index 0000000..0ea2627
--- /dev/null
+++ b/asterisk-startstop-html.lsp
@@ -0,0 +1 @@
+../startstop-html.lsp
\ No newline at end of file
-- 
cgit v1.2.3