X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwho.c;h=abd807705c2da521160562ac6fd838af96e93b11;hb=44c30618e25ce2eb103b87e84e10dcd51dad0879;hp=7eb676c7f72a4c25b9c1a2b8c5974d32fa8d394a;hpb=04f6eb10ab315349157f84b2d5ab2a96a0c091f7;p=citadel.git

diff --git a/webcit/who.c b/webcit/who.c
index 7eb676c7f..abd807705 100644
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -1,66 +1,34 @@
-/* $Id$ */
-
-#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>
+/*
+ * $Id$
+ */
+/**
+ * \defgroup DislpayWho Display a list of all users currently logged on to the Citadel server.
+ */
+/*@{*/
 #include "webcit.h"
 
 
 
-
-
-
-/*
- * who is on?
+/**
+ * \brief Display inner div of Wholist
  */
-void whobbs(void)
-{
-	char buf[SIZ], sess, user[SIZ], room[SIZ], host[SIZ],
+void who_inner_div(void) {
+	char buf[SIZ], user[SIZ], room[SIZ], host[SIZ],
 		realroom[SIZ], realhost[SIZ];
+	int sess;
 	time_t last_activity;
 	time_t now;
+	int bg = 0;
 
-	output_headers(7);
-
-	wprintf("<SCRIPT LANGUAGE=\"JavaScript\">\n"
-		"function ConfirmKill() { \n"
-		"return confirm('Do you really want to kill this session?');\n"
-		"}\n"
-		"</SCRIPT>\n"
-	);
-
-	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-	wprintf("<IMG SRC=\"/static/users-icon.gif\" ALT=\" \" ALIGN=MIDDLE>");
-	wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\">&nbsp;&nbsp;<B>Users currently on ");
-	escputs(serv_info.serv_humannode);
-	wprintf("</B></FONT></TD><TD>");
-	offer_start_page();
-	wprintf("</TD></TR></TABLE>\n");
-
-	wprintf("<CENTER><TABLE BORDER=1 WIDTH=100%%>\n<TR>\n");
-	wprintf("<TH>Session ID</TH>\n");
-	wprintf("<TH>User Name</TH>\n");
-	wprintf("<TH>Room</TH>");
-	wprintf("<TH>From host</TH>\n</TR>\n");
+	wprintf("<table border=\"0\" cellspacing=\"0\" width=\"100%%\" bgcolor=\"#FFFFFF\">"
+		"<tr>\n");
+	wprintf("<th colspan=\"3\"> </th>\n");
+	wprintf("<th>%s</th>\n", _("User name"));
+	wprintf("<th>%s</th>", _("Room"));
+	wprintf("<th>%s</th>\n</tr>\n", _("From host"));
 
 	serv_puts("TIME");
-	serv_gets(buf);
+	serv_getln(buf, sizeof buf);
 	if (buf[0] == '2') {
 		now = extract_long(&buf[4], 0);
 	}
@@ -69,158 +37,244 @@ void whobbs(void)
 	}
 
 	serv_puts("RWHO");
-	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")) {
 			sess = extract_int(buf, 0);
-			extract(user, buf, 1);
-			extract(room, buf, 2);
-			extract(host, buf, 3);
-			extract(realroom, buf, 9);
-			extract(realhost, buf, 10);
+			extract_token(user, buf, 1, '|', sizeof user);
+			extract_token(room, buf, 2, '|', sizeof room);
+			extract_token(host, buf, 3, '|', sizeof host);
+			extract_token(realroom, buf, 9, '|', sizeof realroom);
+			extract_token(realhost, buf, 10, '|', sizeof realhost);
 			last_activity = extract_long(buf, 5);
 
