* Moved to the new string tokenizer API
[citadel.git] / webcit / iconbar.c
index a0649dc151e35a76d0d751a1ccd162e0bf4b42b3..248f2b6806da7937a149f790a7ebc7d617a58f4a 100644 (file)
@@ -1,4 +1,8 @@
-/* $Id$ */
+/*
+ * $Id$
+ *
+ * Displays and customizes the iconbar.
+ */
 
 #include <ctype.h>
 #include <stdlib.h>
 #include "webcit.h"
 
 
+/* Values for ib_displayas */
+#define IB_PICTEXT     0
+#define IB_PICONLY     1
+#define IB_TEXTONLY    2
+
 void do_iconbar(void) {
        char iconbar[SIZ];
        char buf[SIZ];
@@ -34,137 +43,269 @@ void do_iconbar(void) {
         * their iconbars.  These should probably be set in a master
         * configuration somewhere.
         */
-       int ib_logo = 1;        /* Site logo */
-       int ib_inbox = 0;       /* Inbox icon */
-       int ib_calendar = 0;    /* Calendar icon */
-       int ib_tasks = 0;       /* Tasks icon */
+       int ib_displayas = 0;   /* pictures and text, pictures, text */
+       int ib_logo = 0;        /* Site logo */
+       int ib_summary = 1;     /* Summary page icon */
+       int ib_inbox = 1;       /* Inbox icon */
+       int ib_calendar = 1;    /* Calendar icon */
+       int ib_contacts = 1;    /* Contacts icon */
+       int ib_notes = 1;       /* Notes icon */
+       int ib_tasks = 1;       /* Tasks icon */
        int ib_rooms = 1;       /* Rooms icon */
        int ib_users = 1;       /* Users icon */
+       int ib_chat = 1;        /* Chat icon */
        int ib_advanced = 1;    /* Advanced Options icon */
-       int ib_logoff = 1;      /* Logoff button */
        int ib_citadel = 1;     /* 'Powered by Citadel' logo */
        /*
         */
 
-       get_preference("iconbar", iconbar);
+       get_preference("iconbar", iconbar, sizeof iconbar);
        for (i=0; i<num_tokens(iconbar, ','); ++i) {
-               extract_token(buf, iconbar, i, ',');
-               extract_token(key, buf, 0, '=');
-               extract_token(value, buf, 1, '=');
+               extract_token(buf, iconbar, i, ',', sizeof buf);
+               extract_token(key, buf, 0, '=', sizeof key);
+               extract_token(value, buf, 1, '=', sizeof value);
 
+               if (!strcasecmp(key, "ib_displayas")) ib_displayas = atoi(value);
                if (!strcasecmp(key, "ib_logo")) ib_logo = atoi(value);
+               if (!strcasecmp(key, "ib_summary")) ib_summary = atoi(value);
                if (!strcasecmp(key, "ib_inbox")) ib_inbox = atoi(value);
                if (!strcasecmp(key, "ib_calendar")) ib_calendar = atoi(value);
+               if (!strcasecmp(key, "ib_contacts")) ib_contacts = atoi(value);
+               if (!strcasecmp(key, "ib_notes")) ib_notes = atoi(value);
                if (!strcasecmp(key, "ib_tasks")) ib_tasks = atoi(value);
                if (!strcasecmp(key, "ib_rooms")) ib_rooms = atoi(value);
                if (!strcasecmp(key, "ib_users")) ib_users = atoi(value);
+               if (!strcasecmp(key, "ib_chat")) ib_chat = atoi(value);
                if (!strcasecmp(key, "ib_advanced")) ib_advanced = atoi(value);
-               if (!strcasecmp(key, "ib_logoff")) ib_logoff = atoi(value);
                if (!strcasecmp(key, "ib_citadel")) ib_citadel = atoi(value);
+       }
+
+       wprintf("<div id=\"button\">\n"
+               "<ul>\n"
+       );
 
+       if (ib_logo) {
+               wprintf("<li>");
+               if (ib_displayas != IB_TEXTONLY) {
+                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" "
+                               "HEIGHT=\"32\" SRC=\"/image&name=hello\" ALT=\"&nbsp;\">\n"
+                       );
+               }
+               wprintf("</li>\n");
        }
 
+       if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
+               "<li><div align=\"center\">"
+               "<A HREF=\"http://www.citadel.org\" "
+               "title=\"Find out more about Citadel\" target=\"aboutcit\">"
+               "<img border=\"0\" width=\"48\" height=\"48\" "
+               "SRC=\"/static/citadel-logo.gif\" ALT=\"CITADEL\">"
+               "CITADEL</A>"
+               "</div></li>\n"
+       );
 
