StrBuf *Buf;
static long ls = (-1L);
long err = 0;
+ int room_name_supplied = 0;
+ int is_baseroom = 0;
/* store ungoto information */
- if (StrLength(gname) > 0)
+ if (StrLength(gname) > 0) {
+ room_name_supplied = 1;
+ }
+ if (room_name_supplied) {
strcpy(WCC->ugname, ChrPtr(WCC->CurRoom.name));
+ if (!strcasecmp(ChrPtr(gname), "_BASEROOM_")) {
+ is_baseroom = 1;
+ }
+ }
WCC->uglsn = ls;
Buf = NewStrBuf();
/* move to the new room */
- if (StrLength(gname) > 0)
+ if (room_name_supplied) {
serv_printf("GOTO %s", ChrPtr(gname));
- else /* or just refresh the current state... */
+ }
+ else {
+ /* or just refresh the current state... */
serv_printf("GOTO 00000000000000000000");
+ }
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, &err) != 2) {
serv_puts("GOTO _BASEROOM_");
FlushFolder(&WCC->CurRoom);
ParseGoto(&WCC->CurRoom, Buf);
- if (StrLength(gname) > 0)
- {
+ if (room_name_supplied) {
remove_march(WCC->CurRoom.name);
- if (!strcasecmp(ChrPtr(gname), "_BASEROOM_"))
+ if (is_baseroom) {
remove_march(gname);
+ }
}
FreeStrBuf(&Buf);
*/
void delete_room(void)
{
- char buf[SIZ];
-
+ StrBuf *Line;
serv_puts("KILL 1");
- serv_getln(buf, sizeof buf);
-
- if (buf[0] != '2') {
- strcpy(WC->ImportantMessage, &buf[4]);
+ StrBuf_ServGetln(Line);
+ if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
display_main_menu();
- return;
} else {
StrBuf *Buf;
smart_goto(Buf);
FreeStrBuf(&Buf);
}
+ FreeStrBuf(&Line);
}
/*
}
-int GetCurrentRoomFlags(folder *Room)
+int GetCurrentRoomFlags(folder *Room, int CareForStatusMessage)
{
StrBuf *Buf;
FlushStrBuf(Room->XAPass);
FlushStrBuf(Room->Directory);
StrBufCutLeft(Buf, 4);
- AppendImportantMessage (SKEY(Buf));
+ if (CareForStatusMessage)
+ AppendImportantMessage (SKEY(Buf));
FreeStrBuf(&Buf);
+ Room->XALoaded = 2;
return 0;
} else {
const char *Pos;
{
wcsession *WCC = WC;
- if (WCC->CurRoom.XALoaded)
+ if (WCC->CurRoom.XALoaded > 0)
return;
- GetCurrentRoomFlags(&WCC->CurRoom);
+ GetCurrentRoomFlags(&WCC->CurRoom, 0);
}
void toggle_self_service(void) {
wcsession *WCC = WC;
- if (GetCurrentRoomFlags (&WCC->CurRoom) == 0)
+ if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0)
return;
if (yesbstr("QR2_SelfList"))
int succ1, succ2;
if (!havebstr("ok_button")) {
- strcpy(WC->ImportantMessage,
- _("Cancelled. Changes were not saved."));
+ AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
return;
}
- if (GetCurrentRoomFlags (&WCC->CurRoom) == 0)
+ if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0) {
+ http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
return;
+ }
LoadRoomAide();
wcsession *WCC = WC;
- if (GetCurrentRoomFlags(&WCC->CurRoom) == 1)
+ if (GetCurrentRoomFlags(&WCC->CurRoom, 1) == 1)
{
const char *Pos;
UserNames = sbstr("username");
*/
void entroom(void)
{
- char buf[SIZ];
+ StrBuf *Line;
const StrBuf *er_name;
const StrBuf *er_type;
const StrBuf *er_password;
wcsession *WCC = WC;
if (!havebstr("ok_button")) {
- strcpy(WC->ImportantMessage,
- _("Cancelled. No new room was created."));
+ AppendImportantMessage(_("Cancelled. No new room was created."), -1);
display_main_menu();
return;
}
0,
er_view);
- serv_getln(buf, sizeof buf);
- if (buf[0] != '2') {
- strcpy(WCC->ImportantMessage, &buf[4]);
+ Line = NewStrBuf();
+ StrBuf_ServGetln(Line);
+ if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
+ FreeStrBuf(&Line);
display_main_menu();
return;
}
gotoroom(er_name);
serv_printf("VIEW %d", er_view);
- serv_getln(buf, sizeof buf);
+ StrBuf_ServGetln(Line);
+ FreeStrBuf(&Line); /* TODO: should we care about errors? */
WCC->CurRoom.view = er_view;
if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ) {
} else {
smart_goto(WCC->CurRoom.name);
}
-
+ FreeStrBuf(&Line);
}
* Set the message expire policy for this room and/or floor
*/
void set_room_policy(void) {
- char buf[SIZ];
+ StrBuf *Line;
if (!havebstr("ok_button")) {
- strcpy(WC->ImportantMessage,
- _("Cancelled. Changes were not saved."));
+ AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
return;
}
+ Line = NewStrBuf();
serv_printf("SPEX roompolicy|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
- serv_getln(buf, sizeof buf);
- strcpy(WC->ImportantMessage, &buf[4]);
-
+ StrBuf_ServGetln(Line);
+ GetServerStatusMsg(Line, NULL, 1, 0);
if (WC->axlevel >= 6) {
- strcat(WC->ImportantMessage, "<br>\n");
serv_printf("SPEX floorpolicy|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
- serv_getln(buf, sizeof buf);
- strcat(WC->ImportantMessage, &buf[4]);
+ StrBuf_ServGetln(Line);
+ GetServerStatusMsg(Line, NULL, 1, 0);
}
+ FreeStrBuf(&Line);
ReloadCurrentRoom();
http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
}
* Perform changes to a room's network configuration
*/
void netedit(void) {
- FILE *fp;
char buf[SIZ];
char line[SIZ];
char cmpa0[SIZ];
char cmpb1[SIZ];
int i, num_addrs;
StrBuf *Line;
+ StrBuf *TmpBuf;
int Done;
/*/ TODO: do line dynamic! */
return;
}
-
- fp = tmpfile();
- if (fp == NULL) {
- http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
- return;
- }
-
Line = NewStrBuf();
+ TmpBuf = NewStrBuf();
serv_puts("GNET");
StrBuf_ServGetln(Line);
if (GetServerStatus(Line, NULL) != 1) {
- fclose(fp);
AppendImportantMessage(SRV_STATUS_MSG(Line));
FreeStrBuf(&Line);
http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
if ( (strcasecmp(cmpa0, cmpb0))
|| (strcasecmp(cmpa1, cmpb1)) ) {
StrBufAppendBufPlain(Line, HKEY("\n"), 0);
- fwrite(SKEY(Line), 1, fp);
+ StrBufAppendBuf(TmpBuf, Line, 0);
}
}
}
- rewind(fp);
serv_puts("SNET");
StrBuf_ServGetln(Line);
if (GetServerStatus(Line, NULL) != 4) {
- fclose(fp);
+
AppendImportantMessage(SRV_STATUS_MSG(Line));
http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
FreeStrBuf(&Line);
+ FreeStrBuf(&TmpBuf);
return;
}
- while (fgets(buf, sizeof buf, fp) != NULL) {
- buf[strlen(buf)-1] = 0;
- serv_puts(buf);
- }
+ serv_putbuf(TmpBuf);
+ FreeStrBuf(&TmpBuf);
if (havebstr("add_button")) {
num_addrs = num_tokens(bstr("line"), ',');
}
serv_puts("000");
- fclose(fp);
FlushIgnetCfgs(&WC->CurRoom);
FreeStrBuf(&Line);