[Tickets #1691] NEW: Notspam option broken

[bugs at bugs.horde.org]

DO NOT REPLY TO THIS MESSAGE. THIS EMAIL ADDRESS IS NOT MONITORED.

Ticket URL: http://bugs.horde.org/ticket/?id=1691
-----------------------------------------------------------------------
 Ticket             | 1691
 Created By         | grahamcw at hurleybulldogs.com
 Summary            | Notspam option broken 
 Queue              | IMP
 Version            | HEAD
 State              | Unconfirmed
 Priority           | 1. Low
 Type               | Bug
 Owners             | 
-----------------------------------------------------------------------


grahamcw at hurleybulldogs.com (2005-04-04 23:17) wrote:

My try at a fix -  and I didn't honor the spam folder - since it's notspam 

--- /root/horde/imp/templates/message/navbar_actions.inc        Tue Mar 22
23:13:26 2005
+++ navbar_actions.inc  Tue Apr  5 01:00:10 2005
@@ -34,7 +34,7 @@
 <?php if (isset($spam_link) && $imp['mailbox'] !=
IMP::addPreambleString($prefs->getValue('spam_folder'))): ?>
  | <?php echo Horde::widget($spam_link, _("Report as Spam"), 'widget', '',
'', _("Report as Spam"), true) ?>
 <?php endif; ?>
-<?php if (isset($notspam_link) &&  $imp['mailbox'] ==
IMP::addPreambleString($prefs->getValue('spam_folder'))): ?>
+<?php if (isset($notspam_link)): ?>
  | <?php echo Horde::widget($notspam_link, _("Report as Innocent"),
'widget', '', '', _("Report as Innocent"), true) ?>
 <?php endif; ?>
 </td>


--- /root/horde/imp/templates/mailbox/actions.inc       Fri Apr  9 10:31:10
2004
+++ actions.inc Tue Apr  5 00:46:24 2005
@@ -22,8 +22,9 @@
 <?php if ($conf['spam']['reporting']): ?>
 <?php if ($imp['mailbox'] !=
IMP::addPreambleString($prefs->getValue('spam_folder'))): ?>
     | <?php echo Horde::widget('', _("Report as Spam"), 'widget', '',
"Submit('spam_report'); return false;", _("Report as Spam")); ?>
-<?php else: ?>
-    | <?php echo Horde::widget('', _("Report as Innocent"), 'widget', '',
"Submit('notspam_report'); return false;", _("Report as Innocent")); ?>
+<?php endif; ?>
+<?php if ($conf['notspam']['reporting']): ?>
+    |  <?php echo Horde::widget('', _("Report as Innocent"), 'widget', '',
"Submit('notspam_report'); return false;", _("Report as Innocent")); ?>
 <?php endif; ?>
 <?php endif; ?>