-       output_headers(11);
-       do_template("beginbox_nt");
 
-       wprintf("<center>\n");
+       if (ib_summary) {
+               wprintf("<li><A HREF=\"/summary\" "
+                       "TITLE=\"Your summary page\" "
+                       ">"
+               );
+               if (ib_displayas != IB_TEXTONLY) {
+                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+                               "SRC=\"/static/summary.gif\">");
+               }
+               if (ib_displayas != IB_PICONLY) {
+                       wprintf("Summary");
+               }
+               wprintf("</A></li>\n");
+       }
 
-       if (ib_logo) wprintf("\"<IMG BORDER=\"0\" WIDTH=\"48\" "
-               "HEIGHT=\"48\" SRC=\"/image&name=hello\" ALT=\"&nbsp;\">"
-               "<BR>\n"
-       );
+       if (ib_inbox) {
+               wprintf("<li>"
+                       "<A HREF=\"/dotgoto?room=_MAIL_\" "
+                       "TITLE=\"Go to your e-mail inbox\" "
+                       ">"
+               );
+               if (ib_displayas != IB_TEXTONLY) {
+                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+                               "SRC=\"/static/mail.gif\">");
+               }
+               if (ib_displayas != IB_PICONLY) {
+                       wprintf("Mail");
+               }
+               wprintf("</A></li>\n");
+       }
 
-       if (ib_inbox) wprintf(
-               "<SPAN CLASS=\"iconbar_link\">"
-               "<A HREF=\"/dotgoto?room=_MAIL_\" "
-               "TITLE=\"Go to your e-mail inbox\" "
-               "TARGET=\"workspace\">"
-               "<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-               "SRC=\"/static/mail.gif\">"
-               "<BR>Mail</A></SPAN><BR>\n"
-       );
+       if (ib_calendar) {
+               wprintf("<li>"
+                       "<A HREF=\"/dotgoto?room=Calendar\" "
+                       "TITLE=\"Go to your personal calendar\" "
+                       ">"
+               );
+               if (ib_displayas != IB_TEXTONLY) {
+                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+                       "SRC=\"/static/vcalendar.gif\">");
+               }
+               if (ib_displayas != IB_PICONLY) {
+                       wprintf("Calendar");
+               }
+               wprintf("</A></li>\n");
+       }
 
-       if (ib_calendar) wprintf(
-               "<SPAN CLASS=\"iconbar_link\">"
-               "<A HREF=\"/dotgoto?room=Calendar\" "
-               "TITLE=\"Go to your personal calendar\" "
-               "TARGET=\"workspace\">"
-               "<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-               "SRC=\"/static/vcalendar.gif\">"
-               "<BR>Calendar</A></SPAN><BR>\n"
-       );
+       if (ib_contacts) {
+               wprintf("<li>"
+                       "<A HREF=\"/dotgoto?room=Contacts\" "
+                       "TITLE=\"Go to your personal address book\" "
+                       ">"
+               );
+               if (ib_displayas != IB_TEXTONLY) {
+                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+                       "SRC=\"/static/vcard.gif\">");
+               }
+               if (ib_displayas != IB_PICONLY) {
+                       wprintf("Contacts");
+               }
+               wprintf("</A></li>\n");
+       }
 
