diff options
| -rw-r--r-- | tinydns-controller.lua | 14 | ||||
| -rw-r--r-- | tinydns-model.lua | 6 |
2 files changed, 8 insertions, 12 deletions
diff --git a/tinydns-controller.lua b/tinydns-controller.lua index 25a0c12..54fa603 100644 --- a/tinydns-controller.lua +++ b/tinydns-controller.lua @@ -21,11 +21,11 @@ function startstop(self) end function config(self) - return self.handle_form(self, self.model.getconfig, function(value) return self.model.setconfig(self, value) end, self.clientdata, "Save", "Edit Configuration", "Configuration Saved") + return self.handle_form(self, self.model.getconfig, self.model.setconfig, self.clientdata, "Save", "Edit Configuration", "Configuration Saved") end function newfile(self) - return self.handle_form(self, self.model.getnewconfigfile, function(value) + return self.handle_form(self, self.model.getnewconfigfile, function(self, value) return self.model.createconfigfile(self, value, sessiondata.userinfo.userid) end, self.clientdata, "Create", "Create New Config File", "Config File Created") end @@ -48,7 +48,7 @@ end function editfile(self) config = self.handle_form(self, function() return self.model.get_filedetails(self, self.clientdata.filename, sessiondata.userinfo.userid) - end, function(value) + end, function(self, value) return self.model.set_filedetails(self, value, sessiondata.userinfo.userid) end, self.clientdata, "Save", "Edit Config File", "Config File Saved") @@ -69,15 +69,11 @@ end function edituserpermissions(self) return self.handle_form(self, function() return self.model:getuserpermissions(self.clientdata.userid) - end, function(value) - return self.model:setuserpermissions(value) - end, self.clientdata, "Save", "Edit User Permissions", "User permissions set") + end, self.model.setuserpermissions, self.clientdata, "Save", "Edit User Permissions", "User permissions set") end function editrolepermissions(self) return self.handle_form(self, function() return self.model:getrolepermissions(self.clientdata.role) - end, function(value) - return self.model:setrolepermissions(value) - end, self.clientdata, "Save", "Edit Role Permissions", "Role permissions set") + end, self.model.setrolepermissions, self.clientdata, "Save", "Edit Role Permissions", "Role permissions set") end diff --git a/tinydns-model.lua b/tinydns-model.lua index 3df68a3..82c2934 100644 --- a/tinydns-model.lua +++ b/tinydns-model.lua @@ -157,11 +157,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 @@ -280,7 +280,7 @@ end function set_filedetails (self, filedetails, userid) configfiles = searchforconfigfiles(self, userid) - return modelfunctions.setfiledetails(filedetails, validfilename) + return modelfunctions.setfiledetails(self, filedetails, validfilename) end function getnewconfigfile() |