/* Create the link for this folder. */
if ($status !== false) {
- $line .= '<a href="right_main.php?PG_SHOWALL=0&sort=0&startMessage=1&mailbox='.
+ $line .= '<a href="right_main.php?PG_SHOWALL=0&startMessage=1&mailbox='.
$mailboxURL.'" TARGET="right" STYLE="text-decoration:none">';
}
if ($special_color) {
if ( $mailbox == 'INBOX' ) {
$line .= _("INBOX");
} else {
- $line .= str_replace(' ',' ',$mailbox);
+ $line .= str_replace(array(' ','<','>'),array(' ','<','>'),$mailbox);
}
if ($special_color == TRUE)
$line .= '</font>';
function ListBoxes ($boxes, $j=0 ) {
global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
- $move_to_trash, $trash_folder, $collapse_folders, $imapConnection,
- $use_icons, $icon_theme;
+ $move_to_trash, $trash_folder, $collapse_folders, $imapConnection,
+ $use_icons, $icon_theme, $use_special_folder_color;
if (!isset($boxes) || empty($boxes))
return;
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&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
if ($unseen > 0) {
$end .= '</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&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
if ($unseen > 0) {
$end .= '</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&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
if ($unseen > 0) {
$end .= '</b>';
}
$font = '';
$fontend = '';
- if ($boxes->is_special) {
+ if ($use_special_folder_color && $boxes->is_special) {
$font = "<font color=\"$color[11]\">";
$fontend = "</font>";
}
// let plugins fiddle with end of line
$end .= concat_hook_function('left_main_after_each_folder',
- array(isset($numMessages) ? $numMessages : '',
+ array(isset($numMessages) ? $numMessages : '',
$boxes->mailboxname_full, $imapConnection));
$end .= '</nobr>';
if (!$boxes->is_root) {
- echo "" . $pre .$font. $boxes->mailboxname_sub .$fontend . $end. '<br />' . "\n";
+ echo "" . $pre .$font. str_replace(array(' ','<','>'),array(' ','<','>'),$boxes->mailboxname_sub) .$fontend . $end. '<br />' . "\n";
$j++;
}
function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
- $move_to_trash, $trash_folder, $collapse_folders;
+ $move_to_trash, $trash_folder, $collapse_folders, $use_special_folder_color;
if (!isset($boxes) || empty($boxes))
return;
if ($unseen > 0) { $pre .= '<b>'; }
/* color special boxes */
- if ($boxes->is_special) {
+ if ($use_special_folder_color && $boxes->is_special) {
$pre .= "<font color=\"$color[11]\">";
$end .= '</font>';
}
if (! isset($numMessages)) {
$numMessages = $boxes->total;
}
- $pre = "<a class=\"mbx_link\" href=\"right_main.php?PG_SHOWALL=0&sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\">" . $pre;
+ $pre = "<a class=\"mbx_link\" href=\"right_main.php?PG_SHOWALL=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\">" . $pre;
$end .= '</a>';
if ($numMessages > 0) {
$urlMailbox = urlencode($mailbox);
}
} else {
if (!$boxes->is_noselect) { /* \Noselect boxes can't be selected */
- $pre = "<a class=\"mbx_link\" href=\"right_main.php?PG_SHOWALL=0&sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\">" . $pre;
+ $pre = "<a class=\"mbx_link\" href=\"right_main.php?PG_SHOWALL=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\">" . $pre;
$end .= '</a>';
}
}
// let plugins fiddle with end of line
global $imapConnection;
$end .= concat_hook_function('left_main_after_each_folder',
- array(isset($numMessages) ? $numMessages : '',
+ array(isset($numMessages) ? $numMessages : '',
$boxes->mailboxname_full, $imapConnection));
if (!$boxes->is_root) {
}
if (!isset($boxes->mbxs[0])) {
echo ' ' . html_tag( 'div',
- '<tt>'. $pre . $folder_img . '</tt>'. $boxes->mailboxname_sub . $end,
+ '<tt>'. $pre . $folder_img . '</tt>'. str_replace(array(' ','<','>'),array(' ','<','>'),$boxes->mailboxname_sub) . $end,
'left', '', 'class="mbx_sub" id="' .$j. '"' ) . "\n";
} else {
/* get collapse information */
}
displayHtmlHeader( 'SquirrelMail', $xtra );
-
+sqgetGlobalVar('auto_create_done',$auto_create_done,SQ_SESSION);
/* If requested and not yet complete, attempt to autocreate folders. */
if ($auto_create_special && !isset($auto_create_done)) {
$autocreate = array($sent_folder, $trash_folder, $draft_folder);
if (($folder != '') && ($folder != 'none')) {
if ( !sqimap_mailbox_exists($imapConnection, $folder)) {
sqimap_mailbox_create($imapConnection, $folder, '');
- } else if (!sqimap_mailbox_is_subscribed($imapConnection, $folder)) {
- sqimap_subscribe($imapConnection, $folder);
+ } else {
+ //if (!sqimap_mailbox_is_subscribed($imapConnection, $folder)) {
+ // check for subscription is useless and expensive just
+ // surpress the NO response
+ sqimap_subscribe($imapConnection, $folder, false);
}
}
}
echo "\n\n" . html_tag( 'table', '', 'left', '', 'border="0" cellspacing="0" cellpadding="0" width="99%"' ) .
html_tag( 'tr' ) .
html_tag( 'td', '', 'left' ) .
- '<center><font size="4"><b>'. _("Folders") . "</b><br /></font>\n\n";
+ html_tag( 'table', '', '', '', 'border="0" cellspacing="0" cellpadding="0"' ) .
+ html_tag( 'tr' ) .
+ html_tag( 'td', '', 'center' ) .
+ '<font size="4"><b>'. _("Folders") . "</b><br /></font>\n\n";
if ($date_format != 6) {
/* First, display the clock. */
}
$clk = str_replace(' ',' ',$clk);
- echo '<center><small>' . str_replace(' ',' ',_("Last Refresh")) .
- ": $clk</small></center>";
+ echo '<nobr><small>' . str_replace(' ',' ',_("Last Refresh")) .
+ ": $clk</small></nobr><br />";
}
/* Next, display the refresh button. */
-echo '<small>(<a href="../src/left_main.php" target="left">'.
- _("refresh folder list") . '</a>)</small></center><br />';
+echo '<nobr><small>(<a href="../src/left_main.php" target="left">'.
+ _("Check mail") . '</a>)</small></nobr></td></tr></table><br />';
/* Lastly, display the folder list. */
if ( $collapse_folders ) {
echo '</small>';
echo '</form>'."\n";
} else {
- //sqimap_get_status_mbx_tree($imap_stream,$boxes)
+ //sqimap_get_status_mbx_tree($imap_stream,$boxes)
ListBoxes($boxes);
}
} /* if ($oldway) else ... */