} UserListEntry;
-UserListEntry* NewUserListOneEntry(StrBuf *SerializedUser)
+UserListEntry* NewUserListOneEntry(StrBuf *SerializedUser, const char *Pos)
{
UserListEntry *ul;
ul->UserName = NewStrBuf();
ul->Passvoid = NewStrBuf();
- StrBufExtract_token(ul->UserName, SerializedUser, 0, '|');
- StrBufExtract_token(ul->Passvoid, SerializedUser, 1, '|');
- ul->Flags = (unsigned int)StrBufExtract_long(SerializedUser, 2, '|');
- ul->nLogons = StrBufExtract_int(SerializedUser, 3, '|');
- ul->nPosts = StrBufExtract_int(SerializedUser, 4, '|');
- ul->AccessLevel = StrBufExtract_int(SerializedUser, 5, '|');
- ul->UID = StrBufExtract_int(SerializedUser, 6, '|');
- ul->LastLogonT = StrBufExtract_long(SerializedUser, 7, '|');
- ul->DaysTillPurge = StrBufExtract_int(SerializedUser, 8, '|');
+ StrBufExtract_NextToken(ul->UserName, SerializedUser, &Pos, '|');
+ StrBufExtract_NextToken(ul->Passvoid, SerializedUser, &Pos, '|');
+ ul->Flags = StrBufExtractNext_unsigned_long(SerializedUser, &Pos, '|');
+ ul->nLogons = StrBufExtractNext_int( SerializedUser, &Pos, '|');
+ ul->nPosts = StrBufExtractNext_int( SerializedUser, &Pos, '|');
+ ul->AccessLevel = StrBufExtractNext_int( SerializedUser, &Pos, '|');
+ ul->UID = StrBufExtractNext_int( SerializedUser, &Pos, '|');
+ ul->LastLogonT = StrBufExtractNext_long( SerializedUser, &Pos, '|');
+ ul->DaysTillPurge = StrBufExtractNext_int( SerializedUser, &Pos, '|');
return ul;
}
UserListEntry* NewUserListEntry(StrBuf *SerializedUserList)
{
+ const char *Pos = NULL;
UserListEntry *ul;
if (StrLength(SerializedUserList) < 8)
ul->UserName = NewStrBuf();
ul->Passvoid = NewStrBuf();
- StrBufExtract_token(ul->UserName, SerializedUserList, 0, '|');
- ul->AccessLevel = StrBufExtract_int(SerializedUserList, 1, '|');
- ul->UID = StrBufExtract_int(SerializedUserList, 2, '|');
- ul->LastLogonT = StrBufExtract_long(SerializedUserList, 3, '|');
- ul->nLogons = StrBufExtract_int(SerializedUserList, 4, '|');
- ul->nPosts = StrBufExtract_int(SerializedUserList, 5, '|');
- StrBufExtract_token(ul->Passvoid, SerializedUserList, 6, '|');
+ StrBufExtract_NextToken(ul->UserName, SerializedUserList, &Pos, '|');
+ ul->AccessLevel = StrBufExtractNext_int( SerializedUserList, &Pos, '|');
+ ul->UID = StrBufExtractNext_int( SerializedUserList, &Pos, '|');
+ ul->LastLogonT = StrBufExtractNext_long(SerializedUserList, &Pos, '|');
+ ul->nLogons = StrBufExtractNext_int( SerializedUserList, &Pos, '|');
+ ul->nPosts = StrBufExtractNext_int( SerializedUserList, &Pos, '|');
+ StrBufExtract_NextToken(ul->Passvoid, SerializedUserList, &Pos, '|');
ul->Flags = 0;
ul->DaysTillPurge = -1;
return ul;
memset(&SubTP, 0, sizeof(WCTemplputParams));
serv_puts("LIST");
Buf = NewStrBuf();
- StrBuf_ServGetlnBuffered(Buf);
+ StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) == 1) {
Hash = NewHash(1, NULL);
while (!Done) {
- len = StrBuf_ServGetlnBuffered(Buf);
+ len = StrBuf_ServGetln(Buf);
if ((len == 3) &&
(strcmp(ChrPtr(Buf), "000")==0)) {
Done = 1;
if ((*VCMsg == NULL) && (already_tried_creating_one == 0)) {
already_tried_creating_one = 1;
serv_puts("ENT0 1|||4");
- StrBuf_ServGetlnBuffered(Buf);
+ StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) != 4) {
serv_puts("Content-type: text/x-vcard");
serv_puts("");
roomname = NewStrBuf();
StrBufPrintf(roomname, "%010ld.%s", usernum, USERCONFIGROOM);
serv_printf("GOTO %s||1", ChrPtr(roomname));
- StrBuf_ServGetlnBuffered(Buf);
+ StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) != 2) {
serv_printf("CRE8 1|%s|5|||1|", ChrPtr(roomname));
- StrBuf_ServGetlnBuffered(Buf);
+ StrBuf_ServGetln(Buf);
GetServerStatus(Buf, NULL);
serv_printf("GOTO %s||1", ChrPtr(roomname));
- StrBuf_ServGetlnBuffered(Buf);
+ StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) != 2) {
FlushStrBuf(WCC->ImportantMsg);
StrBufAppendBuf(WCC->ImportantMsg, Buf, 4);
void display_edituser(const char *supplied_username, int is_new) {
+ const char *Pos;
wcsession *WCC = WC;
UserListEntry* UL;
StrBuf *Buf;
Buf = NewStrBuf();
serv_printf("AGUP %s", username);
- StrBuf_ServGetlnBuffered(Buf);
+ StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) != 2) {
FlushStrBuf(WCC->ImportantMsg);
StrBufAppendBuf(WCC->ImportantMsg, Buf, 4);
return;
}
else {
- StrBufCutLeft(Buf, 4);
- UL = NewUserListOneEntry(Buf);
+ Pos = ChrPtr(Buf) + 4;
+ UL = NewUserListOneEntry(Buf, Pos);
if ((UL != NULL) && havebstr("edit_abe_button")) {
display_edit_address_book_entry(username, UL->UID);
}
if ((havebstr("newname")) && (strcasecmp(bstr("username"), bstr("newname")))) {
serv_printf("RENU %s|%s", bstr("username"), bstr("newname"));
- StrBuf_ServGetlnBuffered(Buf);
+ StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) == 2) {
FlushStrBuf(WCC->ImportantMsg);
StrBufAppendBuf(WCC->ImportantMsg, Buf, 4);
bstr("lastcall"),
bstr("purgedays")
);
- StrBuf_ServGetlnBuffered(Buf);
+ StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) == 2) {
StrBufAppendBuf(WCC->ImportantMsg, Buf, 4);
}
Buf = NewStrBuf();
serv_printf("ASUP %s|0|0|0|0|0|", username);
- StrBuf_ServGetlnBuffered(Buf);
+ StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) != 2)
StrBufAppendBuf(WCC->ImportantMsg, Buf, 4);
Buf = NewStrBuf();
username = bstr("username");
serv_printf("CREU %s", username);
- StrBuf_ServGetlnBuffered(Buf);
+ StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, &FullState) == 2) {
sprintf(WC->ImportantMessage, _("A new user has been created."));
display_edituser(username, 1);