-			wprintf("<TR>\n\t<TD ALIGN=center>%d", sess);
+			bg = 1 - bg;
+			wprintf("<tr bgcolor=\"#%s\">",
+				(bg ? "DDDDDD" : "FFFFFF")
+			);
+
+
+			wprintf("<td>");
 			if ((WC->is_aide) &&
-			    (sess != serv_info.serv_pid)) {
-				wprintf(" <A HREF=\"/terminate_session&which_session=%d&session_owner=", sess);
-				urlescputs(user);
-				wprintf("\" onClick=\"return ConfirmKill();\" "
-				">(kill)</A>");
+			    (sess != WC->ctdl_pid)) {
+				wprintf(" <a href=\"terminate_session?which_session=%d", sess);
+				wprintf("\" onClick=\"return ConfirmKill();\">%s</a>", _("(kill)"));
 			}
-			if (sess == serv_info.serv_pid) {
-				wprintf(" <A HREF=\"/edit_me\" "
-					">(edit)</A>");
+			if (sess == WC->ctdl_pid) {
+				wprintf(" <a href=\"edit_me\">%s</a>", _("(edit)"));
 			}
-			wprintf("</TD>\n\t<TD>");
+			wprintf("</td>");
 
-			/* (link to page this user) */
-			wprintf("<A HREF=\"/display_page&recp=");
+			/** (link to page this user) */
+			wprintf("<td><a href=\"display_page?recp=");
 			urlescputs(user);
 			wprintf("\">"
-				"<IMG ALIGN=MIDDLE WIDTH=20 HEIGHT=15 "
-				"SRC=\"/static/page.gif\" "
-				"ALT=\"(p)\""
-				" BORDER=0></A>&nbsp;");
+				"<img align=\"middle\" "
+				"src=\"static/citadelchat_24x.gif\" "
+				"alt=\"(p)\""
+				" border=\"0\" /></a> ");
+			wprintf("</td>");
+
+			/** (idle flag) */
+			wprintf("<td>");
+			if ((now - last_activity) > 900L) {
+				wprintf(" "
+					"<img align=\"middle\" "
+					"src=\"static/inactiveuser_24x.gif\" "
+					"alt=\"(idle)\" border=\"0\" />");
+			}
+			else {
+				wprintf(" "
+					"<img align=\"middle\" "
+					"src=\"static/activeuser_24x.gif\" "
+					"alt=\"(active)\" border=\"0\" />");
+			}
+			wprintf("</td>\n<td>");
 
 
-			/* username (link to user bio/photo page) */
-			wprintf("<A HREF=\"/showuser&who=");
+
+			/** username (link to user bio/photo page) */
+			wprintf("<a href=\"showuser?who=");
 			urlescputs(user);
 			wprintf("\">");
 			escputs(user);
-			wprintf("</A>");
+			wprintf("</a>");
 
-			if ((now - last_activity) > 900L) {
-				wprintf("&nbsp;"
-					"<IMG ALIGN=MIDDLE "
-					"SRC=\"/static/idle.gif\" "
-					"ALT=\"[idle]\" BORDER=0>");
-			}
-
-			/* room */
-			wprintf("</TD>\n\t<TD>");
+			/** room */
+			wprintf("</td>\n\t<td>");
 			escputs(room);
 			if (strlen(realroom) > 0) {
-				wprintf("<BR><I>");
+				wprintf("<br /><i>");
 				escputs(realroom);
-				wprintf("</I>");
+				wprintf("</i>");
 			}
-			wprintf("</TD>\n\t<TD>");
+			wprintf("</td>\n\t<td>");
 
-			/* hostname */
+			/** hostname */
 			escputs(host);
 			if (strlen(realhost) > 0) {
-				wprintf("<BR><I>");
+				wprintf("<br /><i>");
 				escputs(realhost);
-				wprintf("</I>");
+				wprintf("</i>");
 			}
-			wprintf("</TD>\n</TR>");
+			wprintf("</td>\n</tr>");
 		}
 	}
-	wprintf("</TABLE>\n"
-		"Click on a name to read user info.  Click on "
-		"<IMG ALIGN=MIDDLE SRC=\"/static/page.gif\" ALT=\"(p)\" "
-		"BORDER=0> to send "
-		"a page (instant message) to that user.<BR></CENTER>\n");
-	wDumpContent(1);
+	wprintf("</table>");
 }
 
 
