X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsummary.c;h=faa4f45b2d82b02e59316919d1d2e7247ce4dc88;hb=HEAD;hp=1e81a59d00dad6dc7f3cdd9d7735a6a82d279a56;hpb=a3ba94ad306d781296c53012f732f3a910015263;p=citadel.git

diff --git a/webcit/summary.c b/webcit/summary.c
index 1e81a59d0..5dbe60435 100644
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -1,12 +1,22 @@
 /*
- * $Id$
- *
  * Displays the "Summary Page"
+ *
+ * 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, 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.
  */
 
 #include "webcit.h"
 #include "calendar.h"
 
+extern int calendar_summary_view(void);
+
 /*
  * Display today's date in a friendly format
  */
@@ -22,17 +32,18 @@ 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);
 
-
-/*
- * Dummy section
- */
-void dummy_section(void) {
-	svput("BOXTITLE", WCS_STRING, "(dummy section)");
-	do_template("beginboxx", NULL);
-	wc_printf(_("(nothing)"));
-	do_template("endbox", NULL);
+	n = wc_strftime(buf, 32, "%A, %x", &tm);
+	StrBufAppendBufPlain(Target, buf, n, 0);
 }
 
 
@@ -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("<table border=0 width=100%%>\n");
+	wc_printf("<table border=\"0\" width=\"100%%\">\n");
 	for (i=0; i<number_of_rooms_to_check; ++i) {
 		extract_token(room, rooms_to_check, i, '|', sizeof room);
 
@@ -83,7 +94,6 @@ void tasks_section(void) {
 	long HKLen;
 	void *vMsg;
 	message_summary *Msg;
-	wcsession *WCC = WC;
 	StrBuf *Buf;
 	SharedMessageStatus Stat;
 
@@ -96,16 +106,16 @@ void tasks_section(void) {
 	gotoroom(Buf);
 	FreeStrBuf(&Buf);
 
-	if (WCC->CurRoom.view != VIEW_TASKS) {
+	if (WC->CurRoom.view != VIEW_TASKS) {
 		num_msgs = 0;
 	}
 	else {
-		num_msgs = load_msg_ptrs("MSGS ALL", &Stat);
+		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);
 		}
@@ -115,7 +125,7 @@ void tasks_section(void) {
 	if (calendar_summary_view() < 1) {
 		wc_printf("<i>");
 		wc_printf(_("(None)"));
-		wc_printf("</i><br />\n");
+		wc_printf("</i><br>\n");
 	}
 }
 
@@ -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);
+		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);
 		}
