X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsummary.c;h=44a6bb35be5d33ea880d182dc457e026fd3e20e1;hb=59e420e50397ed6661692abc39307ce39221efc8;hp=2c3244fecda1db8fa49810483e8e136c0808b077;hpb=d120028b4c45f3c26d05186c8ba488fd2feef13f;p=citadel.git
diff --git a/webcit/summary.c b/webcit/summary.c
index 2c3244fec..44a6bb35b 100644
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -5,6 +5,7 @@
*/
#include "webcit.h"
+#include "calendar.h"
/*
* Display today's date in a friendly format
@@ -12,40 +13,13 @@
void output_date(void) {
struct tm tm;
time_t now;
-
- static char *wdays[7];
- static char *months[12];
-
- wdays[0] = _("Sunday");
- wdays[1] = _("Monday");
- wdays[2] = _("Tuesday");
- wdays[3] = _("Wednesday");
- wdays[4] = _("Thursday");
- wdays[5] = _("Friday");
- wdays[6] = _("Saturday");
-
- months[0] = _("January");
- months[1] = _("February");
- months[2] = _("March");
- months[3] = _("April");
- months[4] = _("May");
- months[5] = _("June");
- months[6] = _("July");
- months[7] = _("August");
- months[8] = _("September");
- months[9] = _("October");
- months[10] = _("November");
- months[11] = _("December");
+ char buf[128];
time(&now);
localtime_r(&now, &tm);
- wprintf("%s, %s %d, %d",
- wdays[tm.tm_wday],
- months[tm.tm_mon],
- tm.tm_mday,
- tm.tm_year + 1900
- );
+ wc_strftime(buf, 32, "%A, %x", &tm);
+ wc_printf("%s", buf);
}
@@ -55,10 +29,10 @@ void output_date(void) {
* Dummy section
*/
void dummy_section(void) {
- svprintf("BOXTITLE", WCS_STRING, "(dummy section)");
- do_template("beginbox");
- wprintf(_("(nothing)"));
- do_template("endbox");
+ svput("BOXTITLE", WCS_STRING, "(dummy section)");
+ do_template("beginboxx", NULL);
+ wc_printf(_("(nothing)"));
+ do_template("endbox", NULL);
}
@@ -72,13 +46,11 @@ void new_messages_section(void) {
int number_of_rooms_to_check;
char *rooms_to_check = "Mail|Lobby";
- svprintf("BOXTITLE", WCS_STRING, _("Messages"));
- do_template("beginbox");
number_of_rooms_to_check = num_tokens(rooms_to_check, '|');
if (number_of_rooms_to_check == 0) return;
- wprintf("
\n");
+ wc_printf("\n");
- do_template("endbox");
-
-}
-
+ wc_printf("
\n");
-/*
- * Wholist section
- */
-void wholist_section(void) {
- char buf[SIZ];
- char user[SIZ];
-
- svprintf("BOXTITLE", WCS_STRING, _("Who's online now"));
- do_template("beginbox");
- serv_puts("RWHO");
- serv_getln(buf, sizeof buf);
- if (buf[0] == '1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- extract_token(user, buf, 1, '|', sizeof user);
- escputs(user);
- wprintf("
\n");
- }
- do_template("endbox");
}
@@ -126,41 +77,45 @@ void wholist_section(void) {
* Task list section
*/
void tasks_section(void) {
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
int num_msgs = 0;
- int i;
-#endif
-
- svprintf("BOXTITLE", WCS_STRING, _("Tasks"));
- do_template("beginbox");
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
- gotoroom("_TASKS_");
- if (WC->wc_view != VIEW_TASKS) {
+ HashPos *at;
+ const char *HashKey;
+ long HKLen;
+ void *vMsg;
+ message_summary *Msg;
+ wcsession *WCC = WC;
+ StrBuf *Buf;
+ SharedMessageStatus Stat;
+
+ memset(&Stat, 0, sizeof(SharedMessageStatus));
+ Stat.maxload = 10000;
+ Stat.lowest_found = (-1);
+ Stat.highest_found = (-1);
+
+ Buf = NewStrBufPlain(HKEY("_TASKS_"));
+ gotoroom(Buf);
+ FreeStrBuf(&Buf);
+ if (WCC->wc_view != VIEW_TASKS) {
num_msgs = 0;
}
else {
- num_msgs = load_msg_ptrs("MSGS ALL", 0);
+ num_msgs = load_msg_ptrs("MSGS ALL", &Stat);
}
- if (num_msgs < 1) {
- wprintf("");
- wprintf(_("(None)"));
- wprintf("
\n");
- }
- else {
- for (i=0; imsgarr[i]);
+ if (num_msgs > 0) {
+ at = GetNewHashPos(WCC->summ, 0);
+ while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
+ Msg = (message_summary*) vMsg;
+ tasks_LoadMsgFromServer(NULL, NULL, Msg, 0, 0);
}
+ DeleteHashPos(&at);
}
- calendar_summary_view();
-
-#else /* WEBCIT_WITH_CALENDAR_SERVICE */
- wprintf("");
- wprintf(_("(This server does not support task lists)"));
- wprintf("\n");
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
- do_template("endbox");
+ if (calendar_summary_view() < 1) {
+ wc_printf("");
+ wc_printf(_("(None)"));
+ wc_printf("
\n");
+ }
}
@@ -168,40 +123,52 @@ void tasks_section(void) {
* Calendar section
*/
void calendar_section(void) {
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
+ char cmd[SIZ];
int num_msgs = 0;
- int i;
-#endif
-
- svprintf("BOXTITLE", WCS_STRING, _("Today on your calendar"));
- do_template("beginbox");
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
- gotoroom("_CALENDAR_");
- if (WC->wc_view != VIEW_CALENDAR) {
+ HashPos *at;
+ const char *HashKey;
+ long HKLen;
+ void *vMsg;
+ message_summary *Msg;
+ wcsession *WCC = WC;
+ StrBuf *Buf;
+ void *v = NULL;
+ SharedMessageStatus Stat;
+
+ memset(&Stat, 0, sizeof(SharedMessageStatus));
+ Stat.maxload = 10000;
+ Stat.lowest_found = (-1);
+ Stat.highest_found = (-1);
+
+ Buf = NewStrBufPlain(HKEY("_CALENDAR_"));
+ gotoroom(Buf);
+ FreeStrBuf(&Buf);
+ if ( (WC->wc_view != VIEW_CALENDAR) && (WC->wc_view != VIEW_CALBRIEF) ) {
num_msgs = 0;
}
else {
- num_msgs = load_msg_ptrs("MSGS ALL", 0);
+ num_msgs = load_msg_ptrs("MSGS ALL", &Stat);
}
-
- if (num_msgs < 1) {
- wprintf("");
- wprintf(_("(Nothing)"));
- wprintf("
\n");
- }
- else {
- for (i=0; imsgarr[i]);
+ calendar_GetParamsGetServerCall(&Stat,
+ &v,
+ readnew,
+ cmd,
+ sizeof(cmd));
+
+ if (num_msgs > 0) {
+ at = GetNewHashPos(WCC->summ, 0);
+ while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
+ Msg = (message_summary*) vMsg;
+ calendar_LoadMsgFromServer(NULL, &v, Msg, 0, 0);
}
- calendar_summary_view();
+ DeleteHashPos(&at);
}
-
-#else /* WEBCIT_WITH_CALENDAR_SERVICE */
- wprintf("");
- wprintf(_("(This server does not support calendars)"));
- wprintf("\n");
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
- do_template("endbox");
+ if (calendar_summary_view() < 1) {
+ wc_printf("");
+ wc_printf(_("(Nothing)"));
+ wc_printf("
\n");
+ }
+ __calendar_Cleanup(&v);
}
/*
@@ -209,59 +176,103 @@ void calendar_section(void) {
*/
void server_info_section(void) {
char message[512];
-
- svprintf("BOXTITLE", WCS_STRING, _("About this server"));
- do_template("beginbox");
+ wcsession *WCC = WC;
snprintf(message, sizeof message,
- _("You are connected to %s, running %s with %s, and located in %s. Your system administrator is %s."),
- serv_info.serv_humannode,
- serv_info.serv_software,
- SERVER,
- serv_info.serv_bbs_city,
- serv_info.serv_sysadm);
+ _("You are connected to %s, running %s with %s, server build %s and located in %s. Your system administrator is %s."),
+ ChrPtr(WCC->serv_info->serv_humannode),
+ ChrPtr(WCC->serv_info->serv_software),
+ PACKAGE_STRING,
+ ChrPtr(WCC->serv_info->serv_svn_revision),
+ ChrPtr(WCC->serv_info->serv_bbs_city),
+ ChrPtr(WCC->serv_info->serv_sysadm));
escputs(message);
- do_template("endbox");
}
+/*
+ * Now let's do three columns of crap. All portals and all groupware
+ * clients seem to want to do three columns, so we'll do three
+ * columns too. Conformity is not inherently a virtue, but there are
+ * a lot of really shallow people out there, and even though they're
+ * not people I consider worthwhile, I still want them to use WebCit.
+ */
void summary_inner_div(void) {
- /*
- * Now let's do three columns of crap. All portals and all groupware
- * clients seem to want to do three columns, so we'll do three
- * columns too. Conformity is not inherently a virtue, but there are
- * a lot of really shallow people out there, and even though they're
- * not people I consider worthwhile, I still want them to use WebCit.
- */
-
- wprintf("