**
**/
- $mailbox_info = true;
+ $mailbox_display_php = true;
- function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage) {
+ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, $where, $what) {
global $color, $msgs, $msort;
global $sent_folder;
+ global $message_highlight_list;
$msg = $msgs[$key];
- $senderName = $msg["FROM"];
+ $senderName = sqimap_find_displayable_name($msg["FROM"]);
$urlMailbox = urlencode($mailbox);
- $subject = trim(stripslashes($msg["SUBJECT"]));
+ $subject = trim($msg["SUBJECT"]);
+ if ($subject == "")
+ $subject = _("(no subject)");
+
echo "<TR>\n";
if ($msg["FLAG_FLAGGED"] == true) { $flag = "<font color=$color[2]>"; $flag_end = "</font>"; }
if ($msg["FLAG_SEEN"] == false) { $bold = "<b>"; $bold_end = "</b>"; }
if ($mailbox == $sent_folder) { $italic = "<i>"; $italic_end = "</i>"; }
- echo " <td width=1% align=center><input type=checkbox name=\"msg[$t]\" value=".$msg["ID"]."></TD>\n";
- echo " <td width=30%>$italic$bold$flag$senderName$flag_end$bold_end$italic_end</td>\n";
- echo " <td nowrap width=1%><center>$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end</center></td>\n";
- if ($msg["FLAG_ANSWERED"] == true) echo " <td width=1%><b><small>A</small></b></td>";
- else echo " <td width=1%> </td>";
- echo " <td width=%>$bold<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=".$msg["ID"]."&startMessage=$startMessage&show_more=0\">$flag$subject$flag_end</a>$bold_end</td>\n";
+ for ($i=0; $i < count($message_highlight_list); $i++) {
+ if (trim($message_highlight_list[$i]["value"]) != "") {
+ if ($message_highlight_list[$i]["match_type"] == "to_cc") {
+ if (strpos("^^".strtolower($msg["TO"]), strtolower($message_highlight_list[$i]["value"])) || strpos("^^".strtolower($msg["CC"]), strtolower($message_highlight_list[$i]["value"]))) {
+ $hlt_color = $message_highlight_list[$i]["color"];
+ continue;
+ }
+ } else if (strpos("^^".strtolower($msg[strtoupper($message_highlight_list[$i]["match_type"])]),strtolower($message_highlight_list[$i]["value"]))) {
+ $hlt_color = $message_highlight_list[$i]["color"];
+ continue;
+ }
+ }
+ }
+
+ if (!$hlt_color)
+ $hlt_color = $color[4];
+
+ if ($where && $what) {
+ $search_stuff = "&where=".urlencode($where)."&what=".urlencode($what);
+ }
+
+ echo " <td width=1% bgcolor=$hlt_color align=center><input type=checkbox name=\"msg[$t]\" value=".$msg["ID"]."$checked></TD>\n";
+ echo " <td width=30% bgcolor=$hlt_color>$italic$bold$flag$senderName$flag_end$bold_end$italic_end</td>\n";
+ echo " <td nowrap width=1% bgcolor=$hlt_color><center>$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end</center></td>\n";
+
+ if ($msg["FLAG_ANSWERED"] == true) echo " <td bgcolor=$hlt_color width=1%><b><small>A</small></b></td>\n";
+ elseif (ereg("(1|2)",substr($msg["PRIORITY"],0,1))) echo " <td bgcolor=$hlt_color width=1%><b><small><font color=$color[1]>!</font></small></b></td>\n";
+ else echo " <td bgcolor=$hlt_color width=1%> </td>\n";
+ echo " <td bgcolor=$hlt_color>$bold<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=".$msg["ID"]."&startMessage=$startMessage&show_more=0$search_stuff\">$flag$subject$flag_end</a>$bold_end</td>\n";
echo "</tr>\n";
}
function showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color,$show_num, $use_cache) {
global $msgs, $msort;
global $sent_folder;
+ global $message_highlight_list;
+ global $auto_expunge;
+
+ if ($auto_expunge) {
+ sqimap_mailbox_expunge($imapConnection, $mailbox);
+ sqimap_mailbox_select($imapConnection, $mailbox);
+ }
if (!$use_cache) {
if ($numMessages >= 1) {
$from[$q] = $hdr->from;
$date[$q] = $hdr->date;
$subject[$q] = $hdr->subject;
+ $to[$q] = $hdr->to;
+ $priority[$q] = $hdr->priority;
+ $cc[$q] = $hdr->cc;
$flags[$q] = sqimap_get_flags ($imapConnection, $q+1);
}
$messages[$j]["DATE_STRING"] = getDateString($messages[$j]["TIME_STAMP"]);
$messages[$j]["ID"] = $j+1;
$messages[$j]["FROM"] = decodeHeader($from[$j]);
+ $messages[$j]["FROM-SORT"] = strtolower(sqimap_find_displayable_name(decodeHeader($from[$j])));
$messages[$j]["SUBJECT"] = decodeHeader($subject[$j]);
+ $messages[$j]["SUBJECT-SORT"] = strtolower(decodeHeader($subject[$j]));
+ $messages[$j]["TO"] = decodeHeader($to[$j]);
+ $messages[$j]["PRIORITY"] = $priority[$j];
+ $messages[$j]["CC"] = $cc[$j];
+
+ # fix SUBJECT-SORT to remove Re:
+ if (substr($messages[$j]["SUBJECT-SORT"], 0, 3) == "re:" ||
+ substr($messages[$j]["SUBJECT-SORT"], 0, 3) == "aw:")
+ $messages[$j]["SUBJECT-SORT"] = trim(substr($messages[$j]["SUBJECT-SORT"], 3));
$num = 0;
while ($num < count($flags[$j])) {
if (($sort == 0) || ($sort == 1))
$msort = array_cleave ($msgs, "TIME_STAMP");
if (($sort == 2) || ($sort == 3))
- $msort = array_cleave ($msgs, "FROM");
+ $msort = array_cleave ($msgs, "FROM-SORT");
if (($sort == 4) || ($sort == 5))
- $msort = array_cleave ($msgs, "SUBJECT");
+ $msort = array_cleave ($msgs, "SUBJECT-SORT");
if(($sort % 2) == 1) {
asort($msort);
global $folder_prefix, $sent_folder;
global $imapServerAddress;
- // do a check to see if the config stuff has already been included or not
-// if (!isset($imapServerAddress))
-// include("../config/config.php");
-
// if cache isn't already set, do it now
if (!session_is_registered("msgs"))
session_register("msgs");
if (!session_is_registered("msort"))
session_register("msort");
+
if ($startMessage + ($show_num - 1) < $numMessages) {
$endMessage = $startMessage + ($show_num-1);
} else {
$endMessage = $numMessages;
}
-
+
+ if ($endMessage < $startMessage) {
+ $startMessage = $startMessage - $show_num;
+ if ($startMessage < 1)
+ $startMessage = 1;
+ }
+
$nextGroup = $startMessage + $show_num;
$prevGroup = $startMessage - $show_num;
$urlMailbox = urlencode($mailbox);
+ do_hook("mailbox_index_before");
/** This is the beginning of the message list table. It wraps around all messages */
- echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1>";
+ echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=0>";
if ($startMessage < $endMessage) {
echo "<TR BGCOLOR=\"$color[4]\"><TD>";
- echo "<CENTER>". _("Viewing messages ") ."<B>$startMessage</B>". _(" to ") ."<B>$endMessage</B> ($numMessages total)</CENTER>\n";
+ echo "<CENTER>". _("Viewing messages") ." <B>$startMessage</B> ". _("to") ." <B>$endMessage</B> ($numMessages " . _("total") . ")</CENTER>\n";
echo "</TD></TR>\n";
} else if ($startMessage == $endMessage) {
echo "<TR BGCOLOR=\"$color[4]\"><TD>";
- echo "<CENTER>". _("Viewing message ") ."<B>$startMessage</B> ($numMessages ". _("total") .")</CENTER>\n";
+ echo "<CENTER>". _("Viewing message") ." <B>$startMessage</B> ($numMessages " . _("total") . ")</CENTER>\n";
echo "</TD></TR>\n";
}
echo "<TR BGCOLOR=\"$color[4]\"><TD>";
if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) {
- echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") ."</A>\n";
+ echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") ."</A> | \n";
echo "<A HREF=\"right_main.php?use_mailbox_cache=1&&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Next") ."</A>\n";
}
else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) {
- echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") ."</A>\n";
- echo "<FONT COLOR=\"$color[9]\">Next</FONT>\n";
+ echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Previous") ."</A> | \n";
+ echo "<FONT COLOR=\"$color[9]\">"._("Next")."</FONT>\n";
}
else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
- echo "<FONT COLOR=\"$color[9]\">Previous</FONT>\n";
+ echo "<FONT COLOR=\"$color[9]\">"._("Previous")."</FONT> | \n";
echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">". _("Next") ."</A>\n";
}
echo "</TD></TR>\n";
echo "<TR><TD BGCOLOR=\"$color[0]\">";
echo "\n\n\n<FORM name=messageList method=post action=\"move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$startMessage\">";
- echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0>\n";
+ do_hook("mailbox_form_before");
+ echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0>\n";
echo " <TR>\n";
- echo " <TD WIDTH=60% ALIGN=LEFT>\n";
+ echo " <TD WIDTH=60% ALIGN=LEFT VALIGN=CENTER>\n";
echo " <NOBR><SMALL>". _("Move selected to:") ."</SMALL>";
echo " <TT><SMALL><SELECT NAME=\"targetMailbox\">";
echo "</TD></TR>";
echo "<TR><TD BGCOLOR=\"$color[0]\">";
- echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1 BGCOLOR=\"$color[4]\">";
+ echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1 BGCOLOR=\"$color[0]\">";
echo "<TR BGCOLOR=\"$color[5]\" ALIGN=\"center\">";
echo " <TD WIDTH=1%><B> </B></TD>";
/** FROM HEADER **/
if ($numMessages == 0) { // if there's no messages in this folder
echo "<TR><TD BGCOLOR=\"$color[4]\" COLSPAN=5><CENTER><BR><B>". _("THIS FOLDER IS EMPTY") ."</B><BR> </CENTER></TD></TR>";
} else if ($startMessage == $endMessage) { // if there's only one message in the box, handle it different.
- $i = $startMessage - 1;
+ $i = $startMessage;
reset($msort);
do {
$key = key($msort);
next($msort);
$k++;
} while (isset ($key) && ($k < $i));
- printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage);
+ printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0);
} else {
$i = $startMessage;
reset($msort);
} while (isset ($key) && ($k < $i));
do {
- printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage);
+ printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0);
$key = key($msort);
$t++;
$i++;
echo "<TR BGCOLOR=\"$color[4]\"><TD>";
if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) {
- echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Previous") . "</A>\n";
+ echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Previous") . "</A> | \n";
echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Next") . "</A>\n";
}
else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) {
- echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Previous") . "</A>\n";
+ echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$prevGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Previous") . "</A> | \n";
echo "<FONT COLOR=\"$color[9]\">" . _("Next") . "</FONT>\n";
}
else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) {
- echo "<FONT COLOR=\"$color[9]\">Previous</FONT>\n";
+ echo "<FONT COLOR=\"$color[9]\">" . _("Previous"). "</FONT> | \n";
echo "<A HREF=\"right_main.php?use_mailbox_cache=1&startMessage=$nextGroup&mailbox=$urlMailbox\" TARGET=\"right\">" . _("Next") . "</A>\n";
}
- echo "</TD></TR></TABLE>"; /** End of message-list table */
+ echo "</TD></TR></table>"; /** End of message-list table */
+ do_hook("mailbox_index_after");
}
?>
projects / squirrelmail.git / blobdiff