X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fuserlist.c;h=83d82e3cf10b1606367bd2c746949dac7ffe772a;hb=1b302cba797e9b8d6f94304f80c52ac63845503a;hp=34e75d9343159697bfa28bd380ee11abce60e201;hpb=f6f51307f975c67d86448d5b456f9650dc36d773;p=citadel.git

diff --git a/webcit/userlist.c b/webcit/userlist.c
index 34e75d934..83d82e3cf 100644
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -1,34 +1,15 @@
 /*
  * $Id$
- *
- * Display a list of all accounts on a Citadel system.
- *
  */
 
-#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 <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
+/* 
+ * structure to keep namelists in
+ */
 struct namelist {
-	struct namelist *next;
-	char name[32];
+	struct namelist *next; /**< next item of the linked list */
+	char name[32];         /**< name of the userentry */
 };
 
 /*
@@ -36,59 +17,66 @@ struct namelist {
  */
 void userlist(void)
 {
-	char buf[SIZ];
-	char fl[SIZ];
-	struct tm *tmbuf;
-	long lc;
+	char buf[256];
+	char fl[256];
+	char title[256];
+	struct tm tmbuf;
+	time_t lc;
 	struct namelist *bio = NULL;
 	struct namelist *bptr;
 	int has_bio;
 	int bg = 0;
 
 	serv_puts("LBIO");
-	serv_gets(buf);
+	serv_getln(buf, sizeof buf);
 	if (buf[0] == '1')
-		while (serv_gets(buf), strcmp(buf, "000")) {
+		while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 			bptr = (struct namelist *) malloc(sizeof(struct namelist));
 			bptr->next = bio;
 			strcpy(bptr->name, buf);
 			bio = bptr;
 		}
-	output_headers(1, 1, 2, 0, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n"
-		"<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-		"<SPAN CLASS=\"titlebar\">User list for ");
-	escputs(serv_info.serv_humannode);
-	wprintf("</SPAN>"
-		"</TD></TR></TABLE>\n"
-		"</div>\n<div id=\"content\">\n"
-	);
+	output_headers(1, 1, 2, 0, 0, 0);
+	wprintf("<div id=\"banner\">\n");
+	wprintf("<h1>");
+	snprintf(title, sizeof title, _("User list for %s"), ChrPtr(WC->serv_info->serv_humannode));
+	escputs(title);
+	wprintf("</h1>");
+        wprintf("</div>");
+
+        wprintf("<div id=\"content\" class=\"service\">\n");
 
 	serv_puts("LIST");
-	serv_gets(buf);
+	serv_getln(buf, sizeof buf);
 	if (buf[0] != '1') {
-		wprintf("<EM>%s</EM><br />\n", &buf[4]);
+		wprintf("<em>%s</em><br />\n", &buf[4]);
 		goto DONE;
 	}
 
-	wprintf("<div style=\"margin-right:1px\">"
-		"<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
-	wprintf("<TR><TH>User Name</TH><TH>Number</TH><TH>Access Level</TH>");
-	wprintf("<TH>Last Login</TH><TH>Total Logins</TH><TH>Total Posts</TH></TR>\n");
-
-	while (serv_gets(buf), strcmp(buf, "000")) {
-		extract(fl, buf, 0);
+	wprintf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"userlist_background\"><tr><td>\n");
+	wprintf("<tr><th>%s</th><th>%s</th><th>%s</th>"
+			"<th>%s</th><th>%s</th><th>%s</th></tr>",
+			_("User Name"),
+			_("Number"),
+			_("Access Level"),
+			_("Last Login"),
+			_("Total Logins"),
+			_("Total Posts"));
+
+	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+		extract_token(fl, buf, 0, '|', sizeof fl);
 		has_bio = 0;
 		for (bptr = bio; bptr != NULL; bptr = bptr->next) {
 			if (!strcasecmp(fl, bptr->name))
 				has_bio = 1;
 		}
 		bg = 1 - bg;
-		wprintf("<TR BGCOLOR=\"#%s\"><TD>",
+		wprintf("<tr bgcolor=\"#%s\"><td>",
 			(bg ? "DDDDDD" : "FFFFFF")
 		);
 		if (has_bio) {
-			wprintf("<A HREF=\"/showuser&who=");
+			wprintf("<a href=\"showuser&who=");
 			urlescputs(fl);
 			wprintf("\">");
 			escputs(fl);
@@ -96,18 +84,18 @@ void userlist(void)
 		} else {
 			escputs(fl);
 		}
-		wprintf("</TD><TD>%ld</TD><TD>%d</TD><TD>",
+		wprintf("</td><td>%ld</td><td>%d</td><td>",
 			extract_long(buf, 2),
 			extract_int(buf, 1));
 		lc = extract_long(buf, 3);
-		tmbuf = (struct tm *) localtime(&lc);
+		localtime_r(&lc, &tmbuf);
 		wprintf("%02d/%02d/%04d ",
-			(tmbuf->tm_mon + 1),
-			tmbuf->tm_mday,
-			(tmbuf->tm_year + 1900));
+			(tmbuf.tm_mon + 1),
+			tmbuf.tm_mday,
+			(tmbuf.tm_year + 1900));
 
 
-		wprintf("</TD><TD>%ld</TD><TD>%5ld</TD></TR>\n",
+		wprintf("</td><td>%ld</td><td>%5ld</td></tr>\n",
 			extract_long(buf, 4), extract_long(buf, 5));
 
 	}
@@ -121,54 +109,66 @@ DONE:	wDumpContent(1);
  */
 void showuser(void)
 {
-	char who[SIZ];
-	char buf[SIZ];
+	char who[256];
+	char buf[256];
 	int have_pic;
 
 	strcpy(who, bstr("who"));
 
-	output_headers(1, 1, 2, 0, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n"
-		"<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-		"<SPAN CLASS=\"titlebar\">User profile</SPAN>"
-		"</TD></TR></TABLE>\n"
-		"</div>\n<div id=\"content\">\n"
-	);
+	output_headers(1, 1, 2, 0, 0, 0);
+	wprintf("<div id=\"banner\">\n");
+	wprintf("<img src=\"static/usermanag_48x.gif\">");
+        wprintf("<h1>");
+	wprintf(_("User profile"));
+        wprintf("</h1>");
+        wprintf("</div>");
 
-	wprintf("<div style=\"margin-right:1px\">"
-		"<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+        wprintf("<div id=\"content\" class=\"service\">\n");
+
+	wprintf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"userlist_background\"><tr><td>\n");
 
 	serv_printf("OIMG _userpic_|%s", who);
-	serv_gets(buf);
+	serv_getln(buf, sizeof buf);
 	if (buf[0] == '2') {
 		have_pic = 1;
 		serv_puts("CLOS");
-		serv_gets(buf);
+		serv_getln(buf, sizeof buf);
 	} else {
 		have_pic = 0;
 	}
 
-	wprintf("<CENTER><TABLE><TR><TD>");
+	wprintf("<center><table><tr><td>");
 	if (have_pic == 1) {
-		wprintf("<IMG SRC=\"/image&name=_userpic_&parm=");
+		wprintf("<img src=\"image&name=_userpic_&parm=");
 		urlescputs(who);
 		wprintf("\">");
 	}
-	wprintf("</TD><TD><H1>%s</H1></TD></TR></TABLE></CENTER>\n", who);
+	wprintf("</td><td><h1>");
+	escputs(who);
+	wprintf("</h1></td></tr></table></center>\n");
 	serv_printf("RBIO %s", who);
-	serv_gets(buf);
+	serv_getln(buf, sizeof buf);
 	if (buf[0] == '1') {
-		fmout(NULL, "JUSTIFY");
+		fmout("JUSTIFY");
 	}
-	wprintf("<br /><A HREF=\"/display_page&recp=");
+	wprintf("<br /><a href=\"display_page?recp=");
 	urlescputs(who);
 	wprintf("\">"
-		"<IMG SRC=\"/static/page.gif\" ALIGN=MIDDLE BORDER=0>"
-		"&nbsp;&nbsp;"
-		"Click here to send an instant message to ");
-	escputs(who);
-	wprintf("</A>\n");
+		"<img src=\"static/citadelchat_24x.gif\" "
+		"align=middle border=0>&nbsp;&nbsp;");
+	snprintf(buf, sizeof buf, _("Click here to send an instant message to %s"), who);
+	escputs(buf);
+	wprintf("</a>\n");
 
 	wprintf("</td></tr></table></div>\n");
 	wDumpContent(1);
 }
+
+void 
+InitModule_USERLIST
+(void)
+{
+	WebcitAddUrlHandler(HKEY("userlist"), userlist, 0);
+	WebcitAddUrlHandler(HKEY("showuser"), showuser, 0);
+}