summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
7a5dffa)
different places: for the summary description of a calendar
event, and for a flag to tell the message reading loop to
display a mailbox summary view. As a result, if an event
summary began with a number, and the number was not zero,
the flag would be set, causing a mailbox summary to appear
instead of the calendar after save/cancel. Renamed the
latter variable to 'is_summary' to remove the conflict.
wprintf("<font size=-1>"
"<a href=\"display_edit_event?"
wprintf("<font size=-1>"
"<a href=\"display_edit_event?"
- "msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\""
+ "msgnum=%ld&calview=month&year=%d&month=%d&day=%d\""
" btt_tooltext=\"",
WC->disp_cal[i].cal_msgnum,
" btt_tooltext=\"",
WC->disp_cal[i].cal_msgnum,
- bstr("calview"),
- bstr("year"),
- bstr("month"),
- bstr("day")
- );
wprintf("<i>%s</i> ", _("Summary:"));
escputs((char *)icalproperty_get_comment(p));
wprintf("<i>%s</i> ", _("Summary:"));
escputs((char *)icalproperty_get_comment(p));
minutes=difftime % 60;
wprintf("<tr><td bgcolor='%s'>%i:%2i</td><td bgcolor='%s'>"
"<font size=-1>"
minutes=difftime % 60;
wprintf("<tr><td bgcolor='%s'>%i:%2i</td><td bgcolor='%s'>"
"<font size=-1>"
- "<a href=\"display_edit_event?msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\">",
+ "<a href=\"display_edit_event?msgnum=%ld&calview=calbrief&year=%s&month=%s&day=%s\">",
daycolor,
hours, minutes,
daycolor,
WC->disp_cal[i].cal_msgnum,
daycolor,
hours, minutes,
daycolor,
WC->disp_cal[i].cal_msgnum,
bstr("year"),
bstr("month"),
bstr("day")
bstr("year"),
bstr("month"),
bstr("day")
"height: %dpx; "
"\" > "
"<a href=\"display_edit_event?msgnum=0"
"height: %dpx; "
"\" > "
"<a href=\"display_edit_event?msgnum=0"
- "&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
+ "&calview=day&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
(hour * extratimeline ), extratimeline,
year, month, day, hour
);
(hour * extratimeline ), extratimeline,
year, month, day, hour
);
"top: %dpx; left: 0px; "
"height: %dpx; "
"\" > "
"top: %dpx; left: 0px; "
"height: %dpx; "
"\" > "
- "<a href=\"display_edit_event?msgnum=0"
+ "<a href=\"display_edit_event?msgnum=0&calview=day"
"&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
gap + ((hour - daystart) * timeline ), timeline,
year, month, day, hour
"&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
gap + ((hour - daystart) * timeline ), timeline,
year, month, day, hour
"top: %dpx; left: 0px; "
"height: %dpx; "
"\" > "
"top: %dpx; left: 0px; "
"height: %dpx; "
"\" > "
- "<a href=\"display_edit_event?msgnum=0"
+ "<a href=\"display_edit_event?msgnum=0&calview=day"
"&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
gap + ((hour - dayend - 1) * extratimeline ), extratimeline,
year, month, day, hour
"&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
gap + ((hour - dayend - 1) * extratimeline ), extratimeline,
year, month, day, hour
+ lprintf(9, "display_edit_individual_event(%ld) calview=%s year=%s month=%s day=%s\n",
+ msgnum, bstr("calview"), bstr("year"), bstr("month"), bstr("day")
+ );
+
now = time(NULL);
strcpy(organizer_string, "");
strcpy(attendee_string, "");
now = time(NULL);
strcpy(organizer_string, "");
strcpy(attendee_string, "");
wprintf("<a href=\"readfwd?startmsg=%ld&is_singlecard=1",
addrbook[i].ab_msgnum);
wprintf("<a href=\"readfwd?startmsg=%ld&is_singlecard=1",
addrbook[i].ab_msgnum);
- wprintf("?maxmsgs=1?summary=0?alpha=%s\">", bstr("alpha"));
+ wprintf("?maxmsgs=1?is_summary=0?alpha=%s\">", bstr("alpha"));
vcard_n_prettyize(addrbook[i].ab_name);
escputs(addrbook[i].ab_name);
wprintf("</a></td>\n");
vcard_n_prettyize(addrbook[i].ab_name);
escputs(addrbook[i].ab_name);
wprintf("</a></td>\n");
char *sendsort_button;
char *datesort_button;
int bbs_reverse = 0;
char *sendsort_button;
char *datesort_button;
int bbs_reverse = 0;
+ struct wcsession *WCC = WC; /* This is done to make it run faster; WC is a function */
- if (WC->wc_view == VIEW_WIKI) {
- sprintf(buf, "wiki?room=%s?page=home", WC->wc_roomname);
+ if (WCC->wc_view == VIEW_WIKI) {
+ sprintf(buf, "wiki?room=%s?page=home", WCC->wc_roomname);
http_redirect(buf);
return;
}
startmsg = atol(bstr("startmsg"));
maxmsgs = atoi(bstr("maxmsgs"));
http_redirect(buf);
return;
}
startmsg = atol(bstr("startmsg"));
maxmsgs = atoi(bstr("maxmsgs"));
- is_summary = atoi(bstr("summary"));
+ is_summary = atoi(bstr("is_summary"));
if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
- snprintf(sortpref_name, sizeof sortpref_name, "sort %s", WC->wc_roomname);
+ snprintf(sortpref_name, sizeof sortpref_name, "sort %s", WCC->wc_roomname);
get_preference(sortpref_name, sortpref_value, sizeof sortpref_value);
sortby = bstr("sortby");
get_preference(sortpref_name, sortpref_value, sizeof sortpref_value);
sortby = bstr("sortby");
strcpy(cmd, "MSGS ALL");
}
strcpy(cmd, "MSGS ALL");
}
- if ((WC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1)) {
+ if ((WCC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1)) {
is_summary = 1;
if (!strcmp(oper, "do_search")) {
sprintf(cmd, "MSGS SEARCH|%s", bstr("query"));
is_summary = 1;
if (!strcmp(oper, "do_search")) {
sprintf(cmd, "MSGS SEARCH|%s", bstr("query"));
- if ((WC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) {
+ if ((WCC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) {
is_addressbook = 1;
if (!strcmp(oper, "do_search")) {
sprintf(cmd, "MSGS SEARCH|%s", bstr("query"));
is_addressbook = 1;
if (!strcmp(oper, "do_search")) {
sprintf(cmd, "MSGS SEARCH|%s", bstr("query"));
is_singlecard = atoi(bstr("is_singlecard"));
is_singlecard = atoi(bstr("is_singlecard"));
- if (WC->wc_default_view == VIEW_CALENDAR) { /**< calendar */
+ if (WCC->wc_default_view == VIEW_CALENDAR) { /**< calendar */
is_calendar = 1;
strcpy(cmd, "MSGS ALL");
maxmsgs = 32767;
}
is_calendar = 1;
strcpy(cmd, "MSGS ALL");
maxmsgs = 32767;
}
- if (WC->wc_default_view == VIEW_TASKS) { /**< tasks */
+ if (WCC->wc_default_view == VIEW_TASKS) { /**< tasks */
is_tasks = 1;
strcpy(cmd, "MSGS ALL");
maxmsgs = 32767;
}
is_tasks = 1;
strcpy(cmd, "MSGS ALL");
maxmsgs = 32767;
}
- if (WC->wc_default_view == VIEW_NOTES) { /**< notes */
+ if (WCC->wc_default_view == VIEW_NOTES) { /**< notes */
is_notes = 1;
strcpy(cmd, "MSGS ALL");
maxmsgs = 32767;
is_notes = 1;
strcpy(cmd, "MSGS ALL");
maxmsgs = 32767;
for (a = 0; a < nummsgs; ++a) {
/** Are you a new message, or an old message? */
if (is_summary) {
for (a = 0; a < nummsgs; ++a) {
/** Are you a new message, or an old message? */
if (is_summary) {
- if (is_msg_in_mset(old_msgs, WC->msgarr[a])) {
- WC->summ[a].is_new = 0;
+ if (is_msg_in_mset(old_msgs, WCC->msgarr[a])) {
+ WCC->summ[a].is_new = 0;
- WC->summ[a].is_new = 1;
+ WCC->summ[a].is_new = 1;
if (startmsg == 0L) {
if (bbs_reverse) {
if (startmsg == 0L) {
if (bbs_reverse) {
- startmsg = WC->msgarr[(nummsgs >= maxmsgs) ? (nummsgs - maxmsgs) : 0];
+ startmsg = WCC->msgarr[(nummsgs >= maxmsgs) ? (nummsgs - maxmsgs) : 0];
- startmsg = WC->msgarr[0];
+ startmsg = WCC->msgarr[0];
}
}
if (is_summary) {
if (!strcasecmp(sortby, "subject")) {
}
}
if (is_summary) {
if (!strcasecmp(sortby, "subject")) {
- qsort(WC->summ, WC->num_summ,
+ qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_subj);
}
else if (!strcasecmp(sortby, "rsubject")) {
sizeof(struct message_summary), summcmp_subj);
}
else if (!strcasecmp(sortby, "rsubject")) {
- qsort(WC->summ, WC->num_summ,
+ qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_rsubj);
}
else if (!strcasecmp(sortby, "sender")) {
sizeof(struct message_summary), summcmp_rsubj);
}
else if (!strcasecmp(sortby, "sender")) {
- qsort(WC->summ, WC->num_summ,
+ qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_sender);
}
else if (!strcasecmp(sortby, "rsender")) {
sizeof(struct message_summary), summcmp_sender);
}
else if (!strcasecmp(sortby, "rsender")) {
- qsort(WC->summ, WC->num_summ,
+ qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_rsender);
}
else if (!strcasecmp(sortby, "date")) {
sizeof(struct message_summary), summcmp_rsender);
}
else if (!strcasecmp(sortby, "date")) {
- qsort(WC->summ, WC->num_summ,
+ qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_date);
}
else if (!strcasecmp(sortby, "rdate")) {
sizeof(struct message_summary), summcmp_date);
}
else if (!strcasecmp(sortby, "rdate")) {
- qsort(WC->summ, WC->num_summ,
+ qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_rdate);
}
}
if (!strcasecmp(sortby, "subject")) {
sizeof(struct message_summary), summcmp_rdate);
}
}
if (!strcasecmp(sortby, "subject")) {
- subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rsubject\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
+ 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(sortby, "rsubject")) {
- subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=subject\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
+ subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=subject\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
- subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=subject\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
+ 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(sortby, "sender")) {
- sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rsender\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
+ 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(sortby, "rsender")) {
- sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=sender\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
+ sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=sender\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
- sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=sender\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
+ 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(sortby, "date")) {
- datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rdate\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
+ 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(sortby, "rdate")) {
- datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=date\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
+ datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=date\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
- datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rdate\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
+ datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=rdate\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
"\"%s"
"?startmsg=%ld"
"?maxmsgs=%d"
"\"%s"
"?startmsg=%ld"
"?maxmsgs=%d"
- ((WC->msgarr[lo-1] == startmsg) ? "selected" : ""),
+ ((WCC->msgarr[lo-1] == startmsg) ? "selected" : ""),
maxmsgs,
is_summary,
hi, lo);
maxmsgs,
is_summary,
hi, lo);
"\"%s"
"?startmsg=%ld"
"?maxmsgs=%d"
"\"%s"
"?startmsg=%ld"
"?maxmsgs=%d"
- ((WC->msgarr[b] == startmsg) ? "selected" : ""),
+ ((WCC->msgarr[b] == startmsg) ? "selected" : ""),
maxmsgs,
is_summary,
lo, hi);
maxmsgs,
is_summary,
lo, hi);
}
wprintf("<option value=\"%s?startmsg=%ld"
}
wprintf("<option value=\"%s?startmsg=%ld"
- "?maxmsgs=9999999?summary=%d\">",
+ "?maxmsgs=9999999?is_summary=%d\">",
- WC->msgarr[0], is_summary);
+ WCC->msgarr[0], is_summary);
wprintf(_("All"));
wprintf("</option>");
wprintf("</select> ");
wprintf(_("All"));
wprintf("</option>");
wprintf("</select> ");
for (a = 0; a < nummsgs; ++a) {
for (a = 0; a < nummsgs; ++a) {
- if ((WC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
+ if ((WCC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
/** Display the message */
if (is_summary) {
display_summarized(a);
}
else if (is_addressbook) {
/** Display the message */
if (is_summary) {
display_summarized(a);
}
else if (is_addressbook) {
- fetch_ab_name(WC->msgarr[a], buf);
+ fetch_ab_name(WCC->msgarr[a], buf);
++num_ab;
addrbook = realloc(addrbook,
(sizeof(struct addrbookent) * num_ab) );
safestrncpy(addrbook[num_ab-1].ab_name, buf,
sizeof(addrbook[num_ab-1].ab_name));
++num_ab;
addrbook = realloc(addrbook,
(sizeof(struct addrbookent) * num_ab) );
safestrncpy(addrbook[num_ab-1].ab_name, buf,
sizeof(addrbook[num_ab-1].ab_name));
- addrbook[num_ab-1].ab_msgnum = WC->msgarr[a];
+ addrbook[num_ab-1].ab_msgnum = WCC->msgarr[a];
}
else if (is_calendar) {
}
else if (is_calendar) {
- display_calendar(WC->msgarr[a]);
+ display_calendar(WCC->msgarr[a]);
- display_task(WC->msgarr[a]);
+ display_task(WCC->msgarr[a]);
- display_note(WC->msgarr[a]);
+ display_note(WCC->msgarr[a]);
}
else {
if (displayed_msgs == NULL) {
displayed_msgs = malloc(sizeof(long) *
(maxmsgs<nummsgs ? maxmsgs : nummsgs));
}
}
else {
if (displayed_msgs == NULL) {
displayed_msgs = malloc(sizeof(long) *
(maxmsgs<nummsgs ? maxmsgs : nummsgs));
}
- displayed_msgs[num_displayed] = WC->msgarr[a];
+ displayed_msgs[num_displayed] = WCC->msgarr[a];
}
if (lowest_displayed < 0) lowest_displayed = a;
}
if (lowest_displayed < 0) lowest_displayed = a;
"\"%s"
"?startmsg=%ld"
"?maxmsgs=%d"
"\"%s"
"?startmsg=%ld"
"?maxmsgs=%d"
- ((WC->msgarr[lo-1] == startmsg) ? "selected" : ""),
+ ((WCC->msgarr[lo-1] == startmsg) ? "selected" : ""),
maxmsgs,
is_summary,
hi, lo);
maxmsgs,
is_summary,
hi, lo);
"\"%s"
"?startmsg=%ld"
"?maxmsgs=%d"
"\"%s"
"?startmsg=%ld"
"?maxmsgs=%d"
- ((WC->msgarr[b] == startmsg) ? "selected" : ""),
+ ((WCC->msgarr[b] == startmsg) ? "selected" : ""),
maxmsgs,
is_summary,
lo, hi);
maxmsgs,
is_summary,
lo, hi);
}
wprintf("<option value=\"%s?startmsg=%ld"
}
wprintf("<option value=\"%s?startmsg=%ld"
- "?maxmsgs=9999999?summary=%d\">",
+ "?maxmsgs=9999999?is_summary=%d\">",
- WC->msgarr[0], is_summary);
+ WCC->msgarr[0], is_summary);
wprintf(_("All"));
wprintf("</option>");
wprintf("</select> ");
wprintf(_("All"));
wprintf("</option>");
wprintf("</select> ");
wDumpContent(1);
/** free the summary */
wDumpContent(1);
/** free the summary */
- if (WC->summ != NULL) {
- free(WC->summ);
- WC->num_summ = 0;
- WC->summ = NULL;
+ if (WCC->summ != NULL) {
+ free(WCC->summ);
+ WCC->num_summ = 0;
+ WCC->summ = NULL;
}
if (addrbook != NULL) free(addrbook);
}
}
if (addrbook != NULL) free(addrbook);
}