wiki

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 92eed0d9395f666797211bdb70ff84e673ecf71a..566720800a23fcd24c4c4252bf2ed17ce8021d5d 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -390,8 +390,6 @@ void output_headers(        int do_httpheaders,     /* 1 = output HTTP headers
        /* ICONBAR */
        if (do_htmlhead) {
 
-               /* check for instant messages (these display in a new window) */
-               page_popup();
 
                /* check for ImportantMessages (these display in a div overlaying the main screen) */
                if (strlen(WC->ImportantMessage) > 0) {
@@ -404,10 +402,15 @@ void output_headers(      int do_httpheaders,     /* 1 = output HTTP headers
                                "</script>\n");
                        safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
                }
+
                if ( (WC->logged_in) && (!unset_cookies) ) {
                        wprintf("<div id=\"iconbar\">");
                        do_selected_iconbar();
+                       /* check for instant messages (these display in a new window) 
+                       page_popup();  */
+                       wprintf("</div>");
                }
+
                if (do_room_banner == 1) {
                        wprintf("<div id=\"banner\">\n");
                        embed_room_banner(NULL, navbar_default);
@@ -1324,6 +1327,8 @@ void session_loop(struct httprequest *req)
                print_message(arg1);
        } else if (!strcasecmp(action, "msgheaders")) {
                display_headers(arg1);
+       } else if (!strcasecmp(action, "wiki")) {
+               display_wiki_page();
        } else if (!strcasecmp(action, "display_enter")) {
                display_enter();
        } else if (!strcasecmp(action, "post")) {
@@ -1371,7 +1376,7 @@ void session_loop(struct httprequest *req)
        } else if (!strcasecmp(action, "editinfo")) {
                save_edit(_("Room info"), "EINF 1", 1);
        } else if (!strcasecmp(action, "display_editbio")) {
-               sprintf(buf, "RBIO %s", WC->wc_username);
+               sprintf(buf, "RBIO %s", WC->wc_fullname);
                display_edit(_("Your bio"), "NOOP", buf, "editbio", 3);
        } else if (!strcasecmp(action, "editbio")) {
                save_edit(_("Your bio"), "EBIO", 0);