X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fleft_main.php;h=2ec862ce9af81a397a5cb3aea3aaa52b32cb18f2;hp=9c105bbe22aa6b81ad694870b7064c0551bfd4fd;hb=353d074afac6827c90f4bb03e846c5e453d3b5b1;hpb=8ad1c1e86be98e2e6f3eb8ecdcc43b7e143f30d6 diff --git a/src/left_main.php b/src/left_main.php index 9c105bbe..2ec862ce 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -3,881 +3,89 @@ /** * left_main.php * - * 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. * + * @copyright 1999-2018 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail */ +/** This is the left_main page */ +define('PAGE_NAME', 'left_main'); + /** - * Path for SquirrelMail required files. - * @ignore + * Include the SquirrelMail initialization file. */ -define('SM_PATH','../'); +require('../include/init.php'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'include/validate.php'); -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/imap_general.php'); require_once(SM_PATH . 'functions/date.php'); +require_once(SM_PATH . 'functions/template/folder_list_util.php'); /* These constants are used for folder stuff. */ define('SM_BOX_UNCOLLAPSED', 0); define('SM_BOX_COLLAPSED', 1); -/* --------------------- FUNCTIONS ------------------------- */ - -function formatMailboxName($imapConnection, $box_array) { - - 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); - - /* Strip down the mailbox name. */ - if (ereg("^( *)([^ ]*)$", $mailbox, $regs)) { - $mailbox = $regs[2]; - } - $unseen = 0; - $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; - } - } - list($unseen_string, $unseen) = $status; - $special_color = ($use_special_folder_color && isSpecialMailbox($real_box)); - - /* Start off with a blank line. */ - $line = ''; - - /* If there are unseen message, bold the line. */ - if ($unseen > 0) { $line .= ''; } - - /* Create the link for this folder. */ - if ($status !== false) { - $line .= ''; - } - if ($special_color) { - $line .= ""; - } - if ( $mailbox == 'INBOX' ) { - $line .= _("INBOX"); - } else { - $line .= str_replace(array(' ','<','>'),array(' ','<','>'),$mailbox); - } - if ($special_color == TRUE) - $line .= ''; - if ($status !== false) { - $line .= ''; - } - - /* If there are unseen message, close bolding. */ - if ($unseen > 0) { $line .= ""; } - - /* Print unseen information. */ - if ($unseen_string != '') { - $line .= " $unseen_string"; - } - - /* If it's the trash folder, show a purge link */ - if (($move_to_trash) && ($real_box == $trash_folder)) { - $urlMailbox = urlencode($real_box); - $line .= "\n\n" . - '  ['._("Purge").']' . - ''; - } - - - // 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); -} - -/** - * Recursive function that computes the collapsed status and parent - * (or not parent) status of this box, and the visiblity and collapsed - * status and parent (or not parent) status for all children boxes. - */ -function compute_folder_children(&$parbox, $boxcount) { - global $boxes, $data_dir, $username, $collapse_folders; - $nextbox = $parbox + 1; - - /* Retreive the name for the parent box. */ - $parbox_name = $boxes[$parbox]['unformatted']; - - /* 'Initialize' this parent box to childless. */ - $boxes[$parbox]['parent'] = FALSE; - - /* Compute the collapse status for this box. */ - if( isset($collapse_folders) && $collapse_folders ) { - $collapse = getPref($data_dir, $username, 'collapse_folder_' . $parbox_name); - $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse); - } else { - $collapse = SM_BOX_UNCOLLAPSED; - } - $boxes[$parbox]['collapse'] = $collapse; - - /* Otherwise, get the name of the next box. */ - if (isset($boxes[$nextbox]['unformatted'])) { - $nextbox_name = $boxes[$nextbox]['unformatted']; - } else { - $nextbox_name = ''; - } - - /* Compute any children boxes for this box. */ - while (($nextbox < $boxcount) && - (is_parent_box($boxes[$nextbox]['unformatted'], $parbox_name))) { - - /* Note that this 'parent' box has at least one child. */ - $boxes[$parbox]['parent'] = TRUE; - - /* Compute the visiblity of this box. */ - $boxes[$nextbox]['visible'] = ($boxes[$parbox]['visible'] && - ($boxes[$parbox]['collapse'] != SM_BOX_COLLAPSED)); - - /* Compute the visibility of any child boxes. */ - compute_folder_children($nextbox, $boxcount); - } - - /* Set the parent box to the current next box. */ - $parbox = $nextbox; -} - -/** - * Create the link for a parent folder that will allow that - * parent folder to either be collapsed or expaned, as is - * currently appropriate. - */ -function create_collapse_link($boxnum) { - global $boxes, $unseen_notify, $color, $use_icons, $icon_theme; - $mailbox = urlencode($boxes[$boxnum]['unformatted']); - - /* Create the link for this collapse link. */ - $link = ''; - } else { - $link .= "unfold=$mailbox\">+"; - } - } else { - if ($use_icons && $icon_theme != 'none') { - $link .= "fold=$mailbox\">'; - } else { - $link .= "fold=$mailbox\">-"; - } - } - $link .= ''; - - /* Return the finished product. */ - return ($link); -} - -/** - * create_unseen_string: - * - * Create unseen and total message count for both this folder and - * it's subfolders. - * - * @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 unseen message string (for display), unseen message count - */ -function create_unseen_string($boxName, $boxArray, $imapConnection, $unseen_type) { - global $boxes, $color, $unseen_cum; - - /* Initialize the return value. */ - $result = array(0,0); - - /* Initialize the counts for this folder. */ - $boxUnseenCount = 0; - $boxMessageCount = 0; - $totalUnseenCount = 0; - $totalMessageCount = 0; - - /* Collect the counts for this box alone. */ - $status = sqimap_status_messages($imapConnection, $boxName); - $boxUnseenCount = $status['UNSEEN']; - if ($boxUnseenCount === false) { - return false; - } - if ($unseen_type == 2) { - $boxMessageCount = $status['MESSAGES']; - } - - /* Initialize the total counts. */ - - if ($boxArray['collapse'] == SM_BOX_COLLAPSED && $unseen_cum) { - /* Collect the counts for this boxes subfolders. */ - $curBoxLength = strlen($boxName); - $boxCount = count($boxes); - - for ($i = 0; $i < $boxCount; ++$i) { - /* Initialize the counts for this subfolder. */ - $subUnseenCount = 0; - $subMessageCount = 0; - - /* 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']; - if ($unseen_type == 2) { - $subMessageCount = $status['MESSAGES'];; - } - /* Add the counts for this subfolder to the total. */ - $totalUnseenCount += $subUnseenCount; - $totalMessageCount += $subMessageCount; - } - } - - /* Add the counts for all subfolders to that of the box. */ - $boxUnseenCount += $totalUnseenCount; - $boxMessageCount += $totalMessageCount; - } - - /* And create the magic unseen count string. */ - /* Really a lot more then just the unseen count. */ - if (($unseen_type == 1) && ($boxUnseenCount > 0)) { - $result[0] = "($boxUnseenCount)"; - } else if ($unseen_type == 2) { - $result[0] = "($boxUnseenCount/$boxMessageCount)"; - $result[0] = "$result[0]"; - } - - /* Set the unseen count to return to the outside world. */ - $result[1] = $boxUnseenCount; - - /* Return our happy result. */ - return ($result); -} - -/** - * This simple function checks if a box is another box's parent. - */ -function is_parent_box($curbox_name, $parbox_name) { - global $delimiter; - - /* Extract the name of the parent of the current box. */ - $curparts = explode($delimiter, $curbox_name); - $curname = array_pop($curparts); - $actual_parname = implode($delimiter, $curparts); - $actual_parname = substr($actual_parname,0,strlen($parbox_name)); - - /* Compare the actual with the given parent name. */ - return ($parbox_name == $actual_parname); -} - -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_found = false; - $unseen = 0; - - $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))) { - - 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; - } - } - } - - 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 . '  '; - } - - /* 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 .= ""; - if ($unseen > 0) { - $end .= ''; - } - /* Print unseen information. */ - if ($unseen_found) { - $end .= " $unseen_string"; - } - } - $end .= "\n\n" . - '  ['._("Purge").']'. - ''; - } else { - if (!$boxes->is_noselect) { - if ($unseen > 0) { - $pre .= ''; - } - $pre .= ""; - $end .= ''; - if ($unseen > 0) { - $end .= ''; - } - } - /* Print unseen information. */ - if ($unseen_found) { - $end .= " $unseen_string"; - } - - } - - $font = ''; - $fontend = ''; - if ($use_special_folder_color && $boxes->is_special) { - $font = ""; - $fontend = ""; - } - - // 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, $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; - - $pre = ''; - $end = ''; - $collapse = false; - $unseen_found = false; - $unseen = 0; - - $mailbox = $boxes->mailboxname_full; - $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))) { - - 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; - } - } - } - - /* If there are unseen message, bold the line. */ - if ($unseen > 0) { $pre .= ''; } - - /* color special boxes */ - if ($use_special_folder_color && $boxes->is_special) { - $pre .= ""; - $end .= ''; - } - - /* If there are unseen message, close bolding. */ - if ($unseen > 0) { $end .= ''; } - - /* Print unseen information. */ - if ($unseen_found) { - $end .= " $unseen_string"; - } - - if (($move_to_trash) && ($mailbox == $trash_folder)) { - $pre = "" . $pre; - $end .= ''; - $end .= "\n\n" . - '  ['._("Purge").']'. - ''; - } else { - if (!$boxes->is_noselect) { /* \Noselect boxes can't be selected */ - $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.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 . ''. str_replace(array(' ','<','>'),array(' ','<','>'),$boxes->mailboxname_sub) . $end, - 'left', '', 'class="mbx_sub" id="' .$j. '"' ) . "\n"; - } else { - /* get collapse information */ - 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 { - $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"; - } - } - - $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++) { - $j++; - ListAdvancedBoxes($boxes->mbxs[$i],$mbx,$j); - } - if (isset($boxes->mbxs[0]) && !$boxes->is_root) - echo ''."\n\n"; -} - - - - -/* -------------------- MAIN ------------------------ */ - /* get globals */ -sqgetGlobalVar('username', $username, SQ_SESSION); -sqgetGlobalVar('key', $key, SQ_COOKIE); sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); -sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); sqgetGlobalVar('fold', $fold, SQ_GET); sqgetGlobalVar('unfold', $unfold, SQ_GET); - /* end globals */ // open a connection on the imap port (143) -$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output +// why hide the output? +global $imap_stream_options; // in case not defined in config +$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, true, $imap_stream_options); /** - * Using stristr since older preferences may contain "None" and "none". + * Using stristr since very old preferences may contain "None" and "none". */ -if (isset($left_refresh) && ($left_refresh != '') && +if (!empty($left_refresh) && !stristr($left_refresh, 'none')){ - $xtra = "\n\n" . - "\n". - "\n"; + $xtra = "\n\n"; } else { $xtra = ''; } /** - * $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 - * 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 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. - * - * Feel free to experiment with the code and report bugs and enhancements - * to marc@its-projects.nl - **/ - -/* 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; + * Include extra javascript files needed by template + */ +$js_includes = $oTemplate->get_javascript_includes(TRUE); +foreach ($js_includes as $js_file) { + $xtra .= '' ."\n"; } -if ($advanced_tree) { -$xtra .= ''."\n"; +displayHtmlHeader( $org_title, $xtra ); +$oErrorHandler->setDelayedErrors(true); -/* style definitions */ - -$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); + $folders_created = false; foreach( $autocreate as $folder ) { - if (($folder != '') && ($folder != 'none')) { - if ( !sqimap_mailbox_exists($imapConnection, $folder)) { + if ($folder != '' && $folder != SMPREF_NONE) { + /** + * If $show_only_subscribed_folders is true, don't use + * $mailboxes array for checking if mailbox exists. + * Mailbox list contains only subscribed folders. + * sqimap_mailbox_create() will fail, if folder exists. + */ + if ($show_only_subscribed_folders) { + $mailbox_cache = false; + } else { + $mailbox_cache = $mailboxes; + } + if ( !sqimap_mailbox_exists($imapConnection, $folder, $mailbox_cache)) { sqimap_mailbox_create($imapConnection, $folder, ''); + $folders_created = true; } else { // check for subscription is useless and expensive, just // surpress the NO response. Unless we're on Mecury, which @@ -886,6 +94,7 @@ if ($auto_create_special && !isset($auto_create_done)) { if ( strtolower($imap_server_type) != 'mercury32' || !sqimap_mailbox_is_subscribed($imapConnection, $folder) ) { sqimap_subscribe($imapConnection, $folder, false); + $folders_created = true; } } } @@ -894,35 +103,12 @@ if ($auto_create_special && !isset($auto_create_done)) { /* Let the world know that autocreation is complete! Hurrah! */ $auto_create_done = TRUE; sqsession_register($auto_create_done, 'auto_create_done'); + // reload mailbox list + if ($folders_created) + $mailboxes=sqimap_get_mailboxes($imapConnection,true,$show_only_subscribed_folders); } -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 "\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"; - +$clock = ''; if ($date_format != 6) { /* First, display the clock. */ if ($hour_format == 1) { @@ -957,16 +143,12 @@ if ($date_format != 6) { } $clk = str_replace(' ',' ',$clk); - echo '' - . str_replace(' ', ' ', _("Last Refresh")) - . ":
$clk
"; +//FIXME don't build HTML here - do it in template + $clock = '' + . str_replace(' ', ' ', _("Last Refresh")) + . ":
$clk
\n"; } -/* Next, display the refresh button. */ -echo '
['. - _("Check mail") . ']

