diff options
| -rw-r--r-- | cron-model.lua | 22 | ||||
| -rw-r--r-- | hostname-model.lua | 2 | ||||
| -rw-r--r-- | interfaces-model.lua | 34 | ||||
| -rw-r--r-- | modules-model.lua | 8 | ||||
| -rw-r--r-- | password-model.lua | 2 | ||||
| -rw-r--r-- | rc-model.lua | 8 | ||||
| -rw-r--r-- | syslog-model.lua | 10 |
7 files changed, 45 insertions, 41 deletions
diff --git a/cron-model.lua b/cron-model.lua index 35f631b..f6fcc40 100644 --- a/cron-model.lua +++ b/cron-model.lua @@ -65,11 +65,11 @@ end -- ################################################################################ -- PUBLIC FUNCTIONS -function get_startstop(clientdata) +function get_startstop(self, clientdata) return modelfunctions.get_startstop(processname) end -function startstop_service(startstop, action) +function startstop_service(self, startstop, action) return modelfunctions.startstop_service(startstop, action) end @@ -81,21 +81,21 @@ function listjobs() return cfe({ type="structure", value=list_jobs(), label="Cron Jobs" }) end -function read_job(clientdata) +function read_job(self, clientdata) return modelfunctions.getfiledetails(clientdata.name, validate_filename) end -function update_job(filedetails) - return modelfunctions.setfiledetails(filedetails, validate_filename) +function update_job(self, filedetails) + return modelfunctions.setfiledetails(self, filedetails, validate_filename) end -function get_delete_job(clientdata) +function get_delete_job(self, 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) +function delete_job(self, deleterequest) deleterequest.errtxt = "Invalid File" if validate_filename(deleterequest.value.filename.value) then os.remove(deleterequest.value.filename.value) @@ -113,7 +113,7 @@ function get_move_job() return cfe({ type="group", value=move, label="Move Job" }) end -function move_job(move) +function move_job(self, move) local success = modelfunctions.validateselect(move.value.name) success = modelfunctions.validateselect(move.value.period) and success @@ -137,7 +137,7 @@ function create_new_job() return cfe({ type="group", value=newjob, label="Create New Job" }) end -function create_job(newjob) +function create_job(self, newjob) local success = modelfunctions.validateselect(newjob.value.period) if newjob.value.name.value == "" then @@ -166,7 +166,7 @@ function read_configfile() return modelfunctions.getfiledetails(configfile) end -function update_configfile(filedetails) +function update_configfile(self, filedetails) -- FIXME validate - return modelfunctions.setfiledetails(filedetails, {configfile}) + return modelfunctions.setfiledetails(self, filedetails, {configfile}) end diff --git a/hostname-model.lua b/hostname-model.lua index 6fafdc0..87b3b5f 100644 --- a/hostname-model.lua +++ b/hostname-model.lua @@ -24,7 +24,7 @@ read_name = function () return cfe({ type="group", value={hostname=get(false)}, label="Hostname" }) end -update_name = function(name) +update_name = function(self, name) local success = true if success then diff --git a/interfaces-model.lua b/interfaces-model.lua index 5d3f9fe..5514ae0 100644 --- a/interfaces-model.lua +++ b/interfaces-model.lua @@ -367,26 +367,30 @@ end get_all_interfaces = iface.unpack_interfaces -get_iface_by_name = function(clientdata) +get_iface_by_name = function(self, clientdata) return iface.read(clientdata.name or "") end -get_iface = function(clientdata) +get_iface = function(self, clientdata) return iface.iface_type(clientdata.family, clientdata.method) end -create_iface = iface.add_after +create_iface = function(self, value) + return iface.add_after(value) +end -update_iface = iface.update +update_iface = function(self, value) + return iface.update(value) +end -get_delete_iface_by_name = function(clientdata) +get_delete_iface_by_name = function(self, clientdata) local result = {} result.iface = cfe({ value=clientdata.name or "", label="Interface Name" }) return cfe({ type="group", value=result, label="Interface Name" }) end -delete_iface_by_name = function(deleterequest) +delete_iface_by_name = function(self, deleterequest) if deleterequest.value.iface.value and deleterequest.value.iface.value ~= "" then local res, err = iface.delete(deleterequest.value.iface.value) @@ -433,10 +437,10 @@ get_file = function () return modelfunctions.getfiledetails(filename) end -write_file = function (newfile) +write_file = function (self, newfile) iface.array = nil iface.file = nil - return modelfunctions.setfiledetails(newfile, {filename}) + return modelfunctions.setfiledetails(self, newfile, {filename}) end get_interfaces = function() @@ -473,14 +477,14 @@ get_addresses = function() return cfe({ type="structure", value=retval, label="Interface IP Addresses" }) end -get_ifup_by_name = function(clientdata) +get_ifup_by_name = function(self, clientdata) local result = {} result.iface = cfe({ value=clientdata.name or "", label="Interface Name" }) return cfe({ type="group", value=result, label="Interface Name" }) end -ifup_by_name = function (ifuprequest) +ifup_by_name = function (self, ifuprequest) name = ifuprequest.value.iface.value or "" local cmd = path.."ifup "..name local f = io.popen(format.escapespecialcharacters(cmd)) @@ -494,14 +498,14 @@ ifup_by_name = function (ifuprequest) return ifuprequest end -get_ifdown_by_name = function(clientdata) +get_ifdown_by_name = function(self, clientdata) local result = {} result.iface = cfe({ value=clientdata.name or "", label="Interface Name" }) return cfe({ type="group", value=result, label="Interface Name" }) end -ifdown_by_name = function (ifdownrequest) +ifdown_by_name = function (self, ifdownrequest) name = ifdownrequest.value.iface.value or "" local cmd = path.."ifdown "..name local f = io.popen(format.escapespecialcharacters(cmd)) @@ -515,16 +519,16 @@ ifdown_by_name = function (ifdownrequest) return ifdownrequest end -get_restartnetworking = function(clientdata) +get_restartnetworking = function(self, clientdata) --return modelfunctions.get_startstop(processname) local actions = {} actions[1] = "restart" local service = cfe({ type="hidden", value="networking", label="Service Name" }) - local startstop = cfe({ type="group", label="Reload Modules", value={servicename=service}, option=actions, errtxt=errtxt }) + local startstop = cfe({ type="group", label="Restart Networking", value={servicename=service}, option=actions, errtxt=errtxt }) return startstop end -restartnetworking = function(startstop) +restartnetworking = function(self, startstop) return modelfunctions.startstop_service(startstop, "restart") end diff --git a/modules-model.lua b/modules-model.lua index aae8115..301a7a2 100644 --- a/modules-model.lua +++ b/modules-model.lua @@ -16,11 +16,11 @@ function read_file() return modelfunctions.getfiledetails(configfile) end -function write_file(filedetails) - return modelfunctions.setfiledetails(filedetails, {configfile}) +function write_file(self, filedetails) + return modelfunctions.setfiledetails(self, filedetails, {configfile}) end -function get_reloadmodules(clientdata) +function get_reloadmodules(self, clientdata) local actions = {} actions[1] = "restart" local service = cfe({ type="hidden", value="modules", label="Service Name" }) @@ -29,6 +29,6 @@ function get_reloadmodules(clientdata) return startstop end -function reloadmodules(startstop) +function reloadmodules(self, startstop) return modelfunctions.startstop_service(startstop, "restart") end diff --git a/password-model.lua b/password-model.lua index 4277a33..6b18897 100644 --- a/password-model.lua +++ b/password-model.lua @@ -14,7 +14,7 @@ read_password = function() end --setup so that it will compare password input -update_password = function (pw) +update_password = function (self, pw) local success = true if pw.value.password.value == "" or pw.value.password.value ~= pw.value.password_confirm.value then pw.value.password.errtxt = "Invalid or non matching password" diff --git a/rc-model.lua b/rc-model.lua index f22f400..cc502c1 100644 --- a/rc-model.lua +++ b/rc-model.lua @@ -30,7 +30,7 @@ status = function() return cfe({ type="structure", value=config, label="Init Runlevels" }) end -read_runlevels = function(clientdata) +read_runlevels = function(self, clientdata) local servicename = clientdata.servicename local value = {} value.servicename = cfe({ value=servicename or "", label="Service Name" }) @@ -48,7 +48,7 @@ read_runlevels = function(clientdata) return cfe({ type="group", value=value, label="Service Runlevels"}) end -update_runlevels = function(service) +update_runlevels = function(self, service) local success = modelfunctions.validatemulti(service.value.runlevels) service.value.servicename.errtxt = "Invalid service" for name in posix.files("/etc/init.d") do @@ -84,11 +84,11 @@ update_runlevels = function(service) return service end -function get_startstop(clientdata) +function get_startstop(self, clientdata) return modelfunctions.get_startstop(clientdata.servicename) end -function startstop_service(startstop) +function startstop_service(self, startstop) return modelfunctions.startstop_service(startstop, clientdata.action) end diff --git a/syslog-model.lua b/syslog-model.lua index a46d95b..426b4fb 100644 --- a/syslog-model.lua +++ b/syslog-model.lua @@ -145,11 +145,11 @@ end -- ################################################################################ -- PUBLIC FUNCTIONS -function get_startstop(clientdata) +function get_startstop(self, clientdata) return modelfunctions.get_startstop(processname) end -function startstop_service(startstop, action) +function startstop_service(self, startstop, action) return modelfunctions.startstop_service(startstop, action) end @@ -193,7 +193,7 @@ function getconfig() return config end -function updateconfig (config) +function updateconfig (self, config) local success = true success, config = validateconfig(config) @@ -206,6 +206,6 @@ function updateconfig (config) return config end -function update_filedetails (filedetails) - return modelfunctions.setfiledetails(filedetails, {configfile}, validate_configfile) +function update_filedetails (self, filedetails) + return modelfunctions.setfiledetails(self, filedetails, {configfile}, validate_configfile) end |