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

diff --git a/webcit/summary.c b/webcit/summary.c
index ecb90c0b1..5dbe60435 100644
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -1,21 +1,15 @@
 /*
  * 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"
@@ -100,7 +94,6 @@ void tasks_section(void) {
 	long HKLen;
 	void *vMsg;
 	message_summary *Msg;
-	wcsession *WCC = WC;
 	StrBuf *Buf;
 	SharedMessageStatus Stat;
 
@@ -113,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, 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);
 		}
@@ -142,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;
@@ -165,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);
 		}
@@ -199,18 +195,26 @@ void tmplput_calendar_section(StrBuf *Target, WCTemplputParams *TP) {
 	calendar_section();
 }
 
+
+/*
+ * summary page
+ */
+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);
-	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("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);
-
 }