Updated for handle_form now passing self to get and set functions

1 files changed, 17 insertions, 17 deletions

diff --git a/vmail-model.lua b/vmail-model.lua
index 683aa77..c3ffcd0 100644
--- a/vmail-model.lua
+++ b/vmail-model.lua
@@ -437,7 +437,7 @@ get_config = function()
 	return cfe({ type="group", value=result, label="Voicemail Config" })
 end
 
-update_config = function(newconfig)
+update_config = function(self, newconfig)
 	local success = validateconfig(newconfig)
 	if success then
 		for name,val in pairs(newconfig.value) do
@@ -493,14 +493,14 @@ get_message = function(message, username)
 	return retval
 end
 
-get_delete_message = function(clientdata)
+get_delete_message = function(self, clientdata)
 	local result = {}
 	result.message = cfe({ value=clientdata.message or "", label="Message" })
 	result.username = cfe({ value=clientdata.username or "", label="User Name" })
 	return cfe({ type="group", value=result, label="Delete Message" })
 end
 
-set_delete_message = function(deleterequest)
+set_delete_message = function(self, deleterequest)
 	if not deleterequest.value.message.value or deleterequest.value.message.value == "" then
 		deleterequest.errtxt = "Failed to delete message - message not found"
 		return deleterequest
@@ -524,7 +524,7 @@ set_delete_message = function(deleterequest)
 	return deleterequest
 end	
 
-get_forward_message = function(clientdata)
+get_forward_message = function(self, clientdata)
 	local result = {}
 	result.message = cfe({ value=clientdata.message or "", label="Message" })
 	result.username = cfe({ value=clientdata.username or "", label="User Name" })
@@ -532,7 +532,7 @@ get_forward_message = function(clientdata)
 	return cfe({ type="group", value=result, label="Forward Message" })
 end
 
-forward_message = function(forwardrequest)
+forward_message = function(self, forwardrequest)
 	local messages = format.string_to_table(forwardrequest.value.message.value, "%s*,%s*")
         local res, err = pcall(function()
 		local connected = databaseconnect()
@@ -567,7 +567,7 @@ forward_message = function(forwardrequest)
 	return forwardrequest
 end
 
-get_email_message = function(clientdata)
+get_email_message = function(self, clientdata)
 	local result = {}
 	result.message = cfe({ value=clientdata.message or "", label="Message" })
 	result.address = cfe({ value=clientdata.newuser or "", label="Address" })
@@ -575,7 +575,7 @@ get_email_message = function(clientdata)
 	return cfe({ type="group", value=result, label="Email Message" })
 end
 
-email_message = function(emailrequest)
+email_message = function(self, emailrequest)
 	local messages = format.string_to_table(emailrequest.value.message.value, "%s*,%s*")
 	if emailrequest.value.address.value == "" or string.find(emailrequest.value.address.value, "%s") or not string.find(emailrequest.value.address.value, "@") then
 		emailrequest.errtxt = "Failed to e-mail message - invalid address"
@@ -632,7 +632,7 @@ email_message = function(emailrequest)
 	return emailrequest
 end
 
-get_move_message = function(clientdata)
+get_move_message = function(self, clientdata)
 	local result = {}
 	result.message = cfe({ value=clientdata.message or "", label="Message" })
 	result.newfolder = cfe({ value=clientdata.newfolder or "", label="New Folder" })
@@ -640,7 +640,7 @@ get_move_message = function(clientdata)
 	return cfe({ type="group", value=result, label="Move Message" })
 end
 
-move_message = function(moverequest)
+move_message = function(self, moverequest)
 	local messages = format.string_to_table(moverequest.value.message.value, "%s*,%s*")
         local res, err = pcall(function()
 		local connected = databaseconnect()
@@ -681,7 +681,7 @@ move_message = function(moverequest)
 	return moverequest
 end
 
-get_callback_message = function(clientdata)
+get_callback_message = function(self, clientdata)
 	local result = {}
 	result.message = cfe({ value=clientdata.message or "", label="Message" })
 	result.extension = cfe({ value=clientdata.extension or "", label="Extension" })
@@ -689,7 +689,7 @@ get_callback_message = function(clientdata)
 	return cfe({ type="group", value=result, label="Callback Message" })
 end
 
-callback_message = function(callbackrequest)
+callback_message = function(self, callbackrequest)
 	if string.find(callbackrequest.value.message.value, ",") then
 		callbackrequest.errtxt = "Failed to callback message - can only callback one message at a time"
 	elseif callbackrequest.value.extension.value == "" or string.find(callbackrequest.value.extension.value, "[%s@]") then
@@ -767,13 +767,13 @@ list_users = function()
 	return cfe({ type="structure", value=users, label="Voicemail Users", errtxt=errtxt })
 end
 
-get_delete_user = function(clientdata)
+get_delete_user = function(self, clientdata)
 	local result = {}
 	result.username = cfe({ value=clientdata.username or "", label="User Name" })
 	return cfe({ type="group", value=result, label="Delete User" })
 end
 
-set_delete_user = function(deleterequest)
+set_delete_user = function(self, deleterequest)
 	local result = ""
 	local success = true
 	if not deleterequest.value.username.value == "" then
@@ -796,7 +796,7 @@ set_delete_user = function(deleterequest)
 	return deleterequest
 end
 
-get_usersettings = function(clientdata)
+get_usersettings = function(self, clientdata)
 	local retval = {}
 	local errtxt
         local res, err = pcall(function()
@@ -812,11 +812,11 @@ get_usersettings = function(clientdata)
 	return cfe({ type="group", value=retval, label="Voicemail User Settings", errtxt=errtxt })
 end
 
-create_usersettings = function(usersettings)
-	return update_usersettings(usersettings, true)
+create_usersettings = function(self, usersettings, action)
+	return update_usersettings(usersettings, action, true)
 end
 
-update_usersettings = function(usersettings, create)
+update_usersettings = function(self, usersettings, action, create)
 	local success = true
 	local errtxt
 	-- Validate the settings