Changed some output formatting, mostly <FONT> tags. Changed who.c

to use urlescputs() rather than escputs() so names with spaces are
handled correctly.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 8142ee5b33d5d742ba9d910bc3ea571bc6ca94ad..bfdc7753de6b1f5ec90b80316ea531619868d595 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 16 12:00:00 EDT 1999 Nick Grossman <nicl@ulster.net>
+       Changed some output formatting (mainly <FONT> tags).
+       Changed who.c to use urlescputs() rather than escputs()
+       in urls so GOTOs and User Profiles work when the string has a
+       space in it.
+
 Wed Apr 14 17:56:18 EDT 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        http://www.webreference.com/dhtml/column18/menuFrLoad.html
        How to cause "onLoad=" to cause a sibling frame to refresh without

diff --git a/webcit/messages.c b/webcit/messages.c
index 4007bd2e962efbed8240314972b4300244f585b3..7aa44c779ab83d19dadb00857c86bbc78e79cd62 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -86,7 +86,7 @@ char *oper;
                return;
        }
        wprintf("<TABLE WIDTH=100% BORDER=0 CELLSPACING=0 CELLPADDING=0 BGCOLOR=000077><TR><TD>\n");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFF00\"> ");
+       wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\" SIZE=+1 COLOR=\"FFFF00\"> ");
        strcpy(m_subject, "");
 
        strcpy(reply_to, "nobody...xxxxx");
@@ -142,7 +142,7 @@ char *oper;
        wprintf("</FONT></TD>");
 
        if (is_room_aide) {
-               wprintf("<TD ALIGN=RIGHT NOWRAP><FONT COLOR=\"FFFF00\"><B>");
+               wprintf("<TD ALIGN=RIGHT NOWRAP><FONT FACE=\"Arial,Helvetica,sans-serif\" COLOR=\"FFFF00\"><B>");
 
                wprintf("<A HREF=\"/confirm_move_msg");
                wprintf("&msgid=%ld", msgnum);
@@ -169,7 +169,7 @@ char *oper;
                                buf[strlen(buf) - 1] = 0;
                        if ((bq == 0) &&
                            ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
-                               wprintf("<FONT COLOR=\"000044\"><I>");
+                               wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\" COLOR=\"000044\"><I>");
                                bq = 1;
                        } else if ((bq == 1) &&
                                   (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
@@ -223,7 +223,7 @@ void readloop(char *oper)
        printf("HTTP/1.0 200 OK\n");
        output_headers(1);
 
-       wprintf("<CENTER><B>%s - ", wc_roomname);
+       wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\"><CENTER><B>%s - ", wc_roomname);
        if (!strcmp(oper, "readnew")) {
                strcpy(cmd, "MSGS NEW");
                wprintf("new messages");
@@ -267,6 +267,7 @@ void post_message(void)
        printf("HTTP/1.0 200 OK\n");
        output_headers(1);
 
+       wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\">");
        strcpy(buf, bstr("sc"));
        if (strcasecmp(buf, "Save message")) {
                wprintf("Cancelled.  Message was not posted.<BR>\n");
@@ -327,6 +328,8 @@ void display_enter(void)
        printf("HTTP/1.0 200 OK\n");
        output_headers(1);
 
+       wprintf("<FACE=\"Arial,Helvetica,sans-serif\">");
+
        sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
        serv_puts(buf);
        serv_gets(buf);
@@ -369,6 +372,7 @@ void display_enter(void)
 
        wprintf("</FORM></CENTER>\n");
       DONE:wDumpContent(1);
+       wprintf("</FONT>");
 }
 
 

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 9acb7a42fbd4a4914656e8b342082e4c97284bf8..957ca4bde0bcd23a0a6d33e1219acb4eaef58283 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -240,14 +240,14 @@ void list_all_rooms_by_floor(void)
        output_headers(1);
 
        wprintf("<TABLE width=100% border><TR><TH>Floor</TH>");
-       wprintf("<TH>Rooms with new messages</TH>");
-       wprintf("<TH>Rooms with no new messages</TH></TR>\n");
+       wprintf("<TH><FONT FACE=\"Arial,Helvetica,sans-serif\">Rooms with new messages</FONT></TH>");
+       wprintf("<TH><FONT FACE=\"Arial,Helvetica,sans-serif\">Rooms with no new messages</FONT></TH></TR>\n");
 
        for (a = 0; a < 128; ++a)
                if (floorlist[a][0] != 0) {
 
                        /* Floor name column */
-                       wprintf("<TR><TD>");
+                       wprintf("<TR><TD><FONT FACE=\"Arial,Helvetica,sans-serif\">");
 
                        serv_printf("OIMG _floorpic_|%d", a);
                        serv_gets(buf);
@@ -260,18 +260,18 @@ void list_all_rooms_by_floor(void)
                                escputs(&floorlist[a][0]);
                        }
 
-                       wprintf("</TD>");
+                       wprintf("</FONT></TD>");
 
                        /* Rooms with new messages column */
-                       wprintf("<TD>");
+                       wprintf("<TD><FONT FACE=\"Arial,Helvetica,sans-serif\">");
                        sprintf(buf, "LKRN %d", a);
                        listrms(buf);
-                       wprintf("</TD><TD>\n");
+                       wprintf("</FONT></TD>\n<TD><FONT FACE=\"Arial,Helvetica,sans-serif\">");
 
                        /* Rooms with old messages column */
                        sprintf(buf, "LKRO %d", a);
                        listrms(buf);
-                       wprintf("</TD></TR>\n");
+                       wprintf("</FONT></TD></TR>\n");
                }
        wprintf("</TABLE>\n");
        wDumpContent(1);