-       if (ib_tasks) wprintf(
-               "<SPAN CLASS=\"iconbar_link\">"
-               "<A HREF=\"/dotgoto?room=Tasks\" "
-               "TITLE=\"Go to your personal task list\" "
-               "TARGET=\"workspace\">"
-               "<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-               "SRC=\"/static/vcalendar.gif\">"
-               "<BR>Tasks</A></SPAN><BR>\n"
-       );
+       if (ib_notes) {
+               wprintf("<li>"
+                       "<A HREF=\"/dotgoto?room=Notes\" "
+                       "TITLE=\"Go to your personal notes\" "
+                       ">"
+               );
+               if (ib_displayas != IB_TEXTONLY) {
+                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+                       "SRC=\"/static/note.gif\">");
+               }
+               if (ib_displayas != IB_PICONLY) {
+                       wprintf("Notes");
+               }
+               wprintf("</A></li>\n");
+       }
 
-       if (ib_rooms) wprintf(
-               "<SPAN CLASS=\"iconbar_link\">"
-               "<A HREF=\"/knrooms\" TITLE=\"Shows a list of all "
-               "Rooms that you have access to\" TARGET=\"workspace\">"
-               "<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-               "SRC=\"/static/rooms-icon.gif\">"
-               "<BR>Rooms</A></SPAN><BR>\n"
-       );
+       if (ib_tasks)  {
+               wprintf("<li>"
+                       "<A HREF=\"/dotgoto?room=Tasks\" "
+                       "TITLE=\"Go to your personal task list\" "
+                       ">"
+               );
+               if (ib_displayas != IB_TEXTONLY) {
+                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+                       "SRC=\"/static/tasks.gif\">");
+               }
+               if (ib_displayas != IB_PICONLY) {
+                       wprintf("Tasks");
+               }
+               wprintf("</A></li>\n");
+       }
 
-       if (ib_users) wprintf(
-               "<SPAN CLASS=\"iconbar_link\">"
-               "<A HREF=\"/whobbs\" TITLE=\"See who is online right now\" "
-               "TARGET=\"workspace\">"
-               "<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-               "SRC=\"/static/users-icon.gif\">"
-               "<BR>Users</A></SPAN><BR>\n"
-       );
+       if (ib_rooms) {
+               wprintf("<li>"
+                       "<A HREF=\"/knrooms\" TITLE=\"List all of your "
+                       "accessible rooms\" >"
+               );
+               if (ib_displayas != IB_TEXTONLY) {
+                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+                       "SRC=\"/static/rooms-icon.gif\">");
+               }
+               if (ib_displayas != IB_PICONLY) {
+                       wprintf("Rooms");
+               }
+               wprintf("</A></li>\n");
+       }
 
-       if (ib_advanced) wprintf(
-               "<SPAN CLASS=\"iconbar_link\">"
-               "<A HREF=\"/display_main_menu\" "
-               "TITLE=\"Advanced Options Menu: Advanced Room commands, "
-               "Account Info, and Chat\" "
-               "TARGET=\"workspace\">"
-               "<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-               "SRC=\"/static/advanced-icon.gif\">"
-               "<BR>Advanced options</A></SPAN><BR>\n"
-       );
+       if (ib_users) {
+               wprintf("<li>"
+                       "<A HREF=\"/whobbs\" TITLE=\"See who is online right now\" "
+                       ">"
+               );
+               if (ib_displayas != IB_TEXTONLY) {
+                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+                       "SRC=\"/static/users-icon.gif\">");
+               }
+               if (ib_displayas != IB_PICONLY) {
+                       wprintf("Who is online?");
+               }
+               wprintf("</A></li>\n");
+       }
 
