X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fleft_main.php;h=99121dee1aa027d4d51ca8d67c6e047655798250;hp=7b0ad989e171f4e3b3c19263a059c76aad852d42;hb=b9f7585798177fd77a151ea644324b8833fef810;hpb=e164659022d8fa13d368b99ef81dbd632edc4381 diff --git a/src/left_main.php b/src/left_main.php index 7b0ad989..99121dee 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -3,16 +3,20 @@ /** * left_main.php * - * Copyright (c) 1999-2003 The SquirrelMail Project Team + * Copyright (c) 1999-2005 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This is the code for the left bar. The left bar shows the folders * available, and has cookie information. * - * $Id$ + * @version $Id$ + * @package squirrelmail */ -/* Path for SquirrelMail required files. */ +/** + * Path for SquirrelMail required files. + * @ignore + */ define('SM_PATH','../'); /* SquirrelMail required files. */ @@ -21,6 +25,7 @@ require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/plugin.php'); require_once(SM_PATH . 'functions/page_header.php'); require_once(SM_PATH . 'functions/html.php'); +require_once(SM_PATH . 'functions/date.php'); /* These constants are used for folder stuff. */ define('SM_BOX_UNCOLLAPSED', 0); @@ -30,11 +35,8 @@ define('SM_BOX_COLLAPSED', 1); function formatMailboxName($imapConnection, $box_array) { - global $folder_prefix, $trash_folder, $sent_folder, - $color, $move_to_sent, $move_to_trash, - $unseen_notify, $unseen_type, $collapse_folders, - $draft_folder, $save_as_draft, - $use_special_folder_color; + global $trash_folder, $color, $move_to_trash, + $unseen_notify, $unseen_type, $use_special_folder_color; $real_box = $box_array['unformatted']; $mailbox = str_replace(' ','',$box_array['formatted']); $mailboxURL = urlencode($real_box); @@ -47,10 +49,10 @@ function formatMailboxName($imapConnection, $box_array) { $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)); @@ -59,12 +61,12 @@ function formatMailboxName($imapConnection, $box_array) { $line = ''; /* If there are unseen message, bold the line. */ - if ($unseen > 0) { $line .= ''; } + if ($unseen > 0) { $line .= ''; } /* Create the link for this folder. */ if ($status !== false) { - $line .= ''; + $line .= ''; } if ($special_color) { $line .= ""; @@ -72,20 +74,20 @@ function formatMailboxName($imapConnection, $box_array) { if ( $mailbox == 'INBOX' ) { $line .= _("INBOX"); } else { - $line .= str_replace(' ',' ',$mailbox); + $line .= str_replace(array(' ','<','>'),array(' ','<','>'),$mailbox); } if ($special_color == TRUE) $line .= ''; if ($status !== false) { - $line .= ''; + $line .= ''; } /* If there are unseen message, close bolding. */ - if ($unseen > 0) { $line .= ""; } + if ($unseen > 0) { $line .= ""; } /* Print unseen information. */ if ($unseen_string != '') { - $line .= " $unseen_string"; + $line .= " $unseen_string"; } /* If it's the trash folder, show a purge link when needed */ @@ -97,15 +99,17 @@ function formatMailboxName($imapConnection, $box_array) { if (($numMessages > 0) or ($box_array['parent'] == 1)) { $urlMailbox = urlencode($real_box); $line .= "\n\n" . - "  ("._("purge").")" . - ""; + '  ['._("Purge").']' . + ''; } - } else { - $line .= concat_hook_function('left_main_after_each_folder', - array(isset($numMessages) ? $numMessages : '', - $real_box, $imapConnection)); } + + // let plugins fiddle with end of line + $line .= concat_hook_function('left_main_after_each_folder', + array(isset($numMessages) ? $numMessages : '', $real_box, $imapConnection)); + + /* Return the final product. */ return ($line); } @@ -166,16 +170,24 @@ function compute_folder_children(&$parbox, $boxcount) { * currently appropriate. */ function create_collapse_link($boxnum) { - global $boxes, $imapConnection, $unseen_notify, $color; + global $boxes, $unseen_notify, $color, $use_icons, $icon_theme; $mailbox = urlencode($boxes[$boxnum]['unformatted']); /* Create the link for this collapse link. */ $link = '+"; + if ($use_icons && $icon_theme != 'none') { + $link .= "unfold=$mailbox\">'; + } else { + $link .= "unfold=$mailbox\">+"; + } } else { - $link .= "fold=$mailbox\">-"; + if ($use_icons && $icon_theme != 'none') { + $link .= "fold=$mailbox\">'; + } else { + $link .= "fold=$mailbox\">-"; + } } $link .= ''; @@ -192,11 +204,10 @@ function create_collapse_link($boxnum) { * @param string $boxName name of the current mailbox * @param array $boxArray array for the current mailbox * @param $imapConnection current imap connection in use - * @return array[0] unseen message string (for display) - * @return array[1] unseen message count + * @return array unseen message string (for display), unseen message count */ function create_unseen_string($boxName, $boxArray, $imapConnection, $unseen_type) { - global $boxes, $unseen_type, $color, $unseen_cum; + global $boxes, $color, $unseen_cum; /* Initialize the return value. */ $result = array(0,0); @@ -211,7 +222,7 @@ function create_unseen_string($boxName, $boxArray, $imapConnection, $unseen_type $status = sqimap_status_messages($imapConnection, $boxName); $boxUnseenCount = $status['UNSEEN']; if ($boxUnseenCount === false) { - return false; + return false; } if ($unseen_type == 2) { $boxMessageCount = $status['MESSAGES']; @@ -231,10 +242,10 @@ function create_unseen_string($boxName, $boxArray, $imapConnection, $unseen_type /* 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'];; } @@ -281,140 +292,162 @@ function is_parent_box($curbox_name, $parbox_name) { return ($parbox_name == $actual_parname); } -function listBoxes ($boxes, $j=0 ) { - global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type, - $move_to_trash, $trash_folder, $collapse_folders, $imapConnection; +function ListBoxes ($boxes, $j=0 ) { + global $data_dir, $username, $color, $unseen_notify, $unseen_type, + $move_to_trash, $trash_folder, $collapse_folders, $imapConnection, + $use_icons, $icon_theme, $use_special_folder_color; + + if (!isset($boxes) || empty($boxes)) + return; + $pre = ''; $end = ''; $collapse = false; - $unseen_type = 1; - $unseen_notify = 0; + $unseen_found = false; + $unseen = 0; - /* Get unseen/total display prefs */ - $unseen_type = getPref( $data_dir , $username , 'unseen_type' ); - $unseen_notify = getPref( $data_dir , $username , 'unseen_notify' ); + $mailbox = $boxes->mailboxname_full; + $leader = ''; + $leader .= str_repeat('  ',$j); + $mailboxURL = urlencode($mailbox); - if (isset($boxes) && !empty($boxes)) { - $mailbox = $boxes->mailboxname_full; - $leader = ''; - $leader .= str_repeat('  ',$j); - $mailboxURL = urlencode($mailbox); + /* get unseen/total messages information */ + /* Only need to display info when option is set */ + if (isset($unseen_notify) && ($unseen_notify > 1) && + (($boxes->unseen !== false) || ($boxes->total !== false))) { - /* get unseen/total messages information */ - if ($boxes->unseen||$boxes->total) { + if ($boxes->unseen !== false) $unseen = $boxes->unseen; - $unseen_string = "($unseen)"; - if ($unseen>0||$boxes->total>0) { - $unseen_found = TRUE; - } - $unseen_before = ''; - $unseen_after = ''; + /* + Should only display unseen info if the folder is inbox + or you set the option for all folders + */ - if ((($unseen_notify == 2) && (strtolower($mailbox) == 'inbox')) || ($unseen_notify == 3)) { - $unseen_string = '(' . $unseen; - - if ($unseen_type > 1) { - $unseen_string .= '/' . $boxes->total; - } + if ((strtolower($mailbox) == 'inbox') || ($unseen_notify == 3)) { + $unseen_string = $unseen; - $unseen_string .= ')'; + /* If users requests, display message count too */ + if (isset($unseen_type) && ($unseen_type == 2) && ($boxes->total !== false)) { + $unseen_string .= '/' . $boxes->total; + } - $unseen_string = $unseen_before . $unseen_string . $unseen_after; + $unseen_string = "($unseen_string)"; + + /* + Finally allow the script to display the values by setting a boolean. + This can only occur if the unseen count is great than 0 (if you have + unseen count only), or you have the message count too. + */ + if (($unseen > 0) || (isset($unseen_type) && ($unseen_type ==2))) { + $unseen_found = true; } - } else { - $unseen = 0; } + } - if (isset($boxes->mbxs[0]) && $collapse_folders) { - $collapse = getPref($data_dir, $username, 'collapse_folder_' . $mailbox); - $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse); + if (isset($boxes->mbxs[0]) && $collapse_folders) { + $collapse = getPref($data_dir, $username, 'collapse_folder_' . $mailbox); + $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse); - $link = '$leader '; + } else { $link .= "unfold=$mailboxURL\">$leader+ "; + } + } else { + if ($use_icons && $icon_theme != 'none') { + $link .= "fold=$mailboxURL\">$leader '; } else { $link .= "fold=$mailboxURL\">$leader- "; } - $link .= ''; - $pre .= $link; - } else { - $pre.= $leader . '  '; } + $link .= ''; + $pre .= $link; + } else { + $pre.= $leader . '  '; + } - /* If there are unseen message, bold the line. */ - - if (($move_to_trash) && ($mailbox == $trash_folder)) { - if (! isset($numMessages)) { - $status = sqimap_status_messages($imapConnection, $mailbox); - $numMessages = $status['MESSAGES']; - } - + /* If there are unseen message, bold the line. */ + if (($move_to_trash) && ($mailbox == $trash_folder)) { + if (! isset($boxes->total)) { + $boxes->total = sqimap_status_messages($imapConnection, $mailbox); + } + if ($unseen > 0) { + $pre .= ''; + } + $pre .= ""; + $end .= ''; + if ($unseen > 0) { + $end .= ''; + } + if ($boxes->total > 0) { if ($unseen > 0) { $pre .= ''; } - - $pre .= ""; - + $pre .= ""; if ($unseen > 0) { $end .= ''; } - - $end .= ''; - if ($numMessages > 0) { - if ($unseen > 0) { - $pre .= ''; - } - $pre .= ""; - if ($unseen > 0) { - $end .= ''; - } - $end .= "\n\n" . - "  ("._("purge").")" . - ""; + /* Print unseen information. */ + if ($unseen_found) { + $end .= " $unseen_string"; } - } else { - if (!$boxes->is_noselect) { - if ($unseen > 0) { - $pre .= ''; - } - $pre .= ""; - if ($unseen > 0) { - $end .= ''; - } - $end .= ''; + $end .= "\n\n" . + '  ['._("Purge").']'. + ''; + } + } else { + if (!$boxes->is_noselect) { + if ($unseen > 0) { + $pre .= ''; + } + $pre .= ""; + $end .= ''; + if ($unseen > 0) { + $end .= ''; } } - /* Print unseen information. */ - if (isset($unseen_found) && $unseen_found) { + if ($unseen_found) { $end .= " $unseen_string"; } - $font = ''; - $fontend = ''; - if ($boxes->is_special) { - $font = ""; - $fontend = ""; - } - $end .= ''; + } - if (!$boxes->is_root) { - echo "" . $pre .$font. $boxes->mailboxname_sub .$fontend . $end. '
' . "\n"; - $j++; - } + $font = ''; + $fontend = ''; + if ($use_special_folder_color && $boxes->is_special) { + $font = ""; + $fontend = ""; + } - if (!$collapse || $boxes->is_root) { - for ($i = 0; $i mbxs); $i++) { - listBoxes($boxes->mbxs[$i],$j); - } + // let plugins fiddle with end of line + $end .= concat_hook_function('left_main_after_each_folder', + array(isset($numMessages) ? $numMessages : '', + $boxes->mailboxname_full, $imapConnection)); + + $end .= ''; + + if (!$boxes->is_root) { + echo "" . $pre .$font. str_replace(array(' ','<','>'),array(' ','<','>'),$boxes->mailboxname_sub) .$fontend . $end. '
' . "\n"; + $j++; + } + + if (!$collapse || $boxes->is_root) { + for ($i = 0; $i mbxs); $i++) { + listBoxes($boxes->mbxs[$i],$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; + global $data_dir, $username, $color, $unseen_notify, $unseen_type, + $move_to_trash, $trash_folder, $collapse_folders, $use_special_folder_color; + + if (!isset($boxes) || empty($boxes)) + return; /* use_folder_images only works if the images exist in ../images */ $use_folder_images = true; @@ -422,28 +455,52 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) { $pre = ''; $end = ''; $collapse = false; + $unseen_found = false; + $unseen = 0; - if ($boxes) { $mailbox = $boxes->mailboxname_full; $mailboxURL = urlencode($mailbox); /* get unseen/total messages information */ - if ($boxes->unseen) { - $unseen = $boxes->unseen; - $unseen_string = "($unseen)"; - if ($unseen>0) $unseen_found = TRUE; - if ($boxes->total) { - $numMessages = $boxes->total; - $unseen_string = "($unseen/$numMessages)"; + /* Only need to display info when option is set */ + if (isset($unseen_notify) && ($unseen_notify > 1) && + (($boxes->unseen !== false) || ($boxes->total !== false))) { + + if ($boxes->unseen !== false) + $unseen = $boxes->unseen; + + /* + Should only display unseen info if the folder is inbox + or you set the option for all folders + */ + + if ((strtolower($mailbox) == 'inbox') || ($unseen_notify == 3)) { + $unseen_string = $unseen; + + /* If users requests, display message count too */ + if (isset($unseen_type) && ($unseen_type == 2) && ($boxes->total !== false)) { + $unseen_string .= '/' . $boxes->total; + } + + $unseen_string = "($unseen_string)"; + + /* + Finally allow the script to display the values by setting a boolean. + This can only occur if the unseen count is great than 0 (if you have + unseen count only), or you have the message count too. + */ + if (($unseen > 0) || (isset($unseen_type) && ($unseen_type ==2))) { + $unseen_found = true; + } } - } else $unseen = 0; + } /* If there are unseen message, bold the line. */ if ($unseen > 0) { $pre .= ''; } /* color special boxes */ - if ($boxes->is_special) { - $pre .= ""; + if ($use_special_folder_color && $boxes->is_special) { + $pre .= ""; $end .= ''; } @@ -451,93 +508,92 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) { if ($unseen > 0) { $end .= ''; } /* Print unseen information. */ - if (isset($unseen_found) && $unseen_found) { - $end .= " $unseen_string"; + if ($unseen_found) { + $end .= " $unseen_string"; } if (($move_to_trash) && ($mailbox == $trash_folder)) { - if (! isset($numMessages)) { + if (! isset($numMessages)) { $numMessages = $boxes->total; - } - if ($numMessages > 0) { - $urlMailbox = urlencode($mailbox); - $pre .= "\n\n" . - "  ("._("purge").")" . - ""; - } + } + $pre = "" . $pre; + $end .= ''; + if ($numMessages > 0) { + $end .= "\n\n" . + '  ['._("Purge").']'. + ''; + } } else { if (!$boxes->is_noselect) { /* \Noselect boxes can't be selected */ - $pre .= ""; - $end .= ''; + $pre = "" . $pre; + $end .= ''; } } + // let plugins fiddle with end of line + global $imapConnection; + $end .= concat_hook_function('left_main_after_each_folder', + array(isset($numMessages) ? $numMessages : '', + $boxes->mailboxname_full, $imapConnection)); + if (!$boxes->is_root) { if ($use_folder_images) { - if ($boxes->is_inbox) { - $folder_img = '../images/inbox.gif'; - } else if ($boxes->is_sent) { - $folder_img = '../images/senti.gif'; - } else if ($boxes->is_trash) { - $folder_img = '../images/delitem.gif'; - } else if ($boxes->is_draft) { - $folder_img = '../images/draft.gif'; - } else $folder_img = '../images/folder.gif'; - $folder_img = '  '; - } else $folder_img = ''; + if ($boxes->is_inbox) { + $folder_img = '../images/inbox.png'; + } else if ($boxes->is_sent) { + $folder_img = '../images/senti.png'; + } else if ($boxes->is_trash) { + $folder_img = '../images/delitem.png'; + } else if ($boxes->is_draft) { + $folder_img = '../images/draft.png'; + } else if ($boxes->is_noinferiors) { + $folder_img = '../images/folder_noinf.png'; + } else { + $folder_img = '../images/folder.png'; + } + $folder_img = '  '; + } else { + $folder_img = ''; + } if (!isset($boxes->mbxs[0])) { echo ' ' . html_tag( 'div', - $pre . $folder_img . $boxes->mailboxname_sub . $end , - 'left', '', 'class="mbx_sub" id="' .$j. '"' ) - . "\n"; + ''. $pre . $folder_img . ''. str_replace(array(' ','<','>'),array(' ','<','>'),$boxes->mailboxname_sub) . $end, + 'left', '', 'class="mbx_sub" id="' .$j. '"' ) . "\n"; } else { /* get collapse information */ - if ($collapse_folders) { - $link = ''." "; + if ($collapse_folders) { + $form_entry = $j.'F'; + if (isset($mbx) && isset($mbx[$form_entry])) { + $collapse = $mbx[$form_entry]; + setPref($data_dir, $username, 'collapse_folder_'.$boxes->mailboxname_full , $collapse ? SM_BOX_COLLAPSED : SM_BOX_UNCOLLAPSED); + } else { + $collapse = getPref($data_dir, $username, 'collapse_folder_' . $mailbox); + $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse); + } + $img_src = ($collapse ? '../images/plus.png' : '../images/minus.png'); + $collapse_link = ''." "; } else { - $link = ''.""; + $collapse_link=''; } - $collapse_link = $link; - } else $collapse_link=''; echo ' ' . html_tag( 'div', $collapse_link . $pre . $folder_img . ' '. $boxes->mailboxname_sub . $end , - 'left', '', 'class="mbx_par" id="' .$j. 'P"' ) - . "\n"; - echo ' '."\n"; + 'left', '', 'class="mbx_par" id="' .$j. 'P"' ) . "\n"; + echo ' '."\n"; } } - if ($collapse) { - $visible = ' style="display:none;"'; - } else { - $visible = ' style="display:block;"'; - } + $visible = ($collapse ? ' style="display:none"' : ' style="display:block"'); if (isset($boxes->mbxs[0]) && !$boxes->is_root) /* mailbox contains childs */ echo html_tag( 'div', '', 'left', '', 'class="par_area" id='.$j.'.0000 '. $visible ) . "\n"; - if ($j !='ID.0000') { - $j = $j .'.0000'; - } - for ($i = 0; $i mbxs); $i++) { + if ($j !='ID.0000') + $j = $j .'.0000'; + for ($i = 0; $i mbxs); $i++) { $j++; - listAdvancedBoxes($boxes->mbxs[$i],$mbx,$j); - } - if (isset($boxes->mbxs[0]) && !$boxes->is_root ) echo ''."\n\n"; + ListAdvancedBoxes($boxes->mbxs[$i],$mbx,$j); } + if (isset($boxes->mbxs[0]) && !$boxes->is_root) + echo ''."\n\n"; } @@ -574,13 +630,17 @@ if (isset($left_refresh) && ($left_refresh != '') && /** * $advanced_tree and $oldway are boolean vars which are default set to default * SM behaviour. - * Setting $oldway to false causes left_main.php to use the new experimental + * Setting $oldway to false causes left_main.php to use the new experimental * way of getting the mailbox-tree. * Setting $advanced tree to true causes SM to display a experimental * mailbox-tree with dhtml behaviour. * It only works on browsers which supports css and javascript. The used - * javascript is experimental and doesn't support all browsers. It is tested on - * IE6 an Konquerer 3.0.0-2. + * javascript is experimental and doesn't support all browsers. + * It has been tested on IE6 an Konquerer 3.0.0-2. + * It is now tested and working on: (please test and update this list) + * Windows: IE 5.5 SP2, IE 6 SP1, Gecko based (Mozilla, Firebird) and Opera7 + * XWindow: ? + * Mac: ? * In the function ListAdvancedBoxes there is another var $use_folder_images. * setting this to true is only usefull if the images exists in ../images. * @@ -588,137 +648,149 @@ if (isset($left_refresh) && ($left_refresh != '') && * to marc@its-projects.nl **/ -$advanced_tree = false; /* set this to true if you want to see a nicer mailboxtree */ -$oldway = false; /* default SM behaviour */ +/* set this to true if you want to see a nicer mailboxtree */ +if (! isset($advanced_tree) || $advanced_tree=="" ) { + $advanced_tree=false; +} +/* default SM behaviour */ +if (! isset($oldway) || $oldway=="" ) { + $oldway=false; +} if ($advanced_tree) { -$xtra .= << - - - - - -ECHO; +$xtra .= 'old_col = masterf.cols;'."\n". +' colPat.exec(old_col);'."\n". +' if (direction) {'."\n". +' new_col_width = parseInt(RegExp.$1) + 25;'."\n". +' } else {'."\n". +' if (parseInt(RegExp.$1) > 35) {'."\n". +' new_col_width = parseInt(RegExp.$1) - 25;'."\n". +' }'."\n". +' }'."\n". +' masterf.cols = calc_col(new_col_width);'."\n". +' }'."\n". +'//-->'."\n". +''."\n"; /* style definitions */ -$xtra .= << - - - - -ECHO; - +$xtra .= ''."\n"; } - - - 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); @@ -841,8 +889,15 @@ if ($auto_create_special && !isset($auto_create_done)) { 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 { + // check for subscription is useless and expensive, just + // surpress the NO response. Unless we're on Mecury, which + // will just subscribe a folder again if it's already + // subscribed. + if ( strtolower($imap_server_type) != 'mercury32' || + !sqimap_mailbox_is_subscribed($imapConnection, $folder) ) { + sqimap_subscribe($imapConnection, $folder, false); + } } } } @@ -852,28 +907,37 @@ if ($auto_create_special && !isset($auto_create_done)) { sqsession_register($auto_create_done, 'auto_create_done'); } -echo "\n\n"; +if ($advanced_tree) { + echo "\n\n"; +} else { + echo "\n\n"; +} do_hook('left_main_before'); if ($advanced_tree) { /* nice future feature, needs layout !! volunteers? */ $right_pos = $left_size - 20; - echo '
'; - echo ''; - echo ''; - echo '
'; - echo '


