X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsummary.c;h=a5db298b030bf8cbec17e3f0b9cf31e9c54257b5;hb=6ec73d6906542ea2f8cca2e62f7625ee2e17ae03;hp=f6e884aefe08a88805dcc502d3c071065e12bf9c;hpb=7836de1a004d9353cadb71885e360715884d1601;p=citadel.git

diff --git a/webcit/summary.c b/webcit/summary.c
index f6e884aef..a5db298b0 100644
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -4,27 +4,8 @@
  * Displays the "Summary Page"
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <time.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
+#include "calendar.h"
 
 /*
  * Display today's date in a friendly format
@@ -32,25 +13,13 @@
 void output_date(void) {
 	struct tm tm;
 	time_t now;
-
-	static char *wdays[] = {
-		"Sunday", "Monday", "Tuesday", "Wednesday",
-		"Thursday", "Friday", "Saturday"
-	};
-	static char *months[] = {
-		"January", "February", "March", "April", "May", "June", "July",
-		"August", "September", "October", "November", "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);
+	wprintf("%s", buf);
 }
 
 
@@ -60,10 +29,10 @@ void output_date(void) {
  * Dummy section
  */
 void dummy_section(void) {
-	svprintf("BOXTITLE", WCS_STRING, "(dummy&nbsp;section)");
-	do_template("beginbox");
-	wprintf("(nothing)");
-	do_template("endbox");
+	svput("BOXTITLE", WCS_STRING, "(dummy&nbsp;section)");
+	do_template("beginboxx", NULL);
+	wprintf(_("(nothing)"));
+	do_template("endbox", NULL);
 }
 
 
@@ -77,53 +46,30 @@ 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("<TABLE BORDER=0 WIDTH=100%%>\n");
+	wprintf("<table border=0 width=100%%>\n");
 	for (i=0; i<number_of_rooms_to_check; ++i) {
-		extract(room, rooms_to_check, i);
+		extract_token(room, rooms_to_check, i, '|', sizeof room);
 
 		serv_printf("GOTO %s", room);
-		serv_gets(buf);
+		serv_getln(buf, sizeof buf);
 		if (buf[0] == '2') {
-			extract(room, &buf[4], 0);
-			wprintf("<TR><TD><A HREF=\"/dotgoto?room=");
+			extract_token(room, &buf[4], 0, '|', sizeof room);
+			wprintf("<tr><td><a href=\"dotgoto?room=");
 			urlescputs(room);
 			wprintf("\">");
 			escputs(room);
-			wprintf("</A></TD><TD>%d/%d</TD></TR>\n",
+			wprintf("</a></td><td>%d/%d</td></tr>\n",
 				extract_int(&buf[4], 1),
 				extract_int(&buf[4], 2)
 			);
 		}
 	}
-	wprintf("</TABLE>\n");
-	do_template("endbox");
-
-}
+	wprintf("</table>\n");
 
-
-/*
- * Wholist section
- */
-void wholist_section(void) {
-	char buf[SIZ];
-	char user[SIZ];
-
-	svprintf("BOXTITLE", WCS_STRING, "Who's&nbsp;online&nbsp;now");
-	do_template("beginbox");
-	serv_puts("RWHO");
-	serv_gets(buf);
-	if (buf[0] == '1') while(serv_gets(buf), strcmp(buf, "000")) {
-		extract(user, buf, 1);
-		escputs(user);
-		wprintf("<br />\n");
-	}
-	do_template("endbox");
 }
 
 
@@ -131,37 +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 (strcasecmp(WC->wc_roomname, "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");
+		num_msgs = load_msg_ptrs("MSGS ALL", &Stat);
 	}
 
