X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Froomops.c;h=cf0b370bb43db8734a57716ce67bb8afe66d917a;hb=a9e34f4f21db2a290905929e6221eb5aa79f0192;hp=d54e00ebace6ece4c7f02f3f928c49332f45fd71;hpb=a35f01f2009f813cb7f56c4d550f276dbdac53f3;p=citadel.git
diff --git a/webcit/roomops.c b/webcit/roomops.c
index d54e00eba..cf0b370bb 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1,409 +1,177 @@
/*
- * $Id$
* Lots of different room-related operations.
+ *
+ * Copyright (c) 1996-2012 by the citadel.org team
+ *
+ * This program is open source software. You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
#include "webcit.h"
#include "webserver.h"
-#define MAX_FLOORS 128
-
-char floorlist[MAX_FLOORS][SIZ]; /* list of our floor names */
-/* See GetFloorListHash and GetRoomListHash for info on these.
- * Basically we pull LFLR/LKRA etc. and set up a room HashList with these keys.
- */
-
-void display_whok(void);
-int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP);
-
-
-char *viewdefs[VIEW_MAX]; /* the different kinds of available views */
-
-ROOM_VIEWS exchangeable_views[VIEW_MAX][VIEW_MAX] = { /* the different kinds of available views for a view */
-{VIEW_BBS, VIEW_MAILBOX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX },
-{VIEW_BBS, VIEW_MAILBOX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX },
-{VIEW_MAX, VIEW_MAX, VIEW_ADDRESSBOOK, VIEW_CALENDAR, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX },
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_CALENDAR, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX /*VIEW_CALBRIEF*/, VIEW_MAX, VIEW_MAX },
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_TASKS, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, },
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_NOTES, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, },
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_WIKI, VIEW_MAX, VIEW_MAX, VIEW_MAX},
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_CALENDAR, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX/*VIEW_CALBRIEF*/, VIEW_MAX, VIEW_MAX},
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_JOURNAL, VIEW_MAX },
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_BLOG },
- };
-/* the brief calendar view is disabled: VIEW_CALBRIEF */
-
-allowed_default_views[VIEW_MAX] = {
- 1, /* VIEW_BBS Bulletin board view */
- 1, /* VIEW_MAILBOX Mailbox summary */
- 1, /* VIEW_ADDRESSBOOK Address book view */
- 1, /* VIEW_CALENDAR Calendar view */
- 1, /* VIEW_TASKS Tasks view */
- 1, /* VIEW_NOTES Notes view */
- 1, /* VIEW_WIKI Wiki view */
- 0, /* VIEW_CALBRIEF Brief Calendar view */
- 0, /* VIEW_JOURNAL Journal view */
- 0 /* VIEW_BLOG Blog view (not yet implemented) */
+ConstStr QRFlagList[] = {
+ {HKEY(strof(QR_PERMANENT))},
+ {HKEY(strof(QR_INUSE))},
+ {HKEY(strof(QR_PRIVATE))},
+ {HKEY(strof(QR_PASSWORDED))},
+ {HKEY(strof(QR_GUESSNAME))},
+ {HKEY(strof(QR_DIRECTORY))},
+ {HKEY(strof(QR_UPLOAD))},
+ {HKEY(strof(QR_DOWNLOAD))},
+ {HKEY(strof(QR_VISDIR))},
+ {HKEY(strof(QR_ANONONLY))},
+ {HKEY(strof(QR_ANONOPT))},
+ {HKEY(strof(QR_NETWORK))},
+ {HKEY(strof(QR_PREFONLY))},
+ {HKEY(strof(QR_READONLY))},
+ {HKEY(strof(QR_MAILBOX))}
+};
+ConstStr QR2FlagList[] = {
+ {HKEY(strof(QR2_SYSTEM))},
+ {HKEY(strof(QR2_SELFLIST))},
+ {HKEY(strof(QR2_COLLABDEL))},
+ {HKEY(strof(QR2_SUBJECTREQ))},
+ {HKEY(strof(QR2_SMTP_PUBLIC))},
+ {HKEY(strof(QR2_MODERATED))},
+ {HKEY("")},
+ {HKEY("")},
+ {HKEY("")},
+ {HKEY("")},
+ {HKEY("")},
+ {HKEY("")},
+ {HKEY("")},
+ {HKEY("")},
+ {HKEY("")}
};
+void _DBG_QR(long QR)
+{
+ int i = 1;
+ int j=0;
+ StrBuf *QRVec;
-/*
- * Initialize the viewdefs with localized strings
- */
-void initialize_viewdefs(void) {
- viewdefs[VIEW_BBS] = _("Bulletin Board");
- viewdefs[VIEW_MAILBOX] = _("Mail Folder");
- viewdefs[VIEW_ADDRESSBOOK] = _("Address Book");
- viewdefs[VIEW_CALENDAR] = _("Calendar");
- viewdefs[VIEW_TASKS] = _("Task List");
- viewdefs[VIEW_NOTES] = _("Notes List");
- viewdefs[VIEW_WIKI] = _("Wiki");
- viewdefs[VIEW_CALBRIEF] = _("Calendar List");
- viewdefs[VIEW_JOURNAL] = _("Journal");
- viewdefs[VIEW_BLOG] = _("Blog");
+ QRVec = NewStrBufPlain(NULL, 256);
+ while (i != 0)
+ {
+ if ((QR & i) != 0) {
+ if (StrLength(QRVec) > 0)
+ StrBufAppendBufPlain(QRVec, HKEY(" | "), 0);
+ StrBufAppendBufPlain(QRVec, CKEY(QRFlagList[j]), 0);
+ }
+ i = i << 1;
+ j++;
+ }
+ syslog(LOG_DEBUG, "DBG: QR-Vec [%ld] [%s]\n", QR, ChrPtr(QRVec));
+ FreeStrBuf(&QRVec);
}
-/*
- * load the list of floors
- * /
-void load_floorlist(StrBuf *Buf)
+void _DBG_QR2(long QR2)
{
- int a;
- int Done = 0;
-
- for (a = 0; a < MAX_FLOORS; ++a)
- floorlist[a][0] = 0;
+ int i = 1;
+ int j=0;
+ StrBuf *QR2Vec;
- serv_puts("LFLR");
- StrBuf_ServGetln(Buf);
- if (GetServerStatus(Buf, NULL) != 1) {
- strcpy(floorlist[0], "Main Floor");
- return;
- }
- while (!Done && (StrBuf_ServGetln(Buf)>=0)) {
- if ( (StrLength(Buf)==3) &&
- !strcmp(ChrPtr(Buf), "000")) {
- Done = 1;
- break;
+ QR2Vec = NewStrBufPlain(NULL, 256);
+ while (i != 0)
+ {
+ if ((QR2 & i) != 0) {
+ if (StrLength(QR2Vec) > 0)
+ StrBufAppendBufPlain(QR2Vec, HKEY(" | "), 0);
+ StrBufAppendBufPlain(QR2Vec, CKEY(QR2FlagList[j]), 0);
}
- extract_token(floorlist[StrBufExtract_int(Buf, 0, '|')], ChrPtr(Buf), 1, '|', sizeof floorlist[0]);
+ i = i << 1;
+ j++;
}
+ syslog(LOG_DEBUG, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
+ FreeStrBuf(&QR2Vec);
}
-*/
-/*
- * Embed the room banner
- *
- * got The information returned from a GOTO server command
- * navbar_style Determines which navigation buttons to display
- *
- */
-void embed_room_banner(void)
-{
- wcsession *WCC = WC;
- char buf[256];
- /* refresh current room states... */
- /* dosen't work??? gotoroom(NULL); */
- /* The browser needs some information for its own use */
- wc_printf("\n",
- ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0)
- );
- /*
- * If the user happens to select the "make this my start page" link,
- * we want it to remember the URL as a "/dotskip" one instead of
- * a "skip" or "gotonext" or something like that.
- */
- if (WCC->Hdr->this_page == NULL) {
- WCC->Hdr->this_page = NewStrBuf();
- }
- StrBufPrintf(WCC->Hdr->this_page,
- "dotskip?room=%s",
- ChrPtr(WC->CurRoom.name)
- );
- do_template("roombanner", NULL);
- /* roombanner contains this for mobile */
- if (WC->is_mobile)
- return;
- wc_printf("
");
- wc_printf(
- "- "
- ""
- ""
- "%s"
- "
\n", _("Ungoto")
- );
-
- if (WC->CurRoom.view == VIEW_BBS) {
- wc_printf(
- "- "
- ""
- ""
- "%s"
- "
\n", _("Read new messages")
- );
- }
-
- switch(WC->CurRoom.view) {
- case VIEW_ADDRESSBOOK:
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", _("View contacts")
- );
- break;
- case VIEW_CALENDAR:
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", _("Day view")
- );
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", _("Month view")
- );
- break;
- case VIEW_CALBRIEF:
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", _("Calendar list")
- );
- break;
- case VIEW_TASKS:
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", _("View tasks")
- );
- break;
- case VIEW_NOTES:
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", _("View notes")
- );
- break;
- case VIEW_MAILBOX:
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", _("Refresh message list")
- );
- break;
- case VIEW_WIKI:
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", _("Wiki home")
- );
- break;
- default:
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", _("Read all messages")
- );
- break;
+
+/*******************************************************************************
+ ***************************** Goto Commands ***********************************
+ ******************************************************************************/
+
+void dotskip(void) {
+ smart_goto(sbstr("room"));
+}
+
+void dotgoto(void) {
+ if (!havebstr("room")) {
+ readloop(readnew, eUseDefault);
+ return;
}
-
- switch(WC->CurRoom.view) {
- case VIEW_ADDRESSBOOK:
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", _("Add new contact")
- );
- break;
- case VIEW_CALENDAR:
- case VIEW_CALBRIEF:
- wc_printf("- "
- ""
- ""
- "%s"
- "
\n", _("Add new event")
- );
- break;
- case VIEW_TASKS:
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", _("Add new task")
- );
- break;
- case VIEW_NOTES:
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", _("Add new note")
- );
- break;
- case VIEW_WIKI:
- safestrncpy(buf, bstr("page"), sizeof buf);
- if (IsEmptyStr(buf)) {
- safestrncpy(buf, "home", sizeof buf);
- }
- str_wiki_index(buf);
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", buf, _("Edit this page")
- );
-
- if (bmstrcasestr((char *)ChrPtr(WCC->Hdr->HR.ReqLine), "wiki_history")) {
- /* already viewing history; display a link to the current page */
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", buf, _("Current version")
- );
- }
- else {
- /* display a link to the history */
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", buf, _("History")
- );
- }
- break;
- case VIEW_MAILBOX:
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", _("Write mail")
- );
- wc_printf(
- "- "
- ""
- ""
- "%s"
- "
\n", _("Delete")
- );
- break;
- default:
- wc_printf(
- "- "
- ""
- ""
- ""
- "%s"
- "
\n", _("Enter a message")
- );
- break;
+ if (WC->CurRoom.view != VIEW_MAILBOX) { /* dotgoto acts like dotskip when we're in a mailbox view */
+ slrp_highest();
}
-
- wc_printf(
- "- "
- ""
- ""
- "%s"
- "
\n",
- _("Leave all messages marked as unread, go to next room with unread messages"),
- _("Skip this room")
- );
-
- wc_printf(
- "- "
- ""
- ""
- "%s"
- "
\n",
- _("Mark all messages as read, go to next room with unread messages"),
- _("Goto next room")
- );
-
- wc_printf("
\n");
+ smart_goto(sbstr("room"));
+}
+
+/*
+ * goto next room
+ */
+void smart_goto(const StrBuf *next_room) {
+ if (gotoroom(next_room) == 2)
+ readloop(readnew, eUseDefault);
+ else
+ do_404();
}
+/*
+ * goto a private room
+ */
+void goto_private(void)
+{
+ char hold_rm[SIZ];
+ StrBuf *Buf;
+ const StrBuf *gr_name;
+ long err;
+
+ if (!havebstr("ok_button")) {
+ display_main_menu();
+ return;
+ }
+ gr_name = sbstr("gr_name");
+ Buf = NewStrBuf();
+ strcpy(hold_rm, ChrPtr(WC->CurRoom.name));
+ serv_printf("GOTO %s|%s",
+ ChrPtr(gr_name),
+ bstr("gr_pass"));
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, &err) == 2) {
+ FlushRoomlist();
+ smart_goto(gr_name);
+ FreeStrBuf(&Buf);
+ return;
+ }
+ if (err == 540) {
+ DoTemplate(HKEY("room_display_private"), NULL, &NoCtx);
+ FreeStrBuf(&Buf);
+ return;
+ }
+ StrBufCutLeft(Buf, 4);
+ AppendImportantMessage (SKEY(Buf));
+ Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
+ smart_goto(Buf);
+ FreeStrBuf(&Buf);
+ return;
+}
/*
* back end routine to take the session to a new room
@@ -414,20 +182,40 @@ long gotoroom(const StrBuf *gname)
StrBuf *Buf;
static long ls = (-1L);
long err = 0;
+ int room_name_supplied = 0;
+ int is_baseroom = 0;
+ int failvisibly;
+
+ /* on fail, should we fallback to _BASEROOM_? */
+ failvisibly = ibstr("failvisibly");
/* 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) {
+ if (failvisibly) {
+ FreeStrBuf(&Buf);
+ return err;
+ }
serv_puts("GOTO _BASEROOM_");
StrBuf_ServGetln(Buf);
/*
@@ -440,13 +228,14 @@ long gotoroom(const StrBuf *gname)
return err;
}
}
+ 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);
@@ -454,6 +243,7 @@ long gotoroom(const StrBuf *gname)
}
+
void ParseGoto(folder *room, StrBuf *Line)
{
wcsession *WCC = WC;
@@ -486,7 +276,7 @@ void ParseGoto(folder *room, StrBuf *Line)
memset(room, 0, sizeof(folder));
room->name = pBuf;
- StrBufExtract_NextToken(room->name, Line, &Pos, '|'); // WC->CurRoom->name
+ StrBufExtract_NextToken(room->name, Line, &Pos, '|');
room->nNewMessages = StrBufExtractNext_long(Line, &Pos, '|');
if (room->nNewMessages > 0)
@@ -496,12 +286,14 @@ void ParseGoto(folder *room, StrBuf *Line)
room->ShowInfo = StrBufExtractNext_long(Line, &Pos, '|');
- room->QRFlags = StrBufExtractNext_long(Line, &Pos, '|'); //CurRoom->QRFlags
+ room->QRFlags = StrBufExtractNext_long(Line, &Pos, '|');
+
+ DBG_QR(room->QRFlags);
room->HighestRead = StrBufExtractNext_long(Line, &Pos, '|');
room->LastMessageRead = StrBufExtractNext_long(Line, &Pos, '|');
- room->is_inbox = StrBufExtractNext_long(Line, &Pos, '|'); // is_mailbox
+ room->is_inbox = StrBufExtractNext_long(Line, &Pos, '|');
flag = StrBufExtractNext_long(Line, &Pos, '|');
if (WCC->is_aide || flag) {
@@ -510,17 +302,18 @@ void ParseGoto(folder *room, StrBuf *Line)
room->UsersNewMAilboxMessages = StrBufExtractNext_long(Line, &Pos, '|');
- room->floorid = StrBufExtractNext_int(Line, &Pos, '|'); // wc_floor
+ room->floorid = StrBufExtractNext_int(Line, &Pos, '|');
- room->view = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->view
+ room->view = StrBufExtractNext_long(Line, &Pos, '|');
- room->defview = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->defview
+ room->defview = StrBufExtractNext_long(Line, &Pos, '|');
flag = StrBufExtractNext_long(Line, &Pos, '|');
if (flag)
- room->RAFlags |= UA_ISTRASH; // wc_is_trash
+ room->RAFlags |= UA_ISTRASH;
- room->QRFlags2 = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->QRFlags2
+ room->QRFlags2 = StrBufExtractNext_long(Line, &Pos, '|');
+ DBG_QR2(room->QRFlags2);
/* find out, whether we are in a sub-room */
room->nRoomNameParts = StrBufNum_tokens(room->name, '\\');
@@ -560,6 +353,102 @@ void ParseGoto(folder *room, StrBuf *Line)
room->Floor = (const Floor*) vFloor;
}
+/*
+ * Delete the current room
+ */
+void delete_room(void)
+{
+ StrBuf *Line = NewStrBuf();
+ const StrBuf *GoBstr;
+
+ GoBstr = sbstr("go");
+
+ if (GoBstr != NULL)
+ {
+ if (gotoroom(GoBstr) == 200)
+ {
+ serv_puts("KILL 1");
+ StrBuf_ServGetln(Line);
+ if (GetServerStatusMsg(Line, NULL, 1, 2) == 2) {
+ StrBuf *Buf;
+
+ FlushRoomlist ();
+ Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
+ smart_goto(Buf);
+ FreeStrBuf(&Buf);
+ FreeStrBuf(&Line);
+ return;
+ }
+ }
+ }
+ display_main_menu();
+ FreeStrBuf(&Line);
+}
+
+/*
+ * zap a room
+ */
+void zap(void)
+{
+ char buf[SIZ];
+ StrBuf *final_destination;
+
+ /**
+ * If the forget-room routine fails for any reason, we fall back
+ * to the current room; otherwise, we go to the Lobby
+ */
+ final_destination = NewStrBufDup(WC->CurRoom.name);
+
+ if (havebstr("ok_button")) {
+ serv_printf("GOTO %s", ChrPtr(WC->CurRoom.name));
+ serv_getln(buf, sizeof buf);
+ if (buf[0] == '2') {
+ serv_puts("FORG");
+ serv_getln(buf, sizeof buf);
+ if (buf[0] == '2') {
+ FlushStrBuf(final_destination);
+ StrBufAppendBufPlain(final_destination, HKEY("_BASEROOM_"), 0);
+ }
+ }
+ FlushRoomlist ();
+ }
+ smart_goto(final_destination);
+ FreeStrBuf(&final_destination);
+}
+
+
+/*
+ * mark all messages in current room as having been read
+ */
+void slrp_highest(void)
+{
+ char buf[256];
+
+ serv_puts("SLRP HIGHEST");
+ serv_getln(buf, sizeof buf);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/*******************************************************************************
+ ***************************** Modify Rooms ************************************
+ ******************************************************************************/
+
+
+
+
+
void LoadRoomAide(void)
{
wcsession *WCC = WC;
@@ -588,67 +477,109 @@ void LoadRoomAide(void)
}
FreeStrBuf (&Buf);
}
-void tmplput_CurrentRoomFloorName(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
- folder *Folder = &WCC->CurRoom;
- const Floor *pFloor = Folder->Floor;
-
- if (pFloor == NULL)
- return;
- StrBufAppendTemplate(Target, TP, pFloor->Name, 0);
-}
-
-void tmplput_CurrentRoomAide(StrBuf *Target, WCTemplputParams *TP)
+int SaveRoomAide(folder *Room)
{
- wcsession *WCC = WC;
-
- LoadRoomAide();
-
- StrBufAppendTemplate(Target, TP, WCC->CurRoom.RoomAide, 0);
+ StrBuf *Buf;
+ Buf = NewStrBuf ();
+ serv_printf("SETA %s", ChrPtr(Room->RoomAide));
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 2) {
+ StrBufCutLeft(Buf, 4);
+ AppendImportantMessage (SKEY(Buf));
+ FreeStrBuf(&Buf);
+ return 0;
+ }
+ FreeStrBuf(&Buf);
+ return 1;
}
-void LoadRoomXA (void)
+int GetCurrentRoomFlags(folder *Room, int CareForStatusMessage)
{
- wcsession *WCC = WC;
StrBuf *Buf;
-
- if (WCC->CurRoom.XALoaded)
- return;
- WCC->CurRoom.XALoaded = 1;
Buf = NewStrBuf();
- serv_puts("GETA");
+ serv_puts("GETR");
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) != 2) {
- FlushStrBuf(WCC->CurRoom.XAPass);
- FlushStrBuf(WCC->CurRoom.Directory);
-
- AppendImportantMessage (ChrPtr(Buf) + 4,
- StrLength(Buf) - 4);
+ FlushStrBuf(Room->XAPass);
+ FlushStrBuf(Room->Directory);
+ StrBufCutLeft(Buf, 4);
+ if (CareForStatusMessage)
+ AppendImportantMessage (SKEY(Buf));
+ FreeStrBuf(&Buf);
+ Room->XALoaded = 2;
+ return 0;
} else {
const char *Pos;
Pos = ChrPtr(Buf) + 4;
- FreeStrBuf(&WCC->CurRoom.XAPass);
- FreeStrBuf(&WCC->CurRoom.Directory);
+ FreeStrBuf(&Room->XAPass);
+ FreeStrBuf(&Room->Directory);
+
+ Room->XAPass = NewStrBufPlain (NULL, StrLength (Buf));
+ Room->Directory = NewStrBufPlain (NULL, StrLength (Buf));
+
+ FreeStrBuf(&Room->name);
+ Room->name = NewStrBufPlain(NULL, StrLength(Buf));
+ StrBufExtract_NextToken(Room->name, Buf, &Pos, '|');
+
+ StrBufExtract_NextToken(Room->XAPass, Buf, &Pos, '|');
+ StrBufExtract_NextToken(Room->Directory, Buf, &Pos, '|');
+
+ Room->QRFlags = StrBufExtractNext_long(Buf, &Pos, '|');
+ Room->floorid = StrBufExtractNext_long(Buf, &Pos, '|');
+ Room->Order = StrBufExtractNext_long(Buf, &Pos, '|');
+ Room->defview = StrBufExtractNext_long(Buf, &Pos, '|');
+ Room->QRFlags2 = StrBufExtractNext_long(Buf, &Pos, '|');
+ FreeStrBuf (&Buf);
+ Room->XALoaded = 1;
+ return 1;
+ }
+}
+
- WCC->CurRoom.XAPass = NewStrBufPlain (NULL, StrLength (Buf));
- WCC->CurRoom.Directory = NewStrBufPlain (NULL, StrLength (Buf));
+int SetCurrentRoomFlags(folder *Room)
+{
+ StrBuf *Buf;
- StrBufSkip_NTokenS(Buf, &Pos, '|', 1); /* The Name, we already know... */
- StrBufExtract_NextToken(WCC->CurRoom.XAPass, Buf, &Pos, '|');
- StrBufExtract_NextToken(WCC->CurRoom.Directory, Buf, &Pos, '|');
- StrBufSkip_NTokenS(Buf, &Pos, '|', 2); /* QRFlags, FloorNum we already know... */
- WCC->CurRoom.Order = StrBufExtractNext_long(Buf, &Pos, '|');
- /* defview, we already know you. */
- /* QR2Flags, we already know them... */
+ Buf = NewStrBuf();
+ DBG_QR(Room->QRFlags);
+ DBG_QR2(Room->QRFlags2);
+
+ serv_printf("SETR %s|%s|%s|%ld|%d|%d|%ld|%ld|%ld",
+ ChrPtr(Room->name),
+ ChrPtr(Room->XAPass),
+ ChrPtr(Room->Directory),
+ Room->QRFlags,
+ Room->BumpUsers,
+ Room->floorid,
+ Room->Order,
+ Room->defview,
+ Room->QRFlags2);
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 2) {
+ StrBufCutLeft(Buf, 4);
+ AppendImportantMessage (SKEY(Buf));
+ FreeStrBuf(&Buf);
+ return 0;
+ } else {
+ FreeStrBuf(&Buf);
+ return 1;
}
- FreeStrBuf (&Buf);
+}
+
+void LoadRoomXA (void)
+{
+ wcsession *WCC = WC;
+
+ if (WCC->CurRoom.XALoaded > 0)
+ return;
+
+ GetCurrentRoomFlags(&WCC->CurRoom, 0);
}
@@ -675,16 +606,6 @@ void LoadXRoomPic(void)
FreeStrBuf (&Buf);
}
-int ConditionalThisRoomXHavePic(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
-
- if (WCC == NULL)
- return 0;
-
- LoadXRoomPic();
- return WCC->CurRoom.XHaveRoomPic == 1;
-}
void LoadXRoomInfoText(void)
{
@@ -692,8 +613,9 @@ void LoadXRoomInfoText(void)
StrBuf *Buf;
int Done = 0;
- if (WCC->CurRoom.XHaveInfoTextLoaded)
+ if (WCC->CurRoom.XHaveInfoTextLoaded) {
return;
+ }
WCC->CurRoom.XHaveInfoTextLoaded = 1;
Buf = NewStrBuf();
@@ -713,28 +635,9 @@ void LoadXRoomInfoText(void)
}
}
- FreeStrBuf (&Buf);
-}
-
-int ConditionalThisRoomXHaveInfoText(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
-
- if (WCC == NULL)
- return 0;
-
- LoadXRoomInfoText();
- return (StrLength(WCC->CurRoom.XInfoText)>0);
+ FreeStrBuf(&Buf);
}
-void tmplput_CurrentRoomInfoText(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
-
- LoadXRoomInfoText();
-
- StrBufAppendTemplate(Target, TP, WCC->CurRoom.XAPass, 1);
-}
void LoadXRoomXCountFiles(void)
{
@@ -764,1328 +667,40 @@ void LoadXRoomXCountFiles(void)
FreeStrBuf (&Buf);
}
-void tmplput_CurrentRoomXNFiles(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
-
- LoadXRoomXCountFiles();
-
- StrBufAppendPrintf(Target, "%d", WCC->CurRoom.XDownloadCount);
-}
-
-void tmplput_CurrentRoomX_FileString(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
-
- LoadXRoomXCountFiles();
-
- if (WCC->CurRoom.XDownloadCount == 1)
- StrBufAppendBufPlain(Target, _("file"), -1, 0);
- else
- StrBufAppendBufPlain(Target, _("files"), -1, 0);
-}
-
-void tmplput_CurrentRoomPass(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
-
- LoadRoomXA();
-
- StrBufAppendTemplate(Target, TP, WCC->CurRoom.XAPass, 0);
-}
-void tmplput_CurrentRoomDirectory(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
-
- LoadRoomXA();
-
- StrBufAppendTemplate(Target, TP, WCC->CurRoom.Directory, 0);
-}
-void tmplput_CurrentRoomOrder(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
-
- LoadRoomXA();
-
- StrBufAppendPrintf(Target, "%d", WCC->CurRoom.Order);
-}
-void tmplput_CurrentRoomDefView(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
-
- StrBufAppendPrintf(Target, "%d", WCC->CurRoom.defview);
-}
-
-void tmplput_CurrentRoom_nNewMessages(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
-
- LoadRoomXA();
-
- StrBufAppendPrintf(Target, "%d", WCC->CurRoom.nNewMessages);
-}
-
-void tmplput_CurrentRoom_nTotalMessages(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
-
- LoadRoomXA();
-
- StrBufAppendPrintf(Target, "%d", WCC->CurRoom.nTotalMessages);
-}
-
-int ConditionalThisRoomOrder(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
- long CheckThis;
-
- if (WCC == NULL)
- return 0;
-
- LoadRoomXA();
-
- CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
- return CheckThis == WCC->CurRoom.Order;
-}
-
-int ConditionalThisRoomDefView(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
- long CheckThis;
-
- if (WCC == NULL)
- return 0;
-
- CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
- return CheckThis == WCC->CurRoom.defview;
-}
-
-int ConditionalThisRoomCurrView(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
- long CheckThis;
-
- if (WCC == NULL)
- return 0;
-
- CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
- return CheckThis == WCC->CurRoom.view;
-}
-
-int ConditionalThisRoomHaveView(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
- long CheckThis;
-
- if (WCC == NULL)
- return 0;
-
- CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
- if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS))
- {
- LogTemplateError(Target, "Conditional", ERR_PARM2, TP,
- "Roomview [%ld] not valid\n",
- CheckThis);
- return 0;
- }
-
- return exchangeable_views [WCC->CurRoom.defview][CheckThis] != VIEW_MAX;
-}
-
-void tmplput_CurrentRoomViewString(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
- StrBuf *Buf;
-
- if ((WCC == NULL) ||
- (WCC->CurRoom.defview >= VIEW_MAX) ||
- (WCC->CurRoom.defview < VIEW_BBS))
- {
- LogTemplateError(Target, "Token", ERR_PARM2, TP,
- "Roomview [%ld] not valid\n",
- (WCC != NULL)?
- WCC->CurRoom.defview : -1);
- return;
- }
-
- Buf = NewStrBufPlain(_(viewdefs[WCC->CurRoom.defview]), -1);
- StrBufAppendTemplate(Target, TP, Buf, 0);
- FreeStrBuf(&Buf);
-}
-
-void tmplput_RoomViewString(StrBuf *Target, WCTemplputParams *TP)
-{
- long CheckThis;
- StrBuf *Buf;
-
- CheckThis = GetTemplateTokenNumber(Target, TP, 0, 0);
- if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS))
- {
- LogTemplateError(Target, "Token", ERR_PARM2, TP,
- "Roomview [%ld] not valid\n",
- CheckThis);
- return;
- }
-
- Buf = NewStrBufPlain(_(viewdefs[CheckThis]), -1);
- StrBufAppendTemplate(Target, TP, Buf, 0);
- FreeStrBuf(&Buf);
-}
-
-
-int ConditionalIsAllowedDefaultView(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
- long CheckThis;
-
- if (WCC == NULL)
- return 0;
-
- CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
- if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS))
- {
- LogTemplateError(Target, "Conditional", ERR_PARM2, TP,
- "Roomview [%ld] not valid\n",
- CheckThis);
- return 0;
- }
-
- return allowed_default_views[CheckThis] != 0;
-}
-
-/*
- * goto next room
- */
-void smart_goto(const StrBuf *next_room) {
- gotoroom(next_room);
- readloop(readnew, eUseDefault);
-}
-
-
-
-/*
- * mark all messages in current room as having been read
- */
-void slrp_highest(void)
-{
- char buf[256];
-
- serv_puts("SLRP HIGHEST");
- serv_getln(buf, sizeof buf);
-}
-
-
-typedef struct __room_states {
- char password[SIZ];
- char dirname[SIZ];
- char name[SIZ];
- int flags;
- int floor;
- int order;
- int view;
- int flags2;
-} room_states;
-
-
-
-
-/*
- * Set/clear/read the "self-service list subscribe" flag for a room
- *
- * set newval to 0 to clear, 1 to set, any other value to leave unchanged.
- * returns the new value.
- */
-
-int self_service(int newval) {
- int current_value = 0;
- char buf[SIZ];
-
- char name[SIZ];
- char password[SIZ];
- char dirname[SIZ];
- int flags, floor, order, view, flags2;
-
- serv_puts("GETR");
- serv_getln(buf, sizeof buf);
- if (buf[0] != '2') return(0);
-
- extract_token(name, &buf[4], 0, '|', sizeof name);
- extract_token(password, &buf[4], 1, '|', sizeof password);
- extract_token(dirname, &buf[4], 2, '|', sizeof dirname);
- flags = extract_int(&buf[4], 3);
- floor = extract_int(&buf[4], 4);
- order = extract_int(&buf[4], 5);
- view = extract_int(&buf[4], 6);
- flags2 = extract_int(&buf[4], 7);
-
- if (flags2 & QR2_SELFLIST) {
- current_value = 1;
- }
- else {
- current_value = 0;
- }
-
- if (newval == 1) {
- flags2 = flags2 | QR2_SELFLIST;
- }
- else if (newval == 0) {
- flags2 = flags2 & ~QR2_SELFLIST;
- }
- else {
- return(current_value);
- }
-
- if (newval != current_value) {
- serv_printf("SETR %s|%s|%s|%d|0|%d|%d|%d|%d",
- name, password, dirname, flags,
- floor, order, view, flags2);
- serv_getln(buf, sizeof buf);
- }
-
- return(newval);
-
-}
-
-int is_selflist(room_states *RoomFlags)
-{
- return ((RoomFlags->flags2 & QR2_SELFLIST) != 0);
-}
-
-int is_publiclist(room_states *RoomFlags)
-{
- return ((RoomFlags->flags2 & QR2_SMTP_PUBLIC) != 0);
-}
-
-int is_moderatedlist(room_states *RoomFlags)
-{
- return ((RoomFlags->flags2 & QR2_MODERATED) != 0);
-}
-
-/*
- * Set/clear/read the "self-service list subscribe" flag for a room
- *
- * set newval to 0 to clear, 1 to set, any other value to leave unchanged.
- * returns the new value.
- */
-
-int get_roomflags(room_states *RoomOps)
-{
- char buf[SIZ];
-
- serv_puts("GETR");
- serv_getln(buf, sizeof buf);
- if (buf[0] != '2') return(0);
-
- extract_token(RoomOps->name, &buf[4], 0, '|', sizeof RoomOps->name);
- extract_token(RoomOps->password, &buf[4], 1, '|', sizeof RoomOps->password);
- extract_token(RoomOps->dirname, &buf[4], 2, '|', sizeof RoomOps->dirname);
- RoomOps->flags = extract_int(&buf[4], 3);
- RoomOps->floor = extract_int(&buf[4], 4);
- RoomOps->order = extract_int(&buf[4], 5);
- RoomOps->view = extract_int(&buf[4], 6);
- RoomOps->flags2 = extract_int(&buf[4], 7);
- return (1);
-}
-
-int set_roomflags(room_states *RoomOps)
-{
- char buf[SIZ];
-
- serv_printf("SETR %s|%s|%s|%d|0|%d|%d|%d|%d",
- RoomOps->name,
- RoomOps->password,
- RoomOps->dirname,
- RoomOps->flags,
- RoomOps->floor,
- RoomOps->order,
- RoomOps->view,
- RoomOps->flags2);
- serv_getln(buf, sizeof buf);
- return (1);
-}
-
-
-
-
-
-
-/*
- * display the form for editing a room
- */
-void display_editroom(void)
-{
- char buf[SIZ];
- char cmd[1024];
- char node[256];
- char remote_room[128];
- char recp[1024];
- char er_name[128];
- char er_password[10];
- char er_dirname[15];
- char er_roomaide[26];
- unsigned er_flags;
- unsigned er_flags2;
- int er_floor;
- int i, j;
- char *tab;
- char *shared_with;
- char *not_shared_with = NULL;
- int roompolicy = 0;
- int roomvalue = 0;
- int floorpolicy = 0;
- int floorvalue = 0;
- char pop3_host[128];
- char pop3_user[32];
- int bg = 0;
-
- tab = bstr("tab");
- if (IsEmptyStr(tab)) tab = "admin";
-
-// Buf = NewStrBuf();
-// load_floorlist(Buf);
-// FreeStrBuf(&Buf);
- output_headers(1, 1, 1, 0, 0, 0);
-
- wc_printf("");
-
- wc_printf("
\n");
-
- /* print the tabbed dialog */
- wc_printf("
");
- wc_printf("
\n");
- wc_printf("
\n");
- /* end tabbed dialog */
-
- wc_printf(""
- );
-
- /* begin content of whatever tab is open now */
-
- if (!strcmp(tab, "admin")) {
- wc_printf("
");
- wc_printf("
");
- wc_printf("
");
- }
-
- if (!strcmp(tab, "config")) {
- wc_printf("
");
- serv_puts("GETR");
- serv_getln(buf, sizeof buf);
-
- if (!strncmp(buf, "550", 3)) {
- wc_printf("
%s
\n",
- _("Higher access is required to access this function.")
- );
- }
- else if (buf[0] != '2') {
- wc_printf("
%s
\n", &buf[4]);
- }
- else {
- extract_token(er_name, &buf[4], 0, '|', sizeof er_name);
- extract_token(er_password, &buf[4], 1, '|', sizeof er_password);
- extract_token(er_dirname, &buf[4], 2, '|', sizeof er_dirname);
- er_flags = extract_int(&buf[4], 3);
- er_floor = extract_int(&buf[4], 4);
- er_flags2 = extract_int(&buf[4], 7);
-
- wc_printf("
");
- }
-
-
- /* Sharing the room with other Citadel nodes... */
- if (!strcmp(tab, "sharing")) {
- wc_printf("
");
-
- shared_with = strdup("");
- not_shared_with = strdup("");
-
- /** Learn the current configuration */
- serv_puts("CONF getsys|application/x-citadel-ignet-config");
- serv_getln(buf, sizeof buf);
- if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- extract_token(node, buf, 0, '|', sizeof node);
- not_shared_with = realloc(not_shared_with,
- strlen(not_shared_with) + 32);
- strcat(not_shared_with, node);
- strcat(not_shared_with, "\n");
- }
-
- serv_puts("GNET");
- serv_getln(buf, sizeof buf);
- if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- extract_token(cmd, buf, 0, '|', sizeof cmd);
- extract_token(node, buf, 1, '|', sizeof node);
- extract_token(remote_room, buf, 2, '|', sizeof remote_room);
- if (!strcasecmp(cmd, "ignet_push_share")) {
- shared_with = realloc(shared_with,
- strlen(shared_with) + 32);
- strcat(shared_with, node);
- if (!IsEmptyStr(remote_room)) {
- strcat(shared_with, "|");
- strcat(shared_with, remote_room);
- }
- strcat(shared_with, "\n");
- }
- }
-
- for (i=0; i
"
- ""
- "");
- wc_printf(_("Shared with"));
- wc_printf(" | "
- "");
- wc_printf(_("Not shared with"));
- wc_printf(" |
\n"
- "\n");
-
- wc_printf("\n");
- wc_printf(" | \n");
- wc_printf("\n");
- wc_printf(" |
"
- "
\n"
- "%s- ", _("Notes:"));
- wc_printf(_("When sharing a room, "
- "it must be shared from both ends. Adding a node to "
- "the 'shared' list sends messages out, but in order to"
- " receive messages, the other nodes must be configured"
- " to send messages out to your system as well. "
- "
- If the remote room name is blank, it is assumed "
- "that the room name is identical on the remote node."
- "
- If the remote room name is different, the remote "
- "node must also configure the name of the room here."
- "
\n"
- ));
-
- wc_printf("");
- }
-
- if (not_shared_with != NULL)
- free (not_shared_with);
-
- /* Mailing list management */
- if (!strcmp(tab, "listserv")) {
- room_states RoomFlags;
- wc_printf("
");
-
- wc_printf("
"
- ""
- "");
-
- wc_printf(_("The contents of this room are being "
- "mailed as individual messages "
- "to the following list recipients:"
- "
\n"));
-
- serv_puts("GNET");
- serv_getln(buf, sizeof buf);
- if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- extract_token(cmd, buf, 0, '|', sizeof cmd);
- if (!strcasecmp(cmd, "listrecp")) {
- extract_token(recp, buf, 1, '|', sizeof recp);
-
- escputs(recp);
- wc_printf(" ");
- wc_printf(_("(remove)"));
- wc_printf(" ");
- }
- }
- wc_printf(" \n");
-
- wc_printf(" | \n");
-
- wc_printf(_("The contents of this room are being "
- "mailed in digest form "
- "to the following list recipients:"
- "
\n"));
-
- serv_puts("GNET");
- serv_getln(buf, sizeof buf);
- if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- extract_token(cmd, buf, 0, '|', sizeof cmd);
- if (!strcasecmp(cmd, "digestrecp")) {
- extract_token(recp, buf, 1, '|', sizeof recp);
-
- escputs(recp);
- wc_printf(" ");
- wc_printf(_("(remove)"));
- wc_printf(" ");
- }
- }
- wc_printf(" \n");
-
- wc_printf(" |
\n");
-
- /** Pop open an address book -- begin **/
- wc_printf("",
- _("List"),
- _("Digest"),
- _("Add recipients from Contacts or other address books"),
- _("Add recipients from Contacts or other address books")
- );
- /* Pop open an address book -- end **/
-
- wc_printf("
\n");
-
-
- wc_printf("\n");
- wc_printf("
");
- }
-
-
- /* Configuration of The Dreaded Auto-Purger */
- if (!strcmp(tab, "expire")) {
- wc_printf("
");
-
- serv_puts("GPEX room");
- serv_getln(buf, sizeof buf);
- if (!strncmp(buf, "550", 3)) {
- wc_printf("
%s
\n",
- _("Higher access is required to access this function.")
- );
- }
- else if (buf[0] != '2') {
- wc_printf("
%s
\n", &buf[4]);
- }
- else {
- roompolicy = extract_int(&buf[4], 0);
- roomvalue = extract_int(&buf[4], 1);
-
- serv_puts("GPEX floor");
- serv_getln(buf, sizeof buf);
- if (buf[0] == '2') {
- floorpolicy = extract_int(&buf[4], 0);
- floorvalue = extract_int(&buf[4], 1);
- }
-
- wc_printf("
\n"
- );
- }
-
- wc_printf("
");
- }
-
- /* Access controls */
- if (!strcmp(tab, "access")) {
- wc_printf("
");
- display_whok();
- wc_printf("
");
- }
-
- /* Fetch messages from remote locations */
- if (!strcmp(tab, "feeds")) {
- wc_printf("
");
-
- wc_printf("
");
- wc_printf(_("Retrieve messages from these remote POP3 accounts and store them in this room:"));
- wc_printf("\n");
-
- wc_printf("
"
- "");
- wc_printf(_("Remote host"));
- wc_printf(" | ");
- wc_printf(_("User name"));
- wc_printf(" | ");
- wc_printf(_("Password"));
- wc_printf(" | ");
- wc_printf(_("Keep messages on server?"));
- wc_printf(" | ");
- wc_printf(_("Interval"));
- wc_printf(" | |
");
-
- serv_puts("GNET");
- serv_getln(buf, sizeof buf);
- bg = 1;
- if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- extract_token(cmd, buf, 0, '|', sizeof cmd);
- if (!strcasecmp(cmd, "pop3client")) {
- safestrncpy(recp, &buf[11], sizeof recp);
-
- bg = 1 - bg;
- wc_printf("",
- (bg ? "even" : "odd")
- );
-
- wc_printf("");
- extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
- escputs(pop3_host);
- wc_printf(" | ");
-
- wc_printf("");
- extract_token(pop3_user, buf, 2, '|', sizeof pop3_user);
- escputs(pop3_user);
- wc_printf(" | ");
-
- wc_printf("***** | "); /* Don't show the password */
-
- wc_printf("%s | ", extract_int(buf, 4) ? _("Yes") : _("No"));
-
- wc_printf("%ld | ", extract_long(buf, 5)); /* Fetching interval */
-
- wc_printf("");
- wc_printf(" ");
- wc_printf(_("(remove)"));
- wc_printf(" | ");
-
- wc_printf("
");
- }
- }
-
- wc_printf("
\n");
-
- wc_printf("
\n");
-
- wc_printf("
");
- wc_printf(_("Fetch the following RSS feeds and store them in this room:"));
- wc_printf("\n");
-
- wc_printf("
"
- "");
- wc_printf(" ");
- wc_printf(_("Feed URL"));
- wc_printf(" | ");
- wc_printf(" |
");
-
- serv_puts("GNET");
- serv_getln(buf, sizeof buf);
- bg = 1;
- if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- extract_token(cmd, buf, 0, '|', sizeof cmd);
- if (!strcasecmp(cmd, "rssclient")) {
- safestrncpy(recp, &buf[10], sizeof recp);
-
- bg = 1 - bg;
- wc_printf("",
- (bg ? "even" : "odd")
- );
-
- wc_printf("");
- extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
- escputs(pop3_host);
- wc_printf(" | ");
-
- wc_printf("");
- wc_printf(" ");
- wc_printf(_("(remove)"));
- wc_printf(" | ");
-
- wc_printf("
");
- }
- }
-
- wc_printf("
\n");
-
- wc_printf("
");
- }
-
-
- /* end content of whatever tab is open now */
- wc_printf("
\n");
-
- address_book_popup();
- wDumpContent(1);
-}
-
/*
* Toggle self-service list subscription
*/
void toggle_self_service(void) {
- room_states RoomFlags;
+ wcsession *WCC = WC;
- get_roomflags (&RoomFlags);
+ if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0)
+ return;
if (yesbstr("QR2_SelfList"))
- RoomFlags.flags2 = RoomFlags.flags2 | QR2_SELFLIST;
+ WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 | QR2_SELFLIST;
else
- RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_SELFLIST;
+ WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SELFLIST;
if (yesbstr("QR2_SMTP_PUBLIC"))
- RoomFlags.flags2 = RoomFlags.flags2 | QR2_SMTP_PUBLIC;
+ WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 | QR2_SMTP_PUBLIC;
else
- RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_SMTP_PUBLIC;
+ WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SMTP_PUBLIC;
if (yesbstr("QR2_Moderated"))
- RoomFlags.flags2 = RoomFlags.flags2 | QR2_MODERATED;
+ WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 | QR2_MODERATED;
else
- RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_MODERATED;
+ WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_MODERATED;
if (yesbstr("QR2_SubsOnly"))
- RoomFlags.flags2 = RoomFlags.flags2 | QR2_SMTP_PUBLIC;
+ WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 | QR2_SMTP_PUBLIC;
else
- RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_SMTP_PUBLIC;
+ WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SMTP_PUBLIC;
- set_roomflags (&RoomFlags);
-
- display_editroom();
+ SetCurrentRoomFlags (&WCC->CurRoom);
+
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
}
@@ -2095,269 +710,148 @@ void toggle_self_service(void) {
*/
void editroom(void)
{
+ wcsession *WCC = WC;
const StrBuf *Ptr;
- StrBuf *Buf;
- StrBuf *er_name;
- StrBuf *er_password;
- StrBuf *er_dirname;
- StrBuf *er_roomaide;
- int er_floor;
- unsigned er_flags;
- int er_listingorder;
- int er_defaultview;
- unsigned er_flags2;
- int bump;
-
+ const StrBuf *er_name;
+ const StrBuf *er_password;
+ const StrBuf *er_dirname;
+ const StrBuf *er_roomaide;
+ int succ1, succ2;
if (!havebstr("ok_button")) {
- strcpy(WC->ImportantMessage,
- _("Cancelled. Changes were not saved."));
- display_editroom();
- return;
- }
- serv_puts("GETR");
- Buf = NewStrBuf();
- StrBuf_ServGetln(Buf);
- if (GetServerStatus(Buf, NULL) != 2) {
- StrBufCutLeft(Buf, 4);
- strcpy(WC->ImportantMessage, ChrPtr(Buf));
- display_editroom();
- FreeStrBuf(&Buf);
+ AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
return;
}
- er_name = NewStrBuf();
- er_password = NewStrBuf();
- er_dirname = NewStrBuf();
- er_roomaide = NewStrBuf();
-
- StrBufCutLeft(Buf, 4);
- StrBufExtract_token(er_name, Buf, 0, '|');
- StrBufExtract_token(er_password, Buf, 1, '|');
- StrBufExtract_token(er_dirname, Buf, 2, '|');
- er_flags = StrBufExtract_int(Buf, 3, '|');
- er_listingorder = StrBufExtract_int(Buf, 5, '|');
- er_defaultview = StrBufExtract_int(Buf, 6, '|');
- er_flags2 = StrBufExtract_int(Buf, 7, '|');
-
- er_roomaide = NewStrBufDup(sbstr("er_roomaide"));
- if (StrLength(er_roomaide) == 0) {
- serv_puts("GETA");
- StrBuf_ServGetln(Buf);
- if (GetServerStatus(Buf, NULL) != 2) {
- FlushStrBuf(er_roomaide);
- } else {
- StrBufCutLeft(Buf, 4);
- StrBufExtract_token(er_roomaide, Buf, 0, '|');
- }
- }
- Ptr = sbstr("er_name");
- if (StrLength(Ptr) > 0) {
- FlushStrBuf(er_name);
- StrBufAppendBuf(er_name, Ptr, 0);
- }
-
- Ptr = sbstr("er_password");
- if (StrLength(Ptr) > 0) {
- FlushStrBuf(er_password);
- StrBufAppendBuf(er_password, Ptr, 0);
- }
-
-
- Ptr = sbstr("er_dirname");
- if (StrLength(Ptr) > 0) { /* todo: cut 15 */
- FlushStrBuf(er_dirname);
- StrBufAppendBuf(er_dirname, Ptr, 0);
+ if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0) {
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
+ return;
}
+ LoadRoomAide();
+ WCC->CurRoom.QRFlags &= !(QR_PRIVATE | QR_PASSWORDED | QR_GUESSNAME);
Ptr = sbstr("type");
- er_flags &= !(QR_PRIVATE | QR_PASSWORDED | QR_GUESSNAME);
-
if (!strcmp(ChrPtr(Ptr), "invonly")) {
- er_flags |= (QR_PRIVATE);
+ WCC->CurRoom.QRFlags |= (QR_PRIVATE);
}
if (!strcmp(ChrPtr(Ptr), "hidden")) {
- er_flags |= (QR_PRIVATE | QR_GUESSNAME);
+ WCC->CurRoom.QRFlags |= (QR_PRIVATE | QR_GUESSNAME);
}
if (!strcmp(ChrPtr(Ptr), "passworded")) {
- er_flags |= (QR_PRIVATE | QR_PASSWORDED);
+ WCC->CurRoom.QRFlags |= (QR_PRIVATE | QR_PASSWORDED);
}
if (!strcmp(ChrPtr(Ptr), "personal")) {
- er_flags |= QR_MAILBOX;
+ WCC->CurRoom.QRFlags |= QR_MAILBOX;
} else {
- er_flags &= ~QR_MAILBOX;
+ WCC->CurRoom.QRFlags &= ~QR_MAILBOX;
}
-
+
if (yesbstr("prefonly")) {
- er_flags |= QR_PREFONLY;
+ WCC->CurRoom.QRFlags |= QR_PREFONLY;
} else {
- er_flags &= ~QR_PREFONLY;
+ WCC->CurRoom.QRFlags &= ~QR_PREFONLY;
}
if (yesbstr("readonly")) {
- er_flags |= QR_READONLY;
+ WCC->CurRoom.QRFlags |= QR_READONLY;
} else {
- er_flags &= ~QR_READONLY;
+ WCC->CurRoom.QRFlags &= ~QR_READONLY;
}
-
if (yesbstr("collabdel")) {
- er_flags2 |= QR2_COLLABDEL;
+ WCC->CurRoom.QRFlags2 |= QR2_COLLABDEL;
} else {
- er_flags2 &= ~QR2_COLLABDEL;
+ WCC->CurRoom.QRFlags2 &= ~QR2_COLLABDEL;
}
if (yesbstr("permanent")) {
- er_flags |= QR_PERMANENT;
+ WCC->CurRoom.QRFlags |= QR_PERMANENT;
} else {
- er_flags &= ~QR_PERMANENT;
+ WCC->CurRoom.QRFlags &= ~QR_PERMANENT;
}
if (yesbstr("subjectreq")) {
- er_flags2 |= QR2_SUBJECTREQ;
+ WCC->CurRoom.QRFlags2 |= QR2_SUBJECTREQ;
} else {
- er_flags2 &= ~QR2_SUBJECTREQ;
+ WCC->CurRoom.QRFlags2 &= ~QR2_SUBJECTREQ;
}
if (yesbstr("network")) {
- er_flags |= QR_NETWORK;
+ WCC->CurRoom.QRFlags |= QR_NETWORK;
} else {
- er_flags &= ~QR_NETWORK;
+ WCC->CurRoom.QRFlags &= ~QR_NETWORK;
}
if (yesbstr("directory")) {
- er_flags |= QR_DIRECTORY;
+ WCC->CurRoom.QRFlags |= QR_DIRECTORY;
} else {
- er_flags &= ~QR_DIRECTORY;
+ WCC->CurRoom.QRFlags &= ~QR_DIRECTORY;
}
if (yesbstr("ulallowed")) {
- er_flags |= QR_UPLOAD;
+ WCC->CurRoom.QRFlags |= QR_UPLOAD;
} else {
- er_flags &= ~QR_UPLOAD;
+ WCC->CurRoom.QRFlags &= ~QR_UPLOAD;
}
if (yesbstr("dlallowed")) {
- er_flags |= QR_DOWNLOAD;
+ WCC->CurRoom.QRFlags |= QR_DOWNLOAD;
} else {
- er_flags &= ~QR_DOWNLOAD;
+ WCC->CurRoom.QRFlags &= ~QR_DOWNLOAD;
}
if (yesbstr("visdir")) {
- er_flags |= QR_VISDIR;
+ WCC->CurRoom.QRFlags |= QR_VISDIR;
} else {
- er_flags &= ~QR_VISDIR;
+ WCC->CurRoom.QRFlags &= ~QR_VISDIR;
}
Ptr = sbstr("anon");
- er_flags &= ~(QR_ANONONLY | QR_ANONOPT);
+ WCC->CurRoom.QRFlags &= ~(QR_ANONONLY | QR_ANONOPT);
if (!strcmp(ChrPtr(Ptr), "anononly"))
- er_flags |= QR_ANONONLY;
+ WCC->CurRoom.QRFlags |= QR_ANONONLY;
if (!strcmp(ChrPtr(Ptr), "anon2"))
- er_flags |= QR_ANONOPT;
-
- bump = yesbstr("bump");
-
- er_floor = ibstr("er_floor");
-
- StrBufPrintf(Buf, "SETR %s|%s|%s|%u|%d|%d|%d|%d|%u",
- ChrPtr(er_name),
- ChrPtr(er_password),
- ChrPtr(er_dirname),
- er_flags,
- bump,
- er_floor,
- er_listingorder,
- er_defaultview,
- er_flags2);
- serv_putbuf(Buf);
- StrBuf_ServGetln(Buf);
- if (GetServerStatus(Buf, NULL) != 2) {
- strcpy(WC->ImportantMessage, &ChrPtr(Buf)[4]);
- display_editroom();
- FreeStrBuf(&Buf);
- FreeStrBuf(&er_name);
- FreeStrBuf(&er_password);
- FreeStrBuf(&er_dirname);
- FreeStrBuf(&er_roomaide);
- return;
- }
- gotoroom(er_name);
-
- if (StrLength(er_roomaide) > 0) {
- serv_printf("SETA %s", ChrPtr(er_roomaide));
- StrBuf_ServGetln(Buf);
- if (GetServerStatus(Buf, NULL) != 2) {
- strcpy(WC->ImportantMessage, &ChrPtr(Buf)[4]);
- display_main_menu();
- FreeStrBuf(&Buf);
- FreeStrBuf(&er_name);
- FreeStrBuf(&er_password);
- FreeStrBuf(&er_dirname);
- FreeStrBuf(&er_roomaide);
- return;
- }
- }
- gotoroom(er_name);
- strcpy(WC->ImportantMessage, _("Your changes have been saved."));
- display_editroom();
- FreeStrBuf(&Buf);
- FreeStrBuf(&er_name);
- FreeStrBuf(&er_password);
- FreeStrBuf(&er_dirname);
- FreeStrBuf(&er_roomaide);
- return;
-}
+ WCC->CurRoom.QRFlags |= QR_ANONOPT;
+ er_name = sbstr("er_name");
+ er_dirname = sbstr("er_dirname");
+ er_roomaide = sbstr("er_roomaide");
+ er_password = sbstr("er_password");
-/*
- * Display form for Invite, Kick, and show Who Knows a room
- */
-void do_invt_kick(void) {
- char buf[SIZ], room[SIZ], username[SIZ];
+ FlushStrBuf(WCC->CurRoom.name);
+ StrBufAppendBuf(WCC->CurRoom.name, er_name, 0);
- serv_puts("GETR");
- serv_getln(buf, sizeof buf);
+ FlushStrBuf(WCC->CurRoom.Directory);
+ StrBufAppendBuf(WCC->CurRoom.Directory, er_dirname, 0);
- if (buf[0] != '2') {
- escputs(&buf[4]);
- return;
- }
- extract_token(room, &buf[4], 0, '|', sizeof room);
+ FlushStrBuf(WCC->CurRoom.RoomAide);
+ StrBufAppendBuf(WCC->CurRoom.RoomAide, er_roomaide, 0);
- strcpy(username, bstr("username"));
+ FlushStrBuf(WCC->CurRoom.XAPass);
+ StrBufAppendBuf(WCC->CurRoom.XAPass, er_password, 0);
- if (havebstr("kick_button")) {
- sprintf(buf, "KICK %s", username);
- serv_puts(buf);
- serv_getln(buf, sizeof buf);
+ WCC->CurRoom.BumpUsers = yesbstr("bump");
- if (buf[0] != '2') {
- strcpy(WC->ImportantMessage, &buf[4]);
- } else {
- sprintf(WC->ImportantMessage,
- _("User %s kicked out of room %s.\n"),
- username, room);
- }
- }
+ WCC->CurRoom.floorid = ibstr("er_floor");
- if (havebstr("invite_button")) {
- sprintf(buf, "INVT %s", username);
- serv_puts(buf);
- serv_getln(buf, sizeof buf);
-
- if (buf[0] != '2') {
- strcpy(WC->ImportantMessage, &buf[4]);
- } else {
- sprintf(WC->ImportantMessage,
- _("User %s invited to room %s.\n"),
- username, room);
- }
- }
+ succ1 = SetCurrentRoomFlags(&WCC->CurRoom);
- display_editroom();
+ succ2 = SaveRoomAide (&WCC->CurRoom);
+
+ if (succ1 + succ2 == 0) {
+ AppendImportantMessage (_("Your changes have been saved."), -1);
+ }
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
+ return;
}
@@ -2365,117 +859,78 @@ void do_invt_kick(void) {
/*
* Display form for Invite, Kick, and show Who Knows a room
*/
-void display_whok(void)
+void do_invt_kick(void)
{
- char buf[SIZ], room[SIZ], username[SIZ];
+ StrBuf *Buf, *User;
+ const StrBuf *UserNames;
+ int Kick, Invite;
+ wcsession *WCC = WC;
- serv_puts("GETR");
- serv_getln(buf, sizeof buf);
- if (buf[0] != '2') {
- escputs(&buf[4]);
- return;
- }
- extract_token(room, &buf[4], 0, '|', sizeof room);
-
-
- wc_printf("");
- wc_printf(_("The users listed below have access to this room. "
- "To remove a user from the access list, select the user "
- "name from the list and click 'Kick'."));
- wc_printf("
");
-
- wc_printf("\n");
-
- wc_printf(" | ");
- wc_printf(_("To grant another user access to this room, enter the "
- "user name in the box below and click 'Invite'."));
- wc_printf("
");
-
- wc_printf("\n", _("Invite"));
- /* Pop open an address book -- begin **/
- wc_printf(
- ""
- ""
- " %s",
- _("User"),
- _("Users"), _("Users")
- );
- /* Pop open an address book -- end **/
-
- wc_printf(" |
\n");
- address_book_popup();
- wDumpContent(1);
-}
-
-/*
- * support function for entroom() -- sets the default view
- */
-void er_set_default_view(int newview) {
- char buf[SIZ];
-
- char rm_name[SIZ];
- char rm_pass[SIZ];
- char rm_dir[SIZ];
- int rm_bits1;
- int rm_floor;
- int rm_listorder;
- int rm_bits2;
-
- serv_puts("GETR");
- serv_getln(buf, sizeof buf);
- if (buf[0] != '2') return;
-
- extract_token(rm_name, &buf[4], 0, '|', sizeof rm_name);
- extract_token(rm_pass, &buf[4], 1, '|', sizeof rm_pass);
- extract_token(rm_dir, &buf[4], 2, '|', sizeof rm_dir);
- rm_bits1 = extract_int(&buf[4], 3);
- rm_floor = extract_int(&buf[4], 4);
- rm_listorder = extract_int(&buf[4], 5);
- rm_bits2 = extract_int(&buf[4], 7);
-
- serv_printf("SETR %s|%s|%s|%d|0|%d|%d|%d|%d",
- rm_name, rm_pass, rm_dir, rm_bits1, rm_floor,
- rm_listorder, newview, rm_bits2
- );
- serv_getln(buf, sizeof buf);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
}
-
/*
* Create a new room
*/
void entroom(void)
{
- char buf[SIZ];
+ StrBuf *Line;
const StrBuf *er_name;
const StrBuf *er_type;
const StrBuf *er_password;
@@ -2485,8 +940,7 @@ void entroom(void)
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;
}
@@ -2514,130 +968,89 @@ void entroom(void)
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;
}
/** TODO: Room created, now update the left hand icon bar for this user */
- burn_folder_cache(0); /* burn the old folder cache */
- FlushRoomlist ();
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) ) {
- display_editroom ();
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
} else {
- do_change_view(er_view); /* Now go there */
- }
-
-}
-
-
-/**
- * \brief goto a private room
- */
-void goto_private(void)
-{
- char hold_rm[SIZ];
- char buf[SIZ];
-
- if (!havebstr("ok_button")) {
- display_main_menu();
- return;
- }
- FlushRoomlist();
- strcpy(hold_rm, ChrPtr(WC->CurRoom.name));
- serv_printf("GOTO %s|%s",
- bstr("gr_name"),
- bstr("gr_pass"));
- serv_getln(buf, sizeof buf);
-
- if (buf[0] == '2') {
- smart_goto(sbstr("gr_name"));
- return;
- }
- if (!strncmp(buf, "540", 3)) {
- DoTemplate(HKEY("room_display_private"), NULL, &NoCtx);
- return;
+ smart_goto(WCC->CurRoom.name);
}
- output_headers(1, 1, 1, 0, 0, 0);
- wc_printf("%s\n", &buf[4]);
- wDumpContent(1);
- return;
+ FreeStrBuf(&Line);
}
-/**
- * \brief zap a room
- */
-void zap(void)
-{
- char buf[SIZ];
- StrBuf *final_destination;
-
- /**
- * If the forget-room routine fails for any reason, we fall back
- * to the current room; otherwise, we go to the Lobby
- */
- final_destination = NewStrBufDup(WC->CurRoom.name);
-
- if (havebstr("ok_button")) {
- serv_printf("GOTO %s", ChrPtr(WC->CurRoom.name));
- serv_getln(buf, sizeof buf);
- if (buf[0] == '2') {
- serv_puts("FORG");
- serv_getln(buf, sizeof buf);
- if (buf[0] == '2') {
- FlushStrBuf(final_destination);
- StrBufAppendBufPlain(final_destination, HKEY("_BASEROOM_"), 0);
- }
- }
- FlushRoomlist ();
- }
- smart_goto(final_destination);
- FreeStrBuf(&final_destination);
-}
-
-/**
- * \brief Delete the current room
+/*
+ * Change the view for this room
*/
-void delete_room(void)
-{
+void change_view(void) {
+ int newview;
char buf[SIZ];
-
- serv_puts("KILL 1");
+ newview = lbstr("view");
+ serv_printf("VIEW %d", newview);
serv_getln(buf, sizeof buf);
- burn_folder_cache(0); /* Burn the cahce of known rooms to update the icon bar */
- FlushRoomlist ();
- if (buf[0] != '2') {
- strcpy(WC->ImportantMessage, &buf[4]);
- display_main_menu();
+ WC->CurRoom.view = newview;
+ smart_goto(WC->CurRoom.name);
+}
+
+
+
+/*
+ * Set the message expire policy for this room and/or floor
+ */
+void set_room_policy(void) {
+ StrBuf *Line;
+
+ if (!havebstr("ok_button")) {
+ AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
return;
- } else {
- StrBuf *Buf;
-
- Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
- smart_goto(Buf);
- FreeStrBuf(&Buf);
}
+
+ Line = NewStrBuf();
+
+ serv_printf("SPEX room|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
+ StrBuf_ServGetln(Line);
+ GetServerStatusMsg(Line, NULL, 1, 0);
+ if (WC->axlevel >= 6) {
+ serv_printf("SPEX floor|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
+ StrBuf_ServGetln(Line);
+ GetServerStatusMsg(Line, NULL, 1, 0);
+ }
+ FreeStrBuf(&Line);
+ ReloadCurrentRoom();
+
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
}
-/**
- * \brief Perform changes to a room's network configuration
+/*
+ * Perform changes to a room's network configuration
*/
void netedit(void) {
- FILE *fp;
char buf[SIZ];
char line[SIZ];
char cmpa0[SIZ];
@@ -2645,6 +1058,17 @@ void netedit(void) {
char cmpb0[SIZ];
char cmpb1[SIZ];
int i, num_addrs;
+ StrBuf *Line;
+ StrBuf *TmpBuf;
+ int malias = 0;
+ int malias_set_default = 0;
+ char sepchar = '|';
+ int Done;
+
+ line[0] = '\0';
+ if (havebstr("force_room")) {
+ gotoroom(sbstr("force_room"));
+ }
/*/ TODO: do line dynamic! */
if (havebstr("line_pop3host")) {
strcpy(line, bstr("prefix"));
@@ -2664,51 +1088,107 @@ void netedit(void) {
strcat(line, bstr("line"));
strcat(line, bstr("suffix"));
}
- else {
- display_editroom();
- return;
+ else if (havebstr("alias")) {
+ const char *domain;
+ domain = bstr("aliasdomain");
+ if ((domain == NULL) || IsEmptyStr(domain))
+ {
+ malias_set_default = 1;
+ strcpy(line, bstr("prefix"));
+ strcat(line, bstr("default_aliasdomain"));
+ }
+ else
+ {
+ malias = 1;
+ sepchar = ',';
+ strcat(line, bstr("prefix"));
+ if (!IsEmptyStr(domain))
+ {
+ strcat(line, "@");
+ strcat(line, domain);
+ }
+ strcat(line, ",");
+ strcat(line, "room_");
+ strcat(line, ChrPtr(WC->CurRoom.name));
+ }
}
-
-
- fp = tmpfile();
- if (fp == NULL) {
- display_editroom();
+ else {
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
return;
}
- serv_puts("GNET");
- serv_getln(buf, sizeof buf);
- if (buf[0] != '1') {
- fclose(fp);
- display_editroom();
+ Line = NewStrBuf();
+ TmpBuf = NewStrBuf();
+ if (malias)
+ serv_puts("GNET "FILE_MAILALIAS);
+ else
+ serv_puts("GNET");
+ StrBuf_ServGetln(Line);
+ if (GetServerStatus(Line, NULL) != 1) {
+ AppendImportantMessage(SRV_STATUS_MSG(Line));
+ FreeStrBuf(&Line);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
return;
}
/** This loop works for add *or* remove. Spiffy, eh? */
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- extract_token(cmpa0, buf, 0, '|', sizeof cmpa0);
- extract_token(cmpa1, buf, 1, '|', sizeof cmpa1);
- extract_token(cmpb0, line, 0, '|', sizeof cmpb0);
- extract_token(cmpb1, line, 1, '|', sizeof cmpb1);
- if ( (strcasecmp(cmpa0, cmpb0))
- || (strcasecmp(cmpa1, cmpb1)) ) {
- fprintf(fp, "%s\n", buf);
+ Done = 0;
+ extract_token(cmpb0, line, 0, sepchar, sizeof cmpb0);
+ extract_token(cmpb1, line, 1, sepchar, sizeof cmpb1);
+ while (!Done && StrBuf_ServGetln(Line)>=0) {
+ if ( (StrLength(Line)==3) &&
+ !strcmp(ChrPtr(Line), "000"))
+ {
+ Done = 1;
+ }
+ else
+ {
+ if (StrLength(Line) == 0)
+ continue;
+
+ if (malias_set_default)
+ {
+ if (strncasecmp(ChrPtr(Line), HKEY("roommailalias|")) != 0)
+ {
+ StrBufAppendBufPlain(Line, HKEY("\n"), 0);
+ StrBufAppendBuf(TmpBuf, Line, 0);
+ }
+ }
+ else
+ {
+ extract_token(cmpa0, ChrPtr(Line), 0, sepchar, sizeof cmpa0);
+ extract_token(cmpa1, ChrPtr(Line), 1, sepchar, sizeof cmpa1);
+ if ( (strcasecmp(cmpa0, cmpb0)) || (strcasecmp(cmpa1, cmpb1)) )
+ {
+ StrBufAppendBufPlain(Line, HKEY("\n"), 0);
+ StrBufAppendBuf(TmpBuf, Line, 0);
+ }
+ }
}
}
- rewind(fp);
- serv_puts("SNET");
- serv_getln(buf, sizeof buf);
- if (buf[0] != '4') {
- fclose(fp);
- display_editroom();
+ if (malias)
+ serv_puts("SNET "FILE_MAILALIAS);
+ else
+ serv_puts("SNET");
+ StrBuf_ServGetln(Line);
+ if (GetServerStatus(Line, NULL) != 4) {
+
+ AppendImportantMessage(SRV_STATUS_MSG(Line));
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
+ 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"), ',');
@@ -2730,367 +1210,131 @@ void netedit(void) {
}
serv_puts("000");
- fclose(fp);
- display_editroom();
-}
-
-
-
-/**
- * \brief Convert a room name to a folder-ish-looking name.
- * \param folder the folderish name
- * \param room the room name
- * \param floor the floor name
- * \param is_mailbox is it a mailbox?
- */
-void room_to_folder(char *folder, char *room, int floor, int is_mailbox)
-{
- int i, len;
-
- /**
- * For mailboxes, just do it straight...
- */
- if (is_mailbox) {
- sprintf(folder, "My folders|%s", room);
- }
-
- /**
- * Otherwise, prefix the floor name as a "public folders" moniker
- */
- else {
- if (floor > MAX_FLOORS) {
- wc_backtrace ();
- sprintf(folder, "%%%%%%|%s", room);
- }
- else {
- sprintf(folder, "%s|%s", floorlist[floor], room);
- }
- }
-
- /**
- * Replace "\" characters with "|" for pseudo-folder-delimiting
- */
- len = strlen (folder);
- for (i=0; iCurRoom.view = newview;
- smart_goto(WC->CurRoom.name);
-}
-
-
-
-/**
- * \brief Change the view for this room
- */
-void change_view(void) {
- int view;
-
- view = lbstr("view");
- do_change_view(view);
-}
-
-/**
- * \brief Burn the cached folder list.
- * \param age How old the cahce needs to be before we burn it.
- */
+ FlushIgnetCfgs(&WC->CurRoom);
+ FreeStrBuf(&Line);
-void burn_folder_cache(time_t age)
-{
- /** If our cached folder list is very old, burn it. */
- if (WC->cache_fold != NULL) {
- if ((time(NULL) - WC->cache_timestamp) > age) {
- free(WC->cache_fold);
- WC->cache_fold = NULL;
- }
- }
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
}
-
-
-/**
- * \brief Do either a known rooms list or a folders list, depending on the
- * user's preference
+/*
+ * Known rooms list (box style)
*/
void knrooms(void)
{
- StrBuf *ListView = NULL;
-
- /** Determine whether the user is trying to change views */
- if (havebstr("view")) {
- ListView = NewStrBufDup(SBSTR("view"));
- set_preference("roomlistview", ListView, 1);
- }
- /** Sanitize the input so its safe */
- if((get_preference("roomlistview", &ListView) != 0)||
- ((strcasecmp(ChrPtr(ListView), "folders") != 0) &&
- (strcasecmp(ChrPtr(ListView), "table") != 0)))
- {
- if (ListView == NULL) {
- ListView = NewStrBufPlain(HKEY("rooms"));
- set_preference("roomlistview", ListView, 0);
- ListView = NULL;
- }
- else {
- ListView = NewStrBufPlain(HKEY("rooms"));
- set_preference("roomlistview", ListView, 0);
- ListView = NULL;
- }
- }
- FreeStrBuf(&ListView);
- url_do_template();
+ DeleteHash(&WC->Rooms);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("knrooms");
+ wDumpContent(1);
}
-/**
- * \brief Set the message expire policy for this room and/or floor
- */
-void set_room_policy(void) {
- char buf[SIZ];
-
- if (!havebstr("ok_button")) {
- strcpy(WC->ImportantMessage,
- _("Cancelled. Changes were not saved."));
- display_editroom();
- return;
- }
- serv_printf("SPEX room|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
- serv_getln(buf, sizeof buf);
- strcpy(WC->ImportantMessage, &buf[4]);
- if (WC->axlevel >= 6) {
- strcat(WC->ImportantMessage, "
\n");
- serv_printf("SPEX floor|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
- serv_getln(buf, sizeof buf);
- strcat(WC->ImportantMessage, &buf[4]);
- }
- display_editroom();
-}
-void tmplput_RoomName(StrBuf *Target, WCTemplputParams *TP)
-{
- StrBufAppendTemplate(Target, TP, WC->CurRoom.name, 0);
-}
-void dotgoto(void) {
- if (!havebstr("room")) {
- readloop(readnew, eUseDefault);
- return;
- }
- if (WC->CurRoom.view != VIEW_MAILBOX) { /* dotgoto acts like dotskip when we're in a mailbox view */
- slrp_highest();
- }
- smart_goto(sbstr("room"));
-}
-void tmplput_current_room(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
- if (WCC != NULL)
- StrBufAppendTemplate(Target, TP,
- WCC->CurRoom.name,
- 0);
-}
-void tmplput_roombanner(StrBuf *Target, WCTemplputParams *TP)
-{
- wc_printf("\n");
- embed_room_banner();
- wc_printf("
\n");
-}
-void tmplput_ungoto(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
- if ((WCC!=NULL) &&
- (!IsEmptyStr(WCC->ugname)))
- StrBufAppendBufPlain(Target, WCC->ugname, -1, 0);
-}
-int ConditionalRoomAide(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
- return (WCC != NULL)?
- ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) : 0;
-}
-int ConditionalRoomAcessDelete(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
- return (WCC == NULL)? 0 :
- ( ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ||
- (WCC->CurRoom.is_inbox) ||
- (WCC->CurRoom.QRFlags2 & QR2_COLLABDEL) );
-}
+/*******************************************************************************
+ ********************** FLOOR Coomands *****************************************
+ ******************************************************************************/
-int ConditionalHaveUngoto(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
-
- return ((WCC!=NULL) &&
- (!IsEmptyStr(WCC->ugname)) &&
- (strcasecmp(WCC->ugname, ChrPtr(WCC->CurRoom.name)) == 0));
-}
-int ConditionalRoomHas_UAFlag(StrBuf *Target, WCTemplputParams *TP)
-{
- folder *Folder = (folder *)(TP->Context);
- long UA_CheckFlag;
+/*
+ * delete the actual floor
+ */
+void delete_floor(void) {
+ int floornum;
+ StrBuf *Buf;
+ const char *Err;
- UA_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
- if (UA_CheckFlag == 0)
- LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
- "requires one of the #\"UA_*\"- defines or an integer flag 0 is invalid!");
-
- return ((Folder->RAFlags & UA_CheckFlag) != 0);
-}
-
-
-
-int ConditionalCurrentRoomHas_QRFlag(StrBuf *Target, WCTemplputParams *TP)
-{
- long QR_CheckFlag;
- wcsession *WCC = WC;
+ floornum = ibstr("floornum");
+ Buf = NewStrBuf();
+ serv_printf("KFLR %d|1", floornum);
- QR_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
- if (QR_CheckFlag == 0)
- LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
- "requires one of the #\"QR*\"- defines or an integer flag 0 is invalid!");
+ StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err);
- return ((WCC!=NULL) &&
- ((WCC->CurRoom.QRFlags & QR_CheckFlag) != 0));
-}
+ if (GetServerStatus(Buf, NULL) == 2) {
+ StrBufPlain(Buf, _("Floor has been deleted."),-1);
+ }
+ else {
+ StrBufCutLeft(Buf, 4);
+ }
+ AppendImportantMessage (SKEY(Buf));
-int ConditionalRoomHas_QRFlag(StrBuf *Target, WCTemplputParams *TP)
-{
- long QR_CheckFlag;
- folder *Folder = (folder *)(TP->Context);
-
- QR_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
- if (QR_CheckFlag == 0)
- LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
- "requires one of the #\"QR*\"- defines or an integer flag 0 is invalid!");
- return ((Folder->QRFlags & QR_CheckFlag) != 0);
+ FlushRoomlist();
+ http_transmit_thing(ChrPtr(do_template("floors")), 0);
+ FreeStrBuf(&Buf);
}
+/*
+ * start creating a new floor
+ */
+void create_floor(void) {
+ StrBuf *Buf;
+ const char *Err;
-int ConditionalCurrentRoomHas_QRFlag2(StrBuf *Target, WCTemplputParams *TP)
-{
- long QR2_CheckFlag;
- wcsession *WCC = WC;
-
- QR2_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
- if (QR2_CheckFlag == 0)
- LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
- "requires one of the #\"QR2*\"- defines or an integer flag 0 is invalid!");
-
- return ((WCC!=NULL) &&
- ((WCC->CurRoom.QRFlags2 & QR2_CheckFlag) != 0));
-}
+ Buf = NewStrBuf();
+ serv_printf("CFLR %s|1", bstr("floorname"));
+ StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err);
-int ConditionalRoomHas_QRFlag2(StrBuf *Target, WCTemplputParams *TP)
-{
- long QR2_CheckFlag;
- folder *Folder = (folder *)(TP->Context);
-
- QR2_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
- if (QR2_CheckFlag == 0)
- LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
- "requires one of the #\"QR2*\"- defines or an integer flag 0 is invalid!");
- return ((Folder->QRFlags2 & QR2_CheckFlag) != 0);
+ if (GetServerStatus(Buf, NULL) == 2) {
+ StrBufPlain(Buf, _("New floor has been created."),-1);
+ }
+ else {
+ StrBufCutLeft(Buf, 4);
+ }
+ AppendImportantMessage (SKEY(Buf));
+ FlushRoomlist();
+ http_transmit_thing(ChrPtr(do_template("floors")), 0);
+ FreeStrBuf(&Buf);
}
-int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
+/*
+ * rename this floor
+ */
+void rename_floor(void) {
+ StrBuf *Buf;
- return ( (WCC!= NULL) &&
- ((WCC->axlevel >= 6) ||
- ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ||
- (WCC->CurRoom.is_inbox) ));
-}
+ Buf = NewStrBuf();
+ FlushRoomlist();
-int ConditionalIsRoomtype(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
+ serv_printf("EFLR %d|%s", ibstr("floornum"), bstr("floorname"));
+ StrBuf_ServGetln(Buf);
- if ((WCC == NULL) ||
- (TP->Tokens->nParameters < 3))
- {
- return ((WCC->CurRoom.view < VIEW_BBS) ||
- (WCC->CurRoom.view > VIEW_MAX));
- }
+ StrBufCutLeft(Buf, 4);
+ AppendImportantMessage (SKEY(Buf));
- return WCC->CurRoom.view == GetTemplateTokenNumber(Target, TP, 2, VIEW_BBS);
+ http_transmit_thing(ChrPtr(do_template("floors")), 0);
+ FreeStrBuf(&Buf);
}
-HashList *GetWhoKnowsHash(StrBuf *Target, WCTemplputParams *TP)
-{
- wcsession *WCC = WC;
- StrBuf *Line;
- StrBuf *Token;
- long State;
- HashList *Whok = NULL;
- int Done = 0;
- int n;
-
- serv_puts("WHOK");
- Line = NewStrBuf();
- StrBuf_ServGetln(Line);
- if (GetServerStatus(Line, &State) == 1)
- {
- Whok = NewHash(1, Flathash);
- while(!Done && StrBuf_ServGetln(Line))
- if ( (StrLength(Line)==3) &&
- !strcmp(ChrPtr(Line), "000"))
- {
- Done = 1;
- }
- else
- {
-
- const char *Pos = NULL;
- Token = NewStrBufPlain (NULL, StrLength(Line));
- StrBufExtract_NextToken(Token, Line, &Pos, '|');
-
- Put(Whok,
- IKEY(n),
- Token,
- HFreeStrBuf);
- }
- }
- else if (State == 550)
- StrBufAppendBufPlain(WCC->ImportantMsg,
- _("Higher access is required to access this function."), -1, 0);
-
- FreeStrBuf(&Line);
- return Whok;
+void jsonRoomFlr(void)
+{
+ /* Send as our own (application/json) content type */
+ hprintf("HTTP/1.1 200 OK\r\n");
+ hprintf("Content-type: application/json; charset=utf-8\r\n");
+ hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software));
+ hprintf("Connection: close\r\n");
+ hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
+ begin_burst();
+ DoTemplate(HKEY("json_roomflr"),NULL,&NoCtx);
+ end_burst();
}
void _FlushRoomList(wcsession *WCC)
@@ -3099,6 +1343,19 @@ void _FlushRoomList(wcsession *WCC)
DeleteHash(&WCC->Floors);
DeleteHash(&WCC->Rooms);
DeleteHash(&WCC->FloorsByName);
+ FlushFolder(&WCC->CurRoom);
+}
+
+void ReloadCurrentRoom(void)
+{
+ wcsession *WCC = WC;
+ StrBuf *CurRoom;
+
+ CurRoom = WCC->CurRoom.name;
+ WCC->CurRoom.name = NULL;
+ _FlushRoomList(WCC);
+ gotoroom(CurRoom);
+ FreeStrBuf(&CurRoom);
}
void FlushRoomlist(void)
@@ -3112,66 +1369,34 @@ void
InitModule_ROOMOPS
(void)
{
- initialize_viewdefs();
RegisterPreference("roomlistview",
_("Room list view"),
PRF_STRING,
NULL);
RegisterPreference("emptyfloors", _("Show empty floors"), PRF_YESNO, NULL);
- RegisterNamespace("ROOMNAME", 0, 1, tmplput_RoomName, NULL, CTX_NONE);
+ WebcitAddUrlHandler(HKEY("json_roomflr"), "", 0, jsonRoomFlr, 0);
+ WebcitAddUrlHandler(HKEY("delete_floor"), "", 0, delete_floor, 0);
+ WebcitAddUrlHandler(HKEY("rename_floor"), "", 0, rename_floor, 0);
+ WebcitAddUrlHandler(HKEY("create_floor"), "", 0, create_floor, 0);
- WebcitAddUrlHandler(HKEY("knrooms"), "", 0, knrooms, 0);
+ WebcitAddUrlHandler(HKEY("knrooms"), "", 0, knrooms, ANONYMOUS);
WebcitAddUrlHandler(HKEY("dotgoto"), "", 0, dotgoto, NEED_URL);
WebcitAddUrlHandler(HKEY("dotskip"), "", 0, dotskip, NEED_URL);
WebcitAddUrlHandler(HKEY("goto_private"), "", 0, goto_private, NEED_URL);
WebcitAddUrlHandler(HKEY("zap"), "", 0, zap, 0);
WebcitAddUrlHandler(HKEY("entroom"), "", 0, entroom, 0);
- WebcitAddUrlHandler(HKEY("display_whok"), "", 0, display_whok, 0);
WebcitAddUrlHandler(HKEY("do_invt_kick"), "", 0, do_invt_kick, 0);
- WebcitAddUrlHandler(HKEY("display_editroom"), "", 0, display_editroom, 0);
+
WebcitAddUrlHandler(HKEY("netedit"), "", 0, netedit, 0);
WebcitAddUrlHandler(HKEY("editroom"), "", 0, editroom, 0);
WebcitAddUrlHandler(HKEY("delete_room"), "", 0, delete_room, 0);
WebcitAddUrlHandler(HKEY("set_room_policy"), "", 0, set_room_policy, 0);
WebcitAddUrlHandler(HKEY("changeview"), "", 0, change_view, 0);
WebcitAddUrlHandler(HKEY("toggle_self_service"), "", 0, toggle_self_service, 0);
- RegisterNamespace("ROOMBANNER", 0, 1, tmplput_roombanner, NULL, CTX_NONE);
-
- RegisterConditional(HKEY("COND:ROOM:TYPE_IS"), 0, ConditionalIsRoomtype, CTX_NONE);
- RegisterConditional(HKEY("COND:THISROOM:FLAG:QR"), 0, ConditionalCurrentRoomHas_QRFlag, CTX_NONE);
- RegisterConditional(HKEY("COND:ROOM:FLAG:QR"), 0, ConditionalRoomHas_QRFlag, CTX_ROOMS);
-
- RegisterConditional(HKEY("COND:THISROOM:FLAG:QR2"), 0, ConditionalCurrentRoomHas_QRFlag2, CTX_NONE);
- RegisterConditional(HKEY("COND:ROOM:FLAG:QR2"), 0, ConditionalRoomHas_QRFlag2, CTX_ROOMS);
- RegisterConditional(HKEY("COND:ROOM:FLAG:UA"), 0, ConditionalRoomHas_UAFlag, CTX_ROOMS);
-
- RegisterIterator("ITERATE:THISROOM:WHO_KNOWS", 0, NULL, GetWhoKnowsHash, NULL, DeleteHash, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
- RegisterNamespace("THISROOM:MSGS:NEW", 0, 0, tmplput_CurrentRoom_nNewMessages, NULL, CTX_NONE);
- RegisterNamespace("THISROOM:MSGS:TOTAL", 0, 0, tmplput_CurrentRoom_nTotalMessages, NULL, CTX_NONE);
-
- RegisterNamespace("THISROOM:FLOOR:NAME", 0, 1, tmplput_CurrentRoomFloorName, NULL, CTX_NONE);
- RegisterNamespace("THISROOM:AIDE", 0, 1, tmplput_CurrentRoomAide, NULL, CTX_NONE);
- RegisterNamespace("THISROOM:PASS", 0, 1, tmplput_CurrentRoomPass, NULL, CTX_NONE);
- RegisterNamespace("THISROOM:DIRECTORY", 0, 1, tmplput_CurrentRoomDirectory, NULL, CTX_NONE);
- RegisterNamespace("THISROOM:ORDER", 0, 0, tmplput_CurrentRoomOrder, NULL, CTX_NONE);
- RegisterNamespace("THISROOM:DEFAULT_VIEW", 0, 0, tmplput_CurrentRoomDefView, NULL, CTX_NONE);
- RegisterConditional(HKEY("COND:THISROOM:HAVE_VIEW"), 0, ConditionalThisRoomHaveView, CTX_NONE);
- RegisterConditional(HKEY("COND:ALLOWED_DEFAULT_VIEW"), 0, ConditionalIsAllowedDefaultView, CTX_NONE);
-
- RegisterNamespace("THISROOM:VIEW_STRING", 0, 1, tmplput_CurrentRoomViewString, NULL, CTX_NONE);
- RegisterNamespace("ROOM:VIEW_STRING", 1, 2, tmplput_RoomViewString, NULL, CTX_NONE);
-
- RegisterNamespace("THISROOM:INFOTEXT", 1, 2, tmplput_CurrentRoomInfoText, NULL, CTX_NONE);
- RegisterConditional(HKEY("COND:THISROOM:ORDER"), 0, ConditionalThisRoomOrder, CTX_NONE);
- RegisterConditional(HKEY("COND:THISROOM:DEFAULT_VIEW"), 0, ConditionalThisRoomDefView, CTX_NONE);
- RegisterConditional(HKEY("COND:THISROOM:CURR_VIEW"), 0, ConditionalThisRoomCurrView, CTX_NONE);
- RegisterConditional(HKEY("COND:THISROOM:HAVE_PIC"), 0, ConditionalThisRoomXHavePic, CTX_NONE);
- RegisterConditional(HKEY("COND:THISROOM:HAVE_INFOTEXT"), 0, ConditionalThisRoomXHaveInfoText, CTX_NONE);
- RegisterNamespace("THISROOM:FILES:N", 0, 1, tmplput_CurrentRoomXNFiles, NULL, CTX_NONE);
- RegisterNamespace("THISROOM:FILES:STR", 0, 1, tmplput_CurrentRoomX_FileString, NULL, CTX_NONE);
+
REGISTERTokenParamDefine(QR_PERMANENT);
REGISTERTokenParamDefine(QR_INUSE);
@@ -3202,6 +1427,7 @@ InitModule_ROOMOPS
REGISTERTokenParamDefine(UA_POSTALLOWED);
REGISTERTokenParamDefine(UA_ADMINALLOWED);
REGISTERTokenParamDefine(UA_DELETEALLOWED);
+ REGISTERTokenParamDefine(UA_REPLYALLOWED);
REGISTERTokenParamDefine(UA_ISTRASH);
REGISTERTokenParamDefine(US_NEEDVALID);
@@ -3229,8 +1455,15 @@ InitModule_ROOMOPS
REGISTERTokenParamDefine(VIEW_CALBRIEF);
REGISTERTokenParamDefine(VIEW_JOURNAL);
REGISTERTokenParamDefine(VIEW_BLOG);
+ REGISTERTokenParamDefine(VIEW_QUEUE);
+ REGISTERTokenParamDefine(VIEW_WIKIMD);
/* GNET types: */
+ /* server internal, we need to know but ignore them. */
+ REGISTERTokenParamDefine(subpending);
+ REGISTERTokenParamDefine(unsubpending);
+ REGISTERTokenParamDefine(lastsent);
+
REGISTERTokenParamDefine(ignet_push_share);
{ /* these are the parts of an IGNET push config */
REGISTERTokenParamDefine(GNET_IGNET_NODE);
@@ -3247,16 +1480,8 @@ InitModule_ROOMOPS
}
REGISTERTokenParamDefine(rssclient);
REGISTERTokenParamDefine(participate);
+ REGISTERTokenParamDefine(roommailalias);
- RegisterConditional(HKEY("COND:ROOMAIDE"), 2, ConditionalRoomAide, CTX_NONE);
- RegisterConditional(HKEY("COND:ACCESS:DELETE"), 2, ConditionalRoomAcessDelete, CTX_NONE);
-
- RegisterConditional(HKEY("COND:UNGOTO"), 0, ConditionalHaveUngoto, CTX_NONE);
- RegisterConditional(HKEY("COND:ROOM:EDITACCESS"), 0, ConditionalHaveRoomeditRights, CTX_NONE);
-
- RegisterNamespace("CURRENT_ROOM", 0, 1, tmplput_current_room, NULL, CTX_NONE);
- RegisterNamespace("ROOM:UNGOTO", 0, 0, tmplput_ungoto, NULL, CTX_NONE);
- RegisterIterator("FLOORS", 0, NULL, GetFloorListHash, NULL, NULL, CTX_FLOORS, CTX_NONE, IT_NOFLAG);
}
@@ -3266,13 +1491,6 @@ void
SessionDestroyModule_ROOMOPS
(wcsession *sess)
{
- FlushFolder(&sess->CurRoom);
- if (sess->cache_fold != NULL) {
- free(sess->cache_fold);
- }
-
_FlushRoomList (sess);
}
-
-/*@}*/