]> 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: ecb5ed4)
* Fixed a bug in the room banner display code
authorArt Cancro <ajc@citadel.org>
Wed, 30 Dec 1998 04:26:17 +0000 (04:26 +0000)
committerArt Cancro <ajc@citadel.org>
Wed, 30 Dec 1998 04:26:17 +0000 (04:26 +0000)
        * Added "delete room"

webcit/ChangeLog patch | blob | history
webcit/auth.c patch | blob | history
webcit/child.h patch | blob | history
webcit/roomops.c patch | blob | history
webcit/static/frameset.html patch | blob | history
webcit/webcit.c patch | blob | history

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 8e6ad9385920b8cb12c4563ea51742f421c8b410..b4234531365f451e50d724f1f1074e08d1d90008 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 29 23:25:50 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
+       * Fixed a bug in the room banner display code
+       * Added "delete room"
+
 Mon Dec 28 00:26:01 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Added "edit room info file"
        * Added "edit bio"
diff --git a/webcit/auth.c b/webcit/auth.c
index b001445060f74855a00628fdfb77fe10ff8f730b..3d63c4ed36a4aa4a80fb65adde26114ac1c179ba 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -88,7 +88,6 @@ void become_logged_in(char *user, char *pass, char *serv_response) {
        strcpy(wc_password, pass);
        axlevel = extract_int(&serv_response[4], 1);
        if (axlevel >=6) is_aide = 1;
-       fprintf(stderr, "become_logged_in(%s,%s)\n", user, pass);
        }
 
 
diff --git a/webcit/child.h b/webcit/child.h
index 62d89325342a87dc238666d713a165086f6e3fdf..9fdc0abbc910794162390de30be35fd274084bbe 100644 (file)
--- a/webcit/child.h
+++ b/webcit/child.h
@@ -15,7 +15,6 @@ void list_all_rooms_by_floor(void);
 void slrp_highest(void);
 void gotonext(void);
 void ungoto(void);
-void dotgoto(void);
 void get_serv_info(void);
 int connectsock(char *host, char *service, char *protocol);
 void serv_gets(char *strbuf);
@@ -68,3 +67,5 @@ void save_edit(char *description, char *enter_cmd, int regoto);
 void display_edit(char *description, char *check_cmd,
                 char *read_cmd, char *save_cmd);
 void gotoroom(char *gname, int display_name);
+void confirm_delete_room(void);
+void delete_room(void);
diff --git a/webcit/roomops.c b/webcit/roomops.c
index aa2159e8229a31eb2a96c523a2b22570d55635db..ab5aa3c9d95d5ed9d4562e57497be23231a7c867 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -203,10 +203,11 @@ void gotoroom(char *gname, int display_name)
                printf("HTTP/1.0 200 OK\n");
                printf("Window-target: top\n");
                output_headers(0);
