diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2013-01-08 02:36:16 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2013-01-08 02:36:16 +0000 |
| commit | 8c6d209619f5871dad39bcccc06791ddad9ea4eb (patch) | |
| tree | d69a8c28942950ffb32c13d4791c1d8cf7c5a570 | |
| parent | a431a0b68e481893b4b8cccaadfe57994d1a8d90 (diff) | |
| download | acf-freeswitch-vmail-8c6d209619f5871dad39bcccc06791ddad9ea4eb.tar.bz2 acf-freeswitch-vmail-8c6d209619f5871dad39bcccc06791ddad9ea4eb.tar.xz | |
Fixed email message bugs
| -rw-r--r-- | vmail-controller.lua | 4 | ||||
| -rw-r--r-- | vmail-model.lua | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vmail-controller.lua b/vmail-controller.lua index 3354693..c86a1e8 100644 --- a/vmail-controller.lua +++ b/vmail-controller.lua @@ -59,7 +59,7 @@ forwardmymessage = function( self ) end emailmessage = function( self ) - return self.handle_form(self, self.model.get_email_message, self.model.email_message, self.clientdata, "Email", "Email Message", "Message Emailed") + return self.handle_form(self, self.model.get_email_message, self.model.email_message, self.clientdata, "Email", "Email Message") end emailmymessage = function( self ) @@ -67,7 +67,7 @@ emailmymessage = function( self ) 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") + return self.handle_form(self, self.model.get_email_message, self.model.email_message, self.clientdata, "Email", "Email Message") end movemessage = function( self ) diff --git a/vmail-model.lua b/vmail-model.lua index c0d8841..66c8f4f 100644 --- a/vmail-model.lua +++ b/vmail-model.lua @@ -575,7 +575,7 @@ email_message = function(self, emailrequest) while validuser(newuser) do newuser = "tempuser"..session.random_hash(128) end - local settings = get_usersettings(self, newuser) + local settings = get_usersettings(self, {username=newuser}) if settings.value["vm-mailto"] and settings.value["vm-email-all-messages"] and settings.value["vm-attach-file"] and settings.value["vm-keep-local-after-email"] then settings.value["vm-mailto"].value = emailrequest.value.address.value settings.value["vm-email-all-messages"].value = true @@ -591,9 +591,9 @@ email_message = function(self, emailrequest) voicemail_inject(newuser, config.domain, m.file_path, m.cid_number, m.cid_name) end if #mess == 1 then - retval.value = "E-mailed message" + emailrequest.descr = "E-mailed message" else - retval.value = "E-mailed "..#mess.." messages" + emailrequest.descr = "E-mailed "..#mess.." messages" end -- Now, delete the temporary user delete_user(newuser) |