global $color, $msgs, $msort;
global $sent_folder;
global $message_highlight_list;
+ global $index_order;
$msg = $msgs[$key];
$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 ($mailbox == $sent_folder) { $italic = "<i>"; $italic_end = "</i>"; }
for ($i=0; $i < count($message_highlight_list); $i++) {
- if ($message_highlight_list[$i]["match_type"] == "to_cc") {
- if (eregi($message_highlight_list[$i]["value"],$msg["TO"]) || eregi($message_highlight_list[$i]["value"],$msg["CC"])) {
+ 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;
- }
- } else if (eregi($message_highlight_list[$i]["value"],$msg[strtoupper($message_highlight_list[$i]["match_type"])])) {
- $hlt_color = $message_highlight_list[$i]["color"];
- continue;
- }
+ }
+ }
}
if (!$hlt_color)
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>";
- 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>";
- else echo " <td bgcolor=$hlt_color width=1%> </td>";
- echo " <td bgcolor=$hlt_color width=%>$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";
+
+ for ($i=1; $i <= count($index_order); $i++) {
+ switch ($index_order[$i]) {
+ case 1: # checkbox
+ echo " <td width=1% bgcolor=$hlt_color align=center><input type=checkbox name=\"msg[$t]\" value=".$msg["ID"]."$checked></TD>\n";
+ break;
+ case 2: # from
+ echo " <td width=30% bgcolor=$hlt_color>$italic$bold$flag$senderName$flag_end$bold_end$italic_end</td>\n";
+ break;
+ case 3: # date
+ echo " <td nowrap width=1% bgcolor=$hlt_color><center>$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end</center></td>\n";
+ break;
+ case 4: # subject
+ 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";
+ break;
+ case 5: # flags
+ $stuff = false;
+ echo " <td bgcolor=$hlt_color width=1%><b><small>\n";
+ if ($msg["FLAG_ANSWERED"] == true) {
+ echo "A\n";
+ $stuff = true;
+ }
+ if ($msg["TYPE0"] == "multipart") {
+ echo "+\n";
+ $stuff = true;
+ }
+ if (ereg("(1|2)",substr($msg["PRIORITY"],0,1))) {
+ echo "<font color=$color[1]>!</font>\n";
+ $stuff = true;
+ }
+ if (!$stuff) echo " \n";
+ echo "</small></b></td>\n";
+ break;
+ case 6: # size
+ echo " <td bgcolor=$hlt_color width=1%>$bold".show_readable_size($msg['SIZE'])."$bold_end</td>\n";
+ break;
+ }
+ }
+
echo "</tr>\n";
}
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) {
$to[$q] = $hdr->to;
$priority[$q] = $hdr->priority;
$cc[$q] = $hdr->cc;
+ $size[$q] = $hdr->size;
+ $type[$q] = $hdr->type0;
$flags[$q] = sqimap_get_flags ($imapConnection, $q+1);
}
$messages[$j]["TO"] = decodeHeader($to[$j]);
$messages[$j]["PRIORITY"] = $priority[$j];
$messages[$j]["CC"] = $cc[$j];
+ $messages[$j]["SIZE"] = $size[$j];
+ $messages[$j]["TYPE0"] = $type[$j];
# fix SUBJECT-SORT to remove Re:
if (substr($messages[$j]["SUBJECT-SORT"], 0, 3) == "re:" ||
function displayMessageArray($imapConnection, $numMessages, $startMessage, &$msgs, $msort, $mailbox, $sort, $color,$show_num) {
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");
+ global $index_order;
// if cache isn't already set, do it now
if (!session_is_registered("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);
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 cellpadding=0 cellspacing=0>\n";
+ echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0 width=100%>\n";
echo " <TR>\n";
echo " <TD WIDTH=60% ALIGN=LEFT VALIGN=CENTER>\n";
echo " <NOBR><SMALL>". _("Move selected to:") ."</SMALL>";
echo " </TD>";
echo " </TR>\n";
- echo "</TABLE>\n\n\n";
+ echo "</TABLE>\n";
+ do_hook("mailbox_form_before");
echo "</TD></TR>";
echo "<TR><TD BGCOLOR=\"$color[0]\">";
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 ($mailbox == $sent_folder)
- echo " <TD WIDTH=30%><B>". _("To") ."</B>";
- else
- echo " <TD WIDTH=30%><B>". _("From") ."</B>";
-
- if ($sort == 2)
- echo " <A HREF=\"right_main.php?newsort=3&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
- else if ($sort == 3)
- echo " <A HREF=\"right_main.php?newsort=2&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
- else
- echo " <A HREF=\"right_main.php?newsort=3&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
- /** DATE HEADER **/
- echo " <TD nowrap WIDTH=1%><B>". _("Date") ."</B>";
- if ($sort == 0)
- echo " <A HREF=\"right_main.php?newsort=1&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
- else if ($sort == 1)
- echo " <A HREF=\"right_main.php?newsort=0&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
- else
- echo " <A HREF=\"right_main.php?newsort=0&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
- echo " <TD WIDTH=1%> </TD>\n";
- /** SUBJECT HEADER **/
- echo " <TD WIDTH=%><B>". _("Subject") ."</B>\n";
- if ($sort == 4)
- echo " <A HREF=\"right_main.php?newsort=5&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
- else if ($sort == 5)
- echo " <A HREF=\"right_main.php?newsort=4&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
- else
- echo " <A HREF=\"right_main.php?newsort=5&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
+ for ($i=1; $i <= count($index_order); $i++) {
+ switch ($index_order[$i]) {
+ case 1: # checkbox
+ echo " <TD WIDTH=1%><B> </B></TD>";
+ break;
+ case 2: # from
+ if ($mailbox == $sent_folder)
+ echo " <TD WIDTH=30%><B>". _("To") ."</B>";
+ else
+ echo " <TD WIDTH=30%><B>". _("From") ."</B>";
+
+ if ($sort == 2)
+ echo " <A HREF=\"right_main.php?newsort=3&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
+ else if ($sort == 3)
+ echo " <A HREF=\"right_main.php?newsort=2&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
+ else
+ echo " <A HREF=\"right_main.php?newsort=3&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
+ break;
+ case 3: # date
+ echo " <TD nowrap WIDTH=1%><B>". _("Date") ."</B>";
+ if ($sort == 0)
+ echo " <A HREF=\"right_main.php?newsort=1&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
+ else if ($sort == 1)
+ echo " <A HREF=\"right_main.php?newsort=0&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
+ else
+ echo " <A HREF=\"right_main.php?newsort=0&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
+ break;
+ case 4: # subject
+ echo " <TD WIDTH=%><B>". _("Subject") ."</B>\n";
+ if ($sort == 4)
+ echo " <A HREF=\"right_main.php?newsort=5&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/up_pointer.gif\" BORDER=0></A></TD>\n";
+ else if ($sort == 5)
+ echo " <A HREF=\"right_main.php?newsort=4&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/down_pointer.gif\" BORDER=0></A></TD>\n";
+ else
+ echo " <A HREF=\"right_main.php?newsort=5&startMessage=1&mailbox=$urlMailbox\" TARGET=\"right\"><IMG SRC=\"../images/sort_none.gif\" BORDER=0></A></TD>\n";
+ break;
+ case 5: # flags
+ echo " <TD WIDTH=1%> </TD>\n";
+ break;
+ case 6: # size
+ echo " <TD WIDTH=1%><b>" . _("Size")."</b></TD>\n";
+ break;
+ }
+ }
echo "</TR>";
+
// loop through and display the info for each message.
$t = 0; // $t is used for the checkbox number
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>";
+ echo "<TR><TD BGCOLOR=\"$color[4]\" COLSPAN=" . count($index_order);
+ echo "><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);
} while ($i < ($endMessage+1));
}
- echo "</FORM></TABLE>";
+ echo "</TABLE>";
echo "</TABLE>\n";
echo "</TD></TR>\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 "</form>";
echo "</TD></TR></table>"; /** End of message-list table */
do_hook("mailbox_index_after");
projects / squirrelmail.git / blobdiff