projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
<SPACE> isn't allowed after MAIL FROM: and RCPT TO: (RFC2821)
[squirrelmail.git]
/
src
/
left_main.php
diff --git
a/src/left_main.php
b/src/left_main.php
index 042abd0f03160def403030e0755562d92cd763a5..71fb702868f5373e4f11e46d59a4257c064fd489 100644
(file)
--- a/
src/left_main.php
+++ b/
src/left_main.php
@@
-99,6
+99,9
@@
function formatMailboxName($imapConnection, $box_array) {
$line .= "\n<small>\n" .
" (<A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A>)" .
"</small>";
$line .= "\n<small>\n" .
" (<A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A>)" .
"</small>";
+ } else {
+ $line .= concat_hook_function('left_main_after_each_folder',
+ array(isset($numMessages) ? $numMessages : '',$real_box,$imapConnection));
}
}
}
}
@@
-292,35
+295,27
@@
function listBoxes ($boxes, $j=0 ) {
if (isset($boxes) && !empty($boxes)) {
$mailbox = $boxes->mailboxname_full;
if (isset($boxes) && !empty($boxes)) {
$mailbox = $boxes->mailboxname_full;
- $leader = '';
- for ($k = 0; $k < $j; $k++) {
- $leader.= ' ';
- }
+ $leader = '<tt>';
+ $leader .= str_repeat(' ',$j);
$mailboxURL = urlencode($mailbox);
$mailboxURL = urlencode($mailbox);
-
/* get unseen/total messages information */
/* get unseen/total messages information */
- if ($boxes->unseen) {
+ if ($boxes->unseen
!== false || $boxes->total !== false
) {
$unseen = $boxes->unseen;
$unseen_string = "($unseen)";
$unseen = $boxes->unseen;
$unseen_string = "($unseen)";
- if ($unseen>0) {
+ if ($unseen>0
||$boxes->total>0
) {
$unseen_found = TRUE;
}
$unseen_found = TRUE;
}
-
$unseen_before = '<font color="' . $color[11] . '">';
$unseen_after = '</font>';
$unseen_before = '<font color="' . $color[11] . '">';
$unseen_after = '</font>';
-
if ((($unseen_notify == 2) && (strtolower($mailbox) == 'inbox')) || ($unseen_notify == 3)) {
$unseen_string = '(' . $unseen;
if ((($unseen_notify == 2) && (strtolower($mailbox) == 'inbox')) || ($unseen_notify == 3)) {
$unseen_string = '(' . $unseen;
-
+
if ($unseen_type > 1) {
$unseen_string .= '/' . $boxes->total;
}
if ($unseen_type > 1) {
$unseen_string .= '/' . $boxes->total;
}
-
$unseen_string .= ')';
$unseen_string .= ')';
-
$unseen_string = $unseen_before . $unseen_string . $unseen_after;
}
$unseen_string = $unseen_before . $unseen_string . $unseen_after;
}
-
} else {
$unseen = 0;
}
} else {
$unseen = 0;
}
@@
-331,37
+326,30
@@
function listBoxes ($boxes, $j=0 ) {
$link = '<a target="left" style="text-decoration:none" ' .'href="left_main.php?';
if ($collapse) {
$link = '<a target="left" style="text-decoration:none" ' .'href="left_main.php?';
if ($collapse) {
- $link .= "unfold=$mailboxURL\">$leader
+
";
+ $link .= "unfold=$mailboxURL\">$leader
+ </tt>
";
} else {
} else {
- $link .= "fold=$mailboxURL\">$leader
-
";
+ $link .= "fold=$mailboxURL\">$leader
- </tt>
";
}
$link .= '</a>';
$pre .= $link;
} else {
}
$link .= '</a>';
$pre .= $link;
} else {
- $pre.= $leader . '
';
+ $pre.= $leader . '
</tt>
';
}
}
-
/* If there are unseen message, bold the line. */
/* If there are unseen message, bold the line. */
-
if (($move_to_trash) && ($mailbox == $trash_folder)) {
if (($move_to_trash) && ($mailbox == $trash_folder)) {
- if (! isset($numMessages)) {
- $status = sqimap_status_messages($imapConnection, $mailbox);
- $numMessages = $status['MESSAGES'];
+ if (! isset($boxes->total)) {
+ $boxes->total = sqimap_status_messages($imapConnection, $mailbox);
}
}
-
if ($unseen > 0) {
$pre .= '<b>';
}
if ($unseen > 0) {
$pre .= '<b>';
}
-
$pre .= "<a href=\"right_main.php?PG_SHOWALL=0&sort=0;startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
$pre .= "<a href=\"right_main.php?PG_SHOWALL=0&sort=0;startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
-
if ($unseen > 0) {
$end .= '</b>';
}
if ($unseen > 0) {
$end .= '</b>';
}
-
$end .= '</a>';
$end .= '</a>';
- if ($
numMessages
> 0) {
+ if ($
boxes->total
> 0) {
if ($unseen > 0) {
$pre .= '<b>';
}
if ($unseen > 0) {
$pre .= '<b>';
}
@@
-398,10
+386,12
@@
function listBoxes ($boxes, $j=0 ) {
$fontend = "</font>";
}
$end .= '</nobr>';
$fontend = "</font>";
}
$end .= '</nobr>';
+
if (!$boxes->is_root) {
echo "" . $pre .$font. $boxes->mailboxname_sub .$fontend . $end. '<br />' . "\n";
$j++;
}
if (!$boxes->is_root) {
echo "" . $pre .$font. $boxes->mailboxname_sub .$fontend . $end. '<br />' . "\n";
$j++;
}
+
if (!$collapse || $boxes->is_root) {
for ($i = 0; $i <count($boxes->mbxs); $i++) {
listBoxes($boxes->mbxs[$i],$j);
if (!$collapse || $boxes->is_root) {
for ($i = 0; $i <count($boxes->mbxs); $i++) {
listBoxes($boxes->mbxs[$i],$j);
@@
-426,12
+416,12
@@
function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
$mailboxURL = urlencode($mailbox);
/* get unseen/total messages information */
$mailboxURL = urlencode($mailbox);
/* get unseen/total messages information */
-
if ($boxes->unseen
) {
+
if ($boxes->unseen !== false
) {
$unseen = $boxes->unseen;
$unseen = $boxes->unseen;
-
$unseen_string = "($unseen)";
+ $unseen_string = "($unseen)";
if ($unseen>0) $unseen_found = TRUE;
if ($unseen>0) $unseen_found = TRUE;
-
if ($boxes->total) {
- $numMessages = $boxes->total;
+ if ($boxes->total) {
+
$numMessages = $boxes->total;
$unseen_string = "<font color=\"$color[11]\">($unseen/$numMessages)</font>";
}
} else $unseen = 0;
$unseen_string = "<font color=\"$color[11]\">($unseen/$numMessages)</font>";
}
} else $unseen = 0;
@@
-587,7
+577,7
@@
if (isset($left_refresh) && ($left_refresh != '') &&
**/
$advanced_tree = false; /* set this to true if you want to see a nicer mailboxtree */
**/
$advanced_tree = false; /* set this to true if you want to see a nicer mailboxtree */
-$oldway = false; /* default SM behaviour */
+$oldway = false;
/* default SM behaviour */
if ($advanced_tree) {
$xtra .= <<<ECHO
if ($advanced_tree) {
$xtra .= <<<ECHO
@@
-985,6
+975,7
@@
for ($i = 0; $i < count($boxes); $i++) {
echo '</div></small>'."\n";
echo '</form>'."\n";
} else {
echo '</div></small>'."\n";
echo '</form>'."\n";
} else {
+ //sqimap_get_status_mbx_tree($imap_stream,$boxes)
ListBoxes($boxes);
}
} /* if ($oldway) else ... */
ListBoxes($boxes);
}
} /* if ($oldway) else ... */