* Support nested folders in IMAP. We might want to change the delimiter.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 3bdc97701250e85e9d4de7ef61fca38e08c9f8f8..586d96cb009fc1774fbd2a75ec9c062876ca2574 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 591.2  2002/04/05 04:25:56  ajc
+ * Support nested folders in IMAP.  We might want to change the delimiter.
+
  Revision 591.1  2002/04/04 23:25:30  ajc
  * Experimental hacking to handle subfolderization in IMAP.  Seems to work ok
    but it makes Mozilla mail hang.  Will investigate more later...
@@ -3576,3 +3579,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
+

diff --git a/citadel/imap_tools.c b/citadel/imap_tools.c
index bf8f28f15f3d633d38cd037a64713a9c7ecce3e2..c54c0832c30dfbdcfff6a85a7c5d0891f87e8ee4 100644 (file)
--- a/citadel/imap_tools.c
+++ b/citadel/imap_tools.c
@@ -154,8 +154,7 @@ int imap_roomname(char *rbuf, int bufsize, char *foldername)
                safestrncpy(rbuf, MAILROOM, bufsize);
                ret = (0 | IR_MAILBOX);
        }
-
-       if (levels > 1) {
+       else if (levels > 1) {
                extract(floorname, foldername, 0);
                strcpy(roomname, &foldername[strlen(floorname)+1]);
                for (i = 0; i < MAXFLOORS; ++i) {

diff --git a/citadel/serv_imap.c b/citadel/serv_imap.c
index 916d8fb435093f6175dafcfc970e6970aa1509c0..1dae24ffa9fb8b0dac5bfb73290964e0257fcde4 100644 (file)
--- a/citadel/serv_imap.c
+++ b/citadel/serv_imap.c
@@ -527,11 +527,11 @@ void imap_lsub_listroom(struct quickroom *qrbuf, void *data) {
        if (ra & UA_KNOWN) {
                imap_mailboxname(buf, sizeof buf, qrbuf);
                if (imap_mailbox_matches_pattern(pattern, buf)) {
-                       cprintf("* LSUB ");
+                       cprintf("* LSUB (");
                        if (!strcasecmp(buf, "INBOX")) {
-                               cprintf("(\\NoInferiors) ");
+                               cprintf("\\NoInferiors");
                        }
-                       cprintf("\"|\" ");
+                       cprintf(") \"|\" ");
                        imap_strout(buf);
                        cprintf("\r\n");
                }
@@ -580,11 +580,11 @@ void imap_list_listroom(struct quickroom *qrbuf, void *data) {
          || ((ra & UA_GOTOALLOWED) && (ra & UA_ZAPPED))) {
                imap_mailboxname(buf, sizeof buf, qrbuf);
                if (imap_mailbox_matches_pattern(pattern, buf)) {
-                       cprintf("* LIST ");
+                       cprintf("* LIST (");
                        if (!strcasecmp(buf, "INBOX")) {
-                               cprintf("(\\NoInferiors) ");
+                               cprintf("\\NoInferiors");
                        }
-                       cprintf("\"|\" ");
+                       cprintf(") \"|\" ");
                        imap_strout(buf);
                        cprintf("\r\n");
                }