]> code.citadel.org Git - citadel.git/commitdiff
projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 523fabe)
added "Create room"
authorArt Cancro <ajc@citadel.org>
Sun, 27 Dec 1998 05:03:59 +0000 (05:03 +0000)
committerArt Cancro <ajc@citadel.org>
Sun, 27 Dec 1998 05:03:59 +0000 (05:03 +0000)
webcit/child.h patch | blob | history
webcit/roomops.c patch | blob | history
webcit/webcit.c patch | blob | history

diff --git a/webcit/child.h b/webcit/child.h
index 096f1dcb0d57829b5b76c031188812072c8068b3..8a27b75085bf01e85fc321ec8b4e24344fdb4cd3 100644 (file)
--- a/webcit/child.h
+++ b/webcit/child.h
@@ -61,3 +61,5 @@ void zap(void);
 void display_error(char *errormessage);
 void display_entroom(void);
 void entroom(void);
+void display_editroom(void);
+void editroom(void);
diff --git a/webcit/roomops.c b/webcit/roomops.c
index 88ee21b6840440a4fc53ce5c84bca4a2b81dc1be..e386a6551279097da18094c7d6436610166f6951 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -199,16 +199,16 @@ void gotoroom(char *gname, int display_name)
        static long ls = (-1L);
 
 
-       printf("HTTP/1.0 200 OK\n");
-       printf("Window-target: top\n");
-       output_headers(0);
-
-        wprintf("<HTML><HEAD></HEAD><BODY \n");
-
-       /* automatically fire up a read-new-msgs in the bottom frame */
-       if (display_name) wprintf("onload=location=\"/readnew\" ");
-
-        wprintf("BACKGROUND=\"/image&name=background\" TEXT=\"#000000\" LINK=\"#004400\">\n");
+       if (display_name) {
+               printf("HTTP/1.0 200 OK\n");
+               printf("Window-target: top\n");
+               output_headers(0);
+               wprintf("<HTML><HEAD></HEAD><BODY \n");
+       
+               /* automatically fire up a read-new-msgs in the bottom frame */
+               wprintf("onload=location=\"/readnew\" ");
+               wprintf("BACKGROUND=\"/image&name=background\" TEXT=\"#000000\" LINK=\"#004400\">\n");
+               }
 
        if (display_name != 2) {
                /* store ungoto information */
@@ -227,7 +227,7 @@ void gotoroom(char *gname, int display_name)
                serv_gets(buf);
                }
        if (buf[0]!='2') {
-               wprintf("<EM>%s</EM><BR>\n",&buf[4]);
+               if (display_name) wprintf("<EM>%s</EM><BR>\n",&buf[4]);
                wDumpContent();
                return;
                }
@@ -253,40 +253,41 @@ void gotoroom(char *gname, int display_name)
                if ( (strlen(ugname)>0) && (strcasecmp(ugname,wc_roomname)) ) {
                        wprintf("<TD><A HREF=\"/ungoto\">");
                        wprintf("<IMG SRC=\"/static/back.gif\" border=0></A></TD>");
-                       }
-
-               wprintf("<TD><H1>%s</H1>",wc_roomname);
-               wprintf("<FONT SIZE=-1>%d new of %d messages</FONT></TD>\n",
-                       extract_int(&buf[4],1),
-                       extract_int(&buf[4],2));
 
-               /* Display room graphic.  The server doesn't actually need the
-                * room name, but we supply it in order to keep the browser
-                * from using a cached graphic from another room.
-                */
-               serv_puts("OIMG _roompic_");
-               serv_gets(buf);
-               if (buf[0]=='2') {
-                       wprintf("<TD>");
-                       wprintf("<IMG SRC=\"/image&name=_roompic_&room=");
-                       escputs(wc_roomname);
-                       wprintf("\"></TD>");
-                       serv_puts("CLOS");
+                       wprintf("<TD><H1>%s</H1>",wc_roomname);
+                       wprintf("<FONT SIZE=-1>%d new of %d messages</FONT></TD>\n",
+                               extract_int(&buf[4],1),
+                               extract_int(&buf[4],2));
+
+                       /* Display room graphic.  The server doesn't actually
+                        * need the room name, but we supply it in order to
+                        * keep the browser from using a cached graphic from 
+                        * another room.
+                        */
+                       serv_puts("OIMG _roompic_");
                        serv_gets(buf);
-                       }
+                       if (buf[0]=='2') {
+                               wprintf("<TD>");
+                               wprintf("<IMG SRC=\"/image&name=_roompic_&room=");
+                               escputs(wc_roomname);
+                               wprintf("\"></TD>");
+                               serv_puts("CLOS");
+                               serv_gets(buf);
+                               }
 
