From: Wilfried Göesgens <willi@citadel.org>
Date: Thu, 5 Nov 2009 22:06:52 +0000 (+0000)
Subject: * use right function to load the room list from the server
X-Git-Tag: v7.86~660
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=a4b004d8b4a5cbc7a5f22c91c8c0ba325c1438ad

* use right function to load the room list from the server
* cheaply check for 000
---

diff --git a/webcit/roomlist.c b/webcit/roomlist.c
index 6aac833c3..635f4586d 100644
--- a/webcit/roomlist.c
+++ b/webcit/roomlist.c
@@ -31,7 +31,7 @@ int SortFloorsByNameOrder(const void *vfloor1, const void *vfloor2)
 
 HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP) 
 {
-
+	int Done = 0;
 	const char *Err;
 	StrBuf *Buf;
 	HashList *floors;
@@ -61,19 +61,25 @@ HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP)
 	StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err); /* '100', we hope */
 	if (GetServerStatus(Buf, NULL) == 1) 
 	{
-		while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(Buf), "000")) 
-		{
+		while(!Done && StrBuf_ServGetln(Buf))
+			if ( (StrLength(Buf)==3) && 
+			     !strcmp(ChrPtr(Buf), "000")) 
+			{
+				Done = 1;
+			}
+			else
+			{
 			
-			Pos = NULL;
+				Pos = NULL;
 
-			Floor = malloc(sizeof(floor));
-			Floor->ID = StrBufExtractNext_int(Buf, &Pos, '|');
-			Floor->Name = NewStrBufPlain(NULL, StrLength(Buf));
-			StrBufExtract_NextToken(Floor->Name, Buf, &Pos, '|');
-			Floor->NRooms = StrBufExtractNext_long(Buf, &Pos, '|');
+				Floor = malloc(sizeof(floor));
+				Floor->ID = StrBufExtractNext_int(Buf, &Pos, '|');
+				Floor->Name = NewStrBufPlain(NULL, StrLength(Buf));
+				StrBufExtract_NextToken(Floor->Name, Buf, &Pos, '|');
+				Floor->NRooms = StrBufExtractNext_long(Buf, &Pos, '|');
 
-			Put(floors, IKEY(Floor->ID), Floor, DeleteFloor);
-		}
+				Put(floors, IKEY(Floor->ID), Floor, DeleteFloor);
+			}
 	}
 	FreeStrBuf(&Buf);
 	
