On Sun, Aug 2, 2009 at 12:12 AM, Jumping Mouse <[email protected]> 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.000000000 -0600
+++ mailbox_display.php 2009-09-06 03:20:53.000000000 -0600
@@ -260,37 +260,66 @@
$stuff = false;
$td_str = "<b><small>";
- 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 .= '<img src="../plugins/msg_flags/images/flagged.gif" border="0" height="10" width="10" alt="'. $msg_alt .'" title="'. $msg_alt .'"> ';
}
if ($default_use_priority) {
if ( ($msg['PRIORITY'] == 1) || ($msg['PRIORITY'] == 2) ) {
- $td_str .= "<font color=\"$color[1]\">!</font>";
- $stuff = true;
+ $msg_alt = _("This message is high priority");
+ $td_str .= '<img src="../plugins/msg_flags/images/prio_high.gif" border="0" height="10" width="5" alt="'. $msg_alt .'" title="'. $msg_alt .'"> ';
}
- if ($msg['PRIORITY'] == 5) {
- $td_str .= "<font color=\"$color[8]\">?</font>";
- $stuff = true;
+ elseif ($msg['PRIORITY'] == 5) {
+ $msg_alt = _("This message is low priority");
+ $td_str .= '<img src="../plugins/msg_flags/images/prio_low.gif" border="0" height="10" width="5" alt="'. $msg_alt .'" title="'. $msg_alt .'"> ';
+ }
+ else {
+ $td_str .= '<img src="../plugins/msg_flags/images/transparent.gif" border="0" height="10" width="6">';
}
}
+ if ($msg['TYPE0'] == 'multipart' && $msg['TYPE1'] == 'mixed') {
+ $msg_alt = _("This message has an attachment");
+ $td_str .= '<img src="../plugins/msg_flags/images/attach.gif" border="0" height="10" width="6" alt="'. $msg_alt .'" title="'. $msg_alt .'">';
+ }
+ else {
+ $td_str .= '<img src="../plugins/msg_flags/images/transparent.gif" border="0" height="10" width="6">';
+ }
+
+ $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 .= "<font color=\"$color[1]\">D</font>";
- $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 .= '<img src="' . $msg_icon . '.gif" border="0" alt="'. $msg_alt . '" title="' . $msg_alt . '" height="12" width="18" ></small></b> ';
+
do_hook("msg_envelope");
$td_str .= '</small></b>';
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');
echo getButton('SUBMIT', 'markRead',_("Read")) . "\n";
echo getButton('SUBMIT', 'markUnread',_("Unread")) . "\n";
echo getButton('SUBMIT', 'delete',_("Delete")) ." \n";
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
-----
squirrelmail-users mailing list
Posting guidelines: http://squirrelmail.org/postingguidelines
List address: [email protected]
List archives: http://news.gmane.org/gmane.mail.squirrelmail.user
List info (subscribe/unsubscribe/change options):
https://lists.sourceforge.net/lists/listinfo/squirrelmail-users
