X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwho.c;h=11c68d86c99602c3c8dddf456e01d0e55e3a3925;hb=25220160fc09e185bbf9f13f7565bb568cc5a463;hp=f93d9624d93cf67aa5961488512d769b1cc16c31;hpb=f4f1153a964cf70beeafb637d60b3827f327418b;p=citadel.git
diff --git a/webcit/who.c b/webcit/who.c
index f93d9624d..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,7 +41,7 @@ int CompareUserStruct(const void *VUser1, const void *VUser2)
}
-int GetWholistSection(HashList *List, time_t now, StrBuf *Buf)
+int GetWholistSection(HashList *List, time_t now, StrBuf *Buf, const char *FilterName, long FNLen)
{
wcsession *WCC = WC;
UserStateStruct *User, *OldUser;
@@ -49,9 +50,12 @@ int GetWholistSection(HashList *List, time_t now, StrBuf *Buf)
const char *Pos;
serv_puts("RWHO");
- StrBuf_ServGetlnBuffered(Buf);
+ StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) == 1) {
- while (BufLen = StrBuf_ServGetlnBuffered(Buf), strcmp(ChrPtr(Buf), "000")) {
+ while (BufLen = StrBuf_ServGetln(Buf),
+ ((BufLen >= 0) &&
+ ((BufLen != 3) || strcmp(ChrPtr(Buf), "000"))))
+ {
if (BufLen <= 0)
continue;
Pos = NULL;
@@ -67,7 +71,8 @@ int GetWholistSection(HashList *List, time_t now, StrBuf *Buf)
User->Host = NewStrBufPlain(NULL, BufLen);
StrBufExtract_NextToken(User->Host, Buf, &Pos, '|');
- StrBufSkip_NTokenS(Buf, &Pos, '|', 1);
+ User->UserAgent = NewStrBufPlain(NULL, BufLen);
+ StrBufExtract_NextToken(User->UserAgent, Buf, &Pos, '|');
User->LastActive = StrBufExtractNext_long(Buf, &Pos, '|');
StrBufSkip_NTokenS(Buf, &Pos, '|', 3);
@@ -82,34 +87,44 @@ int GetWholistSection(HashList *List, time_t now, StrBuf *Buf)
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(&Buf);
+ if (FilterName == NULL)
+ SortByPayload(List, CompareUserStruct);
return 1;
}
else {
- FreeStrBuf(&Buf);
return 0;
}
}
@@ -127,86 +142,6 @@ void terminate_session(void)
}
-/*
- * 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("
\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("
\n");
-
- wprintf("
\n");
- wDumpContent(1);
- }
-}
-
void _terminate_session(void) {
slrp_highest();
terminate_session();
@@ -215,6 +150,10 @@ void _terminate_session(void) {
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;
@@ -222,7 +161,7 @@ HashList *GetWholistHash(StrBuf *Target, WCTemplputParams *TP)
Buf = NewStrBuf();
serv_puts("TIME");
- StrBuf_ServGetlnBuffered(Buf);
+ StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) == 2) {
const char *pos = ChrPtr(Buf) + 4;
now = StrBufExtractNext_long(Buf, &pos, '|');
@@ -230,10 +169,17 @@ HashList *GetWholistHash(StrBuf *Target, WCTemplputParams *TP)
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, Buf);
+ List = NewHash(HashUniq, NULL);
+ GetWholistSection(List, now, Buf, ch, len);
FreeStrBuf(&Buf);
+ FreeStrBuf(&FilterNameStr);
return List;
}
@@ -245,78 +191,89 @@ void DeleteWholistHash(HashList **KillMe)
void tmplput_who_username(StrBuf *Target, WCTemplputParams *TP)
{
- UserStateStruct *User = (UserStateStruct*) CTX;
+ UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
StrBufAppendTemplate(Target, TP, User->UserName, 0);
}
+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;
+ UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
StrBufAppendTemplate(Target, TP, User->Room, 0);
}
void tmplput_who_host(StrBuf *Target, WCTemplputParams *TP)
{
- UserStateStruct *User = (UserStateStruct*) CTX;
+ UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
StrBufAppendTemplate(Target, TP, User->Host, 0);
}
void tmplput_who_realroom(StrBuf *Target, WCTemplputParams *TP)
{
- UserStateStruct *User = (UserStateStruct*) CTX;
+ UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
StrBufAppendTemplate(Target, TP, User->RealRoom, 0);
}
int conditional_who_realroom(StrBuf *Target, WCTemplputParams *TP)
{
- UserStateStruct *User = (UserStateStruct*) CTX;
+ UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
return StrLength(User->RealRoom) > 0;
}
void tmplput_who_realhost(StrBuf *Target, WCTemplputParams *TP)
{
- UserStateStruct *User = (UserStateStruct*) CTX;
+ 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;
+ UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
StrBufAppendPrintf(Target, "%d", User->LastActive);
}
void tmplput_who_idlesince(StrBuf *Target, WCTemplputParams *TP)
{
- UserStateStruct *User = (UserStateStruct*) CTX;
+ UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
StrBufAppendPrintf(Target, "%d", User->IdleSince);
}
void tmplput_who_session(StrBuf *Target, WCTemplputParams *TP)
{
- UserStateStruct *User = (UserStateStruct*) CTX;
+ UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
StrBufAppendPrintf(Target, "%d", User->Session);
}
int conditional_who_idle(StrBuf *Target, WCTemplputParams *TP)
{
- UserStateStruct *User = (UserStateStruct*) CTX;
+ UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
return User->Idle;
}
int conditional_who_nsessions(StrBuf *Target, WCTemplputParams *TP)
{
- UserStateStruct *User = (UserStateStruct*) CTX;
+ UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
return User->SessionCount;
}
void tmplput_who_nsessions(StrBuf *Target, WCTemplputParams *TP)
{
- UserStateStruct *User = (UserStateStruct*) CTX;
+ UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
StrBufAppendPrintf(Target, "%d", User->SessionCount);
}
int conditional_who_isme(StrBuf *Target, WCTemplputParams *TP)
{
- UserStateStruct *User = (UserStateStruct*) CTX;
+ UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
return (User->Session == WC->ctdl_pid);
}
@@ -324,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, IT_NOFLAG);
-
- 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);
}