X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders.php;h=4be23786a33b2034f75825cee40d4634a32152e0;hb=e9f8ea4ecb40efdb6f19631f8359ebd1fbf588be;hp=ce164ae0b16017ba6a34afd7434b7cc029324f14;hpb=c36ed9cfc1635cd9a8f80d9cdf8200628777903f;p=squirrelmail.git

diff --git a/src/folders.php b/src/folders.php
index ce164ae0..4be23786 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -27,12 +27,31 @@
 
    displayPageHeader($color, "None");
 
-   echo "<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>\n";
-   echo "   <TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>\n";
+   echo "<br>";
+   echo "<TABLE WIDTH=95% COLS=1 ALIGN=CENTER>\n";
+   echo "   <TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>\n";
    echo _("Folders");
-   echo "   </TD></TR>\n";
+   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);
 
@@ -61,10 +80,10 @@
     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[0]\" ALIGN=CENTER><B>";
+       echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><B>";
        echo _("Special Folder Options");
        echo "</B></TD></TR>";
-       echo "<TR><TD BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
+       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)) {
@@ -79,11 +98,11 @@
    }
 
    /** DELETING FOLDERS **/
-   echo "<TABLE WIDTH=70% COLS=1 ALIGN=CENTER>\n";
-   echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><B>";
+   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 "</B></TD></TR>";
-   echo "<TR><TD BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
+   echo "</TD></TR>";
+   echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
 
    $count_special_folders = 0;
 	$num_max = 1;
@@ -119,17 +138,18 @@
       echo "<INPUT TYPE=SUBMIT VALUE=\"";
       echo _("Delete");
       echo "\">\n";
-      echo "</FORM><BR></TD></TR>\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[0]\" ALIGN=CENTER><B>";
+   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER>";
    echo _("Create Folder");
-   echo "</B></TD></TR>";
-   echo "<TR><TD BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
+   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");
@@ -174,13 +194,15 @@
       echo "<BR>";
    }   
    echo "<INPUT TYPE=SUBMIT VALUE=Create>\n";
-   echo "</FORM><BR></TD></TR><BR>\n";
+   echo "</FORM></TD></TR>\n";
+
+   echo "<tr><td bgcolor=\"$color[4]\">&nbsp;</td></tr>\n";
 
    /** RENAMING FOLDERS **/
-   echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><B>";
+   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER>";
    echo _("Rename a Folder");
-   echo "</B></TD></TR>";
-   echo "<TR><TD BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
+   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";
@@ -205,15 +227,18 @@
       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 "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><B>";
+   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 "</B></TD></TR>";
-   echo "<TR><TD BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
+   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>\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") &&
@@ -225,26 +250,26 @@
             echo "         <OPTION VALUE=\"$box\">$box2\n";
          }
       }
-      echo "</SELECT></TT>\n";
+      echo "</SELECT></TT><br>\n";
       echo "<INPUT TYPE=SUBMIT VALUE=\"";
       echo _("Unsubscribe");
       echo "\">\n";
-      echo "</FORM></TD></TR>\n";
+      echo "</FORM></TD>\n";
    } else {
-      echo _("No mailboxes found") . "<br><br></td></tr>";
+      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);
 
-   echo "<TR><TD BGCOLOR=\"$color[4]\" ALIGN=CENTER>";
-   if ($count_special_folders <= count($boxes)) {
-      $imap_stream = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 1);
-      $boxes_all = sqimap_mailbox_list_all ($imap_stream);
-      
-      echo "<FORM ACTION=\"folders_subscribe.php?method=sub\" METHOD=\"POST\">\n";
-      echo "<tt><select name=mailbox>";
-      for ($i = 0; $i < count($boxes_all); $i++) {
+      $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"]) {
@@ -255,19 +280,27 @@
 				}
 			}
 			if ($use_folder == true) {	
-            $box = $boxes_all[$i]["unformatted-dm"];
-            $box2 = replace_spaces($boxes_all[$i]["formatted"]);
-            echo "         <OPTION VALUE=\"$box\">$box2\n";
+            $box[$q] = $boxes_all[$i]["unformatted-dm"];
+            $box2[$q] = $boxes_all[$i]["formatted"];
+            $q++;
          }
       }
-      echo "</select></tt>";
-      echo "<INPUT TYPE=SUBMIT VALUE=\"";
-      echo _("Subscribe");
-      echo "\">\n";
+      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 mailboxes found") . "<br><br></td></tr></table>";
+      echo _("No folders were found to subscribe to!") . "</td></tr></table>";
    }
 
+   sqimap_logout($imapConnection);
 ?>
 </BODY></HTML>