]> code.citadel.org Git - citadel.git/blobdiff - webcit/iconbar.c
* use GetTemplateTokenNumber to retrieve token parameter values; this was one of...
[citadel.git] / webcit / iconbar.c
index 65efed0bcd4640d79c2d604e53f0bd081c3c6f8f..532dfbdee53855f343dcdf3ada70d0db32a420ee 100644 (file)
  * Displays and customizes the iconbar.
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <time.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
+/* Values for ib_displayas ... don't change these or you will break the templates */
+#define IB_PICTEXT     0       /* picture and text */
+#define IB_PICONLY     1       /* just a picture */
+#define IB_TEXTONLY    2       /* just text */
 
-/* Values for ib_displayas */
-#define IB_PICTEXT     0
-#define IB_PICONLY     1
-#define IB_TEXTONLY    2
+void DontDeleteThis(void *Data){}
 
-void do_iconbar(void) {
-       char iconbar[SIZ];
-       char buf[SIZ];
-       char key[SIZ], value[SIZ];
-       int i;
-
-       /* 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);
-       }
-
-       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"
-       );
-
-
-       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/summscreen_32x.gif\">");
-               }
-               if (ib_displayas != IB_PICONLY) {
-                       wprintf("Summary");
-               }
-               wprintf("</A></li>\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/privatemess_32x.gif\">");
-               }
-               if (ib_displayas != IB_PICONLY) {
-                       wprintf("Mail");
-               }
-               wprintf("</A></li>\n");
-       }
+#define IconbarIsEnabled(a, b) IconbarIsENABLED(a, sizeof(a) - 1, b)
 
-       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/calarea_32x.gif\">");
-               }
-               if (ib_displayas != IB_PICONLY) {
-                       wprintf("Calendar");
-               }
-               wprintf("</A></li>\n");
-       }
+long IconbarIsENABLED(const char *key, size_t keylen, long defval)
+{
+       void *Data;
+       wcsession *WCC = WC;
 
-       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/viewcontacts_32x.gif\">");
-               }
-               if (ib_displayas != IB_PICONLY) {
-                       wprintf("Contacts");
-               }
-               wprintf("</A></li>\n");
-       }
+       if (WCC == NULL) 
+               return defval;
 
-       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/storenotes_32x.gif\">");
-               }
-               if (ib_displayas != IB_PICONLY) {
-                       wprintf("Notes");
-               }
-               wprintf("</A></li>\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/taskmanag_32x.gif\">");
-               }
-               if (ib_displayas != IB_PICONLY) {
-                       wprintf("Tasks");
-               }
-               wprintf("</A></li>\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/chatrooms_32x.gif\">");
-               }
-               if (ib_displayas != IB_PICONLY) {
-                       wprintf("Rooms");
-               }
-               wprintf("</A></li>\n");
-       }
+       if (GetHash(WCC->IconBarSettings, 
+                   key, 
+                   keylen,
+                   &Data) && 
+           (Data != NULL))
+               return (long) Data;
+       else 
+               return defval;
+}
 
-       if (ib_users) {
-               wprintf("<li>"
-                       "<A HREF=\"/who\" TITLE=\"See who is online right now\" "
-                       ">"
-               );
-               if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/usermanag_32x.gif\">");
-               }
-               if (ib_displayas != IB_PICONLY) {
-                       wprintf("Who is online?");
+#ifdef DBG_ICONBAR_HASH
+static char nbuf[32];
+inline const char *PrintInt(void *Prefstr)
+{
+       snprintf(nbuf, sizeof(nbuf), "%ld", (long)Prefstr);
+       return nbuf;
+}
+#endif
+
+/* Produces a stylesheet which hides any iconbar icons the user does not want */
+void doUserIconStylesheet(void) {
+       HashPos *pos;
+       void *Data;
+       long value;
+       const char *key;
+       long HKLen;
+       
+       output_custom_content_header("text/css");
+       hprintf("Cache-Control: private\r\n");
+       
+       begin_burst();
+       wprintf("#global { left: 16%%; }\r\n");
+       pos = GetNewHashPos(WC->IconBarSettings, 0);
+       while(GetNextHashPos(WC->IconBarSettings, pos, &HKLen, &key, &Data)) {
+               value = (long) Data;
+               if (value == 0 
+                   && strncasecmp("ib_displayas",key,12) 
+                   && strncasecmp("ib_logoff", key, 9)) {
+                       /* Don't shoot me for this */
+                       wprintf("#%s { display: none !important; }\r\n",key);
+               } else if (!strncasecmp("ib_users",key, 8) && value == 2) {
+                       wprintf("#online_users { display: block; !important } \r\n");
                }
-               wprintf("</A></li>\n");
        }
+       DeleteHashPos(&pos);
+       end_burst();
+}
 
-       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/citadelchat_32x.gif\">");
-               }
-               if (ib_displayas != IB_PICONLY) {
-                       wprintf("Chat");
-               }
-               wprintf("</A></li>\n");
-       }
+int ConditionalIsActiveStylesheet(StrBuf *Target, WCTemplputParams *TP) {
+       long testFor;
+       int ib_displayas;
 
-       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/advanpage2_32x.gif\">");
-               }
-               if (ib_displayas != IB_PICONLY) {
-                       wprintf("Advanced");
-               }
-               wprintf("</A></li>\n");
-       }
+       testFor = GetTemplateTokenNumber(Target, TP, 3, IB_PICTEXT);
+       ib_displayas = IconbarIsEnabled("ib_displayas", IB_PICTEXT);
+       return (testFor == ib_displayas);
+}
 
