fix evaluating of userlist bios...

diff --git a/webcit/static/t/user/list_section.html b/webcit/static/t/user/list_section.html
index 1f456de7f826c62015841b5f67733895d14799e0..0c5f6823b05e14ec5e14714c02e470708417a7b8 100644 (file)
--- a/webcit/static/t/user/list_section.html
+++ b/webcit/static/t/user/list_section.html
@@ -1,9 +1,8 @@
 <tr class="<?ITERATE:ODDEVEN>"><td>
-    <?!("COND:USERLIST:HAVEBIO", 1)><a href="showuser?who=<?USERLIST:USERNAME('U')>"><?USERLIST:USERNAME('X')></a><?!("X", 1)>
-    <??("COND:USERLIST:HAVEBIO", 2)><?USERLIST:USERNAME('X')><??("X", 2)>
+    <?!("COND:USERLIST:HAVEBIO", 1)><a href="showuser?who=<?USERLIST:USERNAME('U')>"><?USERLIST:USERNAME('X')></a><?!("X", 1)><??("COND:USERLIST:HAVEBIO", 2)><?USERLIST:USERNAME('X')><??("X", 2)>
   </td>
 <td><?USERLIST:UID></td>
-<td><?USERLIST:ACCLVLSTR)>(<?USERLIST:ACCLVLNO>)</td>
+<td><?USERLIST:ACCLVLSTR>(<?USERLIST:ACCLVLNO>)</td>
 <td><?USERLIST:LASTLOGON:STR></td>
 <td><?USERLIST:NLOGONS></td>
 <td><?USERLIST:NPOSTS></td>

diff --git a/webcit/useredit.c b/webcit/useredit.c
index 81a5bd99545c9c5d7e2ca6f1fb4dbecf74637f6e..ef242981f14737b2bb67c4bb9d4961ad12239e50 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -101,6 +101,7 @@ UserListEntry* NewUserListEntry(StrBuf *SerializedUserList)
        ul->nPosts      = StrBufExtractNext_int( SerializedUserList, &Pos, '|');
        StrBufExtract_NextToken(ul->Passvoid,    SerializedUserList, &Pos, '|');
        ul->Flags = 0;
+       ul->HasBio = 0;
        ul->DaysTillPurge = -1;
        return ul;
 }
@@ -302,7 +303,9 @@ HashList *iterate_load_userlist(StrBuf *Target, WCTemplputParams *TP)
                }
 
                serv_puts("LBIO 1");
+               StrBuf_ServGetln(Buf);
                if (GetServerStatus(Buf, NULL) == 1)
+                       Done = 0;
                        while (!Done) {
                        len = StrBuf_ServGetln(Buf);
                        if ((len <0) ||