Lots of changes for variable initialization - clean up, really,

[squirrelmail.git] / src / folders.php

diff --git a/src/folders.php b/src/folders.php
index c1a3ba2431ca82a1397a6f810371e66eb0f00d35..466e6ef7c4bd80433302122e2d0d00af7fd53bb2 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -101,20 +101,24 @@ echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspaci
      _("as a subfolder of").
      '<BR>'.
      "<TT><SELECT NAME=subfolder>\n";
-if ($default_sub_of_inbox == false) {
+
+$show_selected=0;
+$skip_folders=0;
+$server_type = strtolower($imap_server_type);
+if ( $server_type == 'courier' ) {
+  $show_selected = array('inbox');
+  $skip_folders = array('inbox.trash');
+  if ( $default_folder_prefix == 'INBOX.' ) {
+    array_push($skip_folders, 'inbox');
+  }
+}
+
+if ( $default_sub_of_inbox == false ) {
     echo '<OPTION SELECTED VALUE="">[ '._("None")." ]\n";
 } else {
     echo '<OPTION VALUE="">[ '._("None")." ]\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');