-       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/advanpage2_32x.gif\">");
-               }
-               if (ib_displayas != IB_PICONLY) {
-                       wprintf("Administration");
-               }
-               wprintf("</A></li>\n");
-       }
+void LoadIconSettings(StrBuf *iconbar, long lvalue)
+{
+       wcsession *WCC = WC;
+       StrBuf *buf;
+       StrBuf *key;
+       long val;
+       int i, nTokens;
+
+       buf = NewStrBuf();;
+       key = NewStrBuf();
+       if (WCC->IconBarSettings == NULL)
+               WCC->IconBarSettings = 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.
+        */
 
-       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/logoff_32x.gif\">");
-               }
-               if (ib_displayas != IB_PICONLY) {
-                       wprintf("Log off");
-               }
-               wprintf("</A></li>\n");
+       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->IconBarSettings, 
+                   ChrPtr(key), StrLength(key),
+                   (void*)val, DontDeleteThis);
        }
 
-       wprintf(
-               "<li><div align=\"center\">"
-               "<A HREF=\"/display_customize_iconbar\" "
-               "TITLE=\"Customize this menu\" "
-               ">customize this menu"
-               "</A></div></li>\n"
-       );
+#ifdef DBG_ICONBAR_HASH
+       dbg_PrintHash(WCC->IconBarSetttings, PrintInt, NULL);
+#endif
 
-       wprintf("</ul>\n"
-               "</div>\n");
+       FreeStrBuf(&key);
+       FreeStrBuf(&buf);
 }
 
