X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwho.c;h=11c68d86c99602c3c8dddf456e01d0e55e3a3925;hb=25220160fc09e185bbf9f13f7565bb568cc5a463;hp=91bce92c9db82f0d8ab7312f5ea70da2c22f1881;hpb=1e32899153e9e52aaec1e651e0c33a563b8aaed8;p=citadel.git

diff --git a/webcit/who.c b/webcit/who.c
index 91bce92c9..11c68d86c 100644
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -1,281 +1,307 @@
-/*
- * $Id$
- */
-/**
- * \defgroup DislpayWho Display a list of all users currently logged on to the Citadel server.
- * \ingroup WebcitDisplayItems
- */
-/*@{*/
+
 #include "webcit.h"
 
+CtxType CTX_WHO = CTX_NONE;
+
+typedef struct UserStateStruct {
+	StrBuf *UserName;
+	StrBuf *Room;
+	StrBuf *Host;
+	StrBuf *UserAgent;
+	StrBuf *RealRoom;
+	StrBuf *RealHost;
+	long LastActive;
+	int Session;
+	int Idle;
+	int IdleSince;
+	int SessionCount;
+} UserStateStruct;
+
+void DestroyUserStruct(void *vUser)
+{
+	UserStateStruct *User = (UserStateStruct*) vUser;
+	FreeStrBuf(&User->UserName);
+	FreeStrBuf(&User->Room);
+	FreeStrBuf(&User->Host);
+	FreeStrBuf(&User->RealRoom);
+	FreeStrBuf(&User->RealHost);
+	FreeStrBuf(&User->UserAgent);
+	free(User);
+}
+
+int CompareUserStruct(const void *VUser1, const void *VUser2)
+{
+	const UserStateStruct *User1 = (UserStateStruct*) GetSearchPayload(VUser1);
+	const UserStateStruct *User2 = (UserStateStruct*) GetSearchPayload(VUser2);
+	
+	if (User1->Idle != User2->Idle)
+		return User1->Idle > User2->Idle;
+	return strcasecmp(ChrPtr(User1->UserName), 
+			  ChrPtr(User2->UserName));
+}
+
 
+int GetWholistSection(HashList *List, time_t now, StrBuf *Buf, const char *FilterName, long FNLen)
+{
+	wcsession *WCC = WC;
+	UserStateStruct *User, *OldUser;
+	void *VOldUser;
+	size_t BufLen;
+	const char *Pos;
 
-/**
- * \brief Display inner div of Wholist
+	serv_puts("RWHO");
+	StrBuf_ServGetln(Buf);
+	if (GetServerStatus(Buf, NULL) == 1) {
+		while (BufLen = StrBuf_ServGetln(Buf), 
+		       ((BufLen >= 0) && 
+			((BufLen != 3) || strcmp(ChrPtr(Buf), "000"))))
+		{
+			if (BufLen <= 0)
+			    continue;
+			Pos = NULL;
+			User = (UserStateStruct*) malloc(sizeof(UserStateStruct));
+			User->Session = StrBufExtractNext_int(Buf, &Pos, '|');
+
+			User->UserName = NewStrBufPlain(NULL, BufLen);
+			StrBufExtract_NextToken(User->UserName, Buf, &Pos, '|');
+			
+			User->Room = NewStrBufPlain(NULL, BufLen);
+			StrBufExtract_NextToken(User->Room, Buf, &Pos, '|');
+
+			User->Host = NewStrBufPlain(NULL, BufLen);
+			StrBufExtract_NextToken(User->Host, Buf, &Pos, '|');
+
+			User->UserAgent = NewStrBufPlain(NULL, BufLen);
+			StrBufExtract_NextToken(User->UserAgent, Buf, &Pos, '|');
+
+			User->LastActive = StrBufExtractNext_long(Buf, &Pos, '|');
+			StrBufSkip_NTokenS(Buf, &Pos, '|', 3);
+
+			User->RealRoom = NewStrBufPlain(NULL, BufLen);
+			StrBufExtract_NextToken(User->RealRoom, Buf, &Pos, '|');
+
+			User->RealHost = NewStrBufPlain(NULL, BufLen);
+			StrBufExtract_NextToken(User->RealHost, Buf, &Pos, '|');
+			
+			User->Idle = (now - User->LastActive) > 900L;
+			User->IdleSince = (now - User->LastActive) / 60;
+			User->SessionCount = 1;
+
+			if (FilterName == NULL) {
+				if (GetHash(List, 
+					    SKEY(User->UserName), 
+					    &VOldUser)) {
+					OldUser = VOldUser;
+					OldUser->SessionCount++;
+					if (!User->Idle) {
+						if (User->Session == WCC->ctdl_pid) 
+							OldUser->Session = User->Session;
+						
+						OldUser->Idle = User->Idle;
+						OldUser->LastActive = User->LastActive;
+					}
+					DestroyUserStruct(User);
+				}
+				else
+					Put(List, 
+					    SKEY(User->UserName), 
+					    User, DestroyUserStruct);
+			}
+			else {
+				if (strcmp(FilterName, ChrPtr(User->UserName)) == 0)
+				{
+					Put(List, 
+					    SKEY(User->UserName), 
+					    User, DestroyUserStruct);
+				}
+				else 
+				{
+					DestroyUserStruct(User);
+				}
+			}
+		}
+		if (FilterName == NULL)
+			SortByPayload(List, CompareUserStruct);
+		return 1;
+	}
+	else {
+		return 0;
+	}
+}
+
+/*
+ * end session
  */
-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;
-
-	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"));
+void terminate_session(void)
+{
+	char buf[SIZ];
 
-	serv_puts("TIME");
+	serv_printf("TERM %s", bstr("which_session"));
 	serv_getln(buf, sizeof buf);
-	if (buf[0] == '2') {
-		now = extract_long(&buf[4], 0);
+	url_do_template();
+}
+
+
+void _terminate_session(void) {
+	slrp_highest();
+	terminate_session();
+}
+
+HashList *GetWholistHash(StrBuf *Target, WCTemplputParams *TP)
+
+{
+	const char *ch = NULL;
+	int HashUniq = 1;
+	long len;
+	StrBuf *FilterNameStr = NULL;
+	StrBuf *Buf;
+	HashList *List;
+        time_t now;
+
+	Buf = NewStrBuf();
+
+	serv_puts("TIME");
+	StrBuf_ServGetln(Buf);
+	if (GetServerStatus(Buf, NULL)  == 2) {
+		const char *pos = ChrPtr(Buf) + 4;
+		now = StrBufExtractNext_long(Buf, &pos, '|');
 	}
 	else {
 		now = time(NULL);
 	}
+	if (HaveTemplateTokenString(NULL, TP, 2, &ch, &len))
+	{
+		FilterNameStr = NewStrBuf();
+		GetTemplateTokenString(FilterNameStr, TP, 2, &ch, &len);
+		HashUniq = 0;
+	}
 
-	serv_puts("RWHO");
-	serv_getln(buf, sizeof buf);
-	if (buf[0] == '1') {
-		while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-			sess = extract_int(buf, 0);
-			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);
-
-			bg = 1 - bg;
-			wprintf("<tr bgcolor=\"#%s\">",
-				(bg ? "DDDDDD" : "FFFFFF")
-			);
-
-
-			wprintf("<td>");
-			if ((WC->is_aide) &&
-			    (sess != WC->ctdl_pid)) {
-				wprintf(" <a href=\"terminate_session?which_session=%d", sess);
-				wprintf("\" onClick=\"return ConfirmKill();\">%s</a>", _("(kill)"));
-			}
-			if (sess == WC->ctdl_pid) {
-				wprintf(" <a href=\"edit_me\">%s</a>", _("(edit)"));
-			}
-			wprintf("</td>");
-
-			/** (link to page this user) */
-			wprintf("<td><a href=\"display_page?recp=");
-			urlescputs(user);
-			wprintf("\">"
-				"<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>");
+	List = NewHash(HashUniq, NULL);
+	GetWholistSection(List, now, Buf, ch, len);
+	FreeStrBuf(&Buf);
+	FreeStrBuf(&FilterNameStr);
+	return List;
+}
 
 
+void DeleteWholistHash(HashList **KillMe)
+{
+	DeleteHash(KillMe);
+}
 
-			/** username (link to user bio/photo page) */
-			wprintf("<a href=\"showuser?who=");
-			urlescputs(user);
-			wprintf("\">");
-			escputs(user);
-			wprintf("</a>");
+void tmplput_who_username(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendTemplate(Target, TP, User->UserName, 0);
+}
 
-			/** room */
-			wprintf("</td>\n\t<td>");
-			escputs(room);
-			if (strlen(realroom) > 0) {
-				wprintf("<br /><i>");
-				escputs(realroom);
-				wprintf("</i>");
-			}
-			wprintf("</td>\n\t<td>");
-
-			/** hostname */
-			escputs(host);
-			if (strlen(realhost) > 0) {
-				wprintf("<br /><i>");
-				escputs(realhost);
-				wprintf("</i>");
-			}
-			wprintf("</td>\n</tr>");
-		}
-	}
-	wprintf("</table>");
+void tmplput_who_UserAgent(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendTemplate(Target, TP, User->UserAgent, 0);
 }
 
+void tmplput_who_room(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendTemplate(Target, TP, User->Room, 0);
+}
 
-/**
- * \brief who is on?
- */
-void who(void)
+void tmplput_who_host(StrBuf *Target, WCTemplputParams *TP)
 {
-	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);
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendTemplate(Target, TP, User->Host, 0);
 }
 
-/**
- * \brief end session \todo what??? does this belong here? 
- */
-void terminate_session(void)
+void tmplput_who_realroom(StrBuf *Target, WCTemplputParams *TP)
 {
-	char buf[SIZ];
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendTemplate(Target, TP, User->RealRoom, 0);
+}
+int conditional_who_realroom(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	return StrLength(User->RealRoom) > 0;
+}
 
-	serv_printf("TERM %s", bstr("which_session"));
-	serv_getln(buf, sizeof buf);
-	who();
+void tmplput_who_realhost(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendTemplate(Target, TP, User->RealHost, 0);
+}
+int conditional_who_realhost(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	return StrLength(User->RealHost) > 0;
 }
 
+void tmplput_who_lastactive(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendPrintf(Target, "%d", User->LastActive);
+}
 
-/**
- * \brief Change your session info (fake roomname and hostname)
- */
-void edit_me(void)
+void tmplput_who_idlesince(StrBuf *Target, WCTemplputParams *TP)
 {
-	char buf[SIZ];
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendPrintf(Target, "%d", User->IdleSince);
+}
 
-	if (strlen(bstr("change_room_name_button")) > 0) {
-		serv_printf("RCHG %s", bstr("fake_roomname"));
-		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_getln(buf, sizeof buf);
-		http_redirect("who");
-	} else if (strlen(bstr("change_user_name_button")) > 0) {
-		serv_printf("UCHG %s", bstr("fake_username"));
-		serv_getln(buf, sizeof buf);
-		http_redirect("who");
-	} else if (strlen(bstr("cancel_button")) > 0) {
-		http_redirect("who");
-	} else {
-		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=\"change_host_name_button\" VALUE=\"%s\">",
-			_("Change host name"));
-		wprintf("</TD>\n</TR>\n");
-
-		if (WC->is_aide) {
-			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=\"change_user_name_button\" VALUE=\"%s\">",
-				_("Change user name"));
-			wprintf("</TD>\n</TR>\n");
-		}
-		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);
-	}
+void tmplput_who_session(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendPrintf(Target, "%d", User->Session);
+}
+
+int conditional_who_idle(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	return User->Idle;
+}
+
+int conditional_who_nsessions(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	return User->SessionCount;
 }
 
+void tmplput_who_nsessions(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendPrintf(Target, "%d", User->SessionCount);
+}
 
-/*@}*/
+int conditional_who_isme(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	return (User->Session == WC->ctdl_pid);
+}
+
+void 
+InitModule_WHO
+(void)
+{
+	RegisterCTX(CTX_WHO);
+
+	WebcitAddUrlHandler(HKEY("terminate_session"), "", 0, _terminate_session, 0);
+
+	RegisterIterator("WHOLIST", 1, NULL, GetWholistHash, NULL, DeleteWholistHash, CTX_WHO, CTX_NONE, IT_NOFLAG);
+
+	RegisterNamespace("WHO:NAME",        0, 1, tmplput_who_username, NULL, CTX_WHO);
+	RegisterNamespace("WHO:USERAGENT",   0, 1, tmplput_who_UserAgent, NULL, CTX_WHO);
+	RegisterNamespace("WHO:ROOM",        0, 1, tmplput_who_room, NULL, CTX_WHO);
+	RegisterNamespace("WHO:HOST",        0, 1, tmplput_who_host, NULL, CTX_WHO);
+	RegisterNamespace("WHO:REALROOM",    0, 1, tmplput_who_realroom, NULL, CTX_WHO);
+	RegisterNamespace("WHO:REALHOST",    0, 1, tmplput_who_realhost, NULL, CTX_WHO);
+	RegisterNamespace("WHO:LASTACTIVE",  0, 1, tmplput_who_lastactive, NULL, CTX_WHO);
+	RegisterNamespace("WHO:IDLESINCE",   0, 1, tmplput_who_idlesince, NULL, CTX_WHO);
+	RegisterNamespace("WHO:SESSION",     0, 1, tmplput_who_session, NULL, CTX_WHO);
+	RegisterNamespace("WHO:NSESSIONS",   0, 1, tmplput_who_nsessions, NULL, CTX_WHO);
+	RegisterNamespace("WHO:NSESSIONS",   0, 1, tmplput_who_nsessions, NULL, CTX_WHO);
+
+	RegisterConditional("WHO:IDLE",      1, conditional_who_idle, CTX_WHO);
+	RegisterConditional("WHO:NSESSIONS", 1, conditional_who_nsessions, CTX_WHO);
+	RegisterConditional("WHO:ISME",      1, conditional_who_isme, CTX_WHO);
+	RegisterConditional("WHO:REALROOM",  1, conditional_who_realroom, CTX_WHO);
+	RegisterConditional("WHO:REALHOST",  1, conditional_who_realhost, CTX_WHO);
+}