X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders.php;h=efc3bae7f07b607d3d6cc38013a822fa71613639;hp=80697f038eb46dd32182ae5a3e2b5b2ba23deef7;hb=08185f2a7631c3a12cb1ac085fec3be471b56b00;hpb=eabc2883bac9ab431886da6f155d64f20d9618b4

diff --git a/src/folders.php b/src/folders.php
index 80697f03..efc3bae7 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -1,312 +1,324 @@
 <?php
-   /**
-    **  folders.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Handles all interaction between the user and the other folder
-    **  scripts which do most of the work. Also handles the Special
-    **  Folders.
-    **/
-
-   session_start();
-
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($array_php))
-      include("../functions/array.php");
-
-   include("../src/load_prefs.php");
-
-   displayPageHeader($color, "None");
-
-   echo "<br>";
-   echo "<TABLE WIDTH=95% COLS=1 ALIGN=CENTER>\n";
-   echo "   <TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>\n";
-   echo _("Folders");
-   echo "   </b></TD></TR>\n";
-   echo "</TABLE>\n";
-
-   if ($success) {
-      echo "<table width=100% align=center cellpadding=3 cellspacing=0 border=0>\n";
-      echo "   <tr><td><center>\n";
-      if ($success == "subscribe") {
-         echo "<b>" . _("Subscribed successfully!") . "</b><br>";
-      } else if ($success == "unsubscribe") {
-         echo "<b>" . _("Unsubscribed successfully!") . "</b><br>";
-      } else if ($success == "delete") {
-         echo "<b>" . _("Deleted folder successfully!") . "</b><br>";
-      } else if ($success == "create") {
-         echo "<b>" . _("Created folder successfully!") . "</b><br>";
-      } else if ($success == "rename") {
-         echo "<b>" . _("Renamed successfully!") . "</b><br>";
-      }
-      echo "   <a href=\"../src/left_main.php\" target=left>" . _("refresh folder list") . "</a>";
-      echo "   </center></td></tr>\n";
-      echo "</table><br>\n";
-   }
-   $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
-   $boxes = sqimap_mailbox_list($imapConnection);
-
-  /** Cyrus Folder Options**/
-//Creates the Sent and Trash folder
-   if (($sent_create == "true") || ($trash_create == "true")) {
-      if ($sent_create == "true") {
-         sqimap_mailbox_create ($imapConnection, $sent_folder, "");  
-      }
-   if ($trash_create == "true") {
-      sqimap_mailbox_create ($imapConnection, $trash_folder, "");
-   }
-   echo "<BR><BR><CENTER><b>";
-   echo _("Mailboxes Created Successfully!");
-   echo "<BR><A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>";
-   echo _("Click here");
-   echo "</A> ";
-   echo _("to continue.");
-   echo "</CENTER>";
-   echo "</BODY></HTML>";
-	
-   sqimap_logout($imapConnection);
-   exit;
-   }
-
-//display form option for creating Sent and Trash folder
-    if ($imap_server_type == "cyrus") {
-       if ((!sqimap_mailbox_exists ($imapConnection, $sent_folder)) || (!sqimap_mailbox_exists ($imapConnection, $trash_folder))) {
-       echo "<TABLE WIDTH=70% COLS=1 ALIGN=CENTER>\n";
-       echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><B>";
-       echo _("Special Folder Options");
-       echo "</B></TD></TR>";
-       echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
-       echo _("In order for SquirrelMail to provide the full set of options you need to create the special folders listed below.  Just click the check box and hit the create button.");
-       echo "<FORM ACTION=\"folders.php\" METHOD=\"POST\">\n";
-           if (!sqimap_mailbox_exists ($imapConnection, $sent_folder)) {
-              echo _("Create Sent") . "<INPUT TYPE=checkbox NAME=sent_create value=true><br>\n";
-           }
-           if (!sqimap_mailbox_exists ($imapConnection, $trash_folder)){
-           echo _("Create Trash") . "<INPUT TYPE=checkbox NAME=trash_create value=true><br>\n";
-           echo "<INPUT TYPE=submit VALUE=Create>";
-           }
-       }
-       echo "</FORM></TD></TR></TABLE>n";
-   }
-
-   /** DELETING FOLDERS **/
-   echo "<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=2 cellspacing=0 border=0>\n";
-   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER>";
-   echo _("Delete Folder");
-   echo "</TD></TR>";
-   echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
-
-   $count_special_folders = 0;
-	$num_max = 1;
-	if ($move_to_trash)
-		$num_max++;
-	if ($move_to_sent)
-		$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 ($boxes[$p]["unformatted"] == $trash_folder && $trash_folder)
-         $count_special_folders++;
-      else if ($boxes[$p]["unformatted"] == $sent_folder && $sent_folder)
-         $count_special_folders++;
-   }   
-
-   if ($count_special_folders < count($boxes)) {
-      echo "<FORM ACTION=\"folders_delete.php\" METHOD=\"POST\">\n";
-      echo "<TT><SELECT NAME=mailbox>\n";
-      for ($i = 0; $i < count($boxes); $i++) {
-         $use_folder = true;
-			if ((strtolower($boxes[$i]["unformatted"]) != "inbox") && 
-			    ($boxes[$i]["unformatted"] != $trash_folder) && 
-			    ($boxes[$i]["unformatted"] != $sent_folder)) 
-			{	
-            $box = $boxes[$i]["unformatted-dm"];
-            $box2 = replace_spaces($boxes[$i]["formatted"]);
-            echo "         <OPTION VALUE=\"$box\">$box2\n";
-         }
-      }
-      echo "</SELECT></TT>\n";
-      echo "<INPUT TYPE=SUBMIT VALUE=\"";
-      echo _("Delete");
-      echo "\">\n";
-      echo "</FORM></TD></TR>\n";
-   } else {
-      echo _("No mailboxes found") . "<br><br></td><tr>";
-   }
-
-   echo "<tr><td bgcolor=\"$color[4]\">&nbsp;</td></tr>\n";
-
-   /** CREATING FOLDERS **/
-   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER>";
-   echo _("Create Folder");
-   echo "</TD></TR>";
-   echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
-   echo "<FORM ACTION=\"folders_create.php\" METHOD=\"POST\">\n";
-   echo "<INPUT TYPE=TEXT SIZE=25 NAME=folder_name><BR>\n";
-   echo _("as a subfolder of");
-   echo "<BR>";
-   echo "<TT><SELECT NAME=subfolder>\n";
-   if ($default_sub_of_inbox == false)
-      echo "<OPTION SELECTED>[ None ]\n";
-   else
-      echo "<OPTION>[ None ]\n";
-
-   for ($i = 0; $i < count($boxes); $i++) {
-      if (count($boxes[$i]["flags"]) > 0) {
-         $noinf = false;
-         for ($j = 0; $j < count($boxes[$i]["flags"]); $j++) {
-            if ($boxes[$i]["flags"][$j] == "noinferiors") {
-               $noinf = true;
-               continue;
-            }
-         }    
-         if ($noinf == false) {
-            if ((strtolower($boxes[$i]["unformatted"]) == "inbox") && ($default_sub_of_inbox == true)) {
-               $box = $boxes[$i]["unformatted"];
-               $box2 = replace_spaces($boxes[$i]["formatted"]);
-               echo "<OPTION SELECTED VALUE=\"$box\">$box2\n";
-            } else {
-               $box = $boxes[$i]["unformatted"];
-               $box2 = replace_spaces($boxes[$i]["formatted"]);
-               echo "<OPTION VALUE=\"$box\">$box2\n";
+
+/**
+ * folders.php
+ *
+ * Copyright (c) 1999-2002 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
+ * scripts which do most of the work. Also handles the Special
+ * Folders.
+ *
+ * $Id$
+ */
+
+/* Path for SquirrelMail required files. */
+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');
+
+displayPageHeader($color, 'None');
+
+echo '<br>' .
+    html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) .
+        html_tag( 'tr' ) .
+            html_tag( 'td', '', 'center' ) . '<b>' . _("Folders") . '</b>' .
+                html_tag( 'table', '', 'center', '', 'width="100%" cellpadding="5" cellspacing="0" border="0"' ) .
+                    html_tag( 'tr' ) .
+                        html_tag( 'td', '', 'center', $color[4] );
+
+if ((isset($success) && $success) ||
+    (isset($sent_create) && $sent_create == 'true') ||
+    (isset($trash_create) && $trash_create == 'true')) {
+    if ($success == "subscribe") {
+        $td_str = "<b>" . _("Subscribed successfully!") . "</b><br>";
+    } else if ($success == "unsubscribe") {
+        $td_str = "<b>" . _("Unsubscribed successfully!") . "</b><br>";
+    } else if ($success == "delete") {
+        $td_str = "<b>" . _("Deleted folder successfully!") . "</b><br>";
+    } else if ($success == "create") {
+        $td_str = "<b>" . _("Created folder successfully!") . "</b><br>";
+    } else if ($success == "rename") {
+        $td_str = "<b>" . _("Renamed successfully!") . "</b><br>";
+    } else if ($success == "subscribe-doesnotexist") {
+        $td_str = "<b>" .
+                  _("Subscription Unsuccessful - Folder does not exist.") .
+                  "</b><br>";
+    }
+
+    echo html_tag( 'table',
+                html_tag( 'tr',
+                     html_tag( 'td', $td_str .
+                               "<a href=\"../src/left_main.php\" target=left>" . _("refresh folder list") . "</a>" ,
+                     'center' )
+                ) ,
+            'center', '', 'width="100%" cellpadding="4" cellspacing="0" border="0"' ) . "<br>\n";
+} else {
+    echo "<br>";
+}
+$imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
+$boxes = sqimap_mailbox_list($imapConnection);
+
+/** CREATING FOLDERS **/
+echo html_tag( 'table', '', 'center', '', 'width="70%" cols="1" cellpadding="4" cellspacing="0" border="0"' ) .
+            html_tag( 'tr',
+                html_tag( 'td', '<b>' . _("Create Folder") . '</b>', 'center', $color[9] )
+            ) .
+            html_tag( 'tr' ) .
+                html_tag( 'td', '', 'center', $color[0] ) .
+
+     "<FORM NAME=cf ACTION=\"folders_create.php\" METHOD=\"POST\">\n".
+     "<input type=TEXT SIZE=25 NAME=folder_name><BR>\n".
+     _("as a subfolder of").
+     "<BR>".
+     "<TT><SELECT NAME=subfolder>\n";
+if ($default_sub_of_inbox == false) {
+    echo '<OPTION SELECTED VALUE="">[ '._("None")." ]\n";
+} else {
+    echo '<OPTION VALUE="">[ '._("None")." ]\n";
+}
+
+for ($i = 0; $i < count($boxes); $i++) {
+    if (!in_array('noinferiors', $boxes[$i]['flags'])) {
+        if ((strtolower($boxes[$i]['unformatted']) == 'inbox') &&
+            $default_sub_of_inbox) {
+
+            $box = $boxes[$i]['unformatted'];
+            $box2 = str_replace(' ', '&nbsp;',
+                                imap_utf7_decode_local($boxes[$i]['unformatted-disp']));
+            echo "<OPTION SELECTED VALUE=\"$box\">$box2</option>\n";
+        } else {
+            $box = $boxes[$i]['unformatted'];
+            $box2 = str_replace(' ', '&nbsp;',
+                                imap_utf7_decode_local($boxes[$i]['unformatted-disp'])); 
+            if (strtolower($imap_server_type) != 'courier' ||
+                  strtolower($box) != "inbox.trash")
+                echo "<OPTION VALUE=\"$box\">$box2</option>\n";
+        }
+    }
+}
+echo "</SELECT></TT>\n";
+if ($show_contain_subfolders_option) {
+    echo "<br><input type=CHECKBOX NAME=\"contain_subs\"> &nbsp;";
+    echo _("Let this folder contain subfolders");
+    echo "<BR>";
+}
+echo "<input type=SUBMIT VALUE=\""._("Create")."\">\n";
+echo "</FORM></td></tr>\n";
+
+echo html_tag( 'tr',
+            html_tag( 'td', '&nbsp;', 'left', $color[4] )
+        ) ."\n";
+
+/** count special folders **/
+$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++;
+}
+
+
+/** RENAMING FOLDERS **/
+echo html_tag( 'tr',
+            html_tag( 'td', '<b>' . _("Rename a Folder") . '</b>', 'center', $color[9] )
+        ) .
+        html_tag( 'tr' ) .
+        html_tag( 'td', '', 'center', $color[0] );
+
+if ($count_special_folders < count($boxes)) {
+    echo "<FORM ACTION=\"folders_rename_getname.php\" METHOD=\"POST\">\n"
+       . "<TT><SELECT NAME=old>\n"
+       . '         <OPTION VALUE="">[ ' . _("Select a folder") . " ]</OPTION>\n";
+    for ($i = 0; $i < count($boxes); $i++) {
+        $use_folder = true;
+
+        if ((strtolower($boxes[$i]['unformatted']) != 'inbox') &&
+            ($boxes[$i]['unformatted'] != $trash_folder)  &&
+            ($boxes[$i]['unformatted'] != $sent_folder) &&
+            ($boxes[$i]['unformatted'] != $draft_folder)) {
+            $box = $boxes[$i]['unformatted-dm'];
+
+            $box2 = str_replace(' ', '&nbsp;',
+                                imap_utf7_decode_local($boxes[$i]['unformatted-disp']));
+            if (strtolower($imap_server_type) != 'courier' || strtolower($box) != 'inbox.trash') {
+                echo "<OPTION VALUE=\"$box\">$box2</option>\n";
             }
-         }
-      } else {
-         if ((strtolower($boxes[$i]["unformatted"]) == "inbox") && ($default_sub_of_inbox == true)) {
-            $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["formatted"]);
-            echo "<OPTION SELECTED VALUE=\"$box\">$box2\n";
-         } else {
-            $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["formatted"]);
-            echo "<OPTION VALUE=\"$box\">$box2\n";
-         }
-      }
-   }
-   echo "</SELECT></TT><BR>\n";
-   if ($show_contain_subfolders_option) {
-      echo "<INPUT TYPE=CHECKBOX NAME=\"contain_subs\"> &nbsp;";
-      echo _("Let this folder contain subfolders");
-      echo "<BR>";
-   }   
-   echo "<INPUT TYPE=SUBMIT VALUE=\""._("Create")."\">\n";
-   echo "</FORM></TD></TR>\n";
-
-   echo "<tr><td bgcolor=\"$color[4]\">&nbsp;</td></tr>\n";
-
-   /** RENAMING FOLDERS **/
-   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER>";
-   echo _("Rename a Folder");
-   echo "</TD></TR>";
-   echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
-   if ($count_special_folders < count($boxes)) {
-      echo "<FORM ACTION=\"folders_rename_getname.php\" METHOD=\"POST\">\n";
-      echo "<TT><SELECT NAME=old>\n";
-      for ($i = 0; $i < count($boxes); $i++) {
-         $use_folder = true;
-
-			if ((strtolower($boxes[$i]["unformatted"]) != "inbox") && 
-			    ($boxes[$i]["unformatted"] != $trash_folder)  &&
-			    ($boxes[$i]["unformatted"] != $sent_folder)) 
-			{	
-            $box = $boxes[$i]["unformatted-dm"];
-            $box2 = replace_spaces($boxes[$i]["formatted"]);
-            echo "         <OPTION VALUE=\"$box\">$box2\n";
-         }
-      }
-      echo "</SELECT></TT>\n";
-      echo "<INPUT TYPE=SUBMIT VALUE=\"";
-      echo _("Rename");
-      echo "\">\n";
-      echo "</FORM></TD></TR>\n";
-   } else {
-      echo _("No mailboxes found") . "<br><br></td></tr>";
-   }
-   $boxes_sub = $boxes;
-
-   echo "<tr><td bgcolor=\"$color[4]\">&nbsp;</td></tr></table>\n";
-   
-   /** UNSUBSCRIBE FOLDERS **/
-   echo "<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=2 cellspacing=0 border=0>\n";
-   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER colspan=3>";
-   echo _("Unsubscribe") . "/" . _("Subscribe");
-   echo "</TD></TR>";
-   echo "<TR><TD BGCOLOR=\"$color[0]\" width=49% ALIGN=CENTER>";
-   if ($count_special_folders < count($boxes)) {
-      echo "<FORM ACTION=\"folders_subscribe.php?method=unsub\" METHOD=\"POST\">\n";
-      echo "<TT><SELECT NAME=mailbox[] multiple size=8>\n";
-      for ($i = 0; $i < count($boxes); $i++) {
-         $use_folder = true;
-			if ((strtolower($boxes[$i]["unformatted"]) != "inbox") &&
-			    ($boxes[$i]["unformatted"] != $trash_folder) &&
-			    ($boxes[$i]["unformatted"] != $sent_folder)) 
-			{	
+        }
+    }
+    echo "</SELECT></TT>\n".
+         "<input type=SUBMIT VALUE=\"".
+         _("Rename").
+         "\">\n".
+         "</FORM></td></tr>\n";
+} else {
+    echo _("No folders found") . "<br><br></td></tr>";
+}
+$boxes_sub = $boxes;
+
+echo html_tag( 'tr',
+            html_tag( 'td', '&nbsp;', 'left', $color[4] )
+        ) ."\n";
+
+/** DELETING FOLDERS **/
+echo html_tag( 'tr',
+            html_tag( 'td', '<b>' . _("Delete Folder") . '</b>', 'center', $color[9] )
+        ) .
+        html_tag( 'tr' ) .
+        html_tag( 'td', '', 'center', $color[0] );
+
+if ($count_special_folders < count($boxes)) {
+    echo "<FORM ACTION=\"folders_delete.php\" METHOD=\"POST\">\n"
+       . "<TT><SELECT NAME=mailbox>\n"
+       . '         <OPTION VALUE="">[ ' . _("Select a folder") . " ]</OPTION>\n";
+    for ($i = 0; $i < count($boxes); $i++) {
+        $use_folder = true;
+        if ((strtolower($boxes[$i]['unformatted']) != 'inbox') &&
+            ($boxes[$i]['unformatted'] != $trash_folder) &&
+            ($boxes[$i]['unformatted'] != $sent_folder) &&
+            ($boxes[$i]['unformatted'] != $draft_folder) &&
+            (!in_array('noselect', $boxes[$i]['flags'])) &&
+            ((strtolower($imap_server_type) != 'courier') ||
+             (strtolower($boxes[$i]['unformatted']) != 'inbox.trash'))) {
+            $box = $boxes[$i]['unformatted-dm'];
+            $box2 = str_replace(' ', '&nbsp;',
+                                imap_utf7_decode_local($boxes[$i]['unformatted-disp']));
+            echo "         <OPTION VALUE=\"$box\">$box2</option>\n";
+        }
+    }
+    echo "</SELECT></TT>\n";
+    echo "<input type=SUBMIT VALUE=\"";
+    echo _("Delete");
+    echo "\">\n";
+    echo "</form></td></tr>\n";
+} else {
+    echo _("No folders found") . "<br><br></td></tr>";
+}
+
+echo html_tag( 'tr',
+            html_tag( 'td', '&nbsp;', 'left', $color[4] )
+        ) ."</table>\n";
+
+
+/** UNSUBSCRIBE FOLDERS **/
+echo html_tag( 'table', '', 'center', '', 'width="70%" cols="2" cellpadding="4" cellspacing="0" border="0"' ) .
+            html_tag( 'tr',
+                html_tag( 'td', '<b>' . _("Unsubscribe") . '/' . _("Subscribe") . '</b>', 'center', $color[9], 'colspan="2"' )
+            ) .
+            html_tag( 'tr' ) .
+                html_tag( 'td', '', 'center', $color[0], 'width="50%"' );
+
+if ($count_special_folders < count($boxes)) {
+    echo "<FORM ACTION=\"folders_subscribe.php?method=unsub\" METHOD=\"POST\">\n";
+    echo "<TT><SELECT NAME=\"mailbox[]\" multiple size=8>\n";
+    for ($i = 0; $i < count($boxes); $i++) {
+        $use_folder = true;
+        if ((strtolower($boxes[$i]["unformatted"]) != "inbox") &&
+            ($boxes[$i]["unformatted"] != $trash_folder) &&
+            ($boxes[$i]["unformatted"] != $sent_folder) &&
+            ($boxes[$i]["unformatted"] != $draft_folder)) {
             $box = $boxes[$i]["unformatted-dm"];
-            $box2 = replace_spaces($boxes[$i]["formatted"]);
+            $box2 = str_replace(' ', '&nbsp;',
+                                imap_utf7_decode_local($boxes[$i]["unformatted-disp"]));
             echo "         <OPTION VALUE=\"$box\">$box2\n";
-         }
-      }
-      echo "</SELECT></TT><br>\n";
-      echo "<INPUT TYPE=SUBMIT VALUE=\"";
-      echo _("Unsubscribe");
-      echo "\">\n";
-      echo "</FORM></TD>\n";
-   } else {
-      echo _("No folders were found to unsubscribe from!") . "</td>";
-   }
-   $boxes_sub = $boxes;
-
-   echo "<td bgcolor=\"$color[9]\" width=2%>&nbsp;</td>";
-   
-   /** SUBSCRIBE TO FOLDERS **/
-   echo "<TD BGCOLOR=\"$color[0]\" widtn=49% ALIGN=CENTER>";
-   $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]["formatted"];
-            $q++;
-         }
-      }
-      sqimap_logout($imap_stream);
-
-   if ($box && $box2) {
-      echo "<FORM ACTION=\"folders_subscribe.php?method=sub\" METHOD=\"POST\">\n";
-      echo "<tt><select name=mailbox[] multiple size=8>";
-
-      for ($q = 0; $q < count($box); $q++) {      
-         echo "         <OPTION VALUE=\"$box[$q]\">".$box2[$q]."\n";
-      }      
-      echo "</select></tt><br>";
-      echo "<INPUT TYPE=SUBMIT VALUE=\"". _("Subscribe") . "\">\n";
-      echo "</FORM></TD></TR></TABLE><BR>\n";
-   } else {
-      echo _("No folders were found to subscribe to!") . "</td></tr></table>";
-   }
+        }
+    }
+    echo "</SELECT></TT><br><br>\n";
+    echo "<input type=SUBMIT VALUE=\"";
+    echo _("Unsubscribe");
+    echo "\">\n";
+    echo "</FORM></td>\n";
+} else {
+    echo _("No folders were found to unsubscribe from!") . "</td>";
+}
+$boxes_sub = $boxes;
+
+/** SUBSCRIBE TO FOLDERS **/
+echo html_tag( 'td', '', 'center', $color[0], 'width="50%"' );
+if(!$no_list_for_subscribe) {
+  $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] = imap_utf7_decode_local($boxes_all[$i]["unformatted-disp"]);
+        $q++;
+    }
+  }
+  sqimap_logout($imap_stream);
+
+  if ($box && $box2) {
+    echo "<FORM ACTION=\"folders_subscribe.php?method=sub\" METHOD=\"POST\">\n";
+    echo "<tt><select name=\"mailbox[]\" multiple size=8>";
+
+    for ($q = 0; $q < count($box); $q++) {      
+       echo "         <OPTION VALUE=\"$box[$q]\">".$box2[$q]."\n";
+    }      
+    echo "</select></tt><br><br>";
+    echo "<input type=SUBMIT VALUE=\"". _("Subscribe") . "\">\n";
+    echo "</FORM></td></tr></table><BR>\n";
+  } else {
+    echo _("No folders were found to subscribe to!") . "</td></tr></table>";
+  }
+} else {
+  /* don't perform the list action -- this is much faster */
+  echo "<FORM ACTION=\"folders_subscribe.php?method=sub\" METHOD=\"POST\">\n";
+  echo _("Subscribe to:") . "<br>";
+  echo "<tt><input type=\"text\" name=\"mailbox[]\" size=35>";
+  echo "<INPUT TYPE=SUBMIT VALUE=\"". _("Subscribe") . "\">\n";
+  echo "</FORM></TD></TR></TABLE><BR>\n";
+}
+
+do_hook("folders_bottom");
+?>
+
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
+
+<?php
    sqimap_logout($imapConnection);
 ?>
-</BODY></HTML>
+
+</body></html>