Merge ssh://git.alpinelinux.org/gitroot/zelebar/acf-alpine-baselayout

1 files changed, 23 insertions, 14 deletions

diff --git a/cron-model.lua b/cron-model.lua
index fb3ecb7..35f631b 100644
--- a/cron-model.lua
+++ b/cron-model.lua
@@ -2,9 +2,9 @@ module (..., package.seeall)
 
 require("posix")
 require("modelfunctions")
-require("format")
-require("fs")
-require("validator")
+format = require("acf.format")
+fs = require("acf.fs")
+validator = require("acf.validator")
 
 local configfile = "/etc/crontabs/root"
 local processname = "cron"
@@ -65,8 +65,12 @@ end
 -- ################################################################################
 -- PUBLIC FUNCTIONS
 
-function startstop_service(action)
-	return modelfunctions.startstop_service(processname, action)
+function get_startstop(clientdata)
+	return modelfunctions.get_startstop(processname)	
+end
+
+function startstop_service(startstop, action)
+	return modelfunctions.startstop_service(startstop, action)
 end
 
 function getstatus()
@@ -77,22 +81,27 @@ function listjobs()
 	return cfe({ type="structure", value=list_jobs(), label="Cron Jobs" })
 end
 
-function read_job(filename)
-	return modelfunctions.getfiledetails(filename, validate_filename)
+function read_job(clientdata)
+	return modelfunctions.getfiledetails(clientdata.name, validate_filename)
 end
 
 function update_job(filedetails)
 	return modelfunctions.setfiledetails(filedetails, validate_filename)
 end
 
-function delete_job(filename)
-	local retval = cfe({ label="Delete Job Result", errtxt="Invalid file" })
-	if validate_filename(filename) then
-		os.remove(filename)
-		retval.value = "Job File Deleted"
-		retval.errtxt = nil
+function get_delete_job(clientdata)
+	local result = {}
+	result.filename = cfe({ value=clientdata.name or "", label="File Name" })
+	return cfe({ type="group", value=result, label="Delete Cron Job" })
+end
+
+function delete_job(deleterequest)
+	deleterequest.errtxt = "Invalid File"
+	if validate_filename(deleterequest.value.filename.value) then
+		os.remove(deleterequest.value.filename.value)
+		deleterequest.errtxt = nil
 	end
-	return retval
+	return deleterequest
 end
 
 function get_move_job()