X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsummary.c;h=faa4f45b2d82b02e59316919d1d2e7247ce4dc88;hb=HEAD;hp=1e0d8e160865175109f668dfa862a9e272d84817;hpb=fd034bea666febed8eff22cf10f2b72b8b009665;p=citadel.git
diff --git a/webcit/summary.c b/webcit/summary.c
index 1e0d8e160..5dbe60435 100644
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -1,26 +1,22 @@
/*
* Displays the "Summary Page"
*
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-2021 by the citadel.org team
*
* This program is open source software. You can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * modify it under the terms of the GNU General Public License, version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "webcit.h"
#include "calendar.h"
+extern int calendar_summary_view(void);
+
/*
* Display today's date in a friendly format
*/
@@ -36,6 +32,21 @@ void output_date(void) {
wc_printf("%s", buf);
}
+void tmplput_output_date(StrBuf *Target, WCTemplputParams *TP)
+{
+ struct tm tm;
+ time_t now;
+ char buf[128];
+ size_t n;
+
+ time(&now);
+ localtime_r(&now, &tm);
+
+ n = wc_strftime(buf, 32, "%A, %x", &tm);
+ StrBufAppendBufPlain(Target, buf, n, 0);
+}
+
+
/*
* New messages section
*/
@@ -50,7 +61,7 @@ void new_messages_section(void) {
number_of_rooms_to_check = num_tokens(rooms_to_check, '|');
if (number_of_rooms_to_check == 0) return;
- wc_printf("
\n");
+ wc_printf("\n");
for (i=0; iCurRoom.view != VIEW_TASKS) {
+ if (WC->CurRoom.view != VIEW_TASKS) {
num_msgs = 0;
}
else {
- num_msgs = load_msg_ptrs("MSGS ALL", &Stat, NULL);
+ num_msgs = load_msg_ptrs("MSGS ALL", NULL, NULL, &Stat, NULL, NULL, NULL, NULL, 0);
}
if (num_msgs > 0) {
- at = GetNewHashPos(WCC->summ, 0);
- while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
+ at = GetNewHashPos(WC->summ, 0);
+ while (GetNextHashPos(WC->summ, at, &HKLen, &HashKey, &vMsg)) {
Msg = (message_summary*) vMsg;
tasks_LoadMsgFromServer(NULL, NULL, Msg, 0, 0);
}
@@ -125,13 +135,13 @@ void tasks_section(void) {
*/
void calendar_section(void) {
char cmd[SIZ];
+ char filter[SIZ];
int num_msgs = 0;
HashPos *at;
const char *HashKey;
long HKLen;
void *vMsg;
message_summary *Msg;
- wcsession *WCC = WC;
StrBuf *Buf;
void *v = NULL;
SharedMessageStatus Stat;
@@ -148,17 +158,20 @@ void calendar_section(void) {
num_msgs = 0;
}
else {
- num_msgs = load_msg_ptrs("MSGS ALL", &Stat, NULL);
+ num_msgs = load_msg_ptrs("MSGS ALL", NULL, NULL, &Stat, NULL, NULL, NULL, NULL, 0);
}
calendar_GetParamsGetServerCall(&Stat,
&v,
readnew,
cmd,
- sizeof(cmd));
+ sizeof(cmd),
+ filter,
+ sizeof(filter));
+
if (num_msgs > 0) {
- at = GetNewHashPos(WCC->summ, 0);
- while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
+ at = GetNewHashPos(WC->summ, 0);
+ while (GetNextHashPos(WC->summ, at, &HKLen, &HashKey, &vMsg)) {
Msg = (message_summary*) vMsg;
calendar_LoadMsgFromServer(NULL, &v, Msg, 0, 0);
}
@@ -172,171 +185,36 @@ void calendar_section(void) {
__calendar_Cleanup(&v);
}
-/*
- * Server info section (fluff, really)
- */
-void server_info_section(void) {
- char message[512];
- wcsession *WCC = WC;
-
- snprintf(message, sizeof message,
- _("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);
-}
-
-/*
- * 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) {
-
- wc_printf("");
- wc_printf("");
-
- /*
- * Column One
- */
- wc_printf("");
- wc_printf("");
- wc_printf(" ");
- wc_printf(_("Messages"));
- wc_printf(" ");
- wc_printf(" ");
+void tmplput_new_messages_section(StrBuf *Target, WCTemplputParams *TP) {
new_messages_section();
- wc_printf(" ");
- wc_printf(" | ");
-
- /*
- * Column Two
- */
- wc_printf("");
- wc_printf("");
- wc_printf(" ");
- wc_printf(_("Tasks"));
- wc_printf(" ");
- wc_printf(" ");
+}
+void tmplput_tasks_section(StrBuf *Target, WCTemplputParams *TP) {
tasks_section();
- wc_printf(" ");
- wc_printf(" | ");
-
- /*
- * Column Three
- */
- wc_printf("");
- wc_printf("");
- wc_printf(" ");
- wc_printf(_("Today on your calendar"));
- wc_printf(" ");
- wc_printf(" ");
+}
+void tmplput_calendar_section(StrBuf *Target, WCTemplputParams *TP) {
calendar_section();
- wc_printf(" ");
- wc_printf(" | ");
-
- wc_printf("
");
-
- /*
- * Row Two - Column One
- */
- wc_printf("");
- wc_printf("");
- wc_printf(" ");
- wc_printf(_("Who's online now"));
- wc_printf(" ");
- wc_printf(" ");
- do_template("who_summary");
- wc_printf(" ");
- wc_printf(" | ");
-
- /*
- * Row Two - Column Two
- */
- wc_printf("");
- wc_printf("");
- wc_printf(" ");
- wc_printf(_("About this server"));
- wc_printf(" ");
- wc_printf(" ");
- server_info_section();
- wc_printf(" ");
- wc_printf(" | ");
-
-
- /*
- * End of columns
- */
- wc_printf("
");
}
/*
- * Display this user's summary page
+ * summary page
*/
-void summary(void) {
- char title[256];
-
- output_headers(1, 1, 2, 0, 0, 0);
- wc_printf("\n");
- wc_printf("
");
- wc_printf(" | ");
- wc_printf("");
- snprintf(title, sizeof title, _("Summary page for %s"),
- ( (WC->logged_in) ? ChrPtr(WC->wc_fullname) : ChrPtr(WC->serv_info->serv_humannode))
- );
- escputs(title);
- wc_printf("");
- output_date();
- wc_printf(" |
");
- wc_printf("
");
- wc_printf("
\n");
- wc_printf("- ");
- offer_start_page(NULL, &NoCtx);
- wc_printf("
");
- wc_printf("
"); /* actiondiv */
- wc_printf("
"); /* banner */
-
- /*
- * You guessed it ... we're going to refresh using ajax.
- * In the future we might consider updating individual sections of the summary
- * instead of the whole thing.
- */
- wc_printf("\n");
- summary_inner_div();
- wc_printf("
\n");
-
- wc_printf(
- " \n"
- );
-
+void display_summary_page(void)
+{
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("summary_page");
wDumpContent(1);
}
+
void
InitModule_SUMMARY
(void)
{
+ RegisterNamespace("TIME:NOW", 0, 0, tmplput_output_date, NULL, CTX_NONE);
+ WebcitAddUrlHandler(HKEY("summary"), "", 0, display_summary_page, ANONYMOUS);
WebcitAddUrlHandler(HKEY("new_messages_html"), "", 0, new_messages_section, AJAX);
WebcitAddUrlHandler(HKEY("tasks_inner_html"), "", 0, tasks_section, AJAX);
WebcitAddUrlHandler(HKEY("calendar_inner_html"), "", 0, calendar_section, AJAX);
- WebcitAddUrlHandler(HKEY("mini_calendar"), "", 0, ajax_mini_calendar, AJAX);
- WebcitAddUrlHandler(HKEY("summary"), "", 0, summary, 0);
- WebcitAddUrlHandler(HKEY("summary_inner_div"), "", 0, summary_inner_div, AJAX);
}