@@ -286,7 +286,7 @@ void zapped_list(void)
        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("<FONT FACE=\"Arial,Helvetica,sans-serif\" SIZE=+1 COLOR=\"FFFFFF\"");
        wprintf("<B>Zapped (forgotten) rooms</B>\n");
        wprintf("</FONT></TD></TR></TABLE><BR>\n");
        listrms("LZRM -1");
@@ -381,7 +381,7 @@ void gotoroom(char *gname, int display_name)
                        wprintf("<TD VALIGN=TOP><A HREF=\"/ungoto\">");
                        wprintf("<IMG SRC=\"/static/back.gif\" BORDER=0></A></TD>");
                }
-               wprintf("<TD VALIGN=TOP><FONT FACE=\"Arial,Helvetica,sans-serif\"><H1>%s</H1>", wc_roomname);
+               wprintf("<TD VALIGN=TOP><FONT FACE=\"Arial,Helvetica,sans-serif\"><FONT SIZE=+2>%s</FONT><BR>", wc_roomname);
                wprintf("%d new of %d messages</FONT></TD>\n",
                        extract_int(&buf[4], 1),
                        extract_int(&buf[4], 2));

diff --git a/webcit/static/back.gif b/webcit/static/back.gif
index 7a716886f1258ab7f13126bcce4a2bc4fc5511b8..bcd00bc0c4382a10e98d7b4335bfbb9e2879b498 100644 (file)
Binary files a/webcit/static/back.gif and b/webcit/static/back.gif differ

diff --git a/webcit/static/forward.gif b/webcit/static/forward.gif
index 4d4792bef3534b020e486301fc2ade5ec96591d1..1b6d64ed6d97845505570696e41c66b88f8858d4 100644 (file)
Binary files a/webcit/static/forward.gif and b/webcit/static/forward.gif differ

diff --git a/webcit/static/frameset.html b/webcit/static/frameset.html
index adfafe461f7ae2cdbf4ef017022bd5cd3aeb0c3e..bac38422d98f67e0521ae4b3fa2f6bc45aed168d 100644 (file)
--- a/webcit/static/frameset.html
+++ b/webcit/static/frameset.html
@@ -2,7 +2,7 @@
        <HEAD>
        <TITLE>WebCit</TITLE>
        </HEAD>
-       <FRAMESET COLS="150, *" BORDER=0 FRAMEBORDER=0 FRAMESPACING=0>
+       <FRAMESET COLS="155, *" BORDER=0 FRAMEBORDER=0 FRAMESPACING=0>
 
                <FRAME NAME="left" SRC="/static/menubar.html">
                <FRAMESET ROWS="100, *">

diff --git a/webcit/who.c b/webcit/who.c
index 62dbe1e72534788e288f4f6a526b5fb5da98567f..3714318699f9bcb4061fd71f396092952ee2f7ca 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -100,7 +100,7 @@ void whobbs(void)
                        }
                        /* username */
                        wprintf("</FONT></TD>\n\t<TD><FONT FACE=\"Arial,Helvetica,sans-serif\"><A HREF=\"/showuser?who=");
-                       escputs(wlist->username);
+                       urlescputs(wlist->username);
                        wprintf("\" onMouseOver=\"window.status='View profile for ");
                        escputs(wlist->username);
                        wprintf("'; return true\">");
@@ -113,7 +113,7 @@ void whobbs(void)
                                wprintf("<A HREF=\"/chat\" onMouseOver=\"window.status='Chat'; return true\">&lt;chat&gt;</A>");
                        } else {
                                wprintf("<A HREF=\"/dotgoto&room=");
-                               escputs(wlist->roomname);
+                               urlescputs(wlist->roomname);
                                wprintf("\" onMouseOver=\"window.status='Go to room ");
                                escputs(wlist->roomname);
                                wprintf("'; return true\">");
@@ -130,7 +130,7 @@ void whobbs(void)
                }
        }
        wprintf("</TABLE>\n<BR><BR>\n");
-       wprintf("<TABLE BORDER=0 BGCOLOR=\"#003399\">\n<TR><TD ALIGN=center VALIGN=center CELLPADING=10>\n");
+       wprintf("<TABLE BORDER=0 BGCOLOR=\"#003399\">\n<TR><TD ALIGN=center VALIGN=center CELLPADING=20>\n");
        wprintf("<FONT FACE=\"Arial,Helvetica,sans-serif\" SIZE=+2><B><A HREF=\"/whobbs\"><FONT COLOR=\"#FF0000\">Refresh</FONT></A></B></FONT>\n");
        wprintf("</TD></TR>\n</TABLE>\n</CENTER>");
        wDumpContent(1);