@@ -139,6 +145,7 @@ void DeleteFolder(void *vFolder)
 
 HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP) 
 {
+	int Done = 0;
 	HashList *rooms;
 	folder *room;
 	StrBuf *Buf;
@@ -154,75 +161,79 @@ HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP)
 	StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err);
 	if (GetServerStatus(Buf, NULL) == 1) 
 	{
-		while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err), 
-		      strcmp(ChrPtr(Buf), "000")) 
-		{
-
-			Pos = NULL;
-			room = (folder*) malloc (sizeof(folder));
-			memset(room, 0, sizeof(folder));
+		while(!Done && StrBuf_ServGetln(Buf))
+			if ( (StrLength(Buf)==3) && 
+			     !strcmp(ChrPtr(Buf), "000")) 
+			{
+				Done = 1;
+			}
+			else
+			{				
+				Pos = NULL;
+				room = (folder*) malloc (sizeof(folder));
+				memset(room, 0, sizeof(folder));
 
-			/* Load the base data from the server reply */
-			room->name = NewStrBufPlain(NULL, StrLength(Buf));
-			StrBufExtract_NextToken(room->name, Buf, &Pos, '|');
+				/* Load the base data from the server reply */
+				room->name = NewStrBufPlain(NULL, StrLength(Buf));
+				StrBufExtract_NextToken(room->name, Buf, &Pos, '|');
 
-			room->QRFlags = StrBufExtractNext_long(Buf, &Pos, '|');
-			room->floorid = StrBufExtractNext_int(Buf, &Pos, '|');
-			room->listorder = StrBufExtractNext_long(Buf, &Pos, '|');
-			room->QRFlags2 = StrBufExtractNext_long(Buf, &Pos, '|');
+				room->QRFlags = StrBufExtractNext_long(Buf, &Pos, '|');
+				room->floorid = StrBufExtractNext_int(Buf, &Pos, '|');
+				room->listorder = StrBufExtractNext_long(Buf, &Pos, '|');
+				room->QRFlags2 = StrBufExtractNext_long(Buf, &Pos, '|');
 
-			room->RAFlags = StrBufExtractNext_long(Buf, &Pos, '|');
+				room->RAFlags = StrBufExtractNext_long(Buf, &Pos, '|');
 
 /*
- ACWHUT?
-			room->ACL = NewStrBufPlain(NULL, StrLength(Buf));
-			StrBufExtract_NextToken(room->ACL, Buf, &Pos, '|');
+  ACWHUT?
+  room->ACL = NewStrBufPlain(NULL, StrLength(Buf));
+  StrBufExtract_NextToken(room->ACL, Buf, &Pos, '|');
 */
 
-			room->view = StrBufExtractNext_long(Buf, &Pos, '|');
-			room->defview = StrBufExtractNext_long(Buf, &Pos, '|');
-			room->lastchange = StrBufExtractNext_long(Buf, &Pos, '|');
-
-			/* Evaluate the Server sent data for later use */
-			/* find out, whether we are in a sub-room */
-			room->nRoomNameParts = StrBufNum_tokens(room->name, '\\');
-			if (room->nRoomNameParts > 1)
-			{
-				int i;
+				room->view = StrBufExtractNext_long(Buf, &Pos, '|');
+				room->defview = StrBufExtractNext_long(Buf, &Pos, '|');
+				room->lastchange = StrBufExtractNext_long(Buf, &Pos, '|');
 
-				Pos = NULL;
-				room->RoomNameParts = malloc(sizeof(StrBuf*) * (room->nRoomNameParts + 1));
-				memset(room->RoomNameParts, 0, sizeof(StrBuf*) * (room->nRoomNameParts + 1));
-				for (i=0; i < room->nRoomNameParts; i++)
+				/* Evaluate the Server sent data for later use */
+				/* find out, whether we are in a sub-room */
+				room->nRoomNameParts = StrBufNum_tokens(room->name, '\\');
+				if (room->nRoomNameParts > 1)
 				{
-					room->RoomNameParts[i] = NewStrBuf();
-					StrBufExtract_NextToken(room->RoomNameParts[i],
-								room->name, &Pos, '\\');
+					int i;
+
+					Pos = NULL;
+					room->RoomNameParts = malloc(sizeof(StrBuf*) * (room->nRoomNameParts + 1));
+					memset(room->RoomNameParts, 0, sizeof(StrBuf*) * (room->nRoomNameParts + 1));
+					for (i=0; i < room->nRoomNameParts; i++)
+					{
+						room->RoomNameParts[i] = NewStrBuf();
+						StrBufExtract_NextToken(room->RoomNameParts[i],
+									room->name, &Pos, '\\');
+					}
 				}
-			}
 
-			/* Private mailboxes on the main floor get remapped to the personal folder */
-			if ((room->QRFlags & QR_MAILBOX) && 
-			    (room->floorid == 0))
-			{
-				room->floorid = VIRTUAL_MY_FLOOR;
-				if ((room->nRoomNameParts == 1) && 
-				    (StrLength(room->name) == 4) && 
-				    (strcmp(ChrPtr(room->name), "Mail") == 0))
+				/* Private mailboxes on the main floor get remapped to the personal folder */
+				if ((room->QRFlags & QR_MAILBOX) && 
+				    (room->floorid == 0))
 				{
-					room->is_inbox = 1;
-				}
+					room->floorid = VIRTUAL_MY_FLOOR;
+					if ((room->nRoomNameParts == 1) && 
+					    (StrLength(room->name) == 4) && 
+					    (strcmp(ChrPtr(room->name), "Mail") == 0))
+					{
+						room->is_inbox = 1;
+					}
 
-			}
-			/* get a pointer to the floor we're on: */
-			GetHash(WCC->Floors, IKEY(room->floorid), &vFloor);
-			room->Floor = (const floor*) vFloor;
+				}
+				/* get a pointer to the floor we're on: */
+				GetHash(WCC->Floors, IKEY(room->floorid), &vFloor);
+				room->Floor = (const floor*) vFloor;
 
 
 
-			/* now we know everything, remember it... */
-			Put(rooms, SKEY(room->name), room, DeleteFolder);
-		}
+				/* now we know everything, remember it... */
+				Put(rooms, SKEY(room->name), room, DeleteFolder);
+			}
 	}
 
 	SubTP.Filter.ContextType = CTX_ROOMS;