-
-
+/*
+ * 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);
-       }
+       output_headers(1, 1, 2, 0, 0, 0);
+       wprintf("<div id=\"banner\">");
+       wprintf("<h1>");
+       wprintf(_("Customize the icon bar"));
+       wprintf("</h1></div>\n");
 
-       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=\"content\" class=\"service\">\n");
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
+       wprintf("<div class=\"fix_scrollbar_bug\">");
 
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/commit_iconbar\">\n");
+       wprintf("<form method=\"post\" action=\"commit_iconbar\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
-       wprintf("<CENTER>"
-               "Display icons as: ");
+       wprintf("<table class=\"altern\" >\n");
+       wprintf("<tr><td></td><td colspan=\"2\"><b>");
+       wprintf(_("Display icons as:"));
+       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);
+               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");
+               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("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"
+       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("</td></tr>\n");
+
+       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 src=\"image&name=hello\" width=\"48\" alt=\"&nbsp;\">"
+               "</td><td>"
+               "<b>%s</b><br />"
+               "%s"
+               "</td></tr>\n",
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
+               _("Site logo"),
+               _("An icon describing this site")
        );
 
-       wprintf("<TABLE border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
-
-       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 />"
-               "An icon describing this site"
-               "</TD></TR>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_logo ? "CHECKED" : "")
+       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 src=\"static/summscreen_48x.gif\" alt=\"&nbsp;\">"
+               "</td><td>"
+               "<b>%s</b><br />"
+               "%s"
+               "</td></tr>\n",
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
+               _("Summary"),
+               _("Your summary page")
        );
 
-       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/summscreen_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>Summary</B><br />"
-               "Your summary page"
-               "</TD></TR>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_summary ? "CHECKED" : "")
+       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 src=\"static/privatemess_48x.gif\" alt=\"&nbsp;\">"
+               "</td><td>"
+               "<b>%s</b><br />"
+               "%s"
+               "</td></tr>\n",
+               (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_inbox\" VALUE=\"yes\" %s>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/privatemess_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>Mail (inbox)</B><br />"
-               "A shortcut to your e-mail Inbox."
-               "</TD></TR>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_inbox ? "CHECKED" : "")
+       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 src=\"static/viewcontacts_48x.gif\" alt=\"&nbsp;\">"
+               "</td><td>"
+               "<b>%s</b><br />"
+               "%s"
+               "</td></tr>\n",
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
+               _("Contacts"),
+               _("Your personal address book")
        );
 
-       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/viewcontacts_48x.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" : "")
+       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 src=\"static/storenotes_48x.gif\" alt=\"&nbsp;\">"
+               "</td><td>"
+               "<b>%s</b><br />"
+               "%s"
+               "</td></tr>\n",
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
+               _("Notes"),
+               _("Your personal notes")
        );
 
-       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/storenotes_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>Notes</B><br />"
-               "Your personal notes."
-               "</TD></TR>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_notes ? "CHECKED" : "")
+       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 src=\"static/calarea_48x.gif\" alt=\"&nbsp;\">"
+               "</td><td>"
+               "<b>%s</b><br />"
+               "%s"
+               "</td></tr>\n",
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
+               _("Calendar"),
+               _("A shortcut to your personal calendar")
        );
 
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
-       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/calarea_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>Calendar</B><br />"
-               "A shortcut to your personal calendar."
-               "</TD></TR>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_calendar ? "CHECKED" : "")
+       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 src=\"static/taskmanag_48x.gif\" alt=\"&nbsp;\">"
+               "</td><td>"
+               "<b>%s</b><br />"
+               "%s"
+               "</td></tr>\n",
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
+               _("Tasks"),
+               _("A shortcut to your personal task list")
        );
 
-       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/taskmanag_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<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=%s><TD>"
-               "<INPUT TYPE=\"checkbox\" NAME=\"ib_rooms\" VALUE=\"yes\" %s>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/chatrooms_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<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" : "")
+       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 src=\"static/chatrooms_48x.gif\" alt=\"&nbsp;\">"
+               "</td><td>"
+               "<b>%s</b><br />"
+               "%s"
+               "</td></tr>\n",
+               (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>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/usermanag_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<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" : "")
+       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 src=\"static/usermanag_48x.gif\" alt=\"&nbsp;\">"
+               "</td><td>"
+               "<b>%s</b>"
+               "<br />%s"
+               "</td></tr>\n",
+               (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>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/citadelchat_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>Chat</B><br />"
-               "Clicking this icon enters real-time chat mode "
-               "with other users in the same room."
-               "</TD></TR>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_chat ? "CHECKED" : "")
+       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 src=\"static/citadelchat_48x.gif\" alt=\"&nbsp;\">"
+               "</td><td>"
+               "<b>%s</b><br />"
+               "%s"
+               "</td></tr>\n",
+               (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>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/advanpage2_48x.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>Advanced options</B><br />"
-               "Access to the complete menu of Citadel functions."
-               "</TD></TR>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_advanced ? "CHECKED" : "")
+       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 src=\"static/advanpage2_48x.gif\" alt=\"&nbsp;\">"
+               "</td><td>"
+               "<b>%s</b><br />"
+               "%s"
+               "</td></tr>\n",
+               (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>"
-               "</TD><TD>"
-               "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/citadel-logo.gif\" ALT=\"&nbsp;\">"
-               "</TD><TD>"
-               "<B>Citadel logo</B><br />"
-               "Displays the &quot;Powered by Citadel&quot; icon"
-               "</TD></TR>\n",
-               ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
-               (ib_citadel ? "CHECKED" : "")
+       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;\">"
+               "</td><td>"
+               "<b>%s</b><br />"
+               "%s"
+               "</td></tr>\n",
+               (bar ? "even" : "odd"),
+               (val ? "CHECKED" : ""),_("Yes"),
+               (!val ? "CHECKED" : ""),_("No"),
+               _("Citadel logo"),
+               _("Displays the 'Powered by Citadel' icon")
        );
 
-       wprintf("</TABLE><br />\n"
-               "<CENTER>"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
+       wprintf("</table><br />\n"
+               "<center>"
+               "<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
                "&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">"
-               "</CENTER></FORM>\n"
+               "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">"
+               "</center>\n",
+               _("Save changes"),
+               _("Cancel")
        );
 
-       wprintf("</td></tr></table></div>\n");
+       wprintf("</form></div>\n");
        wDumpContent(2);
 }
 
-
+/*
+ * save changes to iconbar settings
+ */
 void commit_iconbar(void) {
-       char iconbar[SIZ];
+       StrBuf *iconbar;
+       StrBuf *buf;
        int i;
 
        char *boxen[] = {
@@ -591,33 +423,81 @@ void commit_iconbar(void) {
                "ib_citadel"
        };
 
-       if (strcmp(bstr("sc"), "OK")) {
+       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, 0);
+       output_headers(1, 1, 2, 0, 0, 0);
+       /* TODO: TEMPLATE */
+       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\">"
-               "&nbsp;"
-               "Your icon bar has been updated.  Please select any of its "
-               "choices to continue."
-               "</td></tr></table>\n"
-       );
+               "<img src=\"static/advanpage2_48x.gif\">"
+               "&nbsp;");
+       wprintf(_("Your icon bar has been updated.  Please select any of its "
+                 "choices to continue.<br/><span style=\"font-weight: bold;\">You may need to force refresh (SHIFT-F5) in order for changes to take effect</span>"));
+       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)) {
+         DoTemplate(HKEY("iconbar"), NULL, &NoCtx);
+       }
+}
+
+void 
+InitModule_ICONBAR
+(void)
+{
+       WebcitAddUrlHandler(HKEY("user_iconbar"), doUserIconStylesheet, 0);
+       WebcitAddUrlHandler(HKEY("commit_iconbar"), commit_iconbar, 0);
+       RegisterConditional(HKEY("COND:ICONBAR:ACTIVE"), 3, ConditionalIsActiveStylesheet, CTX_NONE);
+       WebcitAddUrlHandler(HKEY("display_customize_iconbar"), display_customize_iconbar, 0);
+       RegisterNamespace("ICONBAR", 0, 0, tmplput_iconbar, 0);
+
+       RegisterPreference("iconbar", _("Iconbar Setting"), PRF_STRING, LoadIconSettings);
+}
+
+
+
+void 
+SessionDestroyModule_ICONBAR
+(wcsession *sess)
+{
+       DeleteHash(&sess->IconBarSettings);
 }