'."\n";
-} else {
- $mailbox_listing = ListBoxes($boxes);
-}
-
$mailbox_structure = getBoxStructure($boxes);
$oTemplate->assign('clock', $clock);
-$oTemplate->assign('mailbox_listing', $mailbox_listing);
-$oTemplate->assign('location_of_bar', $location_of_bar);
-$oTemplate->assign('left_size', $left_size);
-
$oTemplate->assign('mailboxes', $mailbox_structure);
-$oTemplate->assign('imapConnection', $imapConnection);
-
-$oTemplate->assign('unread_notification_enabled', $unseen_notify!=1);
-$oTemplate->assign('unread_notification_cummulative', $unseen_cum==1);
-$oTemplate->assign('unread_notification_allFolders', $unseen_notify == 3);
-$oTemplate->assign('unread_notification_displayTotal', $unseen_type == 2);
-$oTemplate->assign('collapsable_folders_enabled', $collapse_folders==1);
-$oTemplate->assign('icon_theme_path', $icon_theme_path);
-$oTemplate->assign('use_special_folder_color', $use_special_folder_color);
-$oTemplate->assign('message_recycling_enabled', $move_to_trash);
-if (isset($advanced_tree) && $advanced_tree) {
- $oTemplate->display('left_main_advanced.tpl');
-} else {
- $oTemplate->display('left_main.tpl');
-}
+/*
+ * 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['iconThemePath'] = $icon_theme_path;
+$settings['templateDirectory'] = $sTplDir;
+$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);
+
+$oTemplate->display('left_main.tpl');
sqimap_logout($imapConnection);
$oTemplate->display('footer.tpl');