On Sun, Aug 2, 2009 at 12:12 AM, Jumping Mouse wrote:
>
> >
> > Yes, you are. It still requires the patch. Sorry that wasn't clear.
> >
> >Send
>
> Ok I did:
>
> patch -p0 < patches/msg_flags-squirrelmail-1.4.15.diff in the
> plugin/msg_flags directory and now it works.
>
> I would suggest adding to the INSTALL document in number 2:
>
> msg_flags-squirrelmail-1.4.115.diff should/will work for 1.4.15- 1.4.19
>
> thanks for your help Paul!
>
> BTW, I couldn't apply to patch to 1.4.20 RC2, specifically to
functions/mailbox_display.php, no problem with src/move_messages.php
I had to manually see what had to be done, here's the patch. I don't know
how to use patch very well, so tell me if I did something wrong. (or how to
include the patch to move_messages in the same file)
Javier
--- mailbox_display.php.orig 2009-08-12 02:29:53.0 -0600
+++ mailbox_display.php 2009-09-06 03:20:53.0 -0600
@@ -260,37 +260,66 @@
$stuff = false;
$td_str = "";
-if (isset($msg['FLAG_ANSWERED']) && $msg['FLAG_ANSWERED'] == true) {
-// i18n: "A" is short for "Answered". Make sure that two icon strings aren't translated to the same character (only in 1.5).
-$td_str .= _("A");
-$stuff = true;
-}
-if ($msg['TYPE0'] == 'multipart' && $msg['TYPE1'] == 'mixed') {
-$td_str .= '+';
-$stuff = true;
+sq_change_text_domain('msg_flags');
+if (isset($msg['FLAG_FLAGGED']) && $msg['FLAG_FLAGGED'] == true) {
+$msg_alt = _("This message is flagged");
+$td_str .= ' ';
}
if ($default_use_priority) {
if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) {
-$td_str .= "!";
-$stuff = true;
+$msg_alt = _("This message is high priority");
+$td_str .= ' ';
}
-if ($msg['PRIORITY'] == 5) {
-$td_str .= "?";
-$stuff = true;
+elseif ($msg['PRIORITY'] == 5) {
+$msg_alt = _("This message is low priority");
+$td_str .= ' ';
+}
+else {
+$td_str .= '';
}
}
+if ($msg['TYPE0'] == 'multipart' && $msg['TYPE1'] == 'mixed') {
+$msg_alt = _("This message has an attachment");
+$td_str .= '';
+}
+else {
+$td_str .= '';
+}
+
+$msg_icon = '';
+
+if (!isset($msg['FLAG_SEEN']) || $msg['FLAG_SEEN'] == true) {
+$msg_alt = _("This message has been read");
+$msg_icon .= '../plugins/msg_flags/images/msg_read';
+} else {
+$msg_alt = _("This message is new");
+$msg_icon .= '../plugins/msg_flags/images/msg_new';
+}
if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED'] == true) {
-$td_str .= "D";
-$stuff = true;
+if (!isset($msg['FLAG_SEEN']) || $msg['FLAG_SEEN'] == true) {
+$msg_alt = _("This message has been read & deleted");
+} else {
+$msg_alt = _("This message is new & deleted");
+}
+$msg_icon .= '_deleted';
}
-if (!$stuff) {
-$td_str .= ' ';
+if (isset($msg['FLAG_ANSWERED']) && $msg['FLAG_ANSWERED'] == true) {
+if (!isset($msg['FLAG_SEEN']) || $msg['FLAG_SEEN'] == true) {
+$msg_alt = _("This message has been read & answered");
+} else {
+$msg_alt = _("This message is new & answered");
+}
+$msg_icon .= '_reply';
}
+sq_change_text_domain('squirrelmail');
+
+$td_str .= ' ';
+
do_hook("msg_envelope");
$td_str .= '';
echo html_tag( 'td',
$td_str,
- 'center',
+ 'right',
$hlt_color,
'nowrap' );
break;
@@ -760,6 +789,10 @@
echo getButton('SUBMIT', 'expungeButton',_("Expunge")) ."\n";
}
+sq_change_text_domain('msg_flags');
+echo getButton('SUBMIT', 'markFlagged',_("Flag"));
+echo getButton('SUBMIT', 'markUnflagged',_("Unflag"));
+sq_change_text_domain('squirrelmail');
ec
