X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders.php;h=ae3c89676d08a95aee16c1abe6575d69b80a6dd5;hb=6aeb566fbd0d66ec2ab7c84d6a9b18bd6af3dabe;hp=c4568af775572adc5efecc1d0699102279f91796;hpb=9829e1d84ea35989d03c1956871a8f48ad3c538c;p=squirrelmail.git diff --git a/src/folders.php b/src/folders.php index c4568af7..ae3c8967 100644 --- a/src/folders.php +++ b/src/folders.php @@ -1,5 +1,4 @@ assign('note', htmlspecialchars($td_str)); + $oTemplate->display('note.tpl'); +} + $boxes = sqimap_mailbox_list($imapConnection,true); /** CREATING FOLDERS **/ @@ -104,15 +102,6 @@ $server_type = strtolower($imap_server_type); // Special handling for courier if ( $server_type == 'courier' ) { - /** - * If we use courier, we should hide system trash folder - * FIXME: (tokul) Who says that courier does not allow storing folders in - * INBOX.Trash or inbox.trash? Can't reproduce it 3.0.8. This entry is - * useless, because in_array() check is case sensitive and INBOX is in - * upper case. - */ - array_push($skip_folders, 'inbox.trash'); - if ( $default_folder_prefix == 'INBOX.' ) { // We don't need INBOX, since it is top folder array_push($skip_folders, 'INBOX'); @@ -140,7 +129,7 @@ $mbx_option_list .= sqimap_mailbox_option_list($imapConnection, $show_selected, /** count special folders **/ foreach ($boxes as $index => $aBoxData) { - if (isSpecialMailbox($aBoxData['unformatted']) && + if (isSpecialMailbox($aBoxData['unformatted'],false) && ! in_array($aBoxData['unformatted'],$skip_folders)) { $skip_folders[] = $aBoxData['unformatted']; } @@ -160,11 +149,13 @@ foreach ($boxes as $index => $aBoxData) { $rendel_folder_list = sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true); -$subbox_option_list = ''; +$subbox_option_list = array(); if ($show_only_subscribed_folders && !$no_list_for_subscribe) { // FIXME: fix subscription options when top folder is not subscribed and sub folder is subscribed + // TODO: use checkboxes instead of select options. + // DONE Steve Brown 2006-08-08 /** SUBSCRIBE TO FOLDERS **/ $boxes_all = sqimap_mailbox_list_all ($imapConnection); @@ -173,34 +164,33 @@ if ($show_only_subscribed_folders && !$no_list_for_subscribe) { // so we keep only the unsubscribed ones. foreach ($boxes_all as $box_a) { - $use_folder = true; - foreach ( $boxes as $box ) { - if ($box_a['unformatted'] == $box['unformatted'] || - $box_a['unformatted-dm'] == $folder_prefix ) { - $use_folder = false; - } - } - - if ($use_folder) { - $box_enc = htmlspecialchars($box_a['unformatted-dm']); - $box_disp = htmlspecialchars(imap_utf7_decode_local($box_a['unformatted-disp'])); - $subbox_option_list .= '\n"; - } + $use_folder = true; + foreach ( $boxes as $box ) { + if ($box_a['unformatted'] == $box['unformatted'] || + $box_a['unformatted-dm'] == $folder_prefix ) { + $use_folder = false; + } + } + + if ($use_folder) { + $box_enc = htmlspecialchars($box_a['unformatted-dm']); + $box_disp = htmlspecialchars(imap_utf7_decode_local($box_a['unformatted-disp'])); + $subbox_option_list[] = array( 'Value' => $box_enc, 'Display' => $box_disp); + } } } sqimap_logout($imapConnection); -$oTemplate->assign('td_str', @$td_str); -$oTemplate->assign('color', $color); +$oTemplate->assign('show_subfolders_option', $show_contain_subfolders_option); +$oTemplate->assign('show_only_subscribed_folders', $show_only_subscribed_folders==1); +$oTemplate->assign('no_list_for_subscribe', $no_list_for_subscribe); + $oTemplate->assign('mbx_option_list', $mbx_option_list); -$oTemplate->assign('show_contain_subfolders_option', $show_contain_subfolders_option); -$oTemplate->assign('show_only_subscribed_folders', $show_only_subscribed_folders); $oTemplate->assign('rendel_folder_list', $rendel_folder_list); $oTemplate->assign('subbox_option_list', $subbox_option_list); -$oTemplate->assign('no_list_for_subscribe', $no_list_for_subscribe); $oTemplate->display('folder_manip.tpl'); $oTemplate->display('footer.tpl'); - +?>