* Worked on meeting accept/decline a little bit

[citadel.git] / webcit / roomops.c

diff --git a/webcit/roomops.c b/webcit/roomops.c
index c943f7104a2085cc014d23a6da3a17a6d9bb4de6..3be38e15996c9410933a20620c290b3d8c64f5bd 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -26,7 +26,9 @@
 char *viewdefs[] = {
        "Messages",
        "Summary",
-       "Address Book"
+       "Address Book",
+       "Calendar",
+       "Tasks"
 };
 
 char floorlist[128][SIZ];
@@ -1505,7 +1507,7 @@ void display_private(char *rname, int req_pass)
        wprintf("so you don't have to keep returning here.\n");
        wprintf("<BR><BR>");
 
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/goto_private\">\n");
+       wprintf("<FORM METHOD=\"GET\" ACTION=\"/goto_private\">\n");
 
        wprintf("<TABLE border><TR><TD>");
        wprintf("Enter room name:</TD><TD>");
@@ -1575,7 +1577,7 @@ void display_zap(void)
        wprintf("disappear from your room list.  Is this what you wish ");
        wprintf("to do?<BR>\n");
 
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/zap\">\n");
+       wprintf("<FORM METHOD=\"GET\" ACTION=\"/zap\">\n");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
        wprintf("</FORM>\n");
@@ -1637,7 +1639,7 @@ void confirm_delete_room(void)
        wprintf("</FONT></TD></TR></TABLE>\n");
 
        wprintf("<CENTER>");
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/delete_room\">\n");
+       wprintf("<FORM METHOD=\"GET\" ACTION=\"/delete_room\">\n");
 
        wprintf("Are you sure you want to delete <FONT SIZE=+1>");
        escputs(WC->wc_roomname);
@@ -1797,6 +1799,7 @@ void folders(void) {
        char buf[SIZ];
 
        int levels, oldlevels;
+       int swap = 0;
 
        struct folder {
                char room[SIZ];
@@ -1810,7 +1813,7 @@ void folders(void) {
        struct folder ftmp;
        int max_folders = 0;
        int alloc_folders = 0;
-       int i, j, k;
+       int i, j, k, t;
        int p;
        int flags;
        int floor;
@@ -1822,6 +1825,7 @@ void folders(void) {
        fold = malloc(sizeof(struct folder));
        memset(fold, 0, sizeof(struct folder));
        strcpy(fold[0].name, "My folders");
+       fold[0].is_mailbox = 1;
 
        /* Then add floors */
        serv_puts("LFLR");
@@ -1868,7 +1872,19 @@ void folders(void) {
        /* Bubble-sort the folder list */
        for (i=0; i<max_folders; ++i) {
                for (j=0; j<(max_folders-1)-i; ++j) {
-                       if (strcasecmp(fold[j].name, fold[j+1].name) > 0) {
+                       if (fold[j].is_mailbox == fold[j+1].is_mailbox) {
+                               swap = strcasecmp(fold[j].name, fold[j+1].name);
+                       }
+                       else {
+                               if ( (fold[j+1].is_mailbox)
+                                  && (!fold[j].is_mailbox)) {
+                                       swap = 1;
+                               }
+                               else {
+                                       swap = 0;
+                               }
+                       }
+                       if (swap > 0) {
                                memcpy(&ftmp, &fold[j], sizeof(struct folder));
                                memcpy(&fold[j], &fold[j+1],
                                                        sizeof(struct folder));
@@ -1887,31 +1903,41 @@ void folders(void) {
                levels = num_tokens(fold[i].name, '|');
                if (levels > oldlevels) {
                        for (k=0; k<(levels-oldlevels); ++k) {
-                               wprintf("<UL>");
                                ++nests;
                        }
                }
                if (levels < oldlevels) {
                        for (k=0; k<(oldlevels-levels); ++k) {
-                               wprintf("</UL>");
                                --nests;
                        }
                }
                oldlevels = levels;
 
-               wprintf("<LI>");
+               for (t=0; t<nests; ++t) wprintf("&nbsp;&nbsp;&nbsp;");
                if (fold[i].selectable) {
                        wprintf("<A HREF=\"/dotgoto?room=");
                        urlescputs(fold[i].room);
                        wprintf("\">");
                }
+               else {
+                       wprintf("<i>");
+               }
                if (fold[i].hasnewmsgs) wprintf("<B>");
                extract(buf, fold[i].name, levels-1);
                escputs(buf);
                if (fold[i].hasnewmsgs) wprintf("</B>");
-               if (fold[i].selectable) wprintf("</A>\n");
+               if (fold[i].selectable) {
+                       wprintf("</A>");
+               }
+               else {
+                       wprintf("</i>");
+               }
+               if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
+                       wprintf(" (INBOX)");
+               }
+               wprintf("<BR>\n");
        }
-       while (nests-- > 0) wprintf("</UL>\n");
+       while (nests-- > 0) ;; 
 
        free(fold);
        wDumpContent(1);