* Added goto private rooms

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index cd8d7390f60b69c2050bbee829e9f5df6ac62337..167a87ffe9a3d60209155363b9360ed3d7e0744c 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -2,6 +2,7 @@ Thu Dec 17 20:38:00 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Added the screens to send pages
        * Changed message headers to display in bigger font, non-boldface
        * Added the chat system
+       * Added goto private rooms
 
 Wed Dec 16 16:23:58 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Replace "Citadel/UX" in menu bar with the Citadel/UX logo

diff --git a/webcit/child.h b/webcit/child.h
index ab29eec91088dba3696e36b0d3ea2fecab9c77f4..38ca8e35bc5df443c9ee8baf19a761800ac8a424 100644 (file)
--- a/webcit/child.h
+++ b/webcit/child.h
@@ -53,3 +53,5 @@ void showuser(void);
 void display_page(void);
 void page_user(void);
 void do_chat(void);
+void display_private(char *rname, int req_pass);
+void goto_private(void);

diff --git a/webcit/roomops.c b/webcit/roomops.c
index dbf694a41cb9cb38fefa297a206fed6733b22b86..3bffaaebfb75bdf6a393d8cf5311674fb36b54b1 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -192,6 +192,7 @@ void gotoroom(char *gname, int display_name)
 
 
        printf("HTTP/1.0 200 OK\n");
+       printf("Window-target: top\n");
        output_headers(1);
 
        if (display_name != 2) {
@@ -771,10 +772,12 @@ int entroom(void) {
 void display_private(char *rname, int req_pass)
 {
 
+        printf("HTTP/1.0 200 OK\n");
+        output_headers(1);
 
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-        wprintf("<B>Enter a private room</B>\n");
+        wprintf("<B>Goto a private room</B>\n");
         wprintf("</FONT></TD></TR></TABLE>\n");
 
        wprintf("<CENTER>\n");
@@ -801,18 +804,23 @@ void display_private(char *rname, int req_pass)
        
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
-       wprintf("</FORM>");
+       wprintf("</FORM></HTML>\n");
+       wDumpContent();
        }
 
 /* 
  * goto a private room
  */
-int goto_private(void) {
+void goto_private(void) {
        char hold_rm[32];
        char buf[256];
        
-       if (strcmp(bstr("sc"),"OK")) {
-               return(2);
+       if (strcasecmp(bstr("sc"),"OK")) {
+               printf("HTTP/1.0 200 OK\n");
+               output_headers(1);
+               wprintf("Cancelled.</HTML>\n");
+               wDumpContent();
+               return;
                }
 
        strcpy(hold_rm,wc_roomname);
@@ -825,16 +833,19 @@ int goto_private(void) {
 
        if (buf[0]=='2') {
                gotoroom(bstr("gr_name"),1);
-               return(0);
+               return;
                }
 
        if (!strncmp(buf,"540",3)) {
                display_private(bstr("gr_name"),1);
-               return(1);
+               return;
                }
 
-       wprintf("<EM>%s</EM>\n",&buf[4]);
-       return(2);
+        printf("HTTP/1.0 200 OK\n");
+        output_headers(1);
+       wprintf("%s\n",&buf[4]);
+       wDumpContent();
+       return;
        }
 
 

diff --git a/webcit/webcit.c b/webcit/webcit.c
index b3e5208f150819c7e49bd7b7b7566d7e963b0239..f1177c7b6874c81fdeb0a937fba99eb708c1640a 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -668,6 +668,14 @@ fclose(fp);
                do_chat();
                }
 
+       else if (!strcasecmp(action, "display_private")) {
+               display_private("", 0);
+               }
+
+       else if (!strcasecmp(action, "goto_private")) {
+               goto_private();
+               }
+
        /* When all else fails... */
        else {
                printf("HTTP/1.0 200 OK\n");