-               wprintf("<TD>");
-               readinfo(0);
-               wprintf("</TD>");
+                       wprintf("<TD>");
+                       readinfo(0);
+                       wprintf("</TD>");
 
-               wprintf("<TD><A HREF=\"/gotonext\">");
-               wprintf("<IMG SRC=\"/static/forward.gif\" border=0></A></TD>");
+                       wprintf("<TD><A HREF=\"/gotonext\">");
+                       wprintf("<IMG SRC=\"/static/forward.gif\" border=0></A></TD>");
 
-               wprintf("</TR></TABLE></CENTER>\n");
+                       wprintf("</TR></TABLE></CENTER>\n");
+                       }
+               wDumpContent();
                }
 
        strcpy(wc_roomname, wc_roomname);
-       wDumpContent();
        }
 
 
@@ -412,7 +413,7 @@ void ungoto(void) {
 /*
  * display the form for editing a room
  */
-int display_editroom(void) {
+void display_editroom(void) {
        char buf[256];
        char er_name[20];
        char er_password[10];
@@ -424,8 +425,8 @@ int display_editroom(void) {
        serv_gets(buf);
 
        if (buf[0]!='2') {
-               wprintf("<EM>%s</EM><BR>\n",&buf[4]);
-               return(0);
+               display_error(&buf[4]);
+               return;
                }
 
        extract(er_name,&buf[4],0);
@@ -434,6 +435,9 @@ int display_editroom(void) {
        er_flags=extract_int(&buf[4],3);
 
 
+        printf("HTTP/1.0 200 OK\n");
+        output_headers(1);
+
         wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=000077><TR><TD>");
         wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
         wprintf("<B>Edit this room</B>\n");
@@ -542,15 +546,15 @@ int display_editroom(void) {
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
        wprintf("</CENTER>\n");
 
-       wprintf("</FORM>\n");
-       return(1);
+       wprintf("</FORM></HTML>\n");
+       wDumpContent();
        }
 
 
 /*
  * save new parameters for a room
  */
-int editroom(void) {
+void editroom(void) {
        char buf[256];
        char er_name[20];
        char er_password[10];
@@ -561,16 +565,16 @@ int editroom(void) {
 
 
        if (strcmp(bstr("sc"),"OK")) {
-               wprintf("<EM>Changes have <STRONG>not</STRONG> been saved.</EM><BR>");
-               return(0);
+               display_error("Cancelled.  Changes were not saved.");
+               return;
                }
        
        serv_puts("GETR");
        serv_gets(buf);
 
        if (buf[0]!='2') {
-               wprintf("<EM>%s</EM><BR>\n",&buf[4]);
-               return(0);
+               display_error(&buf[4]);
+               return;
                }
 
        extract(er_name,&buf[4],0);
@@ -675,23 +679,22 @@ int editroom(void) {
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0]!='2') {
-               wprintf("<EM>%s</EM><HR>\n",&buf[4]);
-               return(display_editroom());
+               display_error(&buf[4]);
+               return;
                }
-       gotoroom(er_name,0);
+       gotoroom(er_name, 0);
 
        if (strlen(er_roomaide)>0) {
                sprintf(buf,"SETA %s",er_roomaide);
                serv_puts(buf);
                serv_gets(buf);
                if (buf[0]!='2') {
-                       wprintf("<EM>%s</EM><HR>\n",&buf[4]);
-                       return(display_editroom());
+                       display_error(&buf[4]);
+                       return;
                        }
                }
 
-       wprintf("<EM>Changes have been saved.</EM><BR>");
-       return(0);
+       gotoroom(er_name, 1);
        }
 
 
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 187fc884ac245047cd3ebff699a89d6c5973b8db..2fa13e76ca56d5864503e3b291e80ac8651ac6a2 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -716,6 +716,14 @@ fclose(fp);
                entroom();
                }
 
+       else if (!strcasecmp(action, "display_editroom")) {
+               display_editroom();
+               }
+
+       else if (!strcasecmp(action, "editroom")) {
+               editroom();
+               }
+
        /* When all else fails... */
        else {
                printf("HTTP/1.0 200 OK\n");
Citadel server, clients, utilities