X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffolders.php;h=c1a3ba2431ca82a1397a6f810371e66eb0f00d35;hb=6914aa18b99a1f3919ad7cc66eefa611d508d20f;hp=a6c8f63900ca53e74769938c52b488ebbca37910;hpb=b7f83b61539e8952b9b337f167870aa99eb772f8;p=squirrelmail.git
diff --git a/src/folders.php b/src/folders.php
index a6c8f639..c1a3ba24 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -3,7 +3,7 @@
/**
* folders.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Handles all interaction between the user and the other folder
@@ -18,9 +18,7 @@ define('SM_PATH','../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/imap_utf7_decode_local.php');
require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/array.php');
require_once(SM_PATH . 'functions/plugin.php');
require_once(SM_PATH . 'functions/html.php');
@@ -109,25 +107,17 @@ if ($default_sub_of_inbox == false) {
echo '\n";
- } else {
- $box = $boxes[$i]['unformatted'];
- $box2 = str_replace(' ', ' ',
- imap_utf7_decode_local($boxes[$i]['unformatted-disp']));
- if (strtolower($imap_server_type) != 'courier' ||
- strtolower($box) != "inbox.trash")
- echo "\n";
- }
- }
+$show_selected = 0;
+if ( $default_sub_of_inbox ) {
+ $show_selected = array('inbox');
}
+$skip_folders = 0;
+if ( strtolower($imap_server_type) == 'courier' ) {
+ $skip_folders = array('inbox.trash');
+}
+
+echo sqimap_mailbox_option_list($imapConnection, $show_selected, $skip_folders, $boxes, 'noinferiors');
+
echo "\n";
if ($show_contain_subfolders_option) {
echo '
'
@@ -179,22 +169,9 @@ if ($count_special_folders < count($boxes)) {
echo "