'; - -/* Lastly, display the folder list. */ if ( $collapse_folders ) { /* If directed, collapse or uncollapse a folder. */ if (isset($fold)) { @@ -980,100 +162,55 @@ if ( $collapse_folders ) { $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)) { +if (empty($unseen_type)) { + if (!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)) { +if (empty($unseen_notify)) { + if (!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; -$boxcount = count($boxes); - -/* Compute the collapsedness and visibility of each box. */ - -while ($curbox < $boxcount) { - $boxes[$curbox]['visible'] = TRUE; - compute_folder_children($curbox, $boxcount); -} - -for ($i = 0; $i < count($boxes); $i++) { - if ( $boxes[$i]['visible'] ) { - $mailbox = $boxes[$i]['formatted']; - $mblevel = substr_count($boxes[$i]['unformatted'], $delimiter) + 1; - - /* Create the prefix for the folder name and link. */ - $prefix = str_repeat(' ',$mblevel); - if (isset($collapse_folders) && $collapse_folders && $boxes[$i]['parent']) { - $prefix = str_replace(' ',' ',substr($prefix,0,strlen($prefix)-2)). - create_collapse_link($i) . ' '; - } else { - $prefix = str_replace(' ',' ',$prefix); - } - $line = "$prefix"; - - /* Add the folder name and link. */ - if (! isset($color[15])) { - $color[15] = $color[6]; - } +/** + * pass $mailboxes now instead of $imapconnection - sqimap_get_mailboxes() has been separated from + * sqimap_mailbox_tree() so that the cached mailbox list can be used elsewhere in left_main and beyond + */ +$boxes = sqimap_mailbox_tree($imapConnection,$mailboxes,$show_only_subscribed_folders); +$mailbox_structure = getBoxStructure($boxes); - if (in_array('noselect', $boxes[$i]['flags'])) { - if( isSpecialMailbox( $boxes[$i]['unformatted']) ) { - $line .= ""; - } else { - $line .= ""; - } - if (ereg("^( *)([^ ]*)", $mailbox, $regs)) { - $mailbox = str_replace(' ','',$mailbox); - $line .= str_replace(' ', ' ', $mailbox); - } - $line .= ''; - } else { - $line .= formatMailboxName($imapConnection, $boxes[$i]); - } +$oTemplate->assign('clock', $clock); +$oTemplate->assign('mailboxes', $mailbox_structure); - /* Put the final touches on our folder line. */ - $line .= "
\n"; +/* + * Build an array to pass user prefs to the template in order to avoid using + * globals, which are dirty, filthy things in templates. :) + */ +$settings = array(); +#$settings['imapConnection'] = $imapConnection; +$settings['templateID'] = $sTemplateID; +$settings['unreadNotificationEnabled'] = $unseen_notify!=1; +$settings['unreadNotificationAllFolders'] = $unseen_notify == 3; +$settings['unreadNotificationDisplayTotal'] = $unseen_type == 2; +$settings['unreadNotificationCummulative'] = $unseen_cum==1; +$settings['useSpecialFolderColor'] = $use_special_folder_color; +$settings['messageRecyclingEnabled'] = $move_to_trash; +$settings['collapsableFoldersEnabled'] = $collapse_folders==1; +$oTemplate->assign('settings', $settings); + +//access keys +// +$oTemplate->assign('accesskey_folders_refresh', $accesskey_folders_refresh); +$oTemplate->assign('accesskey_folders_purge_trash', $accesskey_folders_purge_trash); +$oTemplate->assign('accesskey_folders_inbox', $accesskey_folders_inbox); + +$oTemplate->display('left_main.tpl'); - /* Output the line for this folder. */ - echo $line; - } -} -} else { /* expiremental code */ - $boxes = sqimap_mailbox_tree($imapConnection); - if (isset($advanced_tree) && $advanced_tree) { - echo '
'; - echo '

'; - echo '
'."\n\n"; - sqgetGlobalVar('mbx', $mbx, SQ_POST); - if (!isset($mbx)) $mbx=NULL; - ListAdvancedBoxes($boxes, $mbx); - 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); - -?> - - +$oTemplate->display('footer.tpl');