1 files changed, 11 insertions, 8 deletions
diff --git a/awall-controller.lua b/awall-controller.lua
index 9fa56a1..9e356f8 100644
--- a/awall-controller.lua
+++ b/awall-controller.lua
@@ -1,13 +1,16 @@
 module(..., package.seeall)
 
-default_action = "status"
+-- Load libraries
+require("controllerfunctions")
 
+default_action = "status"
+     
 function status(self)
 	return self.model.getstatus()
 end
 
 function startstop(self)
-        return self.handle_form(self, self.model.get_startstop, self.model.startstop_service, self.clientdata)
+	return controllerfunctions.handle_startstop(self, self.model.startstop_service, self.clientdata)
 end
 
 function listpolicies(self)
@@ -15,25 +18,25 @@ function listpolicies(self)
 end
 
 function viewpolicy(self)
-	return self.model.read_policyfile(self, clientdata)
+	return self.model.read_policyfile(self.clientdata.filename)
 end
 
 function createpolicy(self)
-	return self.handle_form(self, self.model.get_newpolicy, self.model.create_policy, self.clientdata, "Create", "Create New Policy File", "Policy File Created")
+	return controllerfunctions.handle_form(self, self.model.get_newpolicy, self.model.create_policy, self.clientdata, "Create", "Create New Policy File", "Policy File Created")
 end
 
 function deletepolicy(self)
-	return self.handle_form(self, self.model.get_delete_policy, self.model.delete_policy, self.clientdata, "Delete", "Delete Policy File", "Policy File Deleted")
+	return controllerfunctions.handle_form(self, self.model.get_delete_policy, self.model.delete_policy, self.clientdata, "Delete", "Delete Policy File", "Policy File Deleted")
 end
 
 function editpolicy(self)
-	return self.handle_form(self, self.model.get_policyfile, self.model.update_policyfile, self.clientdata, "Save", "Edit Policy", "Policy File Saved")
+	return controllerfunctions.handle_form(self, function() return self.model.get_policyfile(self.clientdata.filename) end, self.model.update_policyfile, self.clientdata, "Save", "Edit Policy", "Policy File Saved")
 end
 
 function enablepolicy(self)
-	return self.handle_form(self, self.model.get_enablepolicy, self.model.enable_policy, self.clientdata, "Enable", "Enable Policy", "Policy Enabled")
+	return controllerfunctions.handle_form(self, self.model.get_enablepolicy, self.model.enable_policy, self.clientdata, "Enable", "Enable Policy", "Policy Enabled")
 end
 
 function disablepolicy(self)
-	return self.handle_form(self, self.model.get_enablepolicy, self.model.disable_policy, self.clientdata, "Disable", "Disable Policy", "Policy Disabled")
+	return controllerfunctions.handle_form(self, self.model.get_enablepolicy, self.model.disable_policy, self.clientdata, "Disable", "Disable Policy", "Policy Disabled")
 end