Began making changes to do better handling of character sets.

[citadel.git] / webcit / roomops.c

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 8fe2b827704aecfda2c2cfc3a2f8d3cd2fe0f3da..a7993a062c07407f5286988525cba843fd3b0785 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -79,7 +79,7 @@ void free_march_list(struct wcsession *wcf)
 {
        struct march *mptr;
 
-       while (wcf->march == NULL) {
+       while (wcf->march != NULL) {
                mptr = wcf->march->next;
                free(wcf->march);
                wcf->march = mptr;
@@ -373,7 +373,7 @@ void embed_view_o_matic(void) {
                        ||      (i == WC->wc_default_view)                      /**< default */
                        ||      ( (i == 0) && (WC->wc_default_view == 1) )      /**< mail or bulletin */
                        ||      ( (i == 1) && (WC->wc_default_view == 0) )      /**< mail or bulletin */
-                       ||      ( (i == 7) && (WC->wc_default_view == 3) )      /**< calendar */
+                       /** ||  ( (i == 7) && (WC->wc_default_view == 3) )      (calendar list temporarily disabled) */
                ) {
 
                        wprintf("<OPTION %s VALUE=\"changeview?view=%d\">",
@@ -837,15 +837,10 @@ void smart_goto(char *next_room) {
  */
 void slrp_highest(void)
 {
-       char buf[SIZ];
+       char buf[256];
 
-       /* set pointer */
        serv_puts("SLRP HIGHEST");
        serv_getln(buf, sizeof buf);
-       if (buf[0] != '2') {
-               wprintf("<EM>%s</EM><br />\n", &buf[4]);
-               return;
-       }
 }
 
 
@@ -1269,7 +1264,7 @@ void display_editroom(void)
                serv_puts("GETA");
                serv_getln(buf, sizeof buf);
                if (buf[0] != '2') {
-                       wprintf("<EM>%s</EM>\n", &buf[4]);
+                       wprintf("<em>%s</em>\n", &buf[4]);
                } else {
                        extract_token(er_roomaide, &buf[4], 0, '|', sizeof er_roomaide);
                        wprintf("<INPUT TYPE=\"text\" NAME=\"er_roomaide\" VALUE=\"%s\" MAXLENGTH=\"25\">\n", er_roomaide);