X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fleft_main.php;h=0a768061a57b8030e90a457ce21d8bbc31585001;hp=d6e8855810c5cbd17844e5d8ce1f33268c1be6b3;hb=24d1619523e7005477feb74d9a54da6a0efc58a6;hpb=4689abb8539781b736631e5916d2d160e0aeedaf diff --git a/src/left_main.php b/src/left_main.php index d6e88558..0a768061 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -3,36 +3,21 @@ /** * left_main.php * - * Copyright (c) 1999-2001 The Squirrelmail Development Team + * Copyright (c) 1999-2002 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$ - / - -/*****************************************************************/ -/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/ -/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/ -/*** + Base level indent should begin at left margin, as ***/ -/*** the require_once below looks. ***/ -/*** + All identation should consist of four space blocks ***/ -/*** + Tab characters are evil. ***/ -/*** + all comments should use "slash-star ... star-slash" ***/ -/*** style -- no pound characters, no slash-slash style ***/ -/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/ -/*** ALWAYS USE { AND } CHARACTERS!!! ***/ -/*** + Please use ' instead of ", when possible. Note " ***/ -/*** should always be used in _( ) function calls. ***/ -/*** Thank you for your help making the SM code more readable. ***/ -/*****************************************************************/ + */ require_once('../src/validate.php'); require_once('../functions/array.php'); require_once('../functions/imap.php'); require_once('../functions/plugin.php'); require_once('../functions/page_header.php'); +require_once('../functions/html.php'); /* These constants are used for folder stuff. */ define('SM_BOX_UNCOLLAPSED', 0); @@ -41,11 +26,12 @@ define('SM_BOX_COLLAPSED', 1); /* --------------------- FUNCTIONS ------------------------- */ function formatMailboxName($imapConnection, $box_array) { - global $folder_prefix, $trash_folder, $sent_folder; - global $color, $move_to_sent, $move_to_trash; - global $unseen_notify, $unseen_type, $collapse_folders; - global $draft_folder, $save_as_draft; - global $use_special_folder_color; + + 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; $real_box = $box_array['unformatted']; $mailbox = str_replace(' ','',$box_array['formatted']); @@ -63,23 +49,15 @@ function formatMailboxName($imapConnection, $box_array) { $unseen = sqimap_unseen_messages($imapConnection, $real_box); if ($unseen_type == 1 && $unseen > 0) { $unseen_string = "($unseen)"; - $unseen_found = true; + $unseen_found = TRUE; } else if ($unseen_type == 2) { $numMessages = sqimap_get_num_messages($imapConnection, $real_box); $unseen_string = "($unseen/$numMessages)"; - $unseen_found = true; + $unseen_found = TRUE; } } - $special_color = false; - if ($use_special_folder_color) { - if ((strtolower($real_box) == 'inbox') - || (($real_box == $trash_folder) && ($move_to_trash)) - || (($real_box == $sent_folder) && ($move_to_sent)) - || (($real_box == $draft_folder) && ($save_as_draft))) { - $special_color = true; - } - } + $special_color = ($use_special_folder_color && isSpecialMailbox( $real_box ) ); /* Start off with a blank line. */ $line = ''; @@ -88,13 +66,18 @@ function formatMailboxName($imapConnection, $box_array) { if ($unseen > 0) { $line .= ''; } /* Crate the link for this folder. */ - $line .= ""; - if ($special_color == true) - $line .= ""; - $line .= str_replace(' ',' ',$mailbox); - if ($special_color == true) - $line .= ""; - $line .= ''; + $line .= ""; + if ($special_color) { + $line .= ""; + } + if ( $mailbox == 'INBOX' ) { + $line .= _("INBOX"); + } else { + $line .= str_replace(' ',' ',$mailbox); + } + if ($special_color == TRUE) + $line .= ''; + $line .= ''; /* If there are unseen message, close bolding. */ if ($unseen > 0) { $line .= ""; } @@ -104,7 +87,7 @@ function formatMailboxName($imapConnection, $box_array) { $line .= " $unseen_string"; } - if (($move_to_trash == true) && ($real_box == $trash_folder)) { + if (($move_to_trash) && ($real_box == $trash_folder)) { if (! isset($numMessages)) { $numMessages = sqimap_get_num_messages($imapConnection, $real_box); } @@ -112,8 +95,8 @@ function formatMailboxName($imapConnection, $box_array) { if ($numMessages > 0) { $urlMailbox = urlencode($real_box); $line .= "\n\n" . - "  ("._("empty").")" . - "\n\n"; + "  ("._("purge").")" . + ""; } } @@ -134,7 +117,7 @@ function compute_folder_children(&$parbox, $boxcount) { $parbox_name = $boxes[$parbox]['unformatted']; /* 'Initialize' this parent box to childless. */ - $boxes[$parbox]['parent'] = false; + $boxes[$parbox]['parent'] = FALSE; /* Compute the collapse status for this box. */ if( isset($collapse_folders) && $collapse_folders ) { @@ -146,25 +129,22 @@ function compute_folder_children(&$parbox, $boxcount) { $boxes[$parbox]['collapse'] = $collapse; /* Otherwise, get the name of the next box. */ - if (isset($boxes[$nextbox]['unformatted'])) + if (isset($boxes[$nextbox]['unformatted'])) { $nextbox_name = $boxes[$nextbox]['unformatted']; - else + } 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; + $boxes[$parbox]['parent'] = TRUE; /* Compute the visiblity of this box. */ - if ($boxes[$parbox]['visible'] && - ($boxes[$parbox]['collapse'] != SM_BOX_COLLAPSED)) { - $boxes[$nextbox]['visible'] = true; - } else { - $boxes[$nextbox]['visible'] = false; - } + $boxes[$nextbox]['visible'] = ($boxes[$parbox]['visible'] && + ($boxes[$parbox]['collapse'] != SM_BOX_COLLAPSED)); /* Compute the visibility of any child boxes. */ compute_folder_children($nextbox, $boxcount); @@ -184,8 +164,8 @@ function create_collapse_link($boxnum) { $mailbox = urlencode($boxes[$boxnum]['unformatted']); /* Create the link for this collapse link. */ - $link = '+"; } else { @@ -213,16 +193,245 @@ 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; + $pre = ''; + $end = ''; + $collapse = false; + if ($boxes) { + $mailbox = $boxes->mailboxname_full; + $leader = ''; + for ($k = 0; $k < $j; $k++) { + $leader.= '   '; + } + $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)"; + } + } else $unseen = 0; + + + + 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 .= "fold=$mailboxURL\">$leader - "; + } + $link .= ''; + $pre .= $link; + } else { + $pre.= $leader . '   '; + } + + + /* If there are unseen message, bold the line. */ + if ($unseen > 0) { $pre .= ''; } + + if (($move_to_trash) && ($mailbox == $trash_folder)) { + if (! isset($numMessages)) { + $numMessages = sqimap_get_num_messages($imapConnection, $mailbox); + } + + if ($numMessages > 0) { + $urlMailbox = urlencode($mailbox); + $pre .= "\n\n" . + "  ("._("purge").")" . + ""; + } + } else { + if (!$boxes->is_noselect) { + $pre .= ""; + $end .= ''; + } + } + + /* If there are unseen message, close bolding. */ + if ($unseen > 0) { $end .= ""; } + + /* Print unseen information. */ + if (isset($unseen_found) && $unseen_found) { + $end .= " $unseen_string"; + } + + $font = ''; + $fontend = ''; + if ($boxes->is_special) { + $font = ""; + $fontend = ""; + } + + if (!$boxes->is_root) { + echo "" . $pre .$font. $boxes->mailboxname_sub .$fontend . $end. '
'; + $j++; + } + if (!$collapse || $boxes->is_root) { + for ($i = 0; $i mbxs); $i++) { + listBoxes($boxes->mbxs[$i],$j); + } + } + + } +} + +function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0' ) { + global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type, + $move_to_trash, $trash_folder, $collapse_folders; + + /* use_folder_images only works if the images exist in ../images */ + $use_folder_images = false; + + $pre = ''; + $end = ''; + $collapse = false; + + 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)"; + } + } else $unseen = 0; + + + /* If there are unseen message, bold the line. */ + if ($unseen > 0) { $pre .= ''; } + + if (($move_to_trash) && ($mailbox == $trash_folder)) { + if (! isset($numMessages)) { + $numMessages = $boxes->total; + } + if ($numMessages > 0) { + $urlMailbox = urlencode($mailbox); + $pre .= "\n\n" . + "  ("._("purge").")" . + ""; + } + } else { + if (!$boxes->is_noselect) { /* \Noselect boxes can't be selected */ + $pre .= ""; + $end .= ''; + } + } + + /* If there are unseen message, close bolding. */ + if ($unseen > 0) { $end .= ""; } + + /* Print unseen information. */ + if (isset($unseen_found) && $unseen_found) { + $end .= " $unseen_string"; + } + + $font = ''; + $fontend = ''; + + /* color special boxes */ + if ($boxes->is_special) { + $font = ""; + $fontend = ""; + } + 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 (!isset($boxes->mbxs[0])) { + echo ' ' . html_tag( 'div', + $folder_img .$pre .$font. $boxes->mailboxname_sub .$fontend . $end , + 'left', '', 'class="mbx_sub" id="' .$j. '" onmouseover="changerowcolor(this,true)" onmouseout="changerowcolor(this,false)"' ) + . "\n"; + } else { + /* get collapse information */ + if ($collapse_folders) { + $link = ''." "; + } else { + $link = ''.""; + } + $collapse_link = $link; + } else $collapse_link=''; + echo ' ' . html_tag( 'div', + $collapse_link . $folder_img .$pre. $font. '  '. $boxes->mailboxname_sub .$fontend . $end , + 'left', '', 'class="mbx_par" id="' .$j. 'P" onmouseover="changerowcolor(this,true)" onmouseout="changerowcolor(this,false)"' ) + . "\n"; + echo ' '."\n"; + } + } + if ($collapse) { + $visible = ' STYLE="display:none;"'; + } else { + $visible = ' STYLE="display:block;"'; + } + + if (isset($boxes->mbxs[0]) && !$boxes->is_root) /* mailbox contains childs */ + echo html_tag( 'div', '', 'left', '', 'class="par_area" id='.$j.'.0 '. $visible ) . "\n"; + + if ($j !='ID.0') { + $j = $j .'.0'; + } + 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 ------------------------ */ -global $delimiter, $default_folder_prefix; +global $delimiter, $default_folder_prefix, $left_size; // open a connection on the imap port (143) $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output - -if (isset($left_refresh) && ($left_refresh != 'none') && ($left_refresh != '')) { +/** + * Using stristr since older preferences may contain "None" and "none". + */ +if (isset($left_refresh) && ($left_refresh != '') && + !stristr($left_refresh, "none")){ $xtra = "\n\n" . "\n". "\n"; @@ -230,35 +439,319 @@ if (isset($left_refresh) && ($left_refresh != 'none') && ($left_refresh != '')) $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 is tested on + * IE6 an Konquerer 3.0.0-2. + * 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 + **/ + +$advanced_tree = false; /* set this to true if you want to see a nicer mailboxtree */ +$oldway = true; /* default SM behaviour */ + +if ($advanced_tree) { +$xtra .= << + + + + + +ECHO; + +/* style definitions */ + +$xtra .= << + + + + +ECHO; + +} + + + + displayHtmlHeader( 'SquirrelMail', $xtra ); /* 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 ); + $autocreate = array($sent_folder, $trash_folder, $draft_folder); foreach( $autocreate as $folder ) { - if ($folder != '' && $folder != 'none') { + if (($folder != '') && ($folder != 'none')) { if ( !sqimap_mailbox_exists($imapConnection, $folder)) { sqimap_mailbox_create($imapConnection, $folder, ''); - } elseif ( !sqimap_mailbox_is_subscribed($imapConnection, $folder)) { + } else if (!sqimap_mailbox_is_subscribed($imapConnection, $folder)) { sqimap_subscribe($imapConnection, $folder); } } } /* Let the world know that autocreation is complete! Hurrah! */ - $auto_create_done = true; + $auto_create_done = TRUE; session_register('auto_create_done'); } 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 '


'; +} -$boxes = sqimap_mailbox_list($imapConnection); - -echo '
'. _("Folders") . "
\n\n"; +echo "\n\n" . html_tag( 'table', '', '', '', 'border="0" cellspacing="0" cellpadding="0" width="100%"' ) . + html_tag( 'tr' ) . + html_tag( 'td', '', 'left' ) . + '
'. _("Folders") . "
\n\n"; if ($date_format != 6) { /* First, display the clock. */ @@ -287,17 +780,17 @@ if ($date_format != 6) { $clk = date($hr, time()); break; default: - $clk = date('D, '.$hr, time()); + $clk = substr( getDayName( date( 'w', time() ) ), 0, 3 ) . 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 '('. + _("refresh folder list") . ')

'; /* Lastly, display the folder list. */ if ( $collapse_folders ) { @@ -309,17 +802,22 @@ if ( $collapse_folders ) { } } +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++) { + +for ($i = 0; $i < count($boxes); $i++) { if ( $boxes[$i]['visible'] ) { $mailbox = $boxes[$i]['formatted']; $mblevel = substr_count($boxes[$i]['unformatted'], $delimiter) + 1; @@ -335,8 +833,16 @@ for ($i = 0;$i < count($boxes); $i++) { $line = "$prefix"; /* Add the folder name and link. */ + if (! isset($color[15])) { + $color[15] = $color[6]; + } + if (in_array('noselect', $boxes[$i]['flags'])) { - $line .= ""; + if( isSpecialMailbox( $boxes[$i]['unformatted']) ) { + $line .= ""; + } else { + $line .= ""; + } if (ereg("^( *)([^ ]*)", $mailbox, $regs)) { $mailbox = str_replace(' ','',$mailbox); $line .= str_replace(' ', ' ', $mailbox); @@ -353,10 +859,25 @@ for ($i = 0;$i < count($boxes); $i++) { echo $line; } } - -sqimap_logout($imapConnection); +} else { /* expiremental code */ + $boxes = sqimap_mailbox_tree($imapConnection); + if (isset($advanced_tree) && $advanced_tree) { + echo '


'; + echo '
'."\n\n"; + if (!isset($mbx)) $mbx=NULL; + ListAdvancedBoxes($boxes, $mbx); + echo '
'."\n"; + echo '
'."\n"; + } else { + ListBoxes($boxes); + } +} /* if ($oldway) else ... */ do_hook('left_main_after'); +sqimap_logout($imapConnection); -echo "\n"; +echo '' . "\n". + "
\n"; -?> \ No newline at end of file +?>