1 files changed, 12 insertions, 99 deletions

diff --git a/ipsectools-controller.lua b/ipsectools-controller.lua
index c7b6d1a..3ce1896 100644
--- a/ipsectools-controller.lua
+++ b/ipsectools-controller.lua
@@ -1,119 +1,32 @@
 module(..., package.seeall)
 
 -- Load libraries
-require("format")
+require("controllerfunctions")
 
 -- ################################################################################
 -- LOCAL FUNCTIONS
 
-local function displaycmdmanagement(pidofstatus)
-	-- Add a management buttons
-	local management = {}
-	management.start = cfe({ name="cmdmanagement",
-		label="Program control-panel",
-		value="Start",
-		type="submit",
-		})
-	management.stop = cfe({ name="cmdmanagement",
-		label="Program control-panel",
-		value="Stop",
-		type="submit",
-		})
-	management.restart = cfe({ name="cmdmanagement",
-		label="Program control-panel",
-		value="Restart",
-		type="submit",
-		})
-	-- next CFE can be used to present the result of the previous action
-	management.actionresult = cfe({ name="actionresult",
-		label="Previous action result",
-		})
-
-	-- Disable management buttons based on if the process is running or not
-	if (pidofstatus) then 
-		management.start.disabled = "yes"
-	else
-		management.stop.disabled = "yes"
-		management.restart.disabled = "yes"
-	end
-
-	return management
-end
-
 -- ################################################################################
 -- PUBLIC FUNCTIONS
 
 default_action = "status"
 
 function status(self)
-	return { status=self.model.getstatus() }
+	return self.model.getstatus()
 end
 
-function expert (self)
-	local modifications = self.clientdata.filecontent or ""
-	local modifications2 = self.clientdata.filecontent2 or ""
-	if ( self.clientdata.cmdsave ) then
-		modifications = self.model:update_filecontent(modifications)
-		modifications2 = self.model:update_filecontent2(modifications2)
-	end
-
-	local url = self.conf.script .. self.conf.prefix .. self.conf.controller
-
-	-- Start/Stop/Restart process
-	local cmdmanagement, actionresult
-	if ( self.clientdata.cmdmanagement) then
-	cmdmanagement = cfe({ 
-		name="cmdmanagement",
-		label="Previous action result",
-		action=cfe({ 
-			name="cmdmanagement", 
-			value=string.lower(self.clientdata.cmdmanagement),  -- This row contains start/stop/restart (one of these commands)
-			}),
-		})
-		actionresult, cmdmanagement = self.model:startstop_service( cmdmanagement.action )
-	end
-
-	local status=self.model.getstatus()
-	local file = self.model:get_filedetails()
-	local file2 = self.model:get_filedetails("2")
-
-	-- Add buttons
-	file.cmdsave = cfe ({
-		name="cmdsave",
-		label="Apply settings",
-		value="Apply",
-		type="submit",
-		})
-	if (self.clientdata.cmdsave) then
-		file.cmdsave.descr="* Changes has been saved!"
-	end	
-
-	-- Management buttons (Hide/show buttons
-	local pidofstatus
-	if (string.lower(status.status.value) == "enabled" ) then pidofstatus = true end
-	management = displaycmdmanagement(pidofstatus)
-	if (actionresult) then
-		management.actionresult.descr=cmdmanagement.descr
-		management.actionresult.errtxt=cmdmanagement.errtxt
-	end
-
-	return ( {
-		status = status,
-		file = file, 
-		file2 = file2, 
-		modifications = modifications,
-		management = management,
-		url = url, } )
+function startstop(self)
+	return controllerfunctions.handle_startstop(self, self.model.startstop_service, self.model.getstatus, self.clientdata)
 end
 
-function logfile (self)
+function details(self)
+	return self.model.getstatusdetails()
+end
 
-	local status=self.model.getstatus()
-	local logfile = self.model:get_logfile()
+function editracoon (self)
+	return controllerfunctions.handle_form(self, self.model.get_racoonfiledetails, self.model.update_racoonfiledetails, self.clientdata, "Save", "Edit Racoon Config", "Configuration Set")
+end
 
-	return ({
-		status = status, 
-		logfile = logfile, 
-		url = url,
-		})
+function editipsec (self)
+	return controllerfunctions.handle_form(self, self.model.get_ipsecfiledetails, self.model.update_ipsecfiledetails, self.clientdata, "Save", "Edit IPSec Config", "Configuration Set")
 end