From e634431a075bf241c5d32d4c1e52a53137959236 Mon Sep 17 00:00:00 2001 From: teepe Date: Tue, 25 Dec 2001 15:21:39 +0000 Subject: [PATCH] bug fix of the 1.2.0 bug, with thanks to Dave Huang. Also some style police... git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1944 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/folders.php | 445 ++++++++++++++++++++++++------------------------ 1 file changed, 222 insertions(+), 223 deletions(-) diff --git a/src/folders.php b/src/folders.php index c8c00893..577818b4 100644 --- a/src/folders.php +++ b/src/folders.php @@ -34,7 +34,7 @@ require_once('../functions/imap.php'); require_once('../functions/array.php'); require_once('../functions/plugin.php'); - displayPageHeader($color, 'None'); +displayPageHeader($color, 'None'); ?> @@ -49,233 +49,232 @@ require_once('../functions/plugin.php'); \n"; - echo " \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!") . "
"; - } - - echo " " . _("refresh folder list") . ""; - echo " \n"; - echo "
\n"; - } else { - echo "
"; - } - $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0); - $boxes = sqimap_mailbox_list($imapConnection); - - /** CREATING FOLDERS **/ - echo "\n"; - - echo ""; - echo "
"; - echo _("Create Folder"); - echo "
"; - echo "
\n"; - echo "
\n"; - echo _("as a subfolder of"); - echo "
"; - echo "\n"; + echo " \n"; + echo "
\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!") . "
"; + } + + echo " " . _("refresh folder list") . ""; + echo "

\n"; +} else { + echo "
"; +} +$imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0); +$boxes = sqimap_mailbox_list($imapConnection); + +/** CREATING FOLDERS **/ +echo "\n"; + +echo ""; +echo "\n"; - - echo "\n"; - - /** RENAMING FOLDERS **/ - echo ""; - echo "\n"; - } else { - echo _("No folders found") . "

"; - } - $boxes_sub = $boxes; - - echo "\n"; - - /** DELETING FOLDERS **/ - echo ""; - echo "\n"; - } else { - echo _("No folders found") . "

"; - } - echo "\n"; - - /** UNSUBSCRIBE FOLDERS **/ - echo "
"; +echo _("Create Folder"); +echo "
"; +echo "\n"; +echo "
\n"; +echo _("as a subfolder of"); +echo "
"; +echo "\n"; - if ($show_contain_subfolders_option) { - echo "
 "; - echo _("Let this folder contain subfolders"); - echo "
"; - } - echo "\n"; - echo "
 
"; - echo _("Rename a Folder"); - echo "
"; - if ($count_special_folders < count($boxes)) { - echo "
\n"; - echo "\n"; - echo "\n"; - echo "
 
"; - 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++; - } - - if ($count_special_folders < count($boxes)) { - echo "
\n"; - echo "\n"; - echo "\n"; - echo "
 
\n"; - echo "\n"; - echo "\n"; - } else { - echo _("No folders were found to unsubscribe from!") . ""; - } - $boxes_sub = $boxes; - - /** 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); - - $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); - - if ($box && $box2) { - echo "
\n"; - echo "

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

\n"; - } else { - echo _("No folders were found to subscribe to!") . "
"; - } + if (strtolower($imap_server_type) != "courier" || + strtolower($box) != "inbox.trash") + echo "