* All OS-level includes are now included from webcit.h instead of from

[citadel.git] / webcit / iconbar.c

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index c5601f2574cdd42ba3d1122209641a2d671c005f..45a3d214fe318ff97b36d19c917aec3e1ea3a074 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -4,26 +4,6 @@
  * 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"
 
 
@@ -59,11 +39,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);
@@ -98,9 +78,8 @@ void do_iconbar(void) {
                "<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>"
+               "<img border=\"0\" "
+               "SRC=\"/static/citadel-logo.gif\" ALT=\"CITADEL\"></a>"
                "</div></li>\n"
        );
 
@@ -112,7 +91,7 @@ void do_iconbar(void) {
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                               "SRC=\"/static/summary.gif\">");
+                               "SRC=\"/static/summscreen_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Summary");
@@ -128,7 +107,7 @@ void do_iconbar(void) {
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                               "SRC=\"/static/mail.gif\">");
+                               "SRC=\"/static/privatemess_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Mail");
@@ -138,13 +117,13 @@ void do_iconbar(void) {
 
        if (ib_calendar) {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Calendar\" "
+                       "<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\">");
+                       "SRC=\"/static/calarea_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Calendar");
@@ -154,13 +133,13 @@ void do_iconbar(void) {
 
        if (ib_contacts) {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Contacts\" "
+                       "<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\">");
+                       "SRC=\"/static/viewcontacts_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Contacts");
@@ -170,13 +149,13 @@ void do_iconbar(void) {
 
        if (ib_notes) {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Notes\" "
+                       "<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\">");
+                       "SRC=\"/static/storenotes_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Notes");
@@ -186,13 +165,13 @@ void do_iconbar(void) {
 
        if (ib_tasks)  {
                wprintf("<li>"
-                       "<A HREF=\"/dotgoto?room=Tasks\" "
+                       "<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/vcalendar.gif\">");
+                       "SRC=\"/static/taskmanag_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Tasks");
@@ -207,7 +186,7 @@ void do_iconbar(void) {
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/rooms-icon.gif\">");
+                       "SRC=\"/static/chatrooms_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Rooms");
@@ -217,12 +196,12 @@ void do_iconbar(void) {
 
        if (ib_users) {
                wprintf("<li>"
-                       "<A HREF=\"/whobbs\" TITLE=\"See who is online right now\" "
+                       "<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/users-icon.gif\">");
+                       "SRC=\"/static/usermanag_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Who is online?");
@@ -240,7 +219,7 @@ void do_iconbar(void) {
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/chat-icon.gif\">");
+                       "SRC=\"/static/citadelchat_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Chat");
@@ -257,7 +236,7 @@ void do_iconbar(void) {
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/advanced-icon.gif\">");
+                       "SRC=\"/static/advanpage2_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Advanced");
@@ -273,7 +252,7 @@ void do_iconbar(void) {
                );
                if (ib_displayas != IB_TEXTONLY) {
                        wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/advanced-icon.gif\">");
+                       "SRC=\"/static/advanpage2_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Administration");
@@ -288,7 +267,7 @@ void do_iconbar(void) {
                );
                if (ib_displayas != IB_TEXTONLY) {
                wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-                       "SRC=\"/static/exit-icon.gif\">");