-       if (ib_logoff) wprintf(
-               "<SPAN CLASS=\"iconbar_link\">"
-               "<A HREF=\"/termquit\" TITLE=\"Log off\" TARGET=\"_top\" "
-               "onClick=\"return confirm('Log off now?');\">"
-               "<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-               "SRC=\"/static/exit-icon.gif\">"
-               "<BR>Log off</A></SPAN><BR>\n"
-       );
+       if (ib_chat) {
+               wprintf("<li>"
+                       "<A HREF=\"#\" onClick=\"window.open('/chat', "
+                       "'ctdl_chat_window', "
+                       "'toolbar=no,location=no,directories=no,copyhistory=no,"
+                       "status=no,scrollbars=yes,resizable=yes');\""
+                       ">"
+               );
+               if (ib_displayas != IB_TEXTONLY) {
+                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+                       "SRC=\"/static/chat-icon.gif\">");
+               }
+               if (ib_displayas != IB_PICONLY) {
+                       wprintf("Chat");
+               }
+               wprintf("</A></li>\n");
+       }
+
+       if (ib_advanced) {
+               wprintf("<li>"
+                       "<A HREF=\"/display_main_menu\" "
+                       "TITLE=\"Advanced Options Menu: Advanced Room commands, "
+                       "Account Info, and Chat\" "
+                       ">"
+               );
+               if (ib_displayas != IB_TEXTONLY) {
+                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+                       "SRC=\"/static/advanced-icon.gif\">");
+               }
+               if (ib_displayas != IB_PICONLY) {
+                       wprintf("Advanced");
+               }
+               wprintf("</A></li>\n");
+       }
+
+       if ((WC->axlevel >= 6) || (WC->is_room_aide)) {
+               wprintf("<li>"
+                       "<A HREF=\"/display_aide_menu\" "
+                       "TITLE=\"Room and system administration functions\" "
+                       ">"
+               );
+               if (ib_displayas != IB_TEXTONLY) {
+                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+                       "SRC=\"/static/advanced-icon.gif\">");
+               }
+               if (ib_displayas != IB_PICONLY) {
+                       wprintf("Administration");
+               }
+               wprintf("</A></li>\n");
+       }
+
+       if (1) {
+               wprintf("<li>"
+                       "<A HREF=\"/termquit\" TITLE=\"Log off\" "
+                       "onClick=\"return confirm('Log off now?');\">"
+               );
+               if (ib_displayas != IB_TEXTONLY) {
+               wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
+                       "SRC=\"/static/exit-icon.gif\">");
+               }
+               if (ib_displayas != IB_PICONLY) {
+                       wprintf("Log off");
+               }
+               wprintf("</A></li>\n");
+       }
 
        wprintf(
-               "<SPAN CLASS=\"customize\">"
+               "<li><div align=\"center\">"
                "<A HREF=\"/display_customize_iconbar\" "
                "TITLE=\"Customize this menu\" "
-               "TARGET=\"workspace\">customize this menu</A>"
-               "</SPAN><BR>\n"
+               ">customize this menu</A>"
+               "</A></div></li>\n"
        );
 
-       if (ib_citadel) wprintf(
-               "<SPAN CLASS=\"powered_by\">"
-               "<A HREF=\"http://uncensored.citadel.org/citadel\" "
-               "TITLE=\"Find out more about Citadel/UX\" TARGET=\"aboutcit\" "
-               "onMouseOver=\"window.status='Find out more about "
-               "Citadel/UX'; return true;\">powered by<BR><IMG "
-               "BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/citadel-logo.jpg\" ALT=\"CITADEL/UX\"></A>"
-               "</SPAN>\n"
-       );
-
-       wprintf("</CENTER>\n");
-       do_template("endbox");
-       wDumpContent(2);
+       wprintf("</ul>\n"
+               "</div>\n");
 }
 
 