'; +/* echo '
'; + echo ''; + echo ''; + echo '
'; + echo '


';*/ } echo "\n\n" . html_tag( 'table', '', 'left', '', 'border="0" cellspacing="0" cellpadding="0" width="99%"' ) . html_tag( 'tr' ) . html_tag( 'td', '', 'left' ) . - '
'. _("Folders") . "
\n\n"; + 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'; } @@ -886,6 +950,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; @@ -897,17 +964,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 ) { @@ -919,6 +987,26 @@ 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); @@ -969,7 +1057,7 @@ for ($i = 0; $i < count($boxes); $i++) { } /* Put the final touches on our folder line. */ - $line .= "
\n"; + $line .= "
\n"; /* Output the line for this folder. */ echo $line; @@ -980,20 +1068,23 @@ for ($i = 0; $i < count($boxes); $i++) { if (isset($advanced_tree) && $advanced_tree) { echo '


'; + echo ''; + echo '

'; echo '
'."\n\n"; + sqgetGlobalVar('mbx', $mbx, SQ_POST); if (!isset($mbx)) $mbx=NULL; ListAdvancedBoxes($boxes, $mbx); - echo '
'."\n"; + echo '
'; + echo ''; echo ''."\n"; } else { + //sqimap_get_status_mbx_tree($imap_stream,$boxes) ListBoxes($boxes); } } /* if ($oldway) else ... */ do_hook('left_main_after'); sqimap_logout($imapConnection); -echo '' . "\n". - "
\n"; - ?> + +