+                       "SRC=\"/static/logoff_32x.gif\">");
                }
                if (ib_displayas != IB_PICONLY) {
                        wprintf("Log off");
@@ -300,7 +279,7 @@ void do_iconbar(void) {
                "<li><div align=\"center\">"
                "<A HREF=\"/display_customize_iconbar\" "
                "TITLE=\"Customize this menu\" "
-               ">customize this menu</A>"
+               ">customize this menu"
                "</A></div></li>\n"
        );
 
@@ -338,11 +317,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);
@@ -367,7 +346,7 @@ void display_customize_iconbar(void) {
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/commit_iconbar\">\n");
@@ -399,7 +378,7 @@ void display_customize_iconbar(void) {
                "SRC=\"/image&name=hello\" ALT=\"&nbsp;\">"
                "</TD><TD>"
                "<B>Site logo</B><br />"
-               "A graphic describing this site"
+               "An icon describing this site"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
                (ib_logo ? "CHECKED" : "")
@@ -409,7 +388,7 @@ void display_customize_iconbar(void) {
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_summary\" VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/summary.gif\" ALT=\"&nbsp;\">"
+               "SRC=\"/static/summscreen_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
                "<B>Summary</B><br />"
                "Your summary page"
@@ -422,7 +401,7 @@ void display_customize_iconbar(void) {
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_inbox\" VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/mail.gif\" ALT=\"&nbsp;\">"
+               "SRC=\"/static/privatemess_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
                "<B>Mail (inbox)</B><br />"
                "A shortcut to your e-mail Inbox."
@@ -436,7 +415,7 @@ void display_customize_iconbar(void) {
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/vcard.gif\" ALT=\"&nbsp;\">"
+               "SRC=\"/static/viewcontacts_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
                "<B>Contacts</B><br />"
                "Your personal address book."
@@ -450,7 +429,7 @@ void display_customize_iconbar(void) {
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/note.gif\" ALT=\"&nbsp;\">"
+               "SRC=\"/static/storenotes_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
                "<B>Notes</B><br />"
                "Your personal notes."
@@ -465,7 +444,7 @@ void display_customize_iconbar(void) {
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/vcalendar.gif\" ALT=\"&nbsp;\">"
+               "SRC=\"/static/calarea_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
                "<B>Calendar</B><br />"
                "A shortcut to your personal calendar."
@@ -478,7 +457,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/taskmanag_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
                "<B>Tasks</B><br />"
                "A shortcut to your personal task list."
@@ -492,7 +471,7 @@ void display_customize_iconbar(void) {
                "<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;\">"
+               "SRC=\"/static/chatrooms_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
                "<B>Rooms</B><br />"
                "Clicking this icon displays a list of all accesible "
@@ -506,7 +485,7 @@ void display_customize_iconbar(void) {
                "<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;\">"
+               "SRC=\"/static/usermanag_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
                "<B>Who is online?</B><br />"
                "Clicking this icon displays a list of all users "
@@ -520,7 +499,7 @@ void display_customize_iconbar(void) {
                "<INPUT TYPE=\"checkbox\" NAME=\"ib_chat\" VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/chat-icon.gif\" ALT=\"&nbsp;\">"
+               "SRC=\"/static/citadelchat_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
                "<B>Chat</B><br />"
                "Clicking this icon enters real-time chat mode "
@@ -535,7 +514,7 @@ void display_customize_iconbar(void) {
                "VALUE=\"yes\" %s>"
                "</TD><TD>"
                "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
-               "SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
+               "SRC=\"/static/advanpage2_48x.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
                "<B>Advanced options</B><br />"
                "Access to the complete menu of Citadel functions."
@@ -552,7 +531,7 @@ void display_customize_iconbar(void) {
                "SRC=\"/static/citadel-logo.gif\" ALT=\"&nbsp;\">"
                "</TD><TD>"
                "<B>Citadel logo</B><br />"
-               "Displays the &quot;Powered by Citadel&quot; graphic"
+               "Displays the &quot;Powered by Citadel&quot; icon"
                "</TD></TR>\n",
                ((bar = 1 - bar), (bar ? "\"#CCCCCC\"" : "\"#FFFFFF\"")),
                (ib_citadel ? "CHECKED" : "")
@@ -608,12 +587,12 @@ void commit_iconbar(void) {
                }
        }
 
-       set_preference("iconbar", iconbar);
+       set_preference("iconbar", iconbar, 1);
 
        output_headers(1, 1, 0, 0, 0, 0, 0);
        wprintf(
                "<center><table border=1 bgcolor=\"#ffffff\"><tr><td>"
-               "<IMG SRC=\"/static/advanced-icon.gif\">"
+               "<IMG SRC=\"/static/advanpage2_48x.gif\">"
                "&nbsp;"
                "Your icon bar has been updated.  Please select any of its "
                "choices to continue."