-               wprintf("<HTML><HEAD></HEAD><BODY \n");
+               wprintf("<HTML><HEAD></HEAD>\n<BODY ");
        
                /* 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");
                }
 
@@ -225,7 +226,7 @@ void gotoroom(char *gname, int display_name)
                }
        if (buf[0]!='2') {
                if (display_name) {
-                       wprintf("<EM>%s</EM><BR>\n",&buf[4]);
+                       wprintf("<EM>%s</EM><BR></BODY></HTML>\n",&buf[4]);
                        wDumpContent();
                        }
                return;
@@ -251,37 +252,36 @@ 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");
-                               serv_gets(buf);
-                               }
-
+               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>");
-                       readinfo(0);
-                       wprintf("</TD>");
+                       wprintf("<IMG SRC=\"/image&name=_roompic_&room=");
+                       escputs(wc_roomname);
+                       wprintf("\"></TD>");
+                       serv_puts("CLOS");
+                       serv_gets(buf);
+                       }
 
-                       wprintf("<TD><A HREF=\"/gotonext\">");
-                       wprintf("<IMG SRC=\"/static/forward.gif\" border=0></A></TD>");
+               wprintf("<TD>");
+               readinfo(0);
+               wprintf("</TD>");
 
-                       wprintf("</TR></TABLE></CENTER>\n");
-                       }
+               wprintf("<TD><A HREF=\"/gotonext\">");
+               wprintf("<IMG SRC=\"/static/forward.gif\" border=0></A></TD>");
+               wprintf("</TR></TABLE></CENTER>\n");
                wprintf("</BODY></HTML>\n");
                wDumpContent();
                }
@@ -290,13 +290,6 @@ void gotoroom(char *gname, int display_name)
        }
 
 
-/*
- * operation to goto a room
- */
-void dotgoto(void) {
-       gotoroom(bstr("room"), 1);
-       }
-
 
 /* Goto next room having unread messages.
  * We want to skip over rooms that the user has already been to, and take the
@@ -915,3 +908,68 @@ void zap(void) {
 
        gotoroom(bstr("_BASEROOM_"),1);
        }
+
+
+
+
+/*
+ * Confirm deletion of the current room
+ */
+void confirm_delete_room(void) {
+       char buf[256];
+       
+       serv_puts("KILL 0");
+       serv_gets(buf);
+       if (buf[0] != '2') {
+               display_error(&buf[4]);
+               return;
+               }
+
+       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>Confirm deletion of room</B>\n");
+       wprintf("</FONT></TD></TR></TABLE>\n");
+
+       wprintf("<CENTER>");
+       wprintf("<FORM METHOD=\"POST\" ACTION=\"/delete_room\">\n");
+
+       wprintf("Are you sure you want to delete <FONT SIZE=+1>");
+       escputs(wc_roomname);
+       wprintf("</FONT>?<BR>\n");
+
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Delete\">");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
+
+       wprintf("</FORM></CENTER></BODY></HTML>\n");
+       wDumpContent();
+       }
+
+
+/*
+ * Delete the current room
+ */
+void delete_room(void) {
+       char buf[256];
+       char sc[256];
+
+       strcpy(sc, bstr("sc"));
+       
+       if (strcasecmp(sc, "Delete")) {
+               display_error("Cancelled.  This room was not deleted.");
+               return;
+               }
+
+       serv_puts("KILL 1");
+       serv_gets(buf);
+       if (buf[0] != '2') {
+               display_error(&buf[4]);
+               }
+       else {
+               gotoroom("_BASEROOM_", 1);
+               }
+       }
+
+
+
diff --git a/webcit/static/frameset.html b/webcit/static/frameset.html
index a64c0ce8a7f160b96eead24baa3f93d66e0a6afa..1b69ec620b700b7caf0d0508f93082f5de24f1f7 100644 (file)
--- a/webcit/static/frameset.html
+++ b/webcit/static/frameset.html
@@ -5,7 +5,7 @@
        <FRAMESET cols="15%, 80%">
                <FRAME name="left" src="/static/menubar.html">
                <FRAMESET rows="15%, 80%">
-                       <FRAME name="top" src="/dotgoto?room=_BASEROOM_">
+                       <FRAME name="top" src="/dotgoto&room=_BASEROOM_">
                        <FRAME name="bottom" src="/do_welcome">
                </FRAMESET>
                <NOFRAMES>
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 1ce361432d616c2cbd8b2000a70de917c1ff56bc..75fab265e9474beb1f8142d896eba745906298e9 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -303,7 +303,6 @@ void output_headers(int print_standard_html_head) {
                        ExpressMessages = NULL;
                        }
                wprintf("BACKGROUND=\"/image&name=background\" TEXT=\"#000000\" LINK=\"#004400\">\n");
-               wprintf("<FONT SIZE=-2>heloooooooooooo!  isn't it a beautiful day?<BR></FONT>\n");
                }
 
        }
@@ -626,7 +625,7 @@ fclose(fp);
 
        else if (!strcasecmp(action, "dotgoto")) {
                slrp_highest();
-               dotgoto();
+               gotoroom(bstr("room"), 1);
                }
 
        else if (!strcasecmp(action, "termquit")) {
@@ -742,6 +741,14 @@ fclose(fp);
                save_edit("Your bio", "EBIO", 0);
                }
 
+       else if (!strcasecmp(action, "confirm_delete_room")) {
+               confirm_delete_room();
+               }
+
+       else if (!strcasecmp(action, "delete_room")) {
+               delete_room();
+               }
+
        /* When all else fails... */
        else {
                printf("HTTP/1.0 200 OK\n");
Citadel server, clients, utilities