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

diff --git a/webcit/who.c b/webcit/who.c
index 33f9f99a3..11c68d86c 100644
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -1,13 +1,13 @@
-/*
- * $Id$
- */
 
 #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;
@@ -25,6 +25,7 @@ void DestroyUserStruct(void *vUser)
 	FreeStrBuf(&User->Host);
 	FreeStrBuf(&User->RealRoom);
 	FreeStrBuf(&User->RealHost);
+	FreeStrBuf(&User->UserAgent);
 	free(User);
 }
 
@@ -40,75 +41,92 @@ int CompareUserStruct(const void *VUser1, const void *VUser2)
 }
 
 
-int GetWholistSection(HashList *List, time_t now)
+int GetWholistSection(HashList *List, time_t now, StrBuf *Buf, const char *FilterName, long FNLen)
 {
-	StrBuf *Buf, *XBuf;
-	struct wcsession *WCC = WC;	/* This is done to make it run faster; WC is a function */
+	wcsession *WCC = WC;
 	UserStateStruct *User, *OldUser;
 	void *VOldUser;
 	size_t BufLen;
-	char buf[SIZ];
+	const char *Pos;
 
 	serv_puts("RWHO");
-	serv_getln(buf, sizeof buf);
-	if (buf[0] == '1') {
-		Buf = NewStrBuf();
-		XBuf = NewStrBuf();
-		while (BufLen = StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) {
+	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 = StrBufExtract_int(Buf, 0, '|');
+			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, '|');
 
-			StrBufExtract_token(XBuf, Buf, 1, '|');
-			User->UserName = NewStrBufDup(XBuf);
+			User->Host = NewStrBufPlain(NULL, BufLen);
+			StrBufExtract_NextToken(User->Host, Buf, &Pos, '|');
 
-			StrBufExtract_token(XBuf, Buf, 2, '|');
-			User->Room = NewStrBufDup(XBuf);
+			User->UserAgent = NewStrBufPlain(NULL, BufLen);
+			StrBufExtract_NextToken(User->UserAgent, Buf, &Pos, '|');
 
-			StrBufExtract_token(XBuf, Buf, 3, '|');
-			User->Host = NewStrBufDup(XBuf);
+			User->LastActive = StrBufExtractNext_long(Buf, &Pos, '|');
+			StrBufSkip_NTokenS(Buf, &Pos, '|', 3);
 
-			StrBufExtract_token(XBuf, Buf, 9, '|');
-			User->RealRoom = NewStrBufDup(XBuf);
+			User->RealRoom = NewStrBufPlain(NULL, BufLen);
+			StrBufExtract_NextToken(User->RealRoom, Buf, &Pos, '|');
 
-			StrBufExtract_token(XBuf, Buf, 10, '|');
-			User->RealHost = NewStrBufDup(XBuf);
+			User->RealHost = NewStrBufPlain(NULL, BufLen);
+			StrBufExtract_NextToken(User->RealHost, Buf, &Pos, '|');
 			
-			User->LastActive = StrBufExtract_long(Buf, 5, '|');
 			User->Idle = (now - User->LastActive) > 900L;
 			User->IdleSince = (now - User->LastActive) / 60;
 			User->SessionCount = 1;
 
-			if (GetHash(List, 
-				    ChrPtr(User->UserName), 
-				    StrLength(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;
+			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);
 				}
-				DestroyUserStruct(User);
 			}
-			else
-				Put(List, 
-				    ChrPtr(User->UserName), 
-				    StrLength(User->UserName), 
-				    User, DestroyUserStruct);
 		}
-		SortByPayload(List, CompareUserStruct);
-
-		FreeStrBuf(&XBuf);
-		FreeStrBuf(&Buf);
+		if (FilterName == NULL)
+			SortByPayload(List, CompareUserStruct);
 		return 1;
 	}
