From de5fc1c44f4f497219e3828797b96d0118227218 Mon Sep 17 00:00:00 2001 From: Eugene Korbut Date: Sun, 8 Feb 2009 06:27:36 +1000 Subject: [PATCH] delete message --- app/controllers/webmail_controller.rb | 2 +- components/webmail/imapmailbox.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/webmail_controller.rb b/app/controllers/webmail_controller.rb index 42e2048..c5543da 100644 --- a/app/controllers/webmail_controller.rb +++ b/app/controllers/webmail_controller.rb @@ -111,7 +111,7 @@ class WebmailController < ApplicationController def delete @msg_id = msg_id_param.to_i - folder.messages().delete(@msg_id) + folder.delete(@msg_id) redirect_to(:action=>"messages") end diff --git a/components/webmail/imapmailbox.rb b/components/webmail/imapmailbox.rb index 6a606d8..71d763c 100644 --- a/components/webmail/imapmailbox.rb +++ b/components/webmail/imapmailbox.rb @@ -287,6 +287,7 @@ class IMAPFolder # Just delete message without interaction with Trash folder def delete(message) + activate uid = (message.kind_of?(Integer) ? message : message.uid) @mailbox.imap.uid_store(uid, "+FLAGS", :Deleted) @mailbox.imap.expunge