Change lbu-controller.lua to use new handle_form() functions found in acf_www-controller.lua instead of the controllerfunctions.lua version and also instead of redirect_to_referrer(). Made corresponding changes to vmail-model.lua to make everything work.

1 files changed, 6 insertions, 7 deletions

diff --git a/lbu-controller.lua b/lbu-controller.lua
index 8ced688..64a479c 100644
--- a/lbu-controller.lua
+++ b/lbu-controller.lua
@@ -1,5 +1,4 @@
 module(..., package.seeall)
-require("controllerfunctions")
 
 default_action = "listchanges"
 
@@ -12,23 +11,23 @@ function listchanges (self)
 end
 
 function config (self)
-	return controllerfunctions.handle_form(self, self.model.getconfig, self.model.setconfig, self.clientdata, "Save", "Edit Config", "Configuration Set")
+	return self.handle_form(self, self.model.getconfig, self.model.setconfig, self.clientdata, "Save", "Edit Config", "Configuration Set")
 end
 
 function editincluded (self)
-	return controllerfunctions.handle_form(self, self.model.getincluded, self.model.setincluded, self.clientdata, "Save", "Edit Included Files", "Included files set")
+	return self.handle_form(self, self.model.getincluded, self.model.setincluded, self.clientdata, "Save", "Edit Included Files", "Included files set")
 end
 
 function editexcluded (self)
-	return controllerfunctions.handle_form(self, self.model.getexcluded, self.model.setexcluded, self.clientdata, "Save", "Edit Excluded Files", "Excluded files set")
+	return self.handle_form(self, self.model.getexcluded, self.model.setexcluded, self.clientdata, "Save", "Edit Excluded Files", "Excluded files set")
 end
 
 function commit(self)
-	return controllerfunctions.handle_form(self, self.model.getcommit, self.model.commit, self.clientdata, "Commit", "Commit Changes")
+	return self.handle_form(self, self.model.getcommit, self.model.commit, self.clientdata, "Commit", "Commit Changes")
 end
 
 function expert (self)
-	return controllerfunctions.handle_form(self, self.model.get_filedetails, self.model.set_filedetails, self.clientdata, "Save", "Edit Config File", "Configuration saved")
+	return self.handle_form(self, self.model.get_filedetails, self.model.set_filedetails, self.clientdata, "Save", "Edit Config File", "Configuration saved")
 end
 
 function listbackups(self)
@@ -40,7 +39,7 @@ function deletebackup(self)
 end
 --]]
 function selectbackup(self)
-	return self:redirect_to_referrer(self.model.selectbackupfile(self.clientdata.backup))
+	return self.handle_form(self, self.model.get_selectbackup, self.model.selectbackupfile, self.clientdata, "Revert")
 end
 
 function getpackage(self)