diff options
author | Zach LeBar <zach@zachlebar.com> | 2012-02-28 18:47:59 +0000 |
---|---|---|
committer | Zach LeBar <zach@zachlebar.com> | 2012-02-28 18:47:59 +0000 |
commit | e5e9fc6fe1bb44cde346a6ae7c01ac98ec4c0ddf (patch) | |
tree | 6a9e4717fca0532c371cfe95eba0b15adae1192f /vmail-controller.lua | |
parent | 774acc0d56664daa4074690c0b5158a8b4f3ec68 (diff) | |
download | acf-freeswitch-vmail-e5e9fc6fe1bb44cde346a6ae7c01ac98ec4c0ddf.tar.bz2 acf-freeswitch-vmail-e5e9fc6fe1bb44cde346a6ae7c01ac98ec4c0ddf.tar.xz |
Change vmail-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.HEADmaster
Diffstat (limited to 'vmail-controller.lua')
-rw-r--r-- | vmail-controller.lua | 52 |
1 files changed, 35 insertions, 17 deletions
diff --git a/vmail-controller.lua b/vmail-controller.lua index d087833..9a883de 100644 --- a/vmail-controller.lua +++ b/vmail-controller.lua @@ -1,7 +1,5 @@ module (..., package.seeall) -require("controllerfunctions") - default_action = "listmessages" listfolders = function( self ) @@ -17,7 +15,7 @@ editusers = function( self ) end deleteuser = function( self ) - return controllerfunctions.handle_form(self, self.model.get_delete_user, self.model.set_delete_user, self.clientdata, "Delete", "Delete User", "User Deleted") + return self.handle_form(self, self.model.get_delete_user, self.model.set_delete_user, self.clientdata, "Delete", "Delete User", "User Deleted") end listmessages = function( self ) @@ -39,47 +37,67 @@ downloadmymessage = function( self ) end deletemessage = function( self ) - return self:redirect_to_referrer(self.model.delete_message(self.clientdata.message)) + return self.handle_form(self, self.model.get_delete_message, self.model.set_delete_message, self.clientdata, "Delete", "Delete Message", "Message Deleted") end deletemymessage = function( self ) - return self:redirect_to_referrer(self.model.delete_message(self.clientdata.message, self.sessiondata.userinfo.userid)) + self.clientdata.username = nil + if self.sessiondata.userinfo then + self.clientdata.username = self.sessiondata.userinfo.userid + end + return self.handle_form(self, self.model.get_delete_message, self.model.set_delete_message, self.clientdata, "Delete", "Delete Message", "Message Deleted") end forwardmessage = function( self ) - return self:redirect_to_referrer(self.model.forward_message(self.clientdata.message, self.clientdata.newuser)) + return self.handle_form(self, self.model.get_forward_message, self.model.forward_message, self.clientdata, "Forward", "Forward Message", "Message Forwarded") end forwardmymessage = function( self ) - return self:redirect_to_referrer(self.model.forward_message(self.clientdata.message, self.clientdata.newuser, self.sessiondata.userinfo.userid)) + self.clientdata.username = nil + if self.sessiondata.userinfo then + self.clientdata.username = self.sessiondata.userinfo.userid + end + return self.handle_form(self, self.model.get_forward_message, self.model.forward_message, self.clientdata, "Forward", "Forward Message", "Message Forwarded") end emailmessage = function( self ) - return self:redirect_to_referrer(self.model.email_message(self.clientdata.message, self.clientdata.address)) + return self.handle_form(self, self.model.get_email_message, self.model.email_message, self.clientdata, "Email", "Email Message", "Message Emailed") end emailmymessage = function( self ) - return self:redirect_to_referrer(self.model.email_message(self.clientdata.message, self.clientdata.address, self.sessiondata.userinfo.userid)) + self.clientdata.username = nil + if self.sessiondata.userinfo then + self.clientdata.username = self.sessiondata.userinfo.userid + end + return self.handle_form(self, self.model.get_email_message, self.model.email_message, self.clientdata, "Email", "Email Message", "Message Emailed") end movemessage = function( self ) - return self:redirect_to_referrer(self.model.move_message(self.clientdata.message, self.clientdata.newfolder)) + return self.handle_form(self, self.model.get_move_message, self.model.move_message, self.clientdata) end movemymessage = function( self ) - return self:redirect_to_referrer(self.model.move_message(self.clientdata.message, self.clientdata.newfolder, self.sessiondata.userinfo.userid)) + self.clientdata.username = nil + if self.sessiondata.userinfo then + self.clientdata.username = self.sessiondata.userinfo.userid + end + return self.handle_form(self, self.model.get_move_message, self.model.move_message, self.clientdata) end callbackmessage = function( self ) - return self:redirect_to_referrer(self.model.callback_message(self.clientdata.message, self.clientdata.extension)) + return self.handle_form(self, self.model.get_callback_message, self.model.callback_message, self.clientdata) end callbackmymessage = function( self ) - return self:redirect_to_referrer(self.model.callback_message(self.clientdata.message, self.clientdata.extension, self.sessiondata.userinfo.userid)) + self.clientdata.username = nil + if self.sessiondata.userinfo then + self.clientdata.username = self.sessiondata.userinfo.userid + end + return self.handle_form(self, self.model.get_callback_message, self.model.callback_message, self.clientdata) end editusersettings = function( self ) - return controllerfunctions.handle_form(self, self.model.get_usersettings, self.model.update_usersettings, self.clientdata, "Save", "Edit Settings", "Settings Saved") + return self.handle_form(self, self.model.get_usersettings, self.model.update_usersettings, self.clientdata, "Save", "Edit Settings", "Settings Saved") end editmyusersettings = function( self ) @@ -87,11 +105,11 @@ editmyusersettings = function( self ) if self.sessiondata.userinfo then self.clientdata.username = self.sessiondata.userinfo.userid end - return controllerfunctions.handle_form(self, self.model.get_usersettings, self.model.update_usersettings, self.clientdata, "Save", "Edit Settings", "Settings Saved") + return self.handle_form(self, self.model.get_usersettings, self.model.update_usersettings, self.clientdata, "Save", "Edit Settings", "Settings Saved") end createuser = function( self ) - return controllerfunctions.handle_form(self, self.model.get_usersettings, self.model.create_usersettings, self.clientdata, "Create", "Create User", "User Created") + return self.handle_form(self, self.model.get_usersettings, self.model.create_usersettings, self.clientdata, "Create", "Create User", "User Created") end processdialplanxml = function( self ) @@ -105,5 +123,5 @@ processdirectoryxml = function( self ) end editconfig = function( self ) - return controllerfunctions.handle_form(self, self.model.get_config, self.model.update_config, self.clientdata, "Save", "Update Config", "Config Saved") + return self.handle_form(self, self.model.get_config, self.model.update_config, self.clientdata, "Save", "Update Config", "Config Saved") end |