Minor formatting cleanup

[citadel.git] / webcit / who.c

diff --git a/webcit/who.c b/webcit/who.c
index 95ba557cd715d7e74ad471314d1a6ac36fd0efa4..8af2c8fa9c151948ef9795bde9925c8686a1f3db 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -1,13 +1,8 @@
 /*
  * $Id$
  */
-/**
- * \defgroup DislpayWho Display a list of all users currently logged on to the Citadel server.
- * \ingroup WebcitDisplayItems
- */
-/*@{*/
-#include "webcit.h"
 
+#include "webcit.h"
 
 typedef struct UserStateStruct {
        char *UserName;
@@ -50,7 +45,9 @@ int CompareUserStruct(const void *VUser1, const void *VUser2)
 
 int GetWholistSection(HashList *List, time_t now)
 {
+       struct wcsession *WCC = WC;     /* This is done to make it run faster; WC is a function */
        UserStateStruct *User, *OldUser;
+       void *VOldUser;
        char buf[SIZ], user[SIZ], room[SIZ], host[SIZ],
                realroom[SIZ], realhost[SIZ];
        size_t BufLen;
@@ -59,6 +56,8 @@ int GetWholistSection(HashList *List, time_t now)
        serv_getln(buf, sizeof buf);
        if (buf[0] == '1') {
                while (BufLen = serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                       if (BufLen <= 0)
+                           continue;
                        User = (UserStateStruct*) malloc(sizeof(UserStateStruct));
                        User->Session = extract_int(buf, 0);
 
@@ -86,9 +85,13 @@ int GetWholistSection(HashList *List, time_t now)
                        User->Idle = (now - User->LastActive) > 900L;
                        User->SessionCount = 1;
 
-                       if (GetHash(List, User->UserName, User->UserNameLen, (void**)&OldUser)) {
+                       if (GetHash(List, User->UserName, User->UserNameLen, &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;
                                }
@@ -104,18 +107,18 @@ int GetWholistSection(HashList *List, time_t now)
                return 0;
 }
 
-/**
- * \brief Display inner div of Wholist
+/*
+ * Display inner div of Wholist
  */
 void who_inner_div(void) {
        UserStateStruct *User;
+       void *VUser;
        char buf[SIZ];
        struct wcsession *WCC = WC;     /* This is done to make it run faster; WC is a function */
        HashList *List;
        HashPos  *it;
        char *UserName;
        long len;
-       int sess;
        time_t now;
        int bg = 0;
 
@@ -141,8 +144,8 @@ void who_inner_div(void) {
 
        if (GetWholistSection(List, now)) {
                it = GetNewHashPos();
-               while (GetNextHashPos(List, it, &len, &UserName, (void**)&User)) {
-
+               while (GetNextHashPos(List, it, &len, &UserName, &VUser)) {
+                       User = VUser;
                        bg = 1 - bg;
                        wprintf("<tr class=\"%s\">",
                                (bg ? "even" : "odd")
@@ -151,16 +154,16 @@ void who_inner_div(void) {
 
                        wprintf("<td class=\"edit_col\">");
                        if ((WCC->is_aide) &&
-                           (sess != WCC->ctdl_pid)) {
-                               wprintf(" <a href=\"terminate_session?which_session=%d", sess);
+                           (User->Session != WCC->ctdl_pid)) {
+                               wprintf(" <a href=\"terminate_session?which_session=%d", User->Session);
                                wprintf("\" onClick=\"return ConfirmKill();\">%s</a>", _("(kill)"));
                        }
-                       if (sess == WCC->ctdl_pid) {
+                       if (User->Session == WCC->ctdl_pid) {
                                wprintf(" <a href=\"edit_me\">%s</a>", _("(edit)"));
                        }
                        wprintf("</td>");
 
-                       /** (link to page this user) */
+                       /* (link to page this user) */
                        wprintf("<td width=\"5%\"><a href=\"display_page?recp=");
                        urlescputs(User->UserName);
                        wprintf("\">"
@@ -170,7 +173,7 @@ void who_inner_div(void) {
                                " border=\"0\" /></a> ");
                        wprintf("</td>");
 
-                       /** (idle flag) */
+                       /* (idle flag) */
                        wprintf("<td width=\"5%\">");
                        if (User->Idle) {
                                wprintf(" "
@@ -191,7 +194,7 @@ void who_inner_div(void) {
                        }
                        wprintf("</td>\n<td>");
 
-                       /** username (link to user bio/photo page) */
+                       /* username (link to user bio/photo page) */
                        wprintf("<a href=\"showuser?who=");
                        urlescputs(User->UserName);
                        wprintf("\">");
@@ -200,7 +203,7 @@ void who_inner_div(void) {
                                wprintf(" [%d] ", User->SessionCount);
                        wprintf("</a>");
 
-                       /** room */
+                       /* room */
                        wprintf("</td>\n\t<td>");
                        escputs(User->Room);
                        if (!IsEmptyStr(User->RealRoom) ) {
@@ -210,7 +213,7 @@ void who_inner_div(void) {
                        }
                        wprintf("</td>\n\t<td class=\"host_col\">");
 
-                       /** hostname */
+                       /* hostname */
                        escputs(User->Host);
                        if (!IsEmptyStr(User->RealHost)) {
                                wprintf("<br /><i>");
@@ -227,8 +230,8 @@ void who_inner_div(void) {
 }
 
 
-/**
- * \brief who is on?
+/*
+ * Display a list of users currently logged in to the system
  */
 void who(void)
 {
@@ -274,7 +277,7 @@ void who(void)
        );
        wprintf("</div></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
@@ -290,8 +293,8 @@ void who(void)
        wDumpContent(1);
 }
 
-/**
- * \brief end session \todo what??? does this belong here? 
+/*
+ * end session
  */
 void terminate_session(void)
 {
@@ -303,26 +306,26 @@ void terminate_session(void)
 }
 
 
-/**
- * \brief Change your session info (fake roomname and hostname)
+/*
+ * Change your session info (fake roomname and hostname)
  */
 void edit_me(void)
 {
        char buf[SIZ];
 
-       if (!IsEmptyStr(bstr("change_room_name_button"))) {
+       if (havebstr("change_room_name_button")) {
                serv_printf("RCHG %s", bstr("fake_roomname"));
                serv_getln(buf, sizeof buf);
                http_redirect("who");
-       } else if (!IsEmptyStr(bstr("change_host_name_button"))) {
+       } else if (havebstr("change_host_name_button")) {
                serv_printf("HCHG %s", bstr("fake_hostname"));
                serv_getln(buf, sizeof buf);
                http_redirect("who");
-       } else if (!IsEmptyStr(bstr("change_user_name_button"))) {
+       } else if (havebstr("change_user_name_button")) {
                serv_printf("UCHG %s", bstr("fake_username"));
                serv_getln(buf, sizeof buf);
                http_redirect("who");
-       } else if (!IsEmptyStr(bstr("cancel_button"))) {
+       } else if (havebstr("cancel_button")) {
                http_redirect("who");
        } else {
                output_headers(1, 1, 0, 0, 0, 0);
@@ -383,11 +386,12 @@ void edit_me(void)
        }
 }
 
-/**
- * \brief Wholist section
+/*
+ * Wholist section
  */
 void wholist_section(void) {
        UserStateStruct *User;
+       void *VUser;
        HashList *List;
        HashPos  *it;
        char *UserName;
@@ -409,7 +413,8 @@ void wholist_section(void) {
        if (GetWholistSection(List, now)) {
                SortByPayload(List, CompareUserStruct);
                it = GetNewHashPos();
-               while (GetNextHashPos(List, it, &len, &UserName, (void**)&User)) {
+               while (GetNextHashPos(List, it, &len, &UserName, &VUser)) {
+                       User = VUser;
                        if (strcmp(User->UserName, NLI)) {
                                wprintf("<li class=\"");
                                if (User->Idle) {
@@ -429,7 +434,3 @@ void wholist_section(void) {
        }
        DeleteHash(&List);
 }
-
-
-
-/*@}*/