@@ -167,174 +180,41 @@ void calendar_section(void) {
 	if (calendar_summary_view() < 1) {
 		wc_printf("<i>");
 		wc_printf(_("(Nothing)"));
-		wc_printf("</i><br />\n");
+		wc_printf("</i><br>\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) {
-	wc_printf("<div class=\"fix_scrollbar_bug\">"
-		"<table width=\"100%%\" cellspacing=\"10\" cellpadding=\"0\">"
-		"<tr valign=top>");
-
-	/*
-	 * Column One
-	 */
-	wc_printf("<td width=33%%>");
-	wc_printf("<div class=\"box\">");	
-	wc_printf("<div class=\"boxlabel\">");	
-	wc_printf(_("Messages"));
-	wc_printf("</div><div class=\"boxcontent\">");	
-	wc_printf("<div id=\"msg_inner\">");	
+void tmplput_new_messages_section(StrBuf *Target, WCTemplputParams *TP) {
 	new_messages_section();
-	wc_printf("</div></div></div>");
-	wc_printf("</td>");
-
-	/*
-	 * Column Two 
-	 */
-	wc_printf("<td width=33%%>");
-	wc_printf("<div class=\"box\">");	
-	wc_printf("<div class=\"boxlabel\">");	
-	wc_printf(_("Tasks"));
-	wc_printf("</div><div class=\"boxcontent\">");	
-	wc_printf("<div id=\"tasks_inner\">");	
+}
+void tmplput_tasks_section(StrBuf *Target, WCTemplputParams *TP) {
 	tasks_section();
-	wc_printf("</div></div></div>");
-	wc_printf("</td>");
-
-	/*
-	 * Column Three
-	 */
-	wc_printf("<td width=33%%>");
-	wc_printf("<div class=\"box\">");	
-	wc_printf("<div class=\"boxlabel\">");	
-	wc_printf(_("Today&nbsp;on&nbsp;your&nbsp;calendar"));
-	wc_printf("</div><div class=\"boxcontent\">");	
-	wc_printf("<div id=\"calendar_inner\">");	
+}
+void tmplput_calendar_section(StrBuf *Target, WCTemplputParams *TP) {
 	calendar_section();
-	wc_printf("</div></div></div>");
-	wc_printf("</td>");
-
-	wc_printf("</tr><tr valign=top>");
-
-	/*
-	 * Row Two - Column One
-	 */
-	wc_printf("<td colspan=2>");
-	wc_printf("<div class=\"box\">");	
-	wc_printf("<div class=\"boxlabel\">");	
-	wc_printf(_("Who's&nbsp;online&nbsp;now"));
-	wc_printf("</div><div class=\"boxcontent\">");	
-	wc_printf("<div id=\"who_inner\">");	
-	do_template("who_summary", NULL);
-	wc_printf("</div></div></div>");
-	wc_printf("</td>");
-
-	/*
-	 * Row Two - Column Two
-	 */
-	wc_printf("<td width=33%%>");
-	wc_printf("<div class=\"box\">");	
-	wc_printf("<div class=\"boxlabel\">");	
-	wc_printf(_("About&nbsp;this&nbsp;server"));
-	wc_printf("</div><div class=\"boxcontent\">");	
-	wc_printf("<div id=\"info_inner\">");	
-	server_info_section();
-	wc_printf("</div></div></div>");
-	wc_printf("</td>");
-
-
-	/*
-	 * End of columns
-	 */
-	wc_printf("</tr></table>");
 }
 
 
 /*
- * Display this user's summary page
+ * summary page
  */
-void summary(void) {
-	char title[256];
-
-	output_headers(1, 1, 2, 0, 0, 0);
-	wc_printf("<div id=\"banner\">\n");
-	wc_printf("<div class=\"room_banner\">");
-        wc_printf("<img src=\"static/summscreen_48x.gif\">");
-        wc_printf("<h1>");
-        snprintf(title, sizeof title, _("Summary page for %s"), ChrPtr(WC->wc_fullname));
-        escputs(title);
-        wc_printf("</h1><h2>");
-        output_date();
-        wc_printf("</h2></div>");
-	wc_printf("<div id=\"actiondiv\">");
-	wc_printf("<ul class=\"room_actions\">\n");
-	wc_printf("<li class=\"start_page\">");
-	offer_start_page(NULL, &NoCtx);
-        wc_printf("</li></ul>");
-        wc_printf("</div>");
-        wc_printf("</div>");
-
-	/*
-	 * 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("<div id=\"content\" class=\"service\">\n");
-	summary_inner_div();
-	wc_printf("</div>\n");
-
-	wc_printf(
-		"<script type=\"text/javascript\">					"
-		" new Ajax.PeriodicalUpdater('msg_inner', 'new_messages_html',		"
-		"                            { method: 'get', frequency: 60 }  );	"
-		" new Ajax.PeriodicalUpdater('tasks_inner', 'tasks_inner_html',		"
-		"                            { method: 'get', frequency: 120 }  );	"
-		" new Ajax.PeriodicalUpdater('calendar_inner', 'calendar_inner_html',		"
-		"                            { method: 'get', frequency: 90 }  );	"
-		" new Ajax.PeriodicalUpdater('do_template', 'template=who_summary',	"
-		"                            { method: 'get', frequency: 30 }  );	"
-		"</script>							 	\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);
 }