X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwho.c;h=ac30cc72dd2e040fdc4d2ac212ea10bf692649fb;hb=eb3066c0522617c7c5212e0e1508e03c9a87e1e5;hp=c3df2556dfef80c3fa6824165d09b788c5112531;hpb=fcb8c4169baa629eb3c1a4979c7c8c32f1560389;p=citadel.git
diff --git a/webcit/who.c b/webcit/who.c
index c3df2556d..ac30cc72d 100644
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -37,7 +37,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;
@@ -48,7 +48,10 @@ int GetWholistSection(HashList *List, time_t now, StrBuf *Buf)
serv_puts("RWHO");
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) == 1) {
- while (BufLen = StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) {
+ while (BufLen = StrBuf_ServGetln(Buf),
+ ((BufLen >= 0) &&
+ ((BufLen != 3) || strcmp(ChrPtr(Buf), "000"))))
+ {
if (BufLen <= 0)
continue;
Pos = NULL;
@@ -79,28 +82,41 @@ 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);
+ if (FilterName == NULL)
+ SortByPayload(List, CompareUserStruct);
return 1;
}
else {
@@ -128,77 +144,25 @@ void edit_me(void)
{
char buf[SIZ];
+ output_headers(1, 0, 0, 0, 0, 0);
if (havebstr("change_room_name_button")) {
serv_printf("RCHG %s", bstr("fake_roomname"));
serv_getln(buf, sizeof buf);
- http_redirect("who");
+ do_template("who");
} else if (havebstr("change_host_name_button")) {
serv_printf("HCHG %s", bstr("fake_hostname"));
serv_getln(buf, sizeof buf);
- http_redirect("who");
+ do_template("who");
} else if (havebstr("change_user_name_button")) {
serv_printf("UCHG %s", bstr("fake_username"));
serv_getln(buf, sizeof buf);
- http_redirect("who");
+ do_template("who");
} else if (havebstr("cancel_button")) {
- http_redirect("who");
+ do_template("who");
} else {
- output_headers(1, 1, 0, 0, 0, 0);
-
- wc_printf("
\n");
-
- wc_printf(_("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. "));
- wc_printf("
\n");
-
- wc_printf("
\n");
- wDumpContent(1);
+ do_template("who_edit");
}
+ end_burst();
}
void _terminate_session(void) {
@@ -209,6 +173,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;
@@ -224,10 +192,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;
}
@@ -239,83 +214,83 @@ 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_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;
+ 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);
}
@@ -328,7 +303,7 @@ InitModule_WHO
WebcitAddUrlHandler(HKEY("terminate_session"), "", 0, _terminate_session, 0);
WebcitAddUrlHandler(HKEY("edit_me"), "", 0, edit_me, 0);
- RegisterIterator("WHOLIST", 0, NULL, GetWholistHash, NULL, DeleteWholistHash, CTX_WHO, CTX_NONE, IT_NOFLAG);
+ 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:ROOM", 0, 1, tmplput_who_room, NULL, CTX_WHO);