* move some more vars from the session context to strbuf (the use of StrBufAppendTemp...
[citadel.git] / webcit / iconbar.c
index abfa0c172de1539dd04255bcb5507df6d3b56df5..ee216df1df16947bcbcaafbd0819309d10a8a1a0 100644 (file)
@@ -1,11 +1,9 @@
 /*
  * $Id$
+ *
+ * Displays and customizes the iconbar.
  */
-/**
- * \defgroup IconBar Displays and customizes the iconbar.
- * \ingroup MenuInfrastructure
- */
-/*@{*/
+
 #include "webcit.h"
 
 
 #define IB_TEXTONLY    2 /**< just text */
 
 
-/**
- * \brief draw the icon bar?????
+void do_iconbar(void);
+void do_iconbar_roomlist(void);
+
+/*
+ * Render the left side iconbar
  */
 void do_selected_iconbar(void) {
        if (WC->current_iconbar == current_iconbar_roomlist) {
@@ -27,61 +28,82 @@ void do_selected_iconbar(void) {
        }
 }
 
-/**
- * \brief draw the icon bar???
- */
-void do_iconbar(void) {
-       char iconbar[SIZ];
-       char buf[SIZ];
-       char key[SIZ], value[SIZ];
-       int i;
+void DontDeleteThis(void *Data){}
+
+#define IconbarIsEnabled(a, b) IconbarIsENABLED(a, sizeof(a) - 1, b)
 
-       WC->current_iconbar = current_iconbar_menu;
+long IconbarIsENABLED(const char *key, size_t keylen, long defval)
+{
+       void *Data;
+       if (GetHash(WC->IconBarSetttings, key, keylen,
+                   &Data))
+               return (long) Data;
+       else 
+               return defval;
+}
 
+#ifdef DBG_ICONBAR_HASH
+static char nbuf[32];
+inline const char *PrintInt(void *Prefstr)
+{
+       snprintf(nbuf, sizeof(nbuf), "%ld", (long)Prefstr);
+       return nbuf;
+}
+#endif
+
+void LoadIconSettings(void)
+{
+       wcsession *WCC = WC;
+       StrBuf *iconbar = NULL;
+       StrBuf *buf;
+       StrBuf *key;
+       long val;
+       int i, nTokens;
+
+       buf = NewStrBuf();;
+       key = NewStrBuf();
+       WCC->current_iconbar = current_iconbar_menu;
+       if (WCC->IconBarSetttings == NULL)
+               WCC->IconBarSetttings = NewHash(1, NULL);
        /**
         * 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_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_citadel = 1;     /**< 'Powered by Citadel' logo */
-       /*
-        */
 
-       get_preference("iconbar", iconbar, sizeof iconbar);
-       for (i=0; i<num_tokens(iconbar, ','); ++i) {
-               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_citadel")) ib_citadel = atoi(value);
+       if (get_preference("iconbar", &iconbar)) {
+               nTokens = StrBufNum_tokens(iconbar, ',');
+               for (i=0; i<nTokens; ++i) {
+                       StrBufExtract_token(buf, iconbar, i, ',');
+                       StrBufExtract_token(key, buf, 0, '=');
+                       val = StrBufExtract_long(buf, 1, '=');
+                       Put(WCC->IconBarSetttings, 
+                           ChrPtr(key), StrLength(key),
+                           (void*)val, DontDeleteThis);
+               }
        }
 
-        if (ib_logo) {
+#ifdef DBG_ICONBAR_HASH
+       dbg_PrintHash(WCC->IconBarSetttings, PrintInt, NULL);
+#endif
+
+       FreeStrBuf(&key);
+       FreeStrBuf(&buf);
+}
+
+
+/**
+ * \brief draw the icon bar???
+ */
+void do_iconbar(void) {
+       int ib_displayas = IB_PICTEXT;  /**< pictures and text, pictures, text */
+
+       LoadIconSettings();
+       ib_displayas = IconbarIsEnabled("ib_displayas", IB_PICTEXT);
+
+/** Site logo */
+       if (IconbarIsEnabled("ib_logo", 0)) {
                 if (ib_displayas != IB_TEXTONLY) {
                         wprintf("<div class=\"logo\"> <img "
                                 "src=\"image&name=hello\" alt=\"&nbsp;\"> "
@@ -91,10 +113,11 @@ void do_iconbar(void) {
                 wprintf("\n");
         }
 
-        if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
+/** 'Powered by Citadel' logo */
+        if (IconbarIsEnabled("ib_citadel", 1) && (ib_displayas != IB_TEXTONLY)) wprintf(
                 "<div class=\"logo_citadel\"> "
                 "<a href=\"http://www.citadel.org\" "
-                "title=\"%s\" target=\"aboutcit\"> "
+                "title=\"%s\"> "
                 "<img "
                 "src=\"static/citadel-logo.gif\" alt=\"%s\"></a> "
                 "</div>\n",
@@ -108,13 +131,14 @@ void do_iconbar(void) {
        wprintf(_("switch to room list"));
        wprintf("</a></li>");
 
-       if (ib_summary) {
+/** Summary page icon */
+       if (IconbarIsEnabled("ib_summary", 1)) {
                wprintf("<li><a href=\"summary\" "
                        "title=\"%s\" "
                        ">", _("Your summary page")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                                "src=\"static/summscreen_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -123,7 +147,8 @@ void do_iconbar(void) {
                wprintf("</a></li>\n");
        }
 
-       if (ib_inbox) {
+/** Inbox icon */
+       if (IconbarIsEnabled("ib_inbox", 1)) {
                wprintf("<li>"
                        "<a href=\"dotgoto?room=_MAIL_\" "
                        "title=\"%s\" "
@@ -131,7 +156,7 @@ void do_iconbar(void) {
                        _("Go to your email inbox")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                                "src=\"static/privatemess_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -148,7 +173,8 @@ void do_iconbar(void) {
                wprintf("</a></li>\n");
        }
 
-       if (ib_calendar) {
+/** Calendar icon */
+       if (IconbarIsEnabled("ib_calendar", 1)) {
                wprintf("<li>"
                        "<a href=\"dotgoto?room=_CALENDAR_\" "
                        "title=\"%s\" "
@@ -156,7 +182,7 @@ void do_iconbar(void) {
                        _("Go to your personal calendar")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/calarea_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -165,7 +191,8 @@ void do_iconbar(void) {
                wprintf("</a></li>\n");
        }
 
-       if (ib_contacts) {
+/** Contacts icon */
+       if (IconbarIsEnabled("ib_contacts", 1)) {
                wprintf("<li>"
                        "<a href=\"dotgoto?room=_CONTACTS_\" "
                        "title=\"%s\" "
@@ -173,7 +200,7 @@ void do_iconbar(void) {
                        _("Go to your personal address book")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/viewcontacts_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -182,7 +209,8 @@ void do_iconbar(void) {
                wprintf("</a></li>\n");
        }
 
-       if (ib_notes) {
+/** Notes icon */
+       if (IconbarIsEnabled("ib_notes", 1)) {
                wprintf("<li>"
                        "<a href=\"dotgoto?room=_NOTES_\" "
                        "title=\"%s\" "
@@ -190,7 +218,7 @@ void do_iconbar(void) {
                        _("Go to your personal notes")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/storenotes_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -199,7 +227,8 @@ void do_iconbar(void) {
                wprintf("</a></li>\n");
        }
 
-       if (ib_tasks)  {
+/** Tasks icon */
+       if (IconbarIsEnabled("ib_tasks", 1))  {
                wprintf("<li>"
                        "<a href=\"dotgoto?room=_TASKS_\" "
                        "title=\"%s\" "
@@ -207,7 +236,7 @@ void do_iconbar(void) {
                        _("Go to your personal task list")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/taskmanag_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -216,13 +245,14 @@ void do_iconbar(void) {
                wprintf("</a></li>\n");
        }
 
-       if (ib_rooms) {
+/** Rooms icon */
+       if (IconbarIsEnabled("ib_rooms", 1)) {
                wprintf("<li>"
                        "<a href=\"knrooms\" title=\"%s\" >",
                        _("List all of your accessible rooms")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/chatrooms_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -231,14 +261,15 @@ void do_iconbar(void) {
                wprintf("</a></li>\n");
        }
 
-       if (ib_users) {
+/** Users icon */
+       if (IconbarIsEnabled("ib_users", 1)) {
                wprintf("<li>"
-                       "<a href=\"who\" title=\"%s\" "
+                       "<a href=\"do_template?template=who\" title=\"%s\" "
                        ">",
                        _("See who is online right now")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/usermanag_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -246,11 +277,15 @@ void do_iconbar(void) {
                }
                 
                wprintf("</a>\n");
-               wprintf("<ul id=\"wholist\">");
-               wprintf("</ul></li>\n");
+
+               if (IconbarIsEnabled("ib_users", 0)) {
+                       wprintf("<ul id=\"wholist\">");
+                       wprintf("</ul></li>\n");
+               }
        }
 
-       if (ib_chat) {
+/** Chat icon */
+       if (IconbarIsEnabled("ib_chat", 1)) {
                wprintf("<li>"
                        "<a href=\"#\" onClick=\"window.open('chat', "
                        "'ctdl_chat_window', "
@@ -259,7 +294,7 @@ void do_iconbar(void) {
                        ">"
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/citadelchat_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -268,15 +303,16 @@ void do_iconbar(void) {
                wprintf("</a></li>\n");
        }
 
-       if (ib_advanced) {
+/** Advanced Options icon */
+       if (IconbarIsEnabled("ib_advanced", 1)) {
                wprintf("<li>"
-                       "<a href=\"display_main_menu\" "
+                       "<a href=\"do_template?template=display_main_menu\" "
                        "title=\"%s\" "
                        ">",
                        _("Advanced Options Menu: Advanced Room commands, Account Info, and Chat")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/advanpage2_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -287,13 +323,13 @@ void do_iconbar(void) {
 
        if ((WC->axlevel >= 6) || (WC->is_room_aide)) {
                wprintf("<li>"
-                       "<a href=\"display_aide_menu\" "
+                       "<a href=\"do_template?template=display_aide_menu\" "
                        "title=\"%s\" "
                        ">",
                        _("Room and system administration functions")
                );
                if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+                       wprintf("<img alt=\"\" "
                        "src=\"static/advanpage2_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
@@ -310,7 +346,7 @@ void do_iconbar(void) {
                
        );
        if (ib_displayas != IB_TEXTONLY) {
-       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+       wprintf("<img alt=\"\" "
                "src=\"static/logoff_32x.gif\">");
        }
        if (ib_displayas != IB_PICONLY) {
@@ -330,13 +366,12 @@ void do_iconbar(void) {
 
        wprintf("</ul>\n");
 
-        wprintf(
-                "<script type=\"text/javascript\">                                      "
-                " new Ajax.PeriodicalUpdater('wholist', 'wholist_section',             "
-                "                            { method: 'get', frequency: 30 }  );       "
-                "</script>                                                              \n"
-        );
-
+       if (IconbarIsEnabled("ib_users", 0) == 2) {
+               StrBufAppendPrintf(WC->trailing_javascript,
+                       "new Ajax.PeriodicalUpdater('wholist', 'do_template?template=wholist_section', "
+                       "{ method: 'get', frequency: 30 } );    \n"
+               );
+       }
 }
 
 
@@ -346,11 +381,8 @@ void do_iconbar(void) {
  * we generate its innerHTML...
  */
 void do_iconbar_roomlist(void) {
-       char iconbar[SIZ];
-       char buf[SIZ];
-       char key[SIZ], value[SIZ];
-       int i;
-
+       int ib_displayas;
+                               
        WC->current_iconbar = current_iconbar_roomlist;
 
        /**
@@ -359,24 +391,13 @@ void do_iconbar_roomlist(void) {
         * their iconbars.  These should probably be set in a master
         * configuration somewhere.
         */
-       int ib_displayas = 0;   /* pictures and text, pictures, text */
-       int ib_logo = 0;        /* Site logo */
-       int ib_citadel = 1;     /* 'Powered by Citadel' logo */
-       /*
-        */
 
-       get_preference("iconbar", iconbar, sizeof iconbar);
-       for (i=0; i<num_tokens(iconbar, ','); ++i) {
-               extract_token(buf, iconbar, i, ',', sizeof buf);
-               extract_token(key, buf, 0, '=', sizeof key);
-               extract_token(value, buf, 1, '=', sizeof value);
+       LoadIconSettings();
 
-               if (!strcasecmp(key, "ib_displayas")) ib_displayas = atoi(value);
-               if (!strcasecmp(key, "ib_logo")) ib_logo = atoi(value);
-               if (!strcasecmp(key, "ib_citadel")) ib_citadel = atoi(value);
-       }
+       ib_displayas = IconbarIsEnabled("ib_displayas", IB_PICTEXT);    /* pictures and text, pictures, text */
 
-       if (ib_logo) {
+/** Site logo */
+       if (IconbarIsEnabled("ib_logo", 0)) {
                if (ib_displayas != IB_TEXTONLY) {
                         wprintf("<div class=\"logo\"> <img "
                                 "src=\"image&name=hello\" alt=\"&nbsp;\"> "
@@ -385,10 +406,11 @@ void do_iconbar_roomlist(void) {
                }
        }
 
-        if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
+/** 'Powered by Citadel' logo */
+        if (IconbarIsEnabled("ib_citadel", 1) && (ib_displayas != IB_TEXTONLY)) wprintf(
                 "<div class=\"logo_citadel\"> "
                 "<a href=\"http://www.citadel.org\" "
-                "title=\"%s\" target=\"aboutcit\"> "
+                "title=\"%s\"> "
                 "<img "
                 "src=\"static/citadel-logo.gif\" alt=\"%s\"></a> "
                 "</div>\n",
@@ -410,7 +432,7 @@ void do_iconbar_roomlist(void) {
                
        );
        if (ib_displayas != IB_TEXTONLY) {
-       wprintf("<img border=\"0\" width=\"32\" height=\"32\" "
+       wprintf("<img alt=\"\" "
                "src=\"static/logoff_32x.gif\">");
        }
        if (ib_displayas != IB_PICONLY) {
@@ -431,73 +453,32 @@ void do_iconbar_roomlist(void) {
  * \brief display a customized version of the iconbar
  */
 void display_customize_iconbar(void) {
-       char iconbar[SIZ];
-       char buf[SIZ];
-       char key[SIZ], value[SIZ];
        int i;
        int bar = 0;
+       long val;
 
-       /**
-        * 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_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_citadel = 1;     /**< 'Powered by Citadel' logo */
-       /*
-        */
+       int ib_displayas;
 
-       get_preference("iconbar", iconbar, sizeof iconbar);
-       for (i=0; i<num_tokens(iconbar, ','); ++i) {
-               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_citadel")) ib_citadel = atoi(value);
-       }
+       LoadIconSettings();
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE class=\"iconbar_banner\"><tr><td>"
-               "<SPAN CLASS=\"titlebar\">");
+       wprintf("<div id=\"banner\">");
+       wprintf("<h1>");
        wprintf(_("Customize the icon bar"));
-       wprintf("</SPAN>"
-               "</td></tr></table>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1></div>\n");
 
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"iconbar_background\"><tr><td>");
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
-       wprintf("<FORM METHOD=\"POST\" action=\"commit_iconbar\">\n");
+       wprintf("<div class=\"fix_scrollbar_bug\">");
 
-       wprintf("<CENTER>");
+       wprintf("<form method=\"post\" action=\"commit_iconbar\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+
+       wprintf("<table class=\"altern\" >\n");
+       wprintf("<tr><td></td><td colspan=\"2\"><b>");
        wprintf(_("Display icons as:"));
-       wprintf(" ");
+       wprintf("</b>");
+       ib_displayas = IconbarIsEnabled("ib_displayas",IB_PICTEXT);
        for (i=0; i<=2; ++i) {
                wprintf("<input type=\"radio\" name=\"ib_displayas\" value=\"%d\"", i);
                if (ib_displayas == i) wprintf(" CHECKED");
@@ -507,194 +488,223 @@ void display_customize_iconbar(void) {
                if (i == IB_TEXTONLY)   wprintf(_("text only"));
                wprintf("\n");
        }
-       wprintf("<br /><br />\n");
+       wprintf("<br />\n");
 
        wprintf(_("Select the icons you would like to see displayed "
                "in the 'icon bar' menu on the left side of the "
                "screen."));
-       wprintf("</CENTER><br />\n");
-
-       wprintf("<TABLE border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
+       wprintf("</td></tr>\n");
 
-       wprintf("<tr BGCOLOR=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_logo\" value=\"yes\" %s>"
+       bar = 1 - bar;
+       val = IconbarIsEnabled("ib_logo", 0);
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_logo\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_logo\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" "
-               "src=\"image&name=hello\" alt=\"&nbsp;\">"
+               "<img src=\"image&name=hello\" width=\"48\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_logo ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
                _("Site logo"),
                _("An icon describing this site")
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_summary\" value=\"yes\" %s>"
+       bar = 1 - bar;
+       val = IconbarIsEnabled("ib_summary", 1);
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_summary\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_summary\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/summscreen_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/summscreen_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_summary ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
                _("Summary"),
                _("Your summary page")
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_inbox\" value=\"yes\" %s>"
+       bar = 1 - bar;
+       val = IconbarIsEnabled("ib_inbox", 1);
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_inbox\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_inbox\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/privatemess_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/privatemess_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_inbox ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
                _("Mail (inbox)"),
                _("A shortcut to your email Inbox")
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_contacts\" "
-               "value=\"yes\" %s>"
+       bar = 1 - bar;
+       val = IconbarIsEnabled("ib_contacts", 1);
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_contacts\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_contacts\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/viewcontacts_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/viewcontacts_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_contacts ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
                _("Contacts"),
                _("Your personal address book")
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_notes\" "
-               "value=\"yes\" %s>"
+       bar = 1 - bar;
+       val = IconbarIsEnabled("ib_notes", 1);
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_notes\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_notes\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/storenotes_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/storenotes_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_notes ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
                _("Notes"),
                _("Your personal notes")
        );
 
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_calendar\" "
-               "value=\"yes\" %s>"
+       bar = 1 - bar;
+       val = IconbarIsEnabled("ib_calendar", 1);
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_calendar\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_calendar\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/calarea_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/calarea_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_calendar ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
                _("Calendar"),
                _("A shortcut to your personal calendar")
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_tasks\" value=\"yes\" %s>"
+       bar = 1 - bar;
+       val = IconbarIsEnabled("ib_tasks", 1);
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_tasks\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_tasks\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/taskmanag_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/taskmanag_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_tasks ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
                _("Tasks"),
                _("A shortcut to your personal task list")
        );
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_rooms\" value=\"yes\" %s>"
+       bar = 1 - bar;
+       val = IconbarIsEnabled("ib_rooms", 1);
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_rooms\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_rooms\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/chatrooms_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/chatrooms_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_rooms ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
                _("Rooms"),
                _("Clicking this icon displays a list of all accessible "
                "rooms (or folders) available.")
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_users\" value=\"yes\" %s>"
+       bar = 1 - bar;
+       val = IconbarIsEnabled("ib_users", 1);
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_users\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_users\" value=\"no\" %s> %s <br />"
+               "<input type=\"radio\" name=\"ib_users\" value=\"yeslist\" %s> %s"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/usermanag_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/usermanag_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
-               "<b>%s</b><br />"
-               "%s"
+               "<b>%s</b>"
+               "<br />%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_users ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
+               ((val > 1) ? "CHECKED" : ""),_("Yes with users list"),
                _("Who is online?"),
                _("Clicking this icon displays a list of all users "
                "currently logged in.")
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_chat\" value=\"yes\" %s>"
+       bar = 1 - bar;
+       val = IconbarIsEnabled("ib_chat", 1);
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_chat\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_chat\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/citadelchat_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/citadelchat_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_chat ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
                _("Chat"),
                _("Clicking this icon enters real-time chat mode "
                "with other users in the same room.")
                
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_advanced\" "
-               "value=\"yes\" %s>"
+       bar = 1 - bar;
+       val = IconbarIsEnabled("ib_advanced", 1);
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_advanced\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_advanced\" value=\"no\" %s> %s <br />"
                "</td><td>"
-               "<img border=\"0\" width=\"48\" height=\"48\" "
-               "src=\"static/advanpage2_48x.gif\" alt=\"&nbsp;\">"
+               "<img src=\"static/advanpage2_48x.gif\" alt=\"&nbsp;\">"
                "</td><td>"
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_advanced ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
                _("Advanced options"),
                _("Access to the complete menu of Citadel functions.")
 
        );
 
-       wprintf("<tr bgcolor=%s><td>"
-               "<input type=\"checkbox\" name=\"ib_citadel\" "
-               "value=\"yes\" %s>"
+       bar = 1 - bar;
+       val = IconbarIsEnabled("ib_citadel", 1);
+       wprintf("<tr class=\"%s\"><td>"
+               "<input type=\"radio\" name=\"ib_citadel\" value=\"yes\" %s> %s &nbsp;&nbsp;&nbsp;"
+               "<input type=\"radio\" name=\"ib_citadel\" value=\"no\" %s> %s <br />"
                "</td><td>"
                "<img border=\"0\" width=\"48\" height=\"48\" "
                "src=\"static/citadel-logo.gif\" alt=\"&nbsp;\">"
@@ -702,23 +712,24 @@ void display_customize_iconbar(void) {
                "<b>%s</b><br />"
                "%s"
                "</td></tr>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_citadel ? "CHECKED" : ""),
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
                _("Citadel logo"),
                _("Displays the 'Powered by Citadel' icon")
        );
 
        wprintf("</table><br />\n"
-               "<CENTER>"
+               "<center>"
                "<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
                "&nbsp;"
                "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">"
-               "</CENTER></FORM>\n",
+               "</center>\n",
                _("Save changes"),
                _("Cancel")
        );
 
-       wprintf("</td></tr></table></div>\n");
+       wprintf("</form></div>\n");
        wDumpContent(2);
 }
 
@@ -726,7 +737,8 @@ void display_customize_iconbar(void) {
  * \brief commit the changes of an edited iconbar ????
  */
 void commit_iconbar(void) {
-       char iconbar[SIZ];
+       StrBuf *iconbar;
+       StrBuf *buf;
        int i;
 
        char *boxen[] = {
@@ -745,26 +757,39 @@ void commit_iconbar(void) {
                "ib_citadel"
        };
 
-       if (strlen(bstr("ok_button")) == 0) {
+       if (!havebstr("ok_button")) {
                display_main_menu();
                return;
        }
 
-       sprintf(iconbar, "ib_displayas=%d", atoi(bstr("ib_displayas")));
-
+       iconbar = NewStrBuf();
+       buf = NewStrBuf();
+       StrBufPrintf(iconbar, "ib_displayas=%d", ibstr("ib_displayas"));
        for (i=0; i<(sizeof(boxen)/sizeof(char *)); ++i) {
-               sprintf(&iconbar[strlen(iconbar)], ",%s=", boxen[i]);
-               if (!strcasecmp(bstr(boxen[i]), "yes")) {
-                       sprintf(&iconbar[strlen(iconbar)], "1");
+               char *Val;
+               if (!strcasecmp(BSTR(boxen[i]), "yes")) {
+                       Val = "1";
+               }
+               else if (!strcasecmp(BSTR(boxen[i]), "yeslist")) {
+                       Val = "2";
                }
                else {
-                       sprintf(&iconbar[strlen(iconbar)], "0");
+                       Val = "0";
                }
-       }
+               StrBufPrintf(buf, ",%s=%s", boxen[i], Val);
+               StrBufAppendBuf(iconbar, buf, 0);
 
+       }
+       FreeStrBuf(&buf);
        set_preference("iconbar", iconbar, 1);
 
-       output_headers(1, 1, 0, 0, 0, 0);
+       output_headers(1, 1, 2, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
+       wprintf(_("Customize the icon bar"));
+       wprintf("</h1></div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
        wprintf(
                "<center><table border=1 bgcolor=\"#ffffff\"><tr><td>"
                "<img src=\"static/advanpage2_48x.gif\">"
@@ -773,8 +798,36 @@ void commit_iconbar(void) {
                "choices to continue."));
        wprintf("</td></tr></table>\n");
        wDumpContent(2);
+#ifdef DBG_ICONBAR_HASH
+       dbg_PrintHash(WC->IconBarSetttings, PrintInt, NULL);
+#endif
 }
 
 
+void tmplput_iconbar(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       if ((WCC != NULL) && (WCC->logged_in)) {
+               wprintf("<div id=\"iconbar\">");
+               do_selected_iconbar();
+               /** check for instant messages (these display in a new window) */
+               page_popup();
+               wprintf("</div>");
+       }
+}
+
+void 
+InitModule_ICONBAR
+(void)
+{
+       WebcitAddUrlHandler(HKEY("iconbar_ajax_menu"), do_iconbar, AJAX);
+       WebcitAddUrlHandler(HKEY("iconbar_ajax_rooms"), do_iconbar_roomlist, AJAX);
+       WebcitAddUrlHandler(HKEY("display_customize_iconbar"), display_customize_iconbar, 0);
+       WebcitAddUrlHandler(HKEY("commit_iconbar"), commit_iconbar, 0);
+       RegisterNamespace("ICONBAR", 0, 0, tmplput_iconbar, 0);
+
+}
+
 
 /*@}*/