-	if (num_msgs < 1) {
-		wprintf("<i>(None)</i><br />\n");
-	}
-	else {
-		for (i=0; i<num_msgs; ++i) {
-			display_task(WC->msgarr[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("<I>(This server does not support task lists)</I>\n");
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
-	do_template("endbox");
+	if (calendar_summary_view() < 1) {
+		wprintf("<i>");
+		wprintf(_("(None)"));
+		wprintf("</i><br />\n");
+	}
 }
 
 
@@ -169,114 +123,217 @@ 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&nbsp;on&nbsp;your&nbsp;calendar");
-	do_template("beginbox");
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
-	gotoroom("Calendar");
-	if (strcasecmp(WC->wc_roomname, "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");
-	}
-
-	if (num_msgs < 1) {
-		wprintf("<i>(Nothing)</i><br />\n");
+		num_msgs = load_msg_ptrs("MSGS ALL", &Stat);
 	}
-	else {
-		for (i=0; i<num_msgs; ++i) {
-			display_calendar(WC->msgarr[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("<I>(This server does not support calendars)</I>\n");
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
-	do_template("endbox");
+	if (calendar_summary_view() < 1) {
+		wprintf("<i>");
+		wprintf(_("(Nothing)"));
+		wprintf("</i><br />\n");
+	}
+	__calendar_Cleanup(&v);
 }
 
-
 /*
  * Server info section (fluff, really)
  */
 void server_info_section(void) {
-	svprintf("BOXTITLE", WCS_STRING, "About&nbsp;this&nbsp;server");
-	do_template("beginbox");
-	wprintf("You are connected to ");
-	escputs(serv_info.serv_humannode);
-	wprintf(", running ");
-	escputs(serv_info.serv_software);
-	wprintf(", and located in ");
-	escputs(serv_info.serv_bbs_city);
-	wprintf(".<br />\nYour system administrator is ");
-	escputs(serv_info.serv_sysadm);
-	wprintf(".\n");
-	do_template("endbox");
+	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);
 }
 
-
 /*
- * Display this user's summary page
+ * 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(void) {
-
-	output_headers(1, 1, 2, 0, 1, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=#444455><TR>"
-		"<TD><IMG SRC=\"/static/summary.gif\"></TD><TD>"
-		"<SPAN CLASS=\"titlebar\">"
-		"Summary page for ");
-	escputs(WC->wc_username);
-	wprintf("</SPAN></TD><TD>\n");
-	wprintf("</TD><TD ALIGN=RIGHT><SPAN CLASS=\"titlebar\">");
-	output_date();
-	wprintf("</SPAN><br />");
-	offer_start_page();
-	wprintf("</TD></TR></TABLE>\n");
-	wprintf("</div>\n<div id=\"content\">\n");
-
-	/*
-	 * 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("<table border=0><tr valign=top>");
+void summary_inner_div(void) {
+	wprintf("<div class=\"fix_scrollbar_bug\">"
+		"<table width=\"100%%\" cellspacing=\"10\" cellpadding=\"0\">"
+		"<tr valign=top>");
 
 	/*
 	 * Column One
 	 */
 	wprintf("<td width=33%%>");
-	wholist_section();
+	wprintf("<div class=\"box\">");	
+	wprintf("<div class=\"boxlabel\">");	
+	wprintf(_("Messages"));
+	wprintf("</div><div class=\"boxcontent\">");	
+	wprintf("<div id=\"msg_inner\">");	
+	new_messages_section();
+	wprintf("</div></div></div>");
+	wprintf("</td>");
 
 	/*
-	 * Column Two
+	 * Column Two 
 	 */
-	wprintf("</td><td width=33%%>");
-	server_info_section();
-	wprintf("<br />");
+	wprintf("<td width=33%%>");
+	wprintf("<div class=\"box\">");	
+	wprintf("<div class=\"boxlabel\">");	
+	wprintf(_("Tasks"));
+	wprintf("</div><div class=\"boxcontent\">");	
+	wprintf("<div id=\"tasks_inner\">");	
 	tasks_section();
+	wprintf("</div></div></div>");
+	wprintf("</td>");
 
 	/*
 	 * Column Three
 	 */
-	wprintf("</td><td width=33%%>");
-	new_messages_section();
-	wprintf("<br />");
+	wprintf("<td width=33%%>");
+	wprintf("<div class=\"box\">");	
+	wprintf("<div class=\"boxlabel\">");	
+	wprintf(_("Today&nbsp;on&nbsp;your&nbsp;calendar"));
+	wprintf("</div><div class=\"boxcontent\">");	
+	wprintf("<div id=\"calendar_inner\">");	
 	calendar_section();
+	wprintf("</div></div></div>");
+	wprintf("</td>");
+
+	wprintf("</tr><tr valign=top>");
+
+	/*
+	 * Row Two - Column One
+	 */
+	wprintf("<td colspan=2>");
+	wprintf("<div class=\"box\">");	
+	wprintf("<div class=\"boxlabel\">");	
+	wprintf(_("Who's&nbsp;online&nbsp;now"));
+	wprintf("</div><div class=\"boxcontent\">");	
+	wprintf("<div id=\"who_inner\">");	
+	do_template("wholistsummarysection", NULL);
+	wprintf("</div></div></div>");
+	wprintf("</td>");
+
+	/*
+	 * Row Two - Column Two
+	 */
+	wprintf("<td width=33%%>");
+	wprintf("<div class=\"box\">");	
+	wprintf("<div class=\"boxlabel\">");	
+	wprintf(_("About&nbsp;this&nbsp;server"));
+	wprintf("</div><div class=\"boxcontent\">");	
+	wprintf("<div id=\"info_inner\">");	
+	server_info_section();
+	wprintf("</div></div></div>");
+	wprintf("</td>");
+
 
 	/*
 	 * End of columns
 	 */
-	wprintf("</td></tr></table>\n");
+	wprintf("</tr></table>");
+}
+
+
+/*
+ * Display this user's summary page
+ */
+void summary(void) {
+	char title[256];
+
+	output_headers(1, 1, 2, 0, 0, 0);
+	wprintf("<div id=\"banner\">\n");
+	wprintf("<div class=\"room_banner\">");
+        wprintf("<img src=\"static/summscreen_48x.gif\">");
+        wprintf("<h1>");
+        snprintf(title, sizeof title, _("Summary page for %s"), ChrPtr(WC->wc_fullname));
+        escputs(title);
+        wprintf("</h1><h2>");
+        output_date();
+        wprintf("</h2></div>");
+	wprintf("<div id=\"actiondiv\">");
+	wprintf("<ul class=\"room_actions\">\n");
+	wprintf("<li class=\"start_page\">");
+	offer_start_page(NULL, &NoCtx);
+        wprintf("</li></ul>");
+        wprintf("</div>");
+        wprintf("</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.
+	 */
+	wprintf("<div id=\"content\" class=\"service\">\n");
+	summary_inner_div();
+	wprintf("</div>\n");
+
+	wprintf(
+		"<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=wholistsummarysection',	"
+		"                            { method: 'get', frequency: 30 }  );	"
+		"</script>							 	\n"
+	);
 
 	wDumpContent(1);
 }
+
+void 
+InitModule_SUMMARY
+(void)
+{
+	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);
+}
+