* Moved to the new string tokenizer API

[citadel.git] / webcit / iconbar.c

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 0456c341b99d9fbdea7dfa729dfd8f77c06c0851..248f2b6806da7937a149f790a7ebc7d617a58f4a 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -59,11 +59,11 @@ void do_iconbar(void) {
        /*
         */
 
-       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);
@@ -94,6 +94,17 @@ void do_iconbar(void) {
                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\" "
@@ -181,7 +192,7 @@ void do_iconbar(void) {
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/vcalendar.gif\">");
+                       "SRC=\"/static/tasks.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Tasks");
@@ -293,18 +304,6 @@ void do_iconbar(void) {
                "</A></div></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\" "
-               "onMouseOver=\"window.status='Find out more about "
-               "Citadel'; return true;\">powered by<br /><IMG "
-               "BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/citadel-logo.gif\" ALT=\"CITADEL\">"
-               "<br />CITADEL</A>"
-               "</div></li>\n"
-       );
-
        wprintf("</ul>\n"
                "</div>\n");
 }
@@ -339,11 +338,11 @@ void display_customize_iconbar(void) {
        /*
         */
 
-       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);
@@ -368,7 +367,8 @@ void display_customize_iconbar(void) {
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<center><table border=0 width=99%% bgcolor=\"#ffffff\"><tr><td>");
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/commit_iconbar\">\n");
 
@@ -478,7 +478,7 @@ void display_customize_iconbar(void) {
                "<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 />"
                "A shortcut to your personal task list."
@@ -566,7 +566,7 @@ void display_customize_iconbar(void) {
                "</CENTER></FORM>\n"
        );
 
-       wprintf("</td></tr></table></center>\n");
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(2);
 }