X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=templates%2Fdefault%2Fleft_main.tpl;h=6405060da1444b2e9e0a65ec3cb7175be2619604;hp=92e6c555784f4c59f88a80321b52b656622cf389;hb=a15b73a49b070358cf1e8ec699911df67e58ef9e;hpb=d281e128d4c3149dc353397df2cd2c912b8ea5a7 diff --git a/templates/default/left_main.tpl b/templates/default/left_main.tpl index 92e6c555..6405060d 100644 --- a/templates/default/left_main.tpl +++ b/templates/default/left_main.tpl @@ -61,7 +61,7 @@ * in all folders in this mailbox, * excluding trash folders. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright 1999-2010 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail @@ -162,12 +162,21 @@ function buildMailboxTree ($box, $settings, $icon_theme_path, $indent_factor=0) } $pre .= $folder_icon; + // calculate if access key is needed + // + if ($box['IsInbox']) { + global $accesskey_folders_inbox; + $accesskey = $accesskey_folders_inbox; + } + else $accesskey = ''; + /* * The Trash folder should only be displayed if message recycling has * been enabled, i.e. when deleted is a message moved to the trash or * deleted forever? */ $view_link = ''; @@ -209,6 +218,11 @@ function buildMailboxTree ($box, $settings, $icon_theme_path, $indent_factor=0) } } + // Add any extra output that may have been added by plugins, etc + // + if (!empty($box['ExtraOutput'])) + $end .= $box['ExtraOutput']; + $span = ''; $spanend = ''; if ($settings['useSpecialFolderColor'] && $box['IsSpecial']) { @@ -219,22 +233,6 @@ function buildMailboxTree ($box, $settings, $icon_theme_path, $indent_factor=0) $spanend = ''; } -/******** - * Pulling imapConnection due to segfaults that cannot be tracked down. Best - * we can determine, it's some combination of this var and >= 4 plugins enabled. - * No further clue from anyone. - ******** - * Update: syntax of this hook call changed a bit, so if the error is so anomalous, - * it might be worth trying this again to see if it is still segfaulting - ******** - - // let plugins fiddle with end of line -// FIXME: no hooks in templates! - $end .= concat_hook_function('left_main_after_each_folder', - $temp=array(isset($numMessages) ? &$numMessages : '', - &$box['MailboxFullName'], &$settings['imapConnection'])); -*/ - $end .= ''; $out = ''; @@ -263,7 +261,7 @@ extract($t); ?>
- +
@@ -272,7 +270,7 @@ extract($t);
- [] + [target="left">]
@@ -281,5 +279,5 @@ extract($t); - +