X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders.php;h=60a8861daa8d7a31b3524254d0aabbab09152bdc;hp=f2589fb0e4203fdbbf2d3c24f726253c07c6a24d;hb=5619673737450c926cf406d4aeb802d0544f52ed;hpb=7e235a1a75c0544d1b41270f54568990b3af112a diff --git a/src/folders.php b/src/folders.php index f2589fb0..60a8861d 100644 --- a/src/folders.php +++ b/src/folders.php @@ -1,281 +1,198 @@ +} -
- -
+if (isset($td_str)) { + $oTemplate->assign('note', htmlspecialchars($td_str)); + $oTemplate->display('note.tpl'); +} - +$boxes = sqimap_mailbox_list($imapConnection,true); - - \n"; - "
+/** CREATING FOLDERS **/ -\n" . - "
\n"; - if ($success == "subscribe") { - echo "" . _("Subscribed successfully!") . "
"; - } else if ($success == "unsubscribe") { - echo "" . _("Unsubscribed successfully!") . "
"; - } else if ($success == "delete") { - echo "" . _("Deleted folder successfully!") . "
"; - } else if ($success == "create") { - echo "" . _("Created folder successfully!") . "
"; - } else if ($success == "rename") { - echo "" . _("Renamed successfully!") . "
"; +// Special handling for courier +if ( $server_type == 'courier' ) { + if ( $default_folder_prefix == 'INBOX.' ) { + // We don't need INBOX, since it is top folder + array_push($skip_folders, 'INBOX'); + } +} elseif ( $server_type == 'bincimap' ) { + if ( $default_folder_prefix == 'INBOX/' ) { + // We don't need INBOX, since it is top folder + array_push($skip_folders, 'INBOX'); } - - echo " " . _("refresh folder list") . "". - "

\n"; -} else { - echo "
"; } -$imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0); -$boxes = sqimap_mailbox_list($imapConnection); -/** CREATING FOLDERS **/ -echo "\n". - "". - "\n"; - -echo "\n"; +// Call sqimap_mailbox_option_list, using existing connection to IMAP server, +// the arrays of folders to include or skip (assembled above), +// use 'noinferiors' as a mailbox filter to leave out folders that can not contain other folders. +// use the long format to show subfolders in an intelligible way if parent is missing (special folder) +$mbx_option_list .= sqimap_mailbox_option_list($imapConnection, $show_selected, $skip_folders, $boxes, 'noinferiors', true); -/** RENAMING FOLDERS **/ -echo "". - "\n"; -} else { - echo _("No folders found") . "

"; } -$boxes_sub = $boxes; -echo "\n"; +/** + * Retrieve list of folders when special folders are excluded. Special folders + * should be unavailable in rename/delete/unsubscribe. Theoretically user can + * modify form and perform these operations with special folders, but if user + * manages to delete/rename/unsubscribe special folder by hacking form... + * + * If script or program depends on special folder, they should not assume that + * folder is available. + * + * $filtered_folders contains empty string or html formated option list. + */ +$rendel_folder_list = sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true); -/** DELETING FOLDERS **/ -echo ""; -echo "\n"; -} else { - echo _("No folders found") . "

"; -} -echo "
". - _("Create Folder"). - "
". - "
\n". - "
\n". - _("as a subfolder of"). - "
". - "\n"; -if ($show_contain_subfolders_option) { - echo "
 "; - echo _("Let this folder contain subfolders"); - echo "
"; -} -echo "\n"; -echo "
 
". - _("Rename a Folder"). - "
"; -if (count($boxes)) { - echo "
\n". - "\n". - "\n". - "
 
"; -echo _("Delete Folder"); -echo "
"; -$count_special_folders = 0; -$num_max = 1; -if (strtolower($imap_server_type) == "courier" || $move_to_trash) { - $num_max++; -} -if ($move_to_sent) { - $num_max++; -} -if ($save_as_draft) { - $num_max++; -} -for ($p = 0; $p < count($boxes) && $count_special_folders < $num_max; $p++) { - if (strtolower($boxes[$p]['unformatted']) == 'inbox') - $count_special_folders++; - else if (strtolower($imap_server_type) == 'courier' && - strtolower($boxes[$p]['unformatted']) == 'inbox.trash') - $count_special_folders++; - else if ($boxes[$p]['unformatted'] == $trash_folder && $trash_folder) - $count_special_folders++; - else if ($boxes[$p]['unformatted'] == $sent_folder && $sent_folder) - $count_special_folders++; - else if ($boxes[$p]['unformatted'] == $draft_folder && $draft_folder) - $count_special_folders++; -} +$subbox_option_list = array(); -if ($count_special_folders < count($boxes)) { - echo "
\n"; - echo "\n"; - echo "\n"; - echo "
 
\n"; +if ($show_only_subscribed_folders && !$no_list_for_subscribe) { + // FIXME: fix subscription options when top folder is not subscribed and sub folder is subscribed -/** UNSUBSCRIBE FOLDERS **/ -echo "\n"; -echo "\n"; -echo "\n"; -} else { - echo _("No folders were found to unsubscribe from!") . ""; -} -$boxes_sub = $boxes; + // TODO: use checkboxes instead of select options. + // DONE Steve Brown 2006-08-08 -/** SUBSCRIBE TO FOLDERS **/ -echo "
"; -echo _("Unsubscribe") . "/" . _("Subscribe"); -echo "
\n"; -if ($count_special_folders < count($boxes)) { - echo "
\n"; - echo "

\n"; - echo "\n"; - echo "
"; -$imap_stream = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 1); -$boxes_all = sqimap_mailbox_list_all ($imap_stream); + /** SUBSCRIBE TO FOLDERS **/ + $boxes_all = sqimap_mailbox_list_all ($imapConnection); -$box = ""; -$box2 = ""; -for ($i = 0, $q = 0; $i < count($boxes_all); $i++) { - $use_folder = true; - for ($p = 0; $p < count ($boxes); $p++) { - if ($boxes_all[$i]["unformatted"] == $boxes[$p]["unformatted"]) { - $use_folder = false; - continue; - } else if ($boxes_all[$i]["unformatted-dm"] == $folder_prefix) { - $use_folder = false; - } - } - if ($use_folder == true) { - $box[$q] = $boxes_all[$i]["unformatted-dm"]; - $box2[$q] = $boxes_all[$i]["unformatted-disp"]; - $q++; - } -} -sqimap_logout($imap_stream); + // here we filter out all boxes we're already subscribed to, + // so we keep only the unsubscribed ones. + foreach ($boxes_all as $box_a) { -if ($box && $box2) { - echo "
\n"; - echo "

"; - echo "\n"; - echo "

\n"; -} else { - echo _("No folders were found to subscribe to!") . "
"; + $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); + } + } } -do_hook("folders_bottom"); -?> +sqimap_logout($imapConnection); +$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('rendel_folder_list', $rendel_folder_list); +$oTemplate->assign('subbox_option_list', $subbox_option_list); - - - - +$oTemplate->display('folder_manip.tpl'); - \ No newline at end of file +$oTemplate->display('footer.tpl');