+/**
+ * \brief who is on?
+ */
+void who(void)
+{
+	char title[256];
+
+	output_headers(1, 1, 2, 0, 0, 0);
+
+	wprintf("<script type=\"text/javascript\">\n"
+		"function ConfirmKill() { \n"
+		"return confirm('%s');\n"
+		"}\n"
+		"</script>\n", _("Do you really want to kill this session?")
+	);
+
+	wprintf("<div id=\"banner\">\n");
+	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+	wprintf("<img src=\"static/usermanag_48x.gif\" ALT=\" \" "
+		"ALIGN=MIDDLE "
+		">");
+	wprintf("<SPAN CLASS=\"titlebar\"> ");
+
+	snprintf(title, sizeof title, _("Users currently on %s"), serv_info.serv_humannode);
+	escputs(title);
+
+	wprintf("</SPAN></TD><TD ALIGN=RIGHT>");
+	offer_start_page();
+	wprintf("</TD></TR></TABLE>\n");
+	wprintf("</div>\n");
+
+	wprintf("<div id=\"content\">\n");
+
+	wprintf("<div style=\"display:inline\" id=\"fix_scrollbar_bug\">");
+	who_inner_div();
+	wprintf("</div>\n");
+
+	wprintf("<div id=\"instructions\" align=center>");
+	wprintf(_("Click on a name to read user info.  Click on %s "
+		"to send an instant message to that user."),
+		"<img align=\"middle\" src=\"static/citadelchat_16x.gif\" alt=\"(p)\" border=\"0\">"
+	);
+	wprintf("</div>\n");
+
+	/**
+	 * JavaScript to make the ajax refresh happen:
+	 * See http://www.sergiopereira.com/articles/prototype.js.html for info on Ajax.PeriodicalUpdater
+	 * It wants: 1. The div being updated
+	 *           2. The URL of the update source
+	 *           3. Other flags (such as the HTTP method and the refresh frequency)
+	 */
+	wprintf(
+		"<script type=\"text/javascript\">					"
+		" new Ajax.PeriodicalUpdater('fix_scrollbar_bug', 'who_inner_html',	"
+		"                            { method: 'get', frequency: 30 }  );	"
+		"</script>							 	\n"
+	);
+	wDumpContent(1);
+}
+
+/**
+ * \brief end session \todo what??? does this belong here? 
+ */
 void terminate_session(void)
 {
 	char buf[SIZ];
 
 	serv_printf("TERM %s", bstr("which_session"));
-	serv_gets(buf);
-	whobbs();
+	serv_getln(buf, sizeof buf);
+	who();
 }
 
 
