$status = array('','');
if (($unseen_notify == 2 && $real_box == 'INBOX') ||
$unseen_notify == 3) {
- $tmp_status = create_unseen_string($real_box, $box_array, $imapConnection, $unseen_type );
- if ($status !== false) {
- $status = $tmp_status;
- }
+ $tmp_status = create_unseen_string($real_box, $box_array, $imapConnection, $unseen_type );
+ if ($status !== false) {
+ $status = $tmp_status;
+ }
}
list($unseen_string, $unseen) = $status;
$special_color = ($use_special_folder_color && isSpecialMailbox($real_box));
$line = '';
/* If there are unseen message, bold the line. */
- if ($unseen > 0) { $line .= '<B>'; }
+ if ($unseen > 0) { $line .= '<b>'; }
/* Create the link for this folder. */
if ($status !== false) {
- $line .= '<a href="right_main.php?PG_SHOWALL=0&sort=0&startMessage=1&mailbox='.
- $mailboxURL.'" TARGET="right" STYLE="text-decoration:none">';
+ $line .= '<a href="right_main.php?PG_SHOWALL=0&startMessage=1&mailbox='.
+ $mailboxURL.'" target="right" style="text-decoration:none">';
}
if ($special_color) {
$line .= "<font color=\"$color[11]\">";
if ($special_color == TRUE)
$line .= '</font>';
if ($status !== false) {
- $line .= '</a>';
+ $line .= '</a>';
}
/* If there are unseen message, close bolding. */
- if ($unseen > 0) { $line .= "</B>"; }
+ if ($unseen > 0) { $line .= "</b>"; }
/* Print unseen information. */
if ($unseen_string != '') {
- $line .= " <SMALL>$unseen_string</SMALL>";
+ $line .= " <small>$unseen_string</small>";
}
/* If it's the trash folder, show a purge link when needed */
if (($numMessages > 0) or ($box_array['parent'] == 1)) {
$urlMailbox = urlencode($real_box);
$line .= "\n<small>\n" .
- " (<A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A>)" .
- "</small>";
+ ' [<a href="empty_trash.php">'._("Purge").'</a>]' .
+ '</small>';
}
}
'href="left_main.php?';
if ($boxes[$boxnum]['collapse'] == SM_BOX_COLLAPSED) {
if ($use_icons && $icon_theme != 'none') {
- $link .= "unfold=$mailbox\"><IMG src=\"" . SM_PATH . "images/plus.png\" border=\"0\" height=\"7\" width=\"7\">";
+ $link .= "unfold=$mailbox\"><img src=\"" . SM_PATH . 'images/plus.png" border="0" height="7" width="7" />';
} else {
$link .= "unfold=$mailbox\">+";
}
} else {
if ($use_icons && $icon_theme != 'none') {
- $link .= "fold=$mailbox\"><IMG src=\"" . SM_PATH . "images/minus.png\" border=\"0\" height=\"7\" width=\"7\">";
+ $link .= "fold=$mailbox\"><img src=\"" . SM_PATH . 'images/minus.png" border="0" height="7" width="7" />';
} else {
$link .= "fold=$mailbox\">-";
}
$status = sqimap_status_messages($imapConnection, $boxName);
$boxUnseenCount = $status['UNSEEN'];
if ($boxUnseenCount === false) {
- return false;
+ return false;
}
if ($unseen_type == 2) {
$boxMessageCount = $status['MESSAGES'];
/* Collect the counts for this subfolder. */
if (($boxName != $boxes[$i]['unformatted'])
- && (substr($boxes[$i]['unformatted'], 0, $curBoxLength) == $boxName)
- && !in_array('noselect', $boxes[$i]['flags'])) {
- $status = sqimap_status_messages($imapConnection, $boxes[$i]['unformatted']);
- $subUnseenCount = $status['UNSEEN'];
+ && (substr($boxes[$i]['unformatted'], 0, $curBoxLength) == $boxName)
+ && !in_array('noselect', $boxes[$i]['flags'])) {
+ $status = sqimap_status_messages($imapConnection, $boxes[$i]['unformatted']);
+ $subUnseenCount = $status['UNSEEN'];
if ($unseen_type == 2) {
$subMessageCount = $status['MESSAGES'];;
}
function ListBoxes ($boxes, $j=0 ) {
global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
- $move_to_trash, $trash_folder, $collapse_folders, $imapConnection,
+ $move_to_trash, $trash_folder, $collapse_folders, $imapConnection,
$use_icons, $icon_theme, $use_special_folder_color;
if (!isset($boxes) || empty($boxes))
$link = '<a target="left" style="text-decoration:none" ' .'href="left_main.php?';
if ($collapse) {
if ($use_icons && $icon_theme != 'none') {
- $link .= "unfold=$mailboxURL\">$leader<IMG src=\"" . SM_PATH . "images/plus.png\" border=\"0\" height=\"7\" width=\"7\"> </tt>";
+ $link .= "unfold=$mailboxURL\">$leader<img src=\"" . SM_PATH . 'images/plus.png" border="0" height="7" width="7" /> </tt>';
} else {
$link .= "unfold=$mailboxURL\">$leader+ </tt>";
}
} else {
if ($use_icons && $icon_theme != 'none') {
- $link .= "fold=$mailboxURL\">$leader<IMG src=\"" . SM_PATH . "images/minus.png\" border=\"0\" height=\"7\" width=\"7\"> </tt>";
+ $link .= "fold=$mailboxURL\">$leader<img src=\"" . SM_PATH . 'images/minus.png" border="0" height="7" width="7" /> </tt>';
} else {
$link .= "fold=$mailboxURL\">$leader- </tt>";
}
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>';
}
$end .= " <small>$unseen_string</small>";
}
$end .= "\n<small>\n" .
- " (<a href=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</a>)" .
- "</small>";
+ ' [<a href="empty_trash.php">'._("Purge").'</a>]'.
+ '</small>';
}
} else {
if (!$boxes->is_noselect) {
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>';
}
// 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>';
function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
- $move_to_trash, $trash_folder, $collapse_folders, $use_special_folder_color;
+ $move_to_trash, $trash_folder, $collapse_folders, $use_special_folder_color;
if (!isset($boxes) || empty($boxes))
return;
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);
$end .= "\n<small>\n" .
- " (<a class=\"mbx_link\" href=\"empty_trash.php\">"._("purge")."</a>)" .
- "</small>";
+ ' [<a class="mbx_link" href="empty_trash.php">'._("Purge").'</a>]'.
+ '</small>';
}
} 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 ($advanced_tree) {
$xtra .= <<<ECHO
-<script language="Javascript" TYPE="text/javascript">
+<script language="Javascript" type="text/javascript">
<!--
function hidechilds(img) {
id = img.id + ".0000";
form_id = "mbx[" + img.id +"F]";
- if (document.all) { //IE, Opera7
+ if (document.all) { //IE, Opera7
div = document.all[id];
if (div) {
if (div.style.display == "none") {
}
vTreeImg = img;
vTreeDiv = div;
- if (typeof vTreeDiv.readyState != "undefined") //IE
+ if (typeof vTreeDiv.readyState != "undefined") //IE
setTimeout("fTreeTimeout()",100);
- else //Non IE
+ else //Non IE
vTreeImg.src = vTreeSrc;
div.style.display = style;
document.all[form_id].value = value;
}
}
- else if (document.getElementById) { //Gecko
+ else if (document.getElementById) { //Gecko
div = document.getElementById(id);
if (div) {
if (div.style.display == "none") {
$xtra .= <<<ECHO
if (document.all) {
masterf = window.parent.document.all["fs1"];
- leftf = window.parent.document.all["left"];
- leftcontent = document.all["leftframe"];
- leftbutton = document.all["showf"];
+ leftf = window.parent.document.all["left"];
+ leftcontent = document.all["leftframe"];
+ leftbutton = document.all["showf"];
} else if (document.getElementById) {
- masterf = window.parent.document.getElementById("fs1");
- leftf = window.parent.document.getElementById("left");
- leftcontent = document.getElementById("leftframe");
- leftbutton = document.getElementById("showf");
+ masterf = window.parent.document.getElementById("fs1");
+ leftf = window.parent.document.getElementById("left");
+ leftcontent = document.getElementById("leftframe");
+ leftbutton = document.getElementById("showf");
} else {
return false;
}
if(hide) {
new_col = calc_col("20");
masterf.cols = new_col;
- document.body.scrollLeft=0;
- document.body.style.overflow='hidden';
- leftcontent.style.display = 'none';
- leftbutton.style.display='block';
+ document.body.scrollLeft=0;
+ document.body.style.overflow='hidden';
+ leftcontent.style.display = 'none';
+ leftbutton.style.display='block';
} else {
masterf.cols = calc_col(left_size);
- document.body.style.overflow='';
- leftbutton.style.display='none';
- leftcontent.style.display='block';
+ document.body.style.overflow='';
+ leftbutton.style.display='none';
+ leftcontent.style.display='block';
}
}
if (document.all) {
masterf = window.parent.document.all["fs1"];
} else if (document.getElementById) {
- window.parent.document.getElementById("fs1");
+ window.parent.document.getElementById("fs1");
} else {
return false;
}
}
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);
}
}
}
sqsession_register($auto_create_done, 'auto_create_done');
}
-if ($advanced_tree)
- echo "\n<body" .
- ' onload="preload(\'../images/minus.png\',\'../images/plus.png\')"' .
- " bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
-else
- echo "\n<body bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
+if ($advanced_tree) {
+ echo "\n<body" .
+ ' onload="preload(\'../images/minus.png\',\'../images/plus.png\')"' .
+ " bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
+} else {
+ echo "\n<body bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
+}
do_hook('left_main_before');
if ($advanced_tree) {
/* nice future feature, needs layout !! volunteers? */
$right_pos = $left_size - 20;
-/* echo '<div style="position:absolute;top:0;border=solid;border-width:0.1em;border-color:blue;"><div ID="hidef" style="width=20;font-size:12"><A HREF="javascript:hideframe(true)"><b><<</b></a></div>';
- echo '<div ID="showf" style="width=20;font-size:12;display:none;"><a href="javascript:hideframe(false)"><b>>></b></a></div>';
- echo '<div ID="incrf" style="width=20;font-size:12"><a href="javascript:resizeframe(true)"><b>></b></a></div>';
- echo '<div ID="decrf" style="width=20;font-size:12"><a href="javascript:resizeframe(false)"><b><</b></a></div></div>';
- echo '<div ID="leftframe"><br /><br />';*/
+/* echo '<div style="position:absolute;top:0;border=solid;border-width:0.1em;border-color:blue;"><div id="hidef" style="width=20;font-size:12"><a href="javascript:hideframe(true)"><b><<</b></a></div>';
+ echo '<div id="showf" style="width=20;font-size:12;display:none;"><a href="javascript:hideframe(false)"><b>>></b></a></div>';
+ echo '<div id="incrf" style="width=20;font-size:12"><a href="javascript:resizeframe(true)"><b>></b></a></div>';
+ echo '<div id="decrf" style="width=20;font-size:12"><a href="javascript:resizeframe(false)"><b><</b></a></div></div>';
+ echo '<div id="leftframe"><br /><br />';*/
}
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. */
switch( $date_format ) {
case 0:
- $clk = date('Y-m-d '.$hr. ' T', time());
- break;
+ $clk = date('Y-m-d '.$hr. ' T', time());
+ break;
case 1:
$clk = date('m/d/y '.$hr, time());
break;
}
$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 ) {
}
/* Put the final touches on our folder line. */
- $line .= "</nobr><br>\n";
+ $line .= "</nobr><br />\n";
/* Output the line for this folder. */
echo $line;
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 ... */
do_hook('left_main_after');
sqimap_logout($imapConnection);
-echo '</td></tr></table>' . "\n".
- "</div></body></html>\n";
-
?>
+</td></tr></table>
+</div></body></html>
projects / squirrelmail.git / blobdiff