if (!need_to_encode) {
memcpy (target, source, SourceLen);
+ target[SourceLen] = '\0';
return SourceLen;
}
if (sizeof (headerStr + SourceLen + 2) > maxlen)
return -1;
memcpy (target, headerStr, sizeof (headerStr));
- len = sizeof (headerStr);
- for (i=0; (i < SourceLen) && (len < maxlen) ; ++i) {
+ len = sizeof (headerStr) - 1;
+ for (i=0; (i < SourceLen) && (len + 3< maxlen) ; ++i) {
ch = (unsigned char) source[i];
if ((ch < 32) || (ch > 126) || (ch == 61)) {
sprintf(&target[len], "=%02X", ch);
-/**
- * \brief Look for URL's embedded in a buffer and make them linkable. We use a
- * target window in order to keep the BBS session in its own window.
- * \param buf the message buffer
+/*
+ * Look for URL's embedded in a buffer and make them linkable. We use a
+ * target window in order to keep the Citadel session in its own window.
*/
-void url(char *buf)
+void url(char *buf, size_t bufsize)
{
- int len;
+ int len, UrlLen, Offset, TrailerLen, outpos;
char *start, *end, *pos;
char urlbuf[SIZ];
- char outbuf[1024];
+ char outbuf[SIZ];
start = NULL;
len = strlen(buf);
+ if (len > bufsize) {
+ lprintf(1, "URL: content longer than buffer!");
+ return;
+ }
end = buf + len;
for (pos = buf; (pos < end) && (start == NULL); ++pos) {
if (!strncasecmp(pos, "http://", 7))
end = pos;
}
}
+
+ UrlLen = end - start;
+ if (UrlLen > sizeof(urlbuf)){
+ lprintf(1, "URL: content longer than buffer!");
+ return;
+ }
+ memcpy(urlbuf, start, UrlLen);
+ urlbuf[UrlLen] = '\0';
+
+ Offset = start - buf;
+ if ((Offset != 0) && (Offset < sizeof(outbuf)))
+ memcpy(outbuf, buf, Offset);
+ outpos = snprintf(&outbuf[Offset], sizeof(outbuf) - Offset,
+ "%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);
+ if (outpos >= sizeof(outbuf) - Offset) {
+ lprintf(1, "URL: content longer than buffer!");
+ return;
+ }
- strncpy(urlbuf, start, end - start);
- urlbuf[end - start] = '\0';
-
- 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, end);
- if ( strlen(outbuf) < 250 )
- strcpy(buf, outbuf);
+ TrailerLen = len - (end - start);
+ if (TrailerLen > 0)
+ memcpy(outbuf + Offset + outpos, end, TrailerLen);
+ if (Offset + outpos + TrailerLen > bufsize) {
+ lprintf(1, "URL: content longer than buffer!");
+ return;
+ }
+ memcpy (buf, outbuf, Offset + outpos + TrailerLen);
+ *(buf + Offset + outpos + TrailerLen) = '\0';
}
* understand in a simple two-column name/value format.
* \param v the vCard to display
* \param full display all items of the vcard?
+ * \param msgnum Citadel message pointer
*/
-void display_parsed_vcard(struct vCard *v, int full) {
+void display_parsed_vcard(struct vCard *v, int full, long msgnum) {
int i, j;
char buf[SIZ];
char *name;
wprintf("</TD></TR>\n");
}
}
+ else if (!strcasecmp(firsttoken, "photo") && full && pass == 2) {
+ // Only output on second pass
+ wprintf("<tr><td>");
+ wprintf(_("Photo:"));
+ wprintf("</td><td>");
+ wprintf("<img src=\"/vcardphoto/%d/\" alt=\"Contact photo\"/>",msgnum);
+ wprintf("</td></tr>\n");
+ }
else if (!strcasecmp(firsttoken, "version")) {
/* ignore */
}
* \param alpha what???
* \param full should we usse all lines?
* \param storename where to store???
+ * \param msgnum Citadel message pointer
*/
-void display_vcard(char *vcard_source, char alpha, int full, char *storename) {
+void display_vcard(char *vcard_source, char alpha, int full, char *storename,
+ long msgnum) {
struct vCard *v;
char *name;
char buf[SIZ];
|| ((isalpha(alpha)) && (tolower(alpha) == tolower(this_alpha)) )
|| ((!isalpha(alpha)) && (!isalpha(this_alpha)))
) {
- display_parsed_vcard(v, full);
+ display_parsed_vcard(v, full,msgnum);
}
vcard_free(v);
char reply_to[512] = "";
char reply_all[4096] = "";
char reply_references[1024] = "";
+ char reply_inreplyto[256] = "";
char now[64] = "";
int format_type = 0;
int nhdr = 0;
safestrncpy(m_subject, &buf[5], sizeof m_subject);
}
if (!strncasecmp(buf, "msgn=", 5)) {
- safestrncpy(reply_references, &buf[5], sizeof reply_references);
+ safestrncpy(reply_inreplyto, &buf[5], sizeof reply_inreplyto);
}
if (!strncasecmp(buf, "wefw=", 5)) {
- int rrlen = strlen(reply_references);
- if (rrlen > 0) {
- strcpy(&reply_references[rrlen++], "|");
- }
- safestrncpy(&reply_references[rrlen], &buf[5],
- (sizeof(reply_references) - rrlen) );
+ safestrncpy(reply_references, &buf[5], sizeof reply_references);
}
if (!strncasecmp(buf, "cccc=", 5)) {
int len;
}
- /** Generate a reply-to address */
+ /* Trim down excessively long lists of thread references. We eliminate the
+ * second one in the list so that the thread root remains intact.
+ */
+ int rrtok = num_tokens(reply_references, '|');
+ int rrlen = strlen(reply_references);
+ if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) {
+ remove_token(reply_references, 1, '|');
+ }
+
+ /* Generate a reply-to address */
if (!IsEmptyStr(rfca)) {
if (!IsEmptyStr(from)) {
snprintf(reply_to, sizeof(reply_to), "%s <%s>", from, rfca);
if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
urlescputs(m_subject);
}
+ wprintf("?references=");
if (!IsEmptyStr(reply_references)) {
- wprintf("?references=");
urlescputs(reply_references);
+ urlescputs("|");
}
+ urlescputs(reply_inreplyto);
wprintf("\"><span>[</span>%s<span>]</span></a> ", _("Reply"));
}
if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
urlescputs(m_subject);
}
+ wprintf("?references=");
if (!IsEmptyStr(reply_references)) {
- wprintf("?references=");
urlescputs(reply_references);
+ urlescputs("|");
}
+ urlescputs(reply_inreplyto);
wprintf("\"><span>[</span>%s<span>]</span></a> ", _("ReplyQuoted"));
}
}
if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
urlescputs(m_subject);
}
+ wprintf("?references=");
if (!IsEmptyStr(reply_references)) {
- wprintf("?references=");
urlescputs(reply_references);
+ urlescputs("|");
}
+ urlescputs(reply_inreplyto);
wprintf("\"><span>[</span>%s<span>]</span></a> ", _("ReplyAll"));
}
bq = 0;
}
wprintf("<tt>");
- url(buf);
+ url(buf, sizeof(buf));
escputs(buf);
wprintf("</tt><br />\n");
}
}
/** In all cases, display the full card */
- display_vcard(part_source, 0, 1, NULL);
+ display_vcard(part_source, 0, 1, NULL,msgnum);
}
}
bq = 0;
}
wprintf("<tt>");
- url(buf);
+ url(buf, sizeof(buf));
msgescputs1(buf);
wprintf("</tt><br />");
}
strcat(buf, "\n");
msgescputs(buf);
}
- }
+ }//// TODO: charset? utf8?
/** Unknown weirdness ... don't know how to handle this content type */
else {
if (vcard_source != NULL) {
/** Display the summary line */
- display_vcard(vcard_source, alpha, 0, NULL);
+ display_vcard(vcard_source, alpha, 0, NULL,msgnum);
/** If it's my vCard I can edit it */
if ( (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
if (vcard_source != NULL) {
/* Grab the name off the card */
- display_vcard(vcard_source, 0, 0, namebuf);
+ display_vcard(vcard_source, 0, 0, namebuf,msgnum);
free(vcard_source);
}
return;
}
- startmsg = atol(bstr("startmsg"));
- maxmsgs = atoi(bstr("maxmsgs"));
- is_summary = atoi(bstr("is_summary"));
+ startmsg = lbstr("startmsg");
+ maxmsgs = ibstr("maxmsgs");
+ is_summary = ibstr("is_summary");
if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
snprintf(sortpref_name, sizeof sortpref_name, "sort %s", WCC->wc_roomname);
}
}
- is_singlecard = atoi(bstr("is_singlecard"));
+ is_singlecard = ibstr("is_singlecard");
if (WCC->wc_default_view == VIEW_CALENDAR) { /**< calendar */
is_calendar = 1;
}
if (is_notes) {
- wprintf("<div align=center>%s</div>\n", _("Click on any note to edit it."));
wprintf("<div id=\"new_notes_here\"></div>\n");
}
/** end bbview scroller */
}
- if (is_notes)
- {
- wprintf ("<script src=\"/static/dragdrop.js\" type=\"text/javascript\"></script>\n");
- }
-
-
-
for (a = 0; a < nummsgs; ++a) {
if ((WCC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
/** end bbview scroller */
}
- if (is_notes)
- {
-// wprintf ("</div>\n");
- wprintf ("<div id=\"wastebin\" align=middle>Drop notes here to remove them.</div>\n");
- wprintf ("<script type=\"text/javascript\">\n");
-// wprintf ("//<![CDATA[\n");
- wprintf ("Droppables.add(\"wastebin\",\n");
- wprintf ("\t{\n");
- wprintf ("\t\taccept:'notes',\n");
- wprintf ("\t\tonDrop:function(element)\n");
- wprintf ("\t\t{\n");
- wprintf ("\t\t\tElement.hide(element);\n");
- wprintf ("\t\t\tnew Ajax.Updater('notes', 'delnote',\n");
- wprintf ("\t\t\t{\n");
- wprintf ("\t\t\t\tasynchronous:true,\n");
- wprintf ("\t\t\t\tevalScripts:true,\n");
- wprintf ("\t\t\t\tonComplete:function(request)\n");
- wprintf ("\t\t\t\t{\n");
- wprintf ("\t\t\t\t\tElement.hide('indicator')\n");
- wprintf ("\t\t\t\t},\n");
- wprintf ("\t\t\t\tonLoading:function(request)\n");
- wprintf ("\t\t\t\t{\n");
- wprintf ("\t\t\t\t\tElement.show('indicator')\n");
- wprintf ("\t\t\t\t},\n");
- wprintf ("\t\t\t\tparameters:'id=' + encodeURIComponent(element.id)\n");
- wprintf ("\t\t\t})\n");
- wprintf ("\t\t}\n");
- wprintf ("\t})\n");
-// wprintf ("//]]>\n");
- wprintf ("</script>\n");
- }
-
-
-
DONE:
if (is_tasks) {
do_tasks_view(); /** Render the task list */
urlcontent *u;
void *U;
char buf[1024];
- char *encoded_subject = "";
+ char *encoded_subject = NULL;
static long dont_post = (-1L);
struct wc_attachment *att, *aptr;
int is_anonymous = 0;
struct wcsession *WCC = WC;
char *ptr = NULL;
- if (!IsEmptyStr(bstr("force_room"))) {
+ if (havebstr("force_room")) {
gotoroom(bstr("force_room"));
}
- if (GetHash(WCC->urlstrings, HKEY("display_name"), &U)) {
+ if (GetHash(WC->urlstrings, HKEY("display_name"), &U)) {
u = (urlcontent*) U;
display_name = u->url_data;
dpLen = u->url_data_size;
return;
}
- if (!IsEmptyStr(bstr("cancel_button"))) {
+ if (havebstr("cancel_button")) {
sprintf(WCC->ImportantMessage,
_("Cancelled. Message was not posted."));
- } else if (!IsEmptyStr(bstr("attach_button"))) {
+ } else if (havebstr("attach_button")) {
display_enter();
return;
- } else if (atol(bstr("postseq")) == dont_post) {
+ } else if (lbstr("postseq") == dont_post) {
sprintf(WCC->ImportantMessage,
_("Automatically cancelled because you have already "
"saved this message."));
}
lprintf(9, "Converted: %s\n", references);
- if (GetHash(WCC->urlstrings, HKEY("subject"), &U)) {
- u = (urlcontent*) U;
+ if (havebstr("subject")) {
+ char *Subj;
+ size_t SLen;
/*
* make enough room for the encoded string;
* plus the QP header
*/
- len = u->url_data_size * 3 + 32;
+ Subj = xbstr("subject", &SLen);
+ len = SLen * 3 + 32;
encoded_subject = malloc (len);
- len = webcit_rfc2047encode(encoded_subject, len, u->url_data, u->url_data_size);
+ len = webcit_rfc2047encode(encoded_subject, len, Subj, SLen);
if (len < 0) {
free (encoded_subject);
return;
snprintf(CmdBuf, len + 1, CMD,
Recp,
is_anonymous,
- encoded_subject,
+ (encoded_subject ? encoded_subject : ""),
display_name,
Cc,
Bcc,
serv_puts(CmdBuf);
serv_getln(buf, sizeof buf);
free (CmdBuf);
- free (encoded_subject);
+ if (encoded_subject) free(encoded_subject);
if (buf[0] == '4') {
post_mime_to_server();
- if ( (!IsEmptyStr(bstr("recp")))
- || (!IsEmptyStr(bstr("cc" )))
- || (!IsEmptyStr(bstr("bcc" )))
+ if ( (havebstr("recp"))
+ || (havebstr("cc" ))
+ || (havebstr("bcc" ))
) {
sprintf(WCC->ImportantMessage, _("Message has been sent.\n"));
}
else {
sprintf(WC->ImportantMessage, _("Message has been posted.\n"));
}
- dont_post = atol(bstr("postseq"));
+ dont_post = lbstr("postseq");
} else {
lprintf(9, "%s:%d: server post error: %s\n", __FILE__, __LINE__, buf);
sprintf(WC->ImportantMessage, "%s", &buf[4]);
* We may have been supplied with instructions regarding the location
* to which we must return after posting. If found, go there.
*/
- if (!IsEmptyStr(bstr("return_to"))) {
+ if (havebstr("return_to")) {
http_redirect(bstr("return_to"));
}
/**
* If we were editing a page in a wiki room, go to that page now.
*/
- else if (!IsEmptyStr(bstr("wikipage"))) {
+ else if (havebstr("wikipage")) {
snprintf(buf, sizeof buf, "wiki?page=%s", bstr("wikipage"));
http_redirect(buf);
}
int i;
int is_anonymous = 0;
long existing_page = (-1L);
+ size_t dplen;
now = time(NULL);
- if (!IsEmptyStr(bstr("force_room"))) {
+ if (havebstr("force_room")) {
gotoroom(bstr("force_room"));
}
- display_name = bstr("display_name");
+ display_name = xbstr("display_name", &dplen);
if (!strcmp(display_name, "__ANONYMOUS__")) {
display_name = "";
+ dplen = 0;
is_anonymous = 1;
}
/* Now check our actual recipients if there are any */
if (recipient_required) {
- sprintf(buf, "ENT0 0|%s|%d|0||%s||%s|%s|%s",
- bstr("recp"),
- is_anonymous,
- display_name,
- bstr("cc"), bstr("bcc"), bstr("wikipage"));
- serv_puts(buf);
+ const char *Recp = "";
+ const char *Cc = "";
+ const char *Bcc = "";
+ const char *Wikipage = "";
+ char *CmdBuf = NULL;;
+ size_t len = 0;
+ size_t nLen;
+ const char CMD[] = "ENT0 0|%s|%d|0||%s||%s|%s|%s";
+
+ len = sizeof(CMD) + dplen;
+ Recp = xbstr("recp", &nLen);
+ len += nLen;
+ Cc = xbstr("cc", &nLen);
+ len += nLen;
+ Bcc = xbstr("bcc", &nLen);
+ len += nLen;
+ Wikipage = xbstr("wikipage", &nLen);
+ len += nLen;
+
+
+ CmdBuf = (char*) malloc (len + 1);
+
+ snprintf(CmdBuf, len, CMD,
+ Recp, is_anonymous,
+ display_name,
+ Cc, Bcc, Wikipage);
+ serv_puts(CmdBuf);
serv_getln(buf, sizeof buf);
if (!strncmp(buf, "570", 3)) { /** 570 means we have an invalid recipient listed */
- if (!IsEmptyStr(bstr("recp")) &&
- !IsEmptyStr(bstr("cc" )) &&
- !IsEmptyStr(bstr("bcc" ))) {
+ if (havebstr("recp") &&
+ havebstr("cc" ) &&
+ havebstr("bcc" )) {
recipient_bad = 1;
}
}
wprintf(_("To:"));
wprintf("</label></th>"
"<td><input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_id\" value=\"");
- ccraw = bstr("recp");
- len = strlen(ccraw);
+ ccraw = xbstr("recp", &len);
copy = (char*) malloc(len * 2 + 1);
memcpy(copy, ccraw, len + 1);
utf8ify_rfc822_string(copy);
wprintf(_("CC:"));
wprintf("</label></th>"
"<td><input autocomplete=\"off\" type=\"text\" name=\"cc\" id=\"cc_id\" value=\"");
- ccraw = bstr("cc");
- len = strlen(ccraw);
+ ccraw = xbstr("cc", &len);
copy = (char*) malloc(len * 2 + 1);
memcpy(copy, ccraw, len + 1);
utf8ify_rfc822_string(copy);
wprintf(_("BCC:"));
wprintf("</label></th>"
"<td><input autocomplete=\"off\" type=\"text\" name=\"bcc\" id=\"bcc_id\" value=\"");
- ccraw = bstr("bcc");
- len = strlen(ccraw);
+ ccraw = xbstr("bcc", &len);
copy = (char*) malloc(len * 2 + 1);
memcpy(copy, ccraw, len + 1);
utf8ify_rfc822_string(copy);
msgescputs(bstr("msgtext"));
/* If we're forwarding a message, insert it here... */
- if (atol(bstr("fwdquote")) > 0L) {
+ if (lbstr("fwdquote") > 0L) {
wprintf("<br><div align=center><i>");
wprintf(_("--- forwarded message ---"));
wprintf("</i></div><br>");
- pullquote_message(atol(bstr("fwdquote")), 1, 1);
+ pullquote_message(lbstr("fwdquote"), 1, 1);
}
/** If we're replying quoted, insert the quote here... */
- else if (atol(bstr("replyquote")) > 0L) {
+ else if (lbstr("replyquote") > 0L) {
wprintf("<br>"
"<blockquote>");
- pullquote_message(atol(bstr("replyquote")), 0, 1);
+ pullquote_message(lbstr("replyquote"), 0, 1);
wprintf("</blockquote><br>");
}
}
/** Insert our signature if appropriate... */
- if ( (WC->is_mailbox) && (strcmp(bstr("sig_inserted"), "yes")) ) {
+ if ( (WC->is_mailbox) && yesbstr("sig_inserted") ) {
get_preference("use_sig", buf, sizeof buf);
if (!strcasecmp(buf, "yes")) {
int len;
long msgid;
char buf[SIZ];
- msgid = atol(bstr("msgid"));
+ msgid = lbstr("msgid");
if (WC->wc_is_trash) { /** Delete from Trash is a real delete */
serv_printf("DELE %ld", msgid);
long msgid;
char buf[SIZ];
- msgid = atol(bstr("msgid"));
+ msgid = lbstr("msgid");
- if (!IsEmptyStr(bstr("move_button"))) {
+ if (havebstr("move_button")) {
sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
serv_puts(buf);
serv_getln(buf, sizeof buf);
char buf[SIZ];
char targ[SIZ];
- msgid = atol(bstr("msgid"));
+ msgid = lbstr("msgid");
output_headers(1, 1, 2, 0, 0, 0);
projects / citadel.git / blobdiff