-/*
- * Change your session info (fake roomname and hostname)
+/**
+ * \brief Change your session info (fake roomname and hostname)
  */
 void edit_me(void)
 {
 	char buf[SIZ];
 
-	if (!strcasecmp(bstr("sc"), "Change room name")) {
+	if (strlen(bstr("change_room_name_button")) > 0) {
 		serv_printf("RCHG %s", bstr("fake_roomname"));
-		serv_gets(buf);
-		http_redirect("/whobbs");
-	} else if (!strcasecmp(bstr("sc"), "Change host name")) {
+		serv_getln(buf, sizeof buf);
+		http_redirect("who");
+	} else if (strlen(bstr("change_host_name_button")) > 0) {
 		serv_printf("HCHG %s", bstr("fake_hostname"));
-		serv_gets(buf);
-		http_redirect("/whobbs");
-	} else if (!strcasecmp(bstr("sc"), "Change user name")) {
+		serv_getln(buf, sizeof buf);
+		http_redirect("who");
+	} else if (strlen(bstr("change_user_name_button")) > 0) {
 		serv_printf("UCHG %s", bstr("fake_username"));
-		serv_gets(buf);
-		http_redirect("/whobbs");
-	} else if (!strcasecmp(bstr("sc"), "Cancel")) {
-		http_redirect("/whobbs");
+		serv_getln(buf, sizeof buf);
+		http_redirect("who");
+	} else if (strlen(bstr("cancel_button")) > 0) {
+		http_redirect("who");
 	} else {
-
-		output_headers(3);
-
-		wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>");
-		wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"><B>");
-		wprintf("Edit your session display");
-		wprintf("</B></FONT></TD></TR></TABLE>\n");
-		wprintf("This screen allows you to change the way your\n");
-		wprintf("session appears in the 'Who is online' listing.\n");
-		wprintf("To turn off any 'fake' name you've previously\n");
-		wprintf("set, simply click the appropriate 'change' button\n");
-		wprintf("without typing anything in the corresponding box.\n");
-		wprintf("<BR>\n");
-
-		wprintf("<FORM METHOD=\"POST\" ACTION=\"/edit_me\">\n");
-
-		wprintf("<TABLE border=0 width=100%%>\n");
-
-		wprintf("<TR><TD><B>Room name:</B></TD>\n<TD>");
-		wprintf("<INPUT TYPE=\"text\" NAME=\"fake_roomname\" MAXLENGTH=\"64\">\n");
-		wprintf("</TD>\n<TD ALIGN=center>");
-		wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Change room name\">");
-		wprintf("</TD>\n</TR>\n");
-
-		wprintf("<TR><TD><B>Host name:</B></TD><TD>");
+		output_headers(1, 1, 0, 0, 0, 0);
+
+		wprintf("<div id=\"banner\">\n");
+		wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+		wprintf("<SPAN CLASS=\"titlebar\">");
+		wprintf(_("Edit your session display"));
+		wprintf("</SPAN></TD></TR></TABLE>\n");
+		wprintf("</div>\n<div id=\"content\">\n");
+
+		wprintf(_("This screen allows you to change the way your "
+			"session appears in the 'Who is online' listing. "
+			"To turn off any 'fake' name you've previously "
+			"set, simply click the appropriate 'change' button "
+			"without typing anything in the corresponding box. "));
+		wprintf("<br />\n");
+
+		wprintf("<form method=\"POST\" action=\"edit_me\">\n");
+
+		wprintf("<table border=0 width=100%%>\n");
+
+		wprintf("<tr><td><b>");
+		wprintf(_("Room name:"));
+		wprintf("</b></td>\n<td>");
+		wprintf("<input type=\"text\" name=\"fake_roomname\" maxlength=\"64\">\n");
+		wprintf("</td>\n<td align=center>");
+		wprintf("<input type=\"submit\" name=\"change_room_name_button\" value=\"%s\">",
+			_("Change room name"));
+		wprintf("</td>\n</tr>\n");
+
+		wprintf("<TR><TD><B>");
+		wprintf(_("Host name:"));
+		wprintf("</B></TD><TD>");
 		wprintf("<INPUT TYPE=\"text\" NAME=\"fake_hostname\" MAXLENGTH=\"64\">\n");
 		wprintf("</TD>\n<TD ALIGN=center>");
-		wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Change host name\">");
+		wprintf("<INPUT TYPE=\"submit\" NAME=\"change_host_name_button\" VALUE=\"%s\">",
+			_("Change host name"));
 		wprintf("</TD>\n</TR>\n");
 
 		if (WC->is_aide) {
-			wprintf("<TR><TD><B>User name:</B></TD><TD>");
+			wprintf("<TR><TD><B>");
+			wprintf(_("User name:"));
+			wprintf("</B></TD><TD>");
 			wprintf("<INPUT TYPE=\"text\" NAME=\"fake_username\" MAXLENGTH=\"64\">\n");
 			wprintf("</TD>\n<TD ALIGN=center>");
-			wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Change user name\">");
+			wprintf("<INPUT TYPE=\"submit\" NAME=\"change_user_name_button\" VALUE=\"%s\">",
+				_("Change user name"));
 			wprintf("</TD>\n</TR>\n");
 		}
-		wprintf("<TR><TD>&nbsp;</TD><TD>&nbsp;</TD><TD ALIGN=center>");
-		wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
+		wprintf("<TR><TD> </TD><TD> </TD><TD ALIGN=center>");
+		wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">",
+			_("Cancel"));
 		wprintf("</TD></TR></TABLE>\n");
-
 		wprintf("</FORM></CENTER>\n");
 		wDumpContent(1);
 	}
 }
+
+
+/*@}*/