Modified tinydns to remove dnsfiles from session and replace with calls to authenticator. Added in pages for managing tinydns permissions.

git-svn-id: svn://svn.alpinelinux.org/acf/tinydns/trunk@1318 ab2d0c66-481e-0410-8bed-d214d4d58bed

1 files changed, 20 insertions, 8 deletions

diff --git a/tinydns-controller.lua b/tinydns-controller.lua
index 1856fa2..4030cf3 100644
--- a/tinydns-controller.lua
+++ b/tinydns-controller.lua
@@ -5,11 +5,11 @@ require("validator")
 default_action = "status"
 
 function status(self)
-	return self.model.getstatus(self)
+	return self.model.getstatus()
 end
 
 function view(self)
-	return self.model.getconfigobjects(self.clientdata.filename, sessiondata.userinfo.dnsfiles)
+	return self.model.getconfigobjects(self, self.clientdata.filename, sessiondata.userinfo.userid)
 end
 
 function startstop(self)
@@ -22,15 +22,15 @@ end
 
 function newfile(self)
 	return controllerfunctions.handle_form(self, self.model.getnewconfigfile, function(value)
-			return self.model.createconfigfile(self, value, sessiondata.userinfo.dnsfiles)
+			return self.model.createconfigfile(self, value, sessiondata.userinfo.userid)
 		end, self.clientdata, "Create", "Create New Config File", "Config File Created", "listfiles")
 end
 
 function listfiles(self)
-	local configfiles = self.model.getfilelist(sessiondata.userinfo.dnsfiles)
+	local configfiles = self.model.getfilelist(self, sessiondata.userinfo.userid)
 	local config = {}
 	for k,v in pairs(configfiles.value) do
-		local filedetails = self.model.get_filedetails(v, sessiondata.userinfo.dnsfiles)
+		local filedetails = self.model.get_filedetails(self, v, sessiondata.userinfo.userid)
 		table.insert(config,filedetails)
 	end
 
@@ -39,9 +39,9 @@ end
 
 function editfile(self)
 	config = controllerfunctions.handle_form(self, function()
-			return self.model.get_filedetails(self.clientdata.filename, sessiondata.userinfo.dnsfiles)
+			return self.model.get_filedetails(self, self.clientdata.filename, sessiondata.userinfo.userid)
 		end, function(value)
-			return self.model.set_filedetails(value, sessiondata.userinfo.dnsfiles)
+			return self.model.set_filedetails(self, value, sessiondata.userinfo.userid)
 		end, self.clientdata, "Save", "Edit Config File", "Config File Saved")
 	
 	if self.clientdata.linenumber and validator.is_integer(self.clientdata.linenumber) then
@@ -51,5 +51,17 @@ function editfile(self)
 end
 
 function delete(self)
-	return self:redirect_to_referrer(self.model.remove_file(self.clientdata.filename, sessiondata.userinfo.dnsfiles))
+	return self:redirect_to_referrer(self.model.remove_file(self, self.clientdata.filename, sessiondata.userinfo.userid))
+end
+
+function listpermissions(self)
+	return self.model:getpermissionslist()
+end
+
+function edituserpermissions(self)
+	return controllerfunctions.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