@@ -174,171 +315,250 @@ void display_customize_iconbar(void) {
        char buf[SIZ];
        char key[SIZ], value[SIZ];
        int i;
+       int bar = 0;
 
        /* The initialized values of these variables also happen to
         * specify the default values for users who haven't customized
         * their iconbars.  These should probably be set in a master
         * configuration somewhere.
         */
-       int ib_logo = 1;        /* Site logo */
-       int ib_inbox = 0;       /* Inbox icon */
-       int ib_calendar = 0;    /* Calendar icon */
-       int ib_tasks = 0;       /* Tasks icon */
+       int ib_displayas = IB_PICTEXT;  /* pictures and text, pictures, text */
+       int ib_logo = 0;        /* Site logo */
+       int ib_summary = 1;     /* Summary page icon */
+       int ib_inbox = 1;       /* Inbox icon */
+       int ib_calendar = 1;    /* Calendar icon */
+       int ib_contacts = 1;    /* Contacts icon */
+       int ib_notes = 1;       /* Notes icon */
+       int ib_tasks = 1;       /* Tasks icon */
        int ib_rooms = 1;       /* Rooms icon */
        int ib_users = 1;       /* Users icon */
+       int ib_chat = 1;        /* Chat icon */
        int ib_advanced = 1;    /* Advanced Options icon */
-       int ib_logoff = 1;      /* Logoff button */
        int ib_citadel = 1;     /* 'Powered by Citadel' logo */
        /*
         */
 
-       get_preference("iconbar", iconbar);
+       get_preference("iconbar", iconbar, sizeof iconbar);
        for (i=0; i<num_tokens(iconbar, ','); ++i) {
-               extract_token(buf, iconbar, i, ',');
-               extract_token(key, buf, 0, '=');
-               extract_token(value, buf, 1, '=');
+               extract_token(buf, iconbar, i, ',', sizeof buf);
+               extract_token(key, buf, 0, '=', sizeof key);
+               extract_token(value, buf, 1, '=', sizeof value);
 
+               if (!strcasecmp(key, "ib_displayas")) ib_displayas = atoi(value);
                if (!strcasecmp(key, "ib_logo")) ib_logo = atoi(value);
+               if (!strcasecmp(key, "ib_summary")) ib_summary = atoi(value);
                if (!strcasecmp(key, "ib_inbox")) ib_inbox = atoi(value);
                if (!strcasecmp(key, "ib_calendar")) ib_calendar = atoi(value);
+               if (!strcasecmp(key, "ib_contacts")) ib_contacts = atoi(value);
+               if (!strcasecmp(key, "ib_notes")) ib_notes = atoi(value);
                if (!strcasecmp(key, "ib_tasks")) ib_tasks = atoi(value);
                if (!strcasecmp(key, "ib_rooms")) ib_rooms = atoi(value);
                if (!strcasecmp(key, "ib_users")) ib_users = atoi(value);
+               if (!strcasecmp(key, "ib_chat")) ib_chat = atoi(value);
                if (!strcasecmp(key, "ib_advanced")) ib_advanced = atoi(value);
-               if (!strcasecmp(key, "ib_logoff")) ib_logoff = atoi(value);
                if (!strcasecmp(key, "ib_citadel")) ib_citadel = atoi(value);
-
        }
 
-       output_headers(3);
-       svprintf("BOXTITLE", WCS_STRING, "Customize the icon bar");
-       do_template("beginbox");
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Customize the icon bar</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
+
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
+
+       wprintf("<FORM METHOD=\"POST\" ACTION=\"/commit_iconbar\">\n");
+
+       wprintf("<CENTER>"
+               "Display icons as: ");
+       for (i=0; i<=2; ++i) {
+               wprintf("<INPUT TYPE=\"radio\" NAME=\"ib_displayas\" VALUE=\"%d\"", i);
+               if (ib_displayas == i) wprintf(" CHECKED");
+               wprintf(">");
+               if (i == IB_PICTEXT) wprintf("pictures and text");
+               if (i == IB_PICONLY) wprintf("pictures only");
+               if (i == IB_TEXTONLY) wprintf("text only");
+               wprintf("\n");
+       }
+       wprintf("<br /><br />\n");
 
-       wprintf("<CENTER>Select the icons you would like to see displayed "
+       wprintf("Select the icons you would like to see displayed "
                "in the &quot;icon bar&quot; menu on the left side of the "
-               "screen.</CENTER><BR>\n"
+               "screen.</CENTER><br />\n"
        );
 
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/commit_iconbar\">\n");
        wprintf("<TABLE border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
 
-       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
+       wprintf("<TR BGCOLOR=%s><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_logo\" VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/image&name=hello\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Site logo</B><BR>"
+               "<B>Site logo</B><br />"
                "A graphic describing this site"
                "</TD></TR>\n",
+               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
                (ib_logo ? "CHECKED" : "")
        );
 
-       wprintf("<TR><TD>"
+       wprintf("<TR bgcolor=%s><TD>"
+               "<INPUT TYPE=\"checkbox\" NAME=\"ib_summary\" VALUE=\"yes\" %s>"
+               "</TD><TD>"
+               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+               "SRC=\"/static/summary.gif\" ALT=\"&nbsp;\">"
+               "</TD><TD>"
+               "<B>Summary</B><br />"
+               "Your summary page"
+               "</TD></TR>\n",
+               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
+               (ib_summary ? "CHECKED" : "")
+       );
+
+       wprintf("<TR bgcolor=%s><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_inbox\" VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/static/mail.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Mail (inbox)</B><BR>"
+               "<B>Mail (inbox)</B><br />"
                "A shortcut to your e-mail Inbox."
                "</TD></TR>\n",
+               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
                (ib_inbox ? "CHECKED" : "")
        );
 
+       wprintf("<TR bgcolor=%s><TD>"
+               "<INPUT TYPE=\"checkbox\" NAME=\"ib_contacts\" "
+               "VALUE=\"yes\" %s>"
+               "</TD><TD>"
+               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+               "SRC=\"/static/vcard.gif\" ALT=\"&nbsp;\">"
+               "</TD><TD>"
+               "<B>Contacts</B><br />"
+               "Your personal address book."
+               "</TD></TR>\n",
+               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
+               (ib_contacts ? "CHECKED" : "")
+       );
+
+       wprintf("<TR bgcolor=%s><TD>"
+               "<INPUT TYPE=\"checkbox\" NAME=\"ib_notes\" "
+               "VALUE=\"yes\" %s>"
+               "</TD><TD>"
+               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+               "SRC=\"/static/note.gif\" ALT=\"&nbsp;\">"
+               "</TD><TD>"
+               "<B>Notes</B><br />"
+               "Your personal notes."
+               "</TD></TR>\n",
+               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
+               (ib_notes ? "CHECKED" : "")
+       );
+
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
-       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
+       wprintf("<TR bgcolor=%s><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_calendar\" "
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/static/vcalendar.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Calendar</B><BR>"
+               "<B>Calendar</B><br />"
                "A shortcut to your personal calendar."
                "</TD></TR>\n",
+               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
                (ib_calendar ? "CHECKED" : "")
        );
 
-       wprintf("<TR><TD>"
+       wprintf("<TR bgcolor=%s><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_tasks\" VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/vcalendar.gif\" ALT=\"&nbsp;\">"
+               "SRC=\"/static/tasks.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Tasks</B><BR>"
+               "<B>Tasks</B><br />"
                "A shortcut to your personal task list."
                "</TD></TR>\n",
+               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
                (ib_tasks ? "CHECKED" : "")
        );
 #endif /* WEBCIT_WITH_CALENDAR_SERVICE */
 
-       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
+       wprintf("<TR bgcolor=%s><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_rooms\" VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/static/rooms-icon.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Rooms</B><BR>"
+               "<B>Rooms</B><br />"
                "Clicking this icon displays a list of all accesible "
                "rooms (or folders) available."
                "</TD></TR>\n",
+               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
                (ib_rooms ? "CHECKED" : "")
        );
 
-       wprintf("<TR><TD>"
+       wprintf("<TR bgcolor=%s><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_users\" VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
                "SRC=\"/static/users-icon.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Users</B><BR>"
+               "<B>Who is online?</B><br />"
                "Clicking this icon displays a list of all users "
                "currently logged in."
                "</TD></TR>\n",
+               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
                (ib_users ? "CHECKED" : "")
        );
 
-       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
-               "<INPUT TYPE=\"checkbox\" NAME=\"ib_advanced\" "
-               "VALUE=\"yes\" %s>"
+       wprintf("<TR bgcolor=%s><TD>"
+               "<INPUT TYPE=\"checkbox\" NAME=\"ib_chat\" VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
+               "SRC=\"/static/chat-icon.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Advanced options</B><BR>"
-               "Access to the complete menu of Citadel functions."
+               "<B>Chat</B><br />"
+               "Clicking this icon enters real-time chat mode "
+               "with other users in the same room."
                "</TD></TR>\n",
-               (ib_advanced ? "CHECKED" : "")
+               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
+               (ib_chat ? "CHECKED" : "")
        );
 
-       wprintf("<TR><TD>"
-               "<INPUT TYPE=\"checkbox\" NAME=\"ib_logoff\" "
+       wprintf("<TR bgcolor=%s><TD>"
+               "<INPUT TYPE=\"checkbox\" NAME=\"ib_advanced\" "
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/exit-icon.gif\" ALT=\"&nbsp;\">"
+               "SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Log off</B><BR>"
-               "Exit from the Citadel system.  If you remove this icon "
-               "then you will have no way out!"
+               "<B>Advanced options</B><br />"
+               "Access to the complete menu of Citadel functions."
                "</TD></TR>\n",
-               (ib_logoff ? "CHECKED" : "")
+               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
+               (ib_advanced ? "CHECKED" : "")
        );
-       wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
+
+       wprintf("<TR bgcolor=%s><TD>"
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_citadel\" "
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/citadel-logo.jpg\" ALT=\"&nbsp;\">"
+               "SRC=\"/static/citadel-logo.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
-               "<B>Citadel logo</B><BR>"
+               "<B>Citadel logo</B><br />"
                "Displays the &quot;Powered by Citadel&quot; graphic"
                "</TD></TR>\n",
+               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
                (ib_citadel ? "CHECKED" : "")
        );
 
-       wprintf("</TABLE><BR>\n"
+       wprintf("</TABLE><br />\n"
                "<CENTER>"
                "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
                "&nbsp;"
@@ -346,7 +566,7 @@ void display_customize_iconbar(void) {
                "</CENTER></FORM>\n"
        );
 
-       do_template("endbox");
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(2);
 }
 
@@ -357,11 +577,15 @@ void commit_iconbar(void) {
 
        char *boxen[] = {
                "ib_logo",
+               "ib_summary",
                "ib_inbox",
                "ib_calendar",
+               "ib_contacts",
+               "ib_notes",
                "ib_tasks",
                "ib_rooms",
                "ib_users",
+               "ib_chat",
                "ib_advanced",
                "ib_logoff",
                "ib_citadel"
@@ -372,13 +596,10 @@ void commit_iconbar(void) {
                return;
        }
 
-       strcpy(iconbar, "");
+       sprintf(iconbar, "ib_displayas=%d", atoi(bstr("ib_displayas")));
 
        for (i=0; i<(sizeof(boxen)/sizeof(char *)); ++i) {
-               if (i > 0) {
-                       sprintf(&iconbar[strlen(iconbar)], ",");
-               }
-               sprintf(&iconbar[strlen(iconbar)], "%s=", boxen[i]);
+               sprintf(&iconbar[strlen(iconbar)], ",%s=", boxen[i]);
                if (!strcasecmp(bstr(boxen[i]), "yes")) {
                        sprintf(&iconbar[strlen(iconbar)], "1");
                }
@@ -389,7 +610,14 @@ void commit_iconbar(void) {
 
        set_preference("iconbar", iconbar);
 
-       output_headers(3);
-       wprintf("FIXME");
+       output_headers(1, 1, 0, 0, 0, 0, 0);
+       wprintf(
+               "<center><table border=1 bgcolor=\"#ffffff\"><tr><td>"
+               "<IMG SRC=\"/static/advanced-icon.gif\">"
+               "&nbsp;"
+               "Your icon bar has been updated.  Please select any of its "
+               "choices to continue."
+               "</td></tr></table>\n"
+       );
        wDumpContent(2);
 }