}
}
if (illegal_non_rfc2047_encoding) {
- char default_header_charset[128];
- get_preference("default_header_charset", default_header_charset, sizeof default_header_charset);
- if ( (strcasecmp(default_header_charset, "UTF-8")) && (strcasecmp(default_header_charset, "us-ascii")) ) {
- ic = ctdl_iconv_open("UTF-8", default_header_charset);
+ StrBuf *default_header_charset;
+ get_preference("default_header_charset", &default_header_charset);
+ if ( (strcasecmp(ChrPtr(default_header_charset), "UTF-8")) &&
+ (strcasecmp(ChrPtr(default_header_charset), "us-ascii")) ) {
+ ic = ctdl_iconv_open("UTF-8", ChrPtr(default_header_charset));
if (ic != (iconv_t)(-1) ) {
ibuf = malloc(1024);
isav = ibuf;
}
TrailerLen = len - (end - start);
- memcpy(outbuf + Offset + outpos, end, TrailerLen);
- if ( Offset + TrailerLen + outpos > bufsize) {
+ 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 + TrailerLen + outpos);
+ 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/%ld/\" 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);
urlescputs(reply_to);
if (!IsEmptyStr(m_subject)) {
wprintf("?subject=");
- if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+ if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%%20");
urlescputs(m_subject);
}
wprintf("?references=");
urlescputs(reply_to);
if (!IsEmptyStr(m_subject)) {
wprintf("?subject=");
- if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+ if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%%20");
urlescputs(m_subject);
}
wprintf("?references=");
urlescputs(reply_all);
if (!IsEmptyStr(m_subject)) {
wprintf("?subject=");
- if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+ if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%%20");
urlescputs(m_subject);
}
wprintf("?references=");
/* Forward */
if (WC->wc_view == VIEW_MAILBOX) {
wprintf("<a href=\"display_enter?fwdquote=%ld?subject=", msgnum);
- if (strncasecmp(m_subject, "Fwd:", 4)) wprintf("Fwd:%20");
+ if (strncasecmp(m_subject, "Fwd:", 4)) wprintf("Fwd:%%20");
urlescputs(m_subject);
wprintf("\"><span>[</span>%s<span>]</span></a> ", _("Forward"));
}
wprintf("</i><br />");
}
- else /** HTML is fun, but we've got to strip it first */
- if (!strcasecmp(mime_content_type, "text/html")) {
+ /* HTML is fun, but we've got to strip it first */
+ else if (!strcasecmp(mime_content_type, "text/html")) {
output_html(mime_charset, (WC->wc_view == VIEW_WIKI ? 1 : 0));
}
- /** Unknown weirdness */
+ /* Unknown weirdness */
else {
wprintf(_("I don't know how to display %s"), mime_content_type);
- wprintf("<br />\n", mime_content_type);
+ wprintf("<br />\n");
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
}
}
- /** Afterwards, offer links to download attachments 'n' such */
+ /* Afterwards, offer links to download attachments 'n' such */
if ( (num_attach_links > 0) && (!section[0]) ) {
for (i=0; i<num_attach_links; ++i) {
if (strcasecmp(attach_links[i].partnum, msg4_partnum)) {
}
}
- /** Handler for vCard parts */
+ /* Handler for vCard parts */
if (!IsEmptyStr(vcard_partnum)) {
part_source = load_mimepart(msgnum, vcard_partnum);
if (part_source != NULL) {
|| (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
|| (WC->wc_view == VIEW_ADDRESSBOOK)
) {
- wprintf("<a href=\"edit_vcard?"
- "msgnum=%ld?partnum=%s\">",
+ wprintf("<a href=\"edit_vcard?msgnum=%ld?partnum=%s\">",
msgnum, vcard_partnum);
wprintf("[%s]</a>", _("edit"));
}
- /** In all cases, display the full card */
- display_vcard(part_source, 0, 1, NULL);
+ /* In all cases, display the full card */
+ display_vcard(part_source, 0, 1, NULL,msgnum);
}
}
- /** Handler for calendar parts */
+ /* Handler for calendar parts */
if (!IsEmptyStr(cal_partnum)) {
part_source = load_mimepart(msgnum, cal_partnum);
if (part_source != NULL) {
- cal_process_attachment(part_source,
- msgnum, cal_partnum);
+ cal_process_attachment(part_source, msgnum, cal_partnum);
}
}
wprintf("</div>\n");
- /** end everythingamundo table */
+ /* end everythingamundo table */
if (!printable_view) {
wprintf("</div>\n");
}
-/**
- * \brief Unadorned HTML output of an individual message, suitable
+/*
+ * Unadorned HTML output of an individual message, suitable
* for placing in a hidden iframe, for printing, or whatever
*
- * \param msgnum_as_string Message number, as a string instead of as a long int
+ * msgnum_as_string == Message number, as a string instead of as a long int
*/
void embed_message(char *msgnum_as_string) {
long msgnum = 0L;
}
-/**
- * \brief Printable view of a message
+/*
+ * Printable view of a message
*
- * \param msgnum_as_string Message number, as a string instead of as a long int
+ * msgnum_as_string == Message number, as a string instead of as a long int
*/
void print_message(char *msgnum_as_string) {
long msgnum = 0L;
PACKAGE_STRING);
begin_burst();
- wprintf("\r\n\r\n<html>\n"
- "<head><title>Printable view</title></head>\n"
+ wprintf("\r\n\r\n<html>\n<head><title>");
+ escputs(WC->wc_fullname);
+ wprintf("</title></head>\n"
"<body onLoad=\" window.print(); window.close(); \">\n"
);
*/
void display_summarized(int num) {
char datebuf[64];
-
wprintf("<tr id=\"m%ld\" style=\"font-weight:%s;\" "
"onMouseDown=\"CtdlMoveMsgMouseDown(event,%ld)\">",
WC->summ[num].msgnum,
wprintf("</tr>\n");
}
-
-
+/**
+ * \brief Output a message row for the mobile view
+ * \param The row number
+ */
+void display_mobile_summary(int num) {
+ char datebuf[64];
+ wprintf("\n<div><div id=\"m%ld\" style=\"font-weight:%s;\" "
+ "onClick=\"CtdlLoadMsgMouseDown(event,%ld)\">",
+ WC->summ[num].msgnum,
+ (WC->summ[num].is_new ? "bold" : "normal"),
+ WC->summ[num].msgnum
+ );
+ wprintf("<span>%s</span>",WC->summ[num].from);
+ wprintf("<span style=\"float: right;\">");
+ webcit_fmt_date(datebuf, WC->summ[num].date, 1); /* brief */
+ escputs(datebuf);
+ wprintf("</span><br/><span class=\"subject\">");
+ wprintf(WC->summ[num].subj);
+ wprintf("</span></div><div id=\"m_%ld\" class=\"msgview\" onMouseDown=\"\"></div></div>",WC->summ[num].msgnum);
+}
/**
* \brief display the adressbook overview
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);
}
char nodename[128];
char inetaddr[128];
char subject[1024];
+ char *ptr;
int nummsgs;
int sbjlen;
int maxload = 0;
WC->summ[nummsgs-1].msgnum = WC->msgarr[nummsgs-1];
safestrncpy(WC->summ[nummsgs-1].subj,
_("(no subject)"), sizeof WC->summ[nummsgs-1].subj);
- if (!IsEmptyStr(fullname)) {
- /** Handle senders with RFC2047 encoding */
- utf8ify_rfc822_string(fullname);
- safestrncpy(WC->summ[nummsgs-1].from,
- fullname, sizeof WC->summ[nummsgs-1].from);
- }
if (!IsEmptyStr(subject)) {
/** Handle subjects with RFC2047 encoding */
utf8ify_rfc822_string(subject);
}
sbjlen = Ctdl_Utf8StrLen(WC->summ[nummsgs-1].subj);
if (sbjlen > 75) {
- char *ptr;
ptr = Ctdl_Utf8StrCut(WC->summ[nummsgs-1].subj, 72);
strcpy(ptr, "...");
}
- if (!IsEmptyStr(nodename)) {
- if ( ((WC->room_flags & QR_NETWORK)
- || ((strcasecmp(nodename, serv_info.serv_nodename)
- && (strcasecmp(nodename, serv_info.serv_fqdn)))))
- ) {
- strcat(WC->summ[nummsgs-1].from, " @ ");
- strcat(WC->summ[nummsgs-1].from, nodename);
- }
+ if (!IsEmptyStr(fullname)) {
+ /** Handle senders with RFC2047 encoding */
+ utf8ify_rfc822_string(fullname);
+ safestrncpy(WC->summ[nummsgs-1].from,
+ fullname, sizeof WC->summ[nummsgs-1].from);
+ }
+ if ((!IsEmptyStr(nodename)) &&
+ ( ((WC->room_flags & QR_NETWORK)
+ || ((strcasecmp(nodename, serv_info.serv_nodename)
+ && (strcasecmp(nodename, serv_info.serv_fqdn)))))))
+ {
+ strcat(WC->summ[nummsgs-1].from, " @ ");
+ strcat(WC->summ[nummsgs-1].from, nodename);
+
+ }
+ sbjlen = Ctdl_Utf8StrLen(WC->summ[nummsgs-1].from);
+ if (sbjlen > 25) {
+ ptr = Ctdl_Utf8StrCut(WC->summ[nummsgs-1].from, 23);
+ strcpy(ptr, "...");
}
WC->summ[nummsgs-1].date = datestamp;
-
- /** Handle senders with RFC2047 encoding */
- utf8ify_rfc822_string(WC->summ[nummsgs-1].from);
- if (strlen(WC->summ[nummsgs-1].from) > 25) {
- strcpy(&WC->summ[nummsgs-1].from[22], "...");
- }
}
}
}
int highest_displayed = 0;
struct addrbookent *addrbook = NULL;
int num_ab = 0;
- char *sortby = NULL;
- char sortpref_name[128];
- char sortpref_value[128];
+ StrBuf *sortby = NULL;
+ StrBuf *sortpref_name;
+ StrBuf *sortpref_value;
char *subjsort_button;
char *sendsort_button;
char *datesort_button;
startmsg = lbstr("startmsg");
maxmsgs = ibstr("maxmsgs");
- is_summary = ibstr("is_summary");
+ is_summary = (ibstr("is_summary") && !WCC->is_mobile);
if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
- snprintf(sortpref_name, sizeof sortpref_name, "sort %s", WCC->wc_roomname);
- get_preference(sortpref_name, sortpref_value, sizeof sortpref_value);
+ sortpref_name = NewStrBuf ();
+ StrBufPrintf(sortpref_name, "sort %s", WCC->wc_roomname);
+ get_pref(sortpref_name, &sortpref_value);
- sortby = bstr("sortby");
- if ( (!IsEmptyStr(sortby)) && (strcasecmp(sortby, sortpref_value)) ) {
- set_preference(sortpref_name, sortby, 1);
+ sortby = NewStrBufPlain(bstr("sortby"), -1);
+ if ( (!IsEmptyStr(ChrPtr(sortby))) &&
+ (strcasecmp(ChrPtr(sortby), ChrPtr(sortpref_value))) ) {
+ set_pref(sortpref_name, sortby, 1);
}
- if (IsEmptyStr(sortby)) sortby = sortpref_value;
+ FreeStrBuf(&sortpref_name);
+ if (IsEmptyStr(ChrPtr(sortby))) StrBufAppendBuf(sortby, sortpref_value, 0);
/** mailbox sort */
- if (IsEmptyStr(sortby)) sortby = "rdate";
+ if (IsEmptyStr(ChrPtr(sortby))) StrBufPrintf(sortby, "rdate");
/** message board sort */
- if (!strcasecmp(sortby, "reverse")) {
+ if (!strcasecmp(ChrPtr(sortby), "reverse")) {
bbs_reverse = 1;
}
else {
strcpy(cmd, "MSGS ALL");
}
- if ((WCC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1)) {
+ if ((WCC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1) && !WCC->is_mobile) {
is_summary = 1;
if (!strcmp(oper, "do_search")) {
snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
maxmsgs = 9999999;
}
- if (is_summary) { /**< fetch header summary */
+ if (is_summary || WCC->is_mobile) { /**< fetch header summary */
snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
(!strcmp(oper, "do_search") ? "SEARCH" : "ALL"),
(!strcmp(oper, "do_search") ? bstr("query") : "")
);
startmsg = 1;
maxmsgs = 9999999;
+ }
+ if (WCC->is_mobile) {
+ maxmsgs = 20;
+ sortby = "rdate";
}
/**
* new messages.
*/
strcpy(old_msgs, "");
- if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR)){
+ if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR) || WCC->is_mobile){
serv_puts("GTSN");
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
}
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");
}
- nummsgs = load_msg_ptrs(cmd, is_summary);
+ nummsgs = load_msg_ptrs(cmd, (is_summary || WCC->is_mobile));
if (nummsgs == 0) {
if ((!is_tasks) && (!is_calendar) && (!is_notes) && (!is_addressbook)) {
goto DONE;
}
- if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR)){
+ if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR) || WCC->is_mobile){
for (a = 0; a < nummsgs; ++a) {
/** Are you a new message, or an old message? */
if (is_summary) {
}
}
- if (is_summary) {
- if (!strcasecmp(sortby, "subject")) {
+ if (is_summary || WCC->is_mobile) {
+ if (!strcasecmp(ChrPtr(sortby), "subject")) {
qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_subj);
}
- else if (!strcasecmp(sortby, "rsubject")) {
+ else if (!strcasecmp(ChrPtr(sortby), "rsubject")) {
qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_rsubj);
}
- else if (!strcasecmp(sortby, "sender")) {
+ else if (!strcasecmp(ChrPtr(sortby), "sender")) {
qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_sender);
}
- else if (!strcasecmp(sortby, "rsender")) {
+ else if (!strcasecmp(ChrPtr(sortby), "rsender")) {
qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_rsender);
}
- else if (!strcasecmp(sortby, "date")) {
+ else if (!strcasecmp(ChrPtr(sortby), "date")) {
qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_date);
}
- else if (!strcasecmp(sortby, "rdate")) {
+ else if (!strcasecmp(ChrPtr(sortby), "rdate")) {
qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_rdate);
}
}
- if (!strcasecmp(sortby, "subject")) {
+ if (!strcasecmp(ChrPtr(sortby), "subject")) {
subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=rsubject\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
}
- else if (!strcasecmp(sortby, "rsubject")) {
+ else if (!strcasecmp(ChrPtr(sortby), "rsubject")) {
subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=subject\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
}
else {
subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=subject\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
}
- if (!strcasecmp(sortby, "sender")) {
+ if (!strcasecmp(ChrPtr(sortby), "sender")) {
sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=rsender\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
}
- else if (!strcasecmp(sortby, "rsender")) {
+ else if (!strcasecmp(ChrPtr(sortby), "rsender")) {
sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=sender\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
}
else {
sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=sender\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
}
- if (!strcasecmp(sortby, "date")) {
+ if (!strcasecmp(ChrPtr(sortby), "date")) {
datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=rdate\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
}
- else if (!strcasecmp(sortby, "rdate")) {
+ else if (!strcasecmp(ChrPtr(sortby), "rdate")) {
datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=date\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
}
else {
_("Delete")
);
wprintf("</table></div></div>\n");
-
wprintf("<div id=\"message_list\">"
"<div class=\"fix_scrollbar_bug\">\n"
-
"<table class=\"mailbox_summary\" id=\"summary_headers\" "
"cellspacing=0 style=\"width:100%%;-moz-user-select:none;\">"
);
+ } else if (WCC->is_mobile) {
+ wprintf("<div id=\"message_list\">");
}
if (is_bbview) {
/** begin bbview scroller */
wprintf("<form name=\"msgomatictop\" class=\"selector_top\" > \n <p>");
- wprintf(_("Reading #"), lowest_displayed, highest_displayed);
+ wprintf(_("Reading #"));//// TODO this isn't used, should it? : , lowest_displayed, highest_displayed);
wprintf("<select name=\"whichones\" size=\"1\" "
"OnChange=\"location.href=msgomatictop.whichones.options"
wprintf("</p></form>\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)) {
}
else if (is_notes) {
display_note(WCC->msgarr[a], WCC->summ[a].is_new);
+ } else if (WCC->is_mobile) {
+ display_mobile_summary(a);
}
else {
if (displayed_msgs == NULL) {
wprintf("</table>"
"</div>\n"); /**< end of 'fix_scrollbar_bug' div */
wprintf("</div>"); /**< end of 'message_list' div */
-
+
/** Here's the grab-it-to-resize-the-message-list widget */
wprintf("<div id=\"resize_msglist\" "
"onMouseDown=\"CtdlResizeMsgListMouseDown(event)\">"
);
wprintf("<div id=\"preview_pane\">"); /**< The preview pane will initially be empty */
+ } else if (WCC->is_mobile) {
+ wprintf("</div>");
}
/**
if (is_bbview) {
/** begin bbview scroller */
wprintf("<form name=\"msgomatic\" class=\"selector_bottom\" > \n <p>");
- wprintf(_("Reading #"), lowest_displayed, highest_displayed);
+ wprintf(_("Reading #")); /// TODO: this isn't used: , lowest_displayed, highest_displayed);
wprintf("<select name=\"whichones\" size=\"1\" "
"OnChange=\"location.href=msgomatic.whichones.options"
/** 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 */
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;
void display_enter(void)
{
char buf[SIZ];
- char ebuf[SIZ];
+ StrBuf *ebuf;
long now;
char *display_name;
struct wc_attachment *att;
wprintf("<input type=\"hidden\" name=\"wikipage\" value=\"%s\">\n", bstr("wikipage"));
}
wprintf("<input type=\"hidden\" name=\"return_to\" value=\"%s\">\n", bstr("return_to"));
- wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+ wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
wprintf("<input type=\"hidden\" name=\"force_room\" value=\"");
escputs(WC->wc_roomname);
wprintf("\">\n");
/** Insert our signature if appropriate... */
if ( (WC->is_mailbox) && yesbstr("sig_inserted") ) {
- get_preference("use_sig", buf, sizeof buf);
- if (!strcasecmp(buf, "yes")) {
+ int UseSig;
+ get_pref_yesno("use_sig", &UseSig, 0);
+ if (UseSig) {
int len;
- get_preference("signature", ebuf, sizeof ebuf);
- euid_unescapize(buf, ebuf);
+ get_preference("signature", &ebuf);
+ euid_unescapize(buf, ChrPtr(ebuf));/////TODO
wprintf("<br>--<br>");
len = strlen(buf);
for (i=0; i<len; ++i) {
-/**
- * \brief Confirm move of a message
+/*
+ * Confirm move of a message
*/
void confirm_move_msg(void)
{
wprintf("<br />\n");
wprintf("<form METHOD=\"POST\" action=\"move_msg\">\n");
- wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+ wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n", bstr("msgid"));
wprintf("<SELECT NAME=\"target_room\" SIZE=5>\n");
wprintf("</CENTER>\n");
wDumpContent(1);
}
-
-
-/*@}*/
projects / citadel.git / blobdiff