X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsummary.c;h=172a15486703d700279a37f4ee2abac124a1dee8;hb=4b4dc864ede7c5d8d956febe4a0afb422b78e7c4;hp=a5db298b030bf8cbec17e3f0b9cf31e9c54257b5;hpb=6ec73d6906542ea2f8cca2e62f7625ee2e17ae03;p=citadel.git
diff --git a/webcit/summary.c b/webcit/summary.c
index a5db298b0..172a15486 100644
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -1,12 +1,28 @@
/*
- * $Id$
- *
* Displays the "Summary Page"
+ *
+ * Copyright (c) 1996-2011 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.
+ *
+ * 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
*/
@@ -19,20 +35,21 @@ void output_date(void) {
localtime_r(&now, &tm);
wc_strftime(buf, 32, "%A, %x", &tm);
- wprintf("%s", buf);
+ 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);
-
-/*
- * Dummy section
- */
-void dummy_section(void) {
- svput("BOXTITLE", WCS_STRING, "(dummy section)");
- do_template("beginboxx", NULL);
- wprintf(_("(nothing)"));
- do_template("endbox", NULL);
+ n = wc_strftime(buf, 32, "%A, %x", &tm);
+ StrBufAppendBufPlain(Target, buf, n, 0);
}
@@ -50,7 +67,7 @@ void new_messages_section(void) {
number_of_rooms_to_check = num_tokens(rooms_to_check, '|');
if (number_of_rooms_to_check == 0) return;
- wprintf("
\n");
+ wc_printf("\n");
+ wc_printf("
\n");
}
@@ -95,11 +112,12 @@ void tasks_section(void) {
Buf = NewStrBufPlain(HKEY("_TASKS_"));
gotoroom(Buf);
FreeStrBuf(&Buf);
- if (WCC->wc_view != VIEW_TASKS) {
+
+ if (WCC->CurRoom.view != VIEW_TASKS) {
num_msgs = 0;
}
else {
- num_msgs = load_msg_ptrs("MSGS ALL", &Stat);
+ num_msgs = load_msg_ptrs("MSGS ALL", NULL, &Stat, NULL);
}
if (num_msgs > 0) {
@@ -112,9 +130,9 @@ void tasks_section(void) {
}
if (calendar_summary_view() < 1) {
- wprintf("");
- wprintf(_("(None)"));
- wprintf("
\n");
+ wc_printf("");
+ wc_printf(_("(None)"));
+ wc_printf("
\n");
}
}
@@ -124,6 +142,7 @@ void tasks_section(void) {
*/
void calendar_section(void) {
char cmd[SIZ];
+ char filter[SIZ];
int num_msgs = 0;
HashPos *at;
const char *HashKey;
@@ -143,17 +162,20 @@ void calendar_section(void) {
Buf = NewStrBufPlain(HKEY("_CALENDAR_"));
gotoroom(Buf);
FreeStrBuf(&Buf);
- if ( (WC->wc_view != VIEW_CALENDAR) && (WC->wc_view != VIEW_CALBRIEF) ) {
+ if ( (WC->CurRoom.view != VIEW_CALENDAR) && (WC->CurRoom.view != VIEW_CALBRIEF) ) {
num_msgs = 0;
}
else {
- num_msgs = load_msg_ptrs("MSGS ALL", &Stat);
+ num_msgs = load_msg_ptrs("MSGS ALL", NULL, &Stat, NULL);
}
calendar_GetParamsGetServerCall(&Stat,
&v,
readnew,
cmd,
- sizeof(cmd));
+ sizeof(cmd),
+ filter,
+ sizeof(filter));
+
if (num_msgs > 0) {
at = GetNewHashPos(WCC->summ, 0);
@@ -164,176 +186,35 @@ void calendar_section(void) {
DeleteHashPos(&at);
}
if (calendar_summary_view() < 1) {
- wprintf("");
- wprintf(_("(Nothing)"));
- wprintf("
\n");
+ wc_printf("");
+ wc_printf(_("(Nothing)"));
+ wc_printf("
\n");
}
__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) {
- wprintf(""
- "
"
- "");
-
- /*
- * Column One
- */
- wprintf("");
- wprintf("");
- wprintf(" ");
- wprintf(_("Messages"));
- wprintf(" ");
- wprintf(" ");
+void tmplput_new_messages_section(StrBuf *Target, WCTemplputParams *TP) {
new_messages_section();
- wprintf(" ");
- wprintf(" | ");
-
- /*
- * Column Two
- */
- wprintf("");
- wprintf("");
- wprintf(" ");
- wprintf(_("Tasks"));
- wprintf(" ");
- wprintf(" ");
+}
+void tmplput_tasks_section(StrBuf *Target, WCTemplputParams *TP) {
tasks_section();
- wprintf(" ");
- wprintf(" | ");
-
- /*
- * Column Three
- */
- wprintf("");
- wprintf("");
- wprintf(" ");
- wprintf(_("Today on your calendar"));
- wprintf(" ");
- wprintf(" ");
- calendar_section();
- wprintf(" ");
- wprintf(" | ");
-
- wprintf("
");
-
- /*
- * Row Two - Column One
- */
- wprintf("");
- wprintf("");
- wprintf(" ");
- wprintf(_("Who's online now"));
- wprintf(" ");
- wprintf(" ");
- do_template("wholistsummarysection", NULL);
- wprintf(" ");
- wprintf(" | ");
-
- /*
- * Row Two - Column Two
- */
- wprintf("");
- wprintf("");
- wprintf(" ");
- wprintf(_("About this server"));
- wprintf(" ");
- wprintf(" ");
- server_info_section();
- wprintf(" ");
- wprintf(" | ");
-
-
- /*
- * End of columns
- */
- wprintf("
");
}
-
-
-/*
- * Display this user's summary page
- */
-void summary(void) {
- char title[256];
-
- output_headers(1, 1, 2, 0, 0, 0);
- wprintf("
\n");
- wprintf("
");
- wprintf("
");
- wprintf("
");
- snprintf(title, sizeof title, _("Summary page for %s"), ChrPtr(WC->wc_fullname));
- escputs(title);
- wprintf("
");
- output_date();
- wprintf("
");
- wprintf("
");
- wprintf("
\n");
- wprintf("- ");
- offer_start_page(NULL, &NoCtx);
- wprintf("
");
- wprintf("
");
- wprintf("
");
-
- /*
- * 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.
- */
- wprintf("
\n");
- summary_inner_div();
- wprintf("
\n");
-
- wprintf(
- " \n"
- );
-
- wDumpContent(1);
+void tmplput_calendar_section(StrBuf *Target, WCTemplputParams *TP) {
+ calendar_section();
}
void
InitModule_SUMMARY
(void)
{
+ RegisterNamespace("TIME:NOW", 0, 0, tmplput_output_date, NULL, CTX_NONE);
+ RegisterNamespace("SUMMARY:NEWMESSAGES_SELECTION", 0, 0, tmplput_new_messages_section, NULL, CTX_NONE);
+ RegisterNamespace("SUMMARY:TASKSSECTION", 0, 0, tmplput_tasks_section, NULL, CTX_NONE);
+ RegisterNamespace("SUMMARY:CALENDAR_SECTION", 0, 0, tmplput_calendar_section, NULL, CTX_NONE);
+
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);
+
}