I noticed that I see the "Report as Spam" links in both the message and mailbox view when I'm viewing messages inside of my spamfolder. So.. when in the spam folder, I see options for both "Report as Spam" and "Report as Innocent", while in any other folder, I only see "Report as Spam".

I'm pretty sure that the correct behavior is..
- if in spam folder, show "Report as Innocent"
- else, show "Report as Spam"

I believe the attached diff fixes it. I didn't submit it as a bug report because I wanted to confirm that my interpretation of how it should behave was correct.

Liam

--- /tmp/mailbox.php    2008-01-25 15:57:18.000000000 -0500
+++ mailbox.php 2008-01-25 15:57:32.000000000 -0500
@@ -524,5 +524,5 @@
 
     if ($conf['spam']['reporting'] &&
-        ($conf['spam']['spamfolder'] ||
+        (!$conf['spam']['spamfolder'] ||
          ($imp_mbox['mailbox'] != 
IMP::folderPref($prefs->getValue('spam_folder'), true)))) {
         $a_template->set('spam', Horde::widget('#', _("Report as Spam"), 
'widget', '', "messages_submit('spam_report'); return false;", _("Report as 
Spam")));
--- /tmp/message.php    2008-01-25 15:57:18.000000000 -0500
+++ message.php 2008-01-25 15:57:40.000000000 -0500
@@ -590,5 +590,5 @@
 
     if ($conf['spam']['reporting'] &&
-        ($conf['spam']['spamfolder'] ||
+        (!$conf['spam']['spamfolder'] ||
          ($mailbox_name != IMP::folderPref($prefs->getValue('spam_folder'), 
true)))) {
         $a_template->set('spam', Horde::widget('#', _("Report as Spam"), 
'widget', '', "message_submit('spam_report'); return false;", _("Report as 
Spam"), true));
-- 
IMP mailing list - Join the hunt: http://horde.org/bounties/#imp
Frequently Asked Questions: http://horde.org/faq/
To unsubscribe, mail: [EMAIL PROTECTED]

Reply via email to