-	else
+	else {
 		return 0;
+	}
 }
 
 /*
@@ -120,113 +138,48 @@ void terminate_session(void)
 
 	serv_printf("TERM %s", bstr("which_session"));
 	serv_getln(buf, sizeof buf);
-	///who();
 	url_do_template();
 }
 
 
-/*
- * Change your session info (fake roomname and hostname)
- */
-void edit_me(void)
-{
-	char buf[SIZ];
-
-	if (havebstr("change_room_name_button")) {
-		serv_printf("RCHG %s", bstr("fake_roomname"));
-		serv_getln(buf, sizeof buf);
-		http_redirect("who");
-	} else if (havebstr("change_host_name_button")) {
-		serv_printf("HCHG %s", bstr("fake_hostname"));
-		serv_getln(buf, sizeof buf);
-		http_redirect("who");
-	} else if (havebstr("change_user_name_button")) {
-		serv_printf("UCHG %s", bstr("fake_username"));
-		serv_getln(buf, sizeof buf);
-		http_redirect("who");
-	} else if (havebstr("cancel_button")) {
-		http_redirect("who");
-	} else {
-		output_headers(1, 1, 0, 0, 0, 0);
-
-		wprintf("<div id=\"banner\">\n");
-		wprintf("<table class=\"who_banner\"><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("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-
-		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 _terminate_session(void) {
 	slrp_highest();
 	terminate_session();
 }
 
-HashList *GetWholistHash(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+HashList *GetWholistHash(StrBuf *Target, WCTemplputParams *TP)
+
 {
+	const char *ch = NULL;
+	int HashUniq = 1;
+	long len;
+	StrBuf *FilterNameStr = NULL;
+	StrBuf *Buf;
 	HashList *List;
-	char buf[SIZ];
         time_t now;
 
+	Buf = NewStrBuf();
+
 	serv_puts("TIME");
-	serv_getln(buf, sizeof buf);
-	if (buf[0] == '2') {
-		now = extract_long(&buf[4], 0);
+	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;
+	}
 
-	List = NewHash(1, NULL);
-	GetWholistSection(List, now);
+	List = NewHash(HashUniq, NULL);
+	GetWholistSection(List, now, Buf, ch, len);
+	FreeStrBuf(&Buf);
+	FreeStrBuf(&FilterNameStr);
 	return List;
 }
 
@@ -236,80 +189,91 @@ void DeleteWholistHash(HashList **KillMe)
 	DeleteHash(KillMe);
 }
 
-void tmplput_who_username(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *vContext, int ContextType)
+void tmplput_who_username(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendTemplate(Target, TP, User->UserName, 0);
+}
+
+void tmplput_who_UserAgent(StrBuf *Target, WCTemplputParams *TP)
 {
-	UserStateStruct *User = (UserStateStruct*) vContext;
-	StrBufAppendTemplate(Target, nArgs, Tokens, vContext, ContextType, User->UserName, 0);
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendTemplate(Target, TP, User->UserAgent, 0);
 }
 
-void tmplput_who_room(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *vContext, int ContextType)
+void tmplput_who_room(StrBuf *Target, WCTemplputParams *TP)
 {
-	UserStateStruct *User = (UserStateStruct*) vContext;
-	StrBufAppendTemplate(Target, nArgs, Tokens, vContext, ContextType, User->Room, 0);
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendTemplate(Target, TP, User->Room, 0);
 }
 
-void tmplput_who_host(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *vContext, int ContextType)
+void tmplput_who_host(StrBuf *Target, WCTemplputParams *TP)
 {
-	UserStateStruct *User = (UserStateStruct*) vContext;
-	StrBufAppendTemplate(Target, nArgs, Tokens, vContext, ContextType, User->Host, 0);
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendTemplate(Target, TP, User->Host, 0);
 }
 
-void tmplput_who_realroom(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *vContext, int ContextType)
+void tmplput_who_realroom(StrBuf *Target, WCTemplputParams *TP)
 {
-	UserStateStruct *User = (UserStateStruct*) vContext;
-	StrBufAppendTemplate(Target, nArgs, Tokens, vContext, ContextType, User->RealRoom, 0);
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendTemplate(Target, TP, User->RealRoom, 0);
 }
-int conditional_who_realroom(WCTemplateToken *Tokens, void *vContext, int ContextType)
+int conditional_who_realroom(StrBuf *Target, WCTemplputParams *TP)
 {
-	UserStateStruct *User = (UserStateStruct*) vContext;
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
 	return StrLength(User->RealRoom) > 0;
 }
 
-void tmplput_who_realhost(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *vContext, int ContextType)
+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*) vContext;
-	StrBufAppendTemplate(Target, nArgs, Tokens, vContext, ContextType, User->RealHost, 0);
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	return StrLength(User->RealHost) > 0;
 }
 
-void tmplput_who_lastactive(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *vContext, int ContextType)
+void tmplput_who_lastactive(StrBuf *Target, WCTemplputParams *TP)
 {
-	UserStateStruct *User = (UserStateStruct*) vContext;
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
 	StrBufAppendPrintf(Target, "%d", User->LastActive);
 }
 
-void tmplput_who_idlesince(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *vContext, int ContextType)
+void tmplput_who_idlesince(StrBuf *Target, WCTemplputParams *TP)
 {
-	UserStateStruct *User = (UserStateStruct*) vContext;
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
 	StrBufAppendPrintf(Target, "%d", User->IdleSince);
 }
 
-void tmplput_who_session(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *vContext, int ContextType)
+void tmplput_who_session(StrBuf *Target, WCTemplputParams *TP)
 {
-	UserStateStruct *User = (UserStateStruct*) vContext;
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
 	StrBufAppendPrintf(Target, "%d", User->Session);
 }
 
-int conditional_who_idle(WCTemplateToken *Tokens, void *vContext, int ContextType)
+int conditional_who_idle(StrBuf *Target, WCTemplputParams *TP)
 {
-	UserStateStruct *User = (UserStateStruct*) vContext;
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
 	return User->Idle;
 }
 
-int conditional_who_nsessions(WCTemplateToken *Tokens, void *vContext, int ContextType)
+int conditional_who_nsessions(StrBuf *Target, WCTemplputParams *TP)
 {
-	UserStateStruct *User = (UserStateStruct*) vContext;
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
 	return User->SessionCount;
 }
 
-void tmplput_who_nsessions(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *vContext, int ContextType)
+void tmplput_who_nsessions(StrBuf *Target, WCTemplputParams *TP)
 {
-	UserStateStruct *User = (UserStateStruct*) vContext;
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
 	StrBufAppendPrintf(Target, "%d", User->SessionCount);
 }
 
-int conditional_who_isme(WCTemplateToken *Tokens, void *vContext, int ContextType)
+int conditional_who_isme(StrBuf *Target, WCTemplputParams *TP)
 {
-	UserStateStruct *User = (UserStateStruct*) vContext;
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
 	return (User->Session == WC->ctdl_pid);
 }
 
@@ -317,24 +281,27 @@ void
 InitModule_WHO
 (void)
 {
-	WebcitAddUrlHandler(HKEY("terminate_session"), _terminate_session, 0);
-	WebcitAddUrlHandler(HKEY("edit_me"), edit_me, 0);
-
-	RegisterIterator("WHOLIST", 0, NULL, GetWholistHash, NULL, DeleteWholistHash, CTX_WHO, CTX_NONE);
-
-	RegisterNamespace("WHO:NAME",        0, 1, tmplput_who_username, CTX_WHO);
-	RegisterNamespace("WHO:ROOM",        0, 1, tmplput_who_room, CTX_WHO);
-	RegisterNamespace("WHO:HOST",        0, 1, tmplput_who_host, CTX_WHO);
-	RegisterNamespace("WHO:REALROOM",    0, 1, tmplput_who_realroom, CTX_WHO);
-	RegisterNamespace("WHO:REALHOST",    0, 1, tmplput_who_realhost, CTX_WHO);
-	RegisterNamespace("WHO:LASTACTIVE",  0, 1, tmplput_who_lastactive, CTX_WHO);
-	RegisterNamespace("WHO:IDLESINCE",   0, 1, tmplput_who_idlesince, CTX_WHO);
-	RegisterNamespace("WHO:SESSION",     0, 1, tmplput_who_session, CTX_WHO);
-	RegisterNamespace("WHO:NSESSIONS",   0, 1, tmplput_who_nsessions, CTX_WHO);
-	RegisterNamespace("WHO:NSESSIONS",   0, 1, tmplput_who_nsessions, CTX_WHO);
-
-	RegisterConditional(HKEY("WHO:IDLE"),      1, conditional_who_idle, CTX_WHO);
-	RegisterConditional(HKEY("WHO:NSESSIONS"), 1, conditional_who_nsessions, CTX_WHO);
-	RegisterConditional(HKEY("WHO:ISME"),      1, conditional_who_isme, CTX_WHO);
-	RegisterConditional(HKEY("WHO:REALROOM"),  1, conditional_who_realroom, CTX_WHO);
+	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);
 }