';*/
}
-echo "\n\n" . html_tag( 'table', '', '', '', 'border="0" cellspacing="0" cellpadding="0" width="100%"' ) .
- html_tag( 'tr' ) .
- html_tag( 'td', '', 'left' ) .
- '
'. _("Folders") . "
\n\n";
+echo "\n\n" . html_tag( 'table', '', 'left', '', 'border="0" cellspacing="0" cellpadding="0" width="99%"' ) .
+ html_tag( 'tr' ) .
+ html_tag( 'td', '', 'left' ) .
+ html_tag( 'table', '', '', '', 'border="0" cellspacing="0" cellpadding="0" width="98%"' ) .
+ html_tag( 'tr' ) .
+ html_tag( 'td', '', 'center' ) .
+ ''. _("Folders") . "
\n\n";
if ($date_format != 6) {
/* First, display the clock. */
if ($hour_format == 1) {
- $hr = 'G:i';
+ $hr = 'H:i';
if ($date_format == 4) {
$hr .= ':s';
}
@@ -831,6 +939,9 @@ if ($date_format != 6) {
}
switch( $date_format ) {
+ case 0:
+ $clk = date('Y-m-d '.$hr. ' T', time());
+ break;
case 1:
$clk = date('m/d/y '.$hr, time());
break;
@@ -842,17 +953,18 @@ if ($date_format != 6) {
$clk = date($hr, time());
break;
default:
- $clk = substr( getDayName( date( 'w', time() ) ), 0, 3 ) . date( ', ' . $hr, time() );
+ $clk = getDayAbrv( date( 'w', time() ) ) . date( ', ' . $hr, time() );
}
$clk = str_replace(' ',' ',$clk);
- echo '' . str_replace(' ',' ',_("Last Refresh")) .
- ": $clk";
+ echo ''
+ . str_replace(' ', ' ', _("Last Refresh"))
+ . ":
$clk
";
}
/* Next, display the refresh button. */
-echo '('.
- _("refresh folder list") . ')';
+echo '
';
/* Lastly, display the folder list. */
if ( $collapse_folders ) {
@@ -864,8 +976,28 @@ if ( $collapse_folders ) {
}
}
+/* Get unseen/total display prefs */
+$unseen_type = getPref( $data_dir , $username , 'unseen_type' );
+$unseen_notify = getPref( $data_dir , $username , 'unseen_notify' );
+
+if (!isset($unseen_type) || empty($unseen_type)) {
+ if (isset($default_unseen_type) && !empty($default_unseen_type)) {
+ $unseen_type = $default_unseen_type;
+ } else {
+ $unseen_type = 1;
+ }
+}
+
+if (!isset($unseen_notify) || empty($unseen_notify)) {
+ if (isset($default_unseen_notify) && !empty($default_unseen_notify)) {
+ $unseen_notify = $default_unseen_notify;
+ } else {
+ $unseen_notify = 0;
+ }
+}
+
if ($oldway) { /* normal behaviour SM */
-
+
$boxes = sqimap_mailbox_list($imapConnection);
/* Prepare do do out collapsedness and visibility computation. */
$curbox = 0;
@@ -878,7 +1010,6 @@ while ($curbox < $boxcount) {
compute_folder_children($curbox, $boxcount);
}
-
for ($i = 0; $i < count($boxes); $i++) {
if ( $boxes[$i]['visible'] ) {
$mailbox = $boxes[$i]['formatted'];
@@ -892,7 +1023,7 @@ for ($i = 0; $i < count($boxes); $i++) {
} else {
$prefix = str_replace(' ',' ',$prefix);
}
- $line = "
$prefix";
+ $line = "$prefix";
/* Add the folder name and link. */
if (! isset($color[15])) {
@@ -901,45 +1032,48 @@ for ($i = 0; $i < count($boxes); $i++) {
if (in_array('noselect', $boxes[$i]['flags'])) {
if( isSpecialMailbox( $boxes[$i]['unformatted']) ) {
- $line .= "";
+ $line .= "";
} else {
- $line .= "";
+ $line .= "";
}
if (ereg("^( *)([^ ]*)", $mailbox, $regs)) {
$mailbox = str_replace(' ','',$mailbox);
$line .= str_replace(' ', ' ', $mailbox);
}
- $line .= '';
+ $line .= '';
} else {
$line .= formatMailboxName($imapConnection, $boxes[$i]);
}
/* Put the final touches on our folder line. */
- $line .= "
\n";
+ $line .= "\n";
/* Output the line for this folder. */
echo $line;
}
}
-} else { /* expiremental code */
+} else { /* expiremental code */
$boxes = sqimap_mailbox_tree($imapConnection);
if (isset($advanced_tree) && $advanced_tree) {
- echo '
'."\n";
+ echo '
'."\n";
} else {
- ListBoxes($boxes);
+ //sqimap_get_status_mbx_tree($imap_stream,$boxes)
+ ListBoxes($boxes);
}
} /* if ($oldway) else ... */
do_hook('left_main_after');
sqimap_logout($imapConnection);
-echo '' . "\n".
- "