From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 17 Jul 2011 23:10:44 +0000 (+0000)
Subject: fix evaluating of userlist bios...
X-Git-Tag: v8.11~568
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=418d0f7288d2897e18042614189726a179a95e6b;hp=a0eb4609b896a62f0cf9ebf15f4b6228bda4ed32;p=citadel.git

fix evaluating of userlist bios...
---

diff --git a/webcit/static/t/user/list_section.html b/webcit/static/t/user/list_section.html
index 1f456de7f..0c5f6823b 100644
--- 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 81a5bd995..ef242981f 100644
--- 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) ||