]> code.citadel.org Git - citadel.git/blobdiff - webcit/messages.c
* lets start knit-picking on buffersizes.
[citadel.git] / webcit / messages.c
index ee35b5ea54c4ab9353be8f425be03b2eb5b24cee..032b79c04b9337d238cbeb9391a2364a1a64268b 100644 (file)
@@ -254,50 +254,52 @@ void rfc2047encode(char *target, int maxlen, char *source)
  */
 void url(char *buf)
 {
-       int pos, len;
-       int start, end;
+       int len;
+       char *start, *end, *pos;
        char urlbuf[SIZ];
        char outbuf[1024];
-       start = (-1);
-       len = end = strlen(buf);
 
-       for (pos = 0; pos < len; ++pos) {
-               if (!strncasecmp(&buf[pos], "http://", 7))
+       start = NULL;
+       len = strlen(buf);
+       end = buf + len;
+       for (pos = buf; (pos < end) && (start == NULL); ++pos) {
+               if (!strncasecmp(pos, "http://", 7))
                        start = pos;
-               if (!strncasecmp(&buf[pos], "ftp://", 6))
+               if (!strncasecmp(pos, "ftp://", 6))
                        start = pos;
        }
 
-       if (start < 0)
+       if (start == NULL)
                return;
 
-       for (pos = len; pos > start; --pos) {
-               if (  (!isprint(buf[pos]))
-                  || (isspace(buf[pos]))
-                  || (buf[pos] == '{')
-                  || (buf[pos] == '}')
-                  || (buf[pos] == '|')
-                  || (buf[pos] == '\\')
-                  || (buf[pos] == '^')
-                  || (buf[pos] == '[')
-                  || (buf[pos] == ']')
-                  || (buf[pos] == '`')
-                  || (buf[pos] == '<')
-                  || (buf[pos] == '>')
-                  || (buf[pos] == '(')
-                  || (buf[pos] == ')')
+       for (pos = buf+len; pos > start; --pos) {
+               if (  (!isprint(*pos))
+                  || (isspace(*pos))
+                  || (*pos == '{')
+                  || (*pos == '}')
+                  || (*pos == '|')
+                  || (*pos == '\\')
+                  || (*pos == '^')
+                  || (*pos == '[')
+                  || (*pos == ']')
+                  || (*pos == '`')
+                  || (*pos == '<')
+                  || (*pos == '>')
+                  || (*pos == '(')
+                  || (*pos == ')')
                ) {
                        end = pos;
                }
        }
 
-       strncpy(urlbuf, &buf[start], end - start);
-       urlbuf[end - start] = 0;
+       strncpy(urlbuf, start, end - start);
+       urlbuf[end - start] = '\0';
 
-       strncpy(outbuf, buf, start);
-       sprintf(&outbuf[start], "%ca href=%c%s%c TARGET=%c%s%c%c%s%c/A%c",
+       if (start != buf)
+               strncpy(outbuf, buf, start - buf );
+       sprintf(&outbuf[start-buf], "%ca href=%c%s%c TARGET=%c%s%c%c%s%c/A%c",
                LB, QU, urlbuf, QU, QU, TARGET, QU, RB, urlbuf, LB, RB);
-       strcat(outbuf, &buf[end]);
+       strcat(outbuf, end);
        if ( strlen(outbuf) < 250 )
                strcpy(buf, outbuf);
 }
@@ -491,6 +493,7 @@ void display_parsed_vcard(struct vCard *v, int full) {
        
                        else if (!strcasecmp(firsttoken, "email")) {
                                if (!IsEmptyStr(mailto)) strcat(mailto, "<br />");
+                               long len;
                                strcat(mailto,
                                        "<a href=\"display_enter"
                                        "?force_room=_MAIL_?recp=");
@@ -501,7 +504,8 @@ void display_parsed_vcard(struct vCard *v, int full) {
                                urlesc(&mailto[strlen(mailto)], ">");
 
                                strcat(mailto, "\">");
-                               stresc(&mailto[strlen(mailto)], thisvalue, 1, 1);
+                               len = strlen(mailto);
+                               stresc(mailto+len, SIZ - len, thisvalue, 1, 1);
                                strcat(mailto, "</A>");
                        }
                        else if (!strcasecmp(firsttoken, "tel")) {
@@ -1091,11 +1095,12 @@ void read_message(long msgnum, int printable_view, char *section) {
        /** Boring old 80-column fixed format text gets handled this way... */
        else if ( (!strcasecmp(mime_content_type, "text/plain"))
                || (!strcasecmp(mime_content_type, "text")) ) {
+               buf [0] = '\0';
                while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                        int len;
                        len = strlen(buf);
-                       if (buf[len-1] == '\n') buf[--len] = 0;
-                       if (buf[len-1] == '\r') buf[--len] = 0;
+                       if ((len > 0) && buf[len-1] == '\n') buf[--len] = 0;
+                       if ((len > 0) && buf[len-1] == '\r') buf[--len] = 0;
 
 #ifdef HAVE_ICONV
                        if (ic != (iconv_t)(-1) ) {
@@ -1546,7 +1551,7 @@ void pullquote_message(long msgnum, int forward_attachments, int include_headers
                        }
                        wprintf("<tt>");
                        url(buf);
-                       msgescputs(buf);
+                       msgescputs1(buf);
                        wprintf("</tt><br />");
                }
                wprintf("</i><br />");
@@ -1833,8 +1838,8 @@ int abcmp(const void *ab1, const void *ab2) {
  * \param tabbuf the tabbuffer to add name to
  * \param name the name to add to the tabbuffer
  */
-void nametab(char *tabbuf, char *name) {
-       stresc(tabbuf, name, 0, 0);
+void nametab(char *tabbuf, long len, char *name) {
+       stresc(tabbuf, len, name, 0, 0);
        tabbuf[0] = toupper(tabbuf[0]);
        tabbuf[1] = tolower(tabbuf[1]);
        tabbuf[2] = tolower(tabbuf[2]);
@@ -1886,8 +1891,8 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
                tabfirst = i * NAMESPERPAGE;
                tablast = tabfirst + NAMESPERPAGE - 1;
                if (tablast > (num_ab - 1)) tablast = (num_ab - 1);
-               nametab(tabfirst_label, addrbook[tabfirst].ab_name);
-               nametab(tablast_label, addrbook[tablast].ab_name);
+               nametab(tabfirst_label, 64, addrbook[tabfirst].ab_name);
+               nametab(tablast_label, 64, addrbook[tablast].ab_name);
                sprintf(this_tablabel, "%s&nbsp;-&nbsp;%s", tabfirst_label, tablast_label);
                tablabels[i] = strdup(this_tablabel);
        }
@@ -2450,6 +2455,102 @@ void readloop(char *oper)
                );
        }
 
+
+       /**
+        * Set the "is_bbview" variable if it appears that we are looking at
+        * a classic bulletin board view.
+        */
+       if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
+             && (!is_notes) && (!is_singlecard) && (!is_summary)) {
+               is_bbview = 1;
+       }
+
+       /**
+        * If we're not currently looking at ALL requested
+        * messages, then display the selector bar
+        */
+       if (is_bbview) {
+               /** begin bbview scroller */
+               wprintf("<form name=\"msgomatictop\" class=\"selector_top\" >");
+               wprintf(_("Reading #"), lowest_displayed, highest_displayed);
+
+               wprintf("<select name=\"whichones\" size=\"1\" "
+                       "OnChange=\"location.href=msgomatictop.whichones.options"
+                       "[selectedIndex].value\">\n");
+
+               if (bbs_reverse) {
+                       for (b=nummsgs-1; b>=0; b = b - maxmsgs) {
+                               hi = b + 1;
+                               lo = b - maxmsgs + 2;
+                               if (lo < 1) lo = 1;
+                               wprintf("<option %s value="
+                                       "\"%s"
+                                       "?startmsg=%ld"
+                                       "?maxmsgs=%d"
+                                       "?summary=%d\">"
+                                       "%d-%d</option> \n",
+                                       ((WC->msgarr[lo-1] == startmsg) ? "selected" : ""),
+                                       oper,
+                                       WC->msgarr[lo-1],
+                                       maxmsgs,
+                                       is_summary,
+                                       hi, lo);
+                       }
+               }
+               else {
+                       for (b=0; b<nummsgs; b = b + maxmsgs) {
+                               lo = b + 1;
+                               hi = b + maxmsgs + 1;
+                               if (hi > nummsgs) hi = nummsgs;
+                               wprintf("<option %s value="
+                                       "\"%s"
+                                       "?startmsg=%ld"
+                                       "?maxmsgs=%d"
+                                       "?summary=%d\">"
+                                       "%d-%d</option> \n",
+                                       ((WC->msgarr[b] == startmsg) ? "selected" : ""),
+                                       oper,
+                                       WC->msgarr[lo-1],
+                                       maxmsgs,
+                                       is_summary,
+                                       lo, hi);
+                       }
+               }
+
+               wprintf("<option value=\"%s?startmsg=%ld"
+                       "?maxmsgs=9999999?summary=%d\">",
+                       oper,
+                       WC->msgarr[0], is_summary);
+               wprintf(_("All"));
+               wprintf("</option>");
+               wprintf("</select> ");
+               wprintf(_("of %d messages."), nummsgs);
+
+               /** forward/reverse */
+               wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
+                       "OnChange=\"location.href='%s?sortby=forward'\"",  
+                       (bbs_reverse ? "" : "checked"),
+                       oper
+               );
+               wprintf(">");
+               wprintf(_("oldest to newest"));
+               wprintf("&nbsp;&nbsp;&nbsp;&nbsp;");
+
+               wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
+                       "OnChange=\"location.href='%s?sortby=reverse'\"", 
+                       (bbs_reverse ? "checked" : ""),
+                       oper
+               );
+               wprintf(">");
+               wprintf(_("newest to oldest"));
+               wprintf("\n");
+       
+               wprintf("</select></form>\n");
+               /** end bbview scroller */
+       }
+
+
+
        for (a = 0; a < nummsgs; ++a) {
                if ((WC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
 
@@ -2490,14 +2591,6 @@ void readloop(char *oper)
                }
        }
 
-       /**
-        * Set the "is_bbview" variable if it appears that we are looking at
-        * a classic bulletin board view.
-        */
-       if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
-             && (!is_notes) && (!is_singlecard) && (!is_summary)) {
-               is_bbview = 1;
-       }
 
        /** Output loop */
        if (displayed_msgs != NULL) {
@@ -2545,7 +2638,7 @@ void readloop(char *oper)
         */
        if (is_bbview) {
                /** begin bbview scroller */
-               wprintf("<form name=\"msgomatic\">");
+               wprintf("<form name=\"msgomatic\" class=\"selector_bottom\" >");
                wprintf(_("Reading #"), lowest_displayed, highest_displayed);
 
                wprintf("<select name=\"whichones\" size=\"1\" "
@@ -2592,32 +2685,33 @@ void readloop(char *oper)
                }
 
                wprintf("<option value=\"%s?startmsg=%ld"
-                       "?maxmsgs=9999999?summary=%d\">"
-                       "ALL"
-                       "</option> ",
+                       "?maxmsgs=9999999?summary=%d\">",
                        oper,
                        WC->msgarr[0], is_summary);
-
+               wprintf(_("All"));
+               wprintf("</option>");
                wprintf("</select> ");
                wprintf(_("of %d messages."), nummsgs);
 
                /** forward/reverse */
-               wprintf("&nbsp;<select name=\"direction\" size=\"1\" "
-                       "OnChange=\"location.href=msgomatic.direction.options"
-                       "[selectedIndex].value\">\n"
-               );
-
-               wprintf("<option %s value=\"%s?sortby=forward\">oldest to newest</option>\n",
-                       (bbs_reverse ? "" : "selected"),
+               wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
+                       "OnChange=\"location.href='%s?sortby=forward'\"",  
+                       (bbs_reverse ? "" : "checked"),
                        oper
                );
-       
-               wprintf("<option %s value=\"%s?sortby=reverse\">newest to oldest</option>\n",
-                       (bbs_reverse ? "selected" : ""),
+               wprintf(">");
+               wprintf(_("oldest to newest"));
+               wprintf("&nbsp;&nbsp;&nbsp;&nbsp;");
+               wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
+                       "OnChange=\"location.href='%s?sortby=reverse'\"", 
+                       (bbs_reverse ? "checked" : ""),
                        oper
                );
-       
-               wprintf("</select></form>\n");
+               wprintf(">");
+               wprintf(_("newest to oldest"));
+               wprintf("\n");
+
+               wprintf("</form>\n");
                /** end bbview scroller */
        }
 
@@ -3195,7 +3289,7 @@ void display_enter(void)
        do_template("richedit");
 
        /** Enumerate any attachments which are already in place... */
-       wprintf("<div><img src=\"static/diskette_24x.gif\" class=\"imgedit\" ");
+       wprintf("<div class=\"attachment buttons\"><img src=\"static/diskette_24x.gif\" class=\"imgedit\" > ");
        wprintf(_("Attachments:"));
        wprintf(" ");
        wprintf("<select name=\"which_attachment\" size=1>");
@@ -3212,7 +3306,7 @@ void display_enter(void)
        /** Now offer the ability to attach additional files... */
        wprintf("&nbsp;&nbsp;&nbsp;");
        wprintf(_("Attach file:"));
-       wprintf(" <input name=\"attachfile\" "
+       wprintf(" <input name=\"attachfile\" class=\"attachfile\" "
                "size=16 type=\"file\">\n&nbsp;&nbsp;"
                "<input type=\"submit\" name=\"attach_button\" value=\"%s\">\n", _("Add"));
        wprintf("</div>");
@@ -3295,12 +3389,12 @@ void confirm_move_msg(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf("<h1>");
        wprintf(_("Confirm move of message"));
-       wprintf("</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<CENTER>");