/*
* Lots of different room-related operations.
+ *
+ * Copyright (c) 1996-2016 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"
-
ConstStr QRFlagList[] = {
{HKEY(strof(QR_PERMANENT))},
{HKEY(strof(QR_INUSE))},
{HKEY(strof(QR2_SUBJECTREQ))},
{HKEY(strof(QR2_SMTP_PUBLIC))},
{HKEY(strof(QR2_MODERATED))},
- {HKEY("")},
+ {HKEY(strof(QR2_NOUPLMSG))},
{HKEY("")},
{HKEY("")},
{HKEY("")},
i = i << 1;
j++;
}
- lprintf(9, "DBG: QR-Vec [%ld] [%s]\n", QR, ChrPtr(QRVec));
+ syslog(LOG_DEBUG, "DBG: QR-Vec [%ld] [%s]\n", QR, ChrPtr(QRVec));
FreeStrBuf(&QRVec);
}
i = i << 1;
j++;
}
- lprintf(9, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
+ syslog(LOG_DEBUG, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
FreeStrBuf(&QR2Vec);
}
/*******************************************************************************
***************************** Goto Commands ***********************************
******************************************************************************/
+
+void dotskip(void) {
+ smart_goto(sbstr("room"));
+}
+
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 */
+ if (WC->CurRoom.view != VIEW_MAILBOX) {
+ /* dotgoto acts like dotskip when we're in a mailbox view */
slrp_highest();
}
smart_goto(sbstr("room"));
* goto next room
*/
void smart_goto(const StrBuf *next_room) {
- gotoroom(next_room);
- readloop(readnew, eUseDefault);
+ if (gotoroom(next_room) / 100 == 2)
+ readloop(readnew, eUseDefault);
+ else
+ do_404();
}
-/**
- * \brief goto a private room
+/*
+ * goto a private room
*/
void goto_private(void)
{
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);
/*
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);
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)
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) {
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->Floor = (const Floor*) vFloor;
}
-/**
- * \brief Delete the current room
+/*
+ * Delete the current room
*/
void delete_room(void)
{
- char buf[SIZ];
-
+ StrBuf *Line = NewStrBuf();
+ const StrBuf *GoBstr;
- serv_puts("KILL 1");
- serv_getln(buf, sizeof buf);
+ GoBstr = sbstr("go");
- if (buf[0] != '2') {
- strcpy(WC->ImportantMessage, &buf[4]);
- display_main_menu();
- return;
- } else {
- StrBuf *Buf;
-
- FlushRoomlist ();
- Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
- smart_goto(Buf);
- FreeStrBuf(&Buf);
+ 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);
}
-/**
- * \brief zap a room
+/*
+ * zap a room
*/
void zap(void)
{
}
-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);
}
{
wcsession *WCC = WC;
StrBuf *Buf;
+ off_t bytes;
- if (WCC->CurRoom.XHaveRoomPicLoaded)
+ if (WCC->CurRoom.XHaveRoomPicLoaded) {
return;
+ }
WCC->CurRoom.XHaveRoomPicLoaded = 1;
Buf = NewStrBuf();
- serv_puts("OIMG _roompic_");
+ serv_puts("DLRI");
StrBuf_ServGetln(Buf);
- if (GetServerStatus(Buf, NULL) != 2) {
- WCC->CurRoom.XHaveRoomPic = 0;
- } else {
+ if (GetServerStatus(Buf, NULL) == 6) {
+ StrBufCutLeft(Buf, 4);
+ bytes = StrBufExtract_long(Buf, 0, '|');
WCC->CurRoom.XHaveRoomPic = 1;
+ StrBuf_ServGetBLOBBuffered(Buf, bytes); // discard the data
+ } else {
+ WCC->CurRoom.XHaveRoomPic = 0;
}
- serv_puts("CLOS");
- StrBuf_ServGetln(Buf);
- GetServerStatus(Buf, NULL);
FreeStrBuf (&Buf);
}
void toggle_self_service(void) {
wcsession *WCC = WC;
- if (GetCurrentRoomFlags (&WCC->CurRoom) == 0)
+ if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0)
return;
if (yesbstr("QR2_SelfList"))
WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SMTP_PUBLIC;
SetCurrentRoomFlags (&WCC->CurRoom);
-
- http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
}
const StrBuf *er_password;
const StrBuf *er_dirname;
const StrBuf *er_roomaide;
- unsigned er_flags;
- unsigned er_flags2;
+ const StrBuf *templ;
int succ1, succ2;
+ templ = sbstr("template");
if (!havebstr("ok_button")) {
- strcpy(WC->ImportantMessage,
- _("Cancelled. Changes were not saved."));
- http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+ putlbstr("success", 0);
+ AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
+ if (templ != NULL) {
+ output_headers(1, 0, 0, 0, 0, 0);
+ DoTemplate(SKEY(templ), NULL, &NoCtx);
+ end_burst();
+ }
+ else {
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
+ }
return;
}
- if (GetCurrentRoomFlags (&WCC->CurRoom) == 0)
+
+ if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0) {
+ putlbstr("success", 0);
+ if (templ != NULL) {
+ output_headers(1, 0, 0, 0, 0, 0);
+ DoTemplate(SKEY(templ), NULL, &NoCtx);
+ end_burst();
+ }
+ else {
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
+ }
return;
+ }
LoadRoomAide();
-
- er_flags = WCC->CurRoom.QRFlags;
- er_flags &= !(QR_PRIVATE | QR_PASSWORDED | QR_GUESSNAME);
-
- er_flags2 = WCC->CurRoom.QRFlags2;
+ WCC->CurRoom.QRFlags &= !(QR_PRIVATE | QR_PASSWORDED | QR_GUESSNAME);
Ptr = sbstr("type");
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;
+ if (yesbstr("ulmsg")) {
+ WCC->CurRoom.QRFlags2 |= QR2_NOUPLMSG;
} else {
- er_flags &= ~QR_VISDIR;
+ WCC->CurRoom.QRFlags2 &= ~QR2_NOUPLMSG;
}
+ if (yesbstr("visdir")) {
+ WCC->CurRoom.QRFlags |= QR_VISDIR;
+ } else {
+ 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;
+ WCC->CurRoom.QRFlags |= QR_ANONOPT;
er_name = sbstr("er_name");
er_dirname = sbstr("er_dirname");
succ2 = SaveRoomAide (&WCC->CurRoom);
- if (succ1 + succ2 == 0)
+ if (succ1 + succ2 == 0) {
+ putlbstr("success", 1);
AppendImportantMessage (_("Your changes have been saved."), -1);
- http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+ }
+ else {
+ putlbstr("success", 0);
+ }
+ if (templ != NULL) {
+ output_headers(1, 0, 0, 0, 0, 0);
+ DoTemplate(SKEY(templ), NULL, &NoCtx);
+ end_burst();
+ }
+ else {
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
+ }
return;
}
wcsession *WCC = WC;
- if (GetCurrentRoomFlags(&WCC->CurRoom) == 1)
+ if (GetCurrentRoomFlags(&WCC->CurRoom, 1) == 1)
{
const char *Pos;
UserNames = sbstr("username");
if ((StrLength(User) > 0) && (Kick))
{
serv_printf("KICK %s", ChrPtr(User));
- StrBuf_ServGetln(Buf);
+ if (StrBuf_ServGetln(Buf) < 0)
+ break;
if (GetServerStatus(Buf, NULL) != 2) {
StrBufCutLeft(Buf, 4);
AppendImportantMessage(SKEY(Buf));
else if ((StrLength(User) > 0) && (Invite))
{
serv_printf("INVT %s", ChrPtr(User));
- StrBuf_ServGetln(Buf);
+ if (StrBuf_ServGetln(Buf) < 0)
+ break;
if (GetServerStatus(Buf, NULL) != 2) {
StrBufCutLeft(Buf, 4);
AppendImportantMessage(SKEY(Buf));
}
}
- http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
}
*/
void entroom(void)
{
- char buf[SIZ];
+ StrBuf *Line;
const StrBuf *er_name;
const StrBuf *er_type;
const StrBuf *er_password;
+ const StrBuf *template;
int er_floor;
int er_num_type;
int er_view;
wcsession *WCC = WC;
- if (!havebstr("ok_button")) {
- strcpy(WC->ImportantMessage,
- _("Cancelled. No new room was created."));
- display_main_menu();
+ template = sbstr("template");
+ if ((WCC == NULL) || !havebstr("ok_button")) {
+ putlbstr("success", 0);
+ AppendImportantMessage(_("Cancelled. No new room was created."), -1);
+ if (template != NULL) {
+ output_headers(1, 0, 0, 0, 0, 0);
+ DoTemplate(SKEY(template), NULL, &NoCtx);
+ end_burst();
+ }
+ else {
+ display_main_menu();
+ }
return;
}
er_name = sbstr("er_name");
0,
er_view);
- serv_getln(buf, sizeof buf);
- if (buf[0] != '2') {
- strcpy(WCC->ImportantMessage, &buf[4]);
- display_main_menu();
+ Line = NewStrBuf();
+ StrBuf_ServGetln(Line);
+ if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
+ putlbstr("success", 0);
+ FreeStrBuf(&Line);
+ if (template != NULL) {
+ output_headers(1, 0, 0, 0, 0, 0);
+ DoTemplate(SKEY(template), NULL, &NoCtx);
+ end_burst();
+ }
+ else {
+ display_main_menu();
+ }
return;
}
/** TODO: Room created, now update the left hand icon bar for this user */
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) ) {
- http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+ putlbstr("success", 1);
+ if (template != NULL) {
+ output_headers(1, 0, 0, 0, 0, 0);
+ DoTemplate(SKEY(template), NULL, &NoCtx);
+ end_burst();
+ }
+ else if ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) {
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
} else {
smart_goto(WCC->CurRoom.name);
}
-
+ FreeStrBuf(&Line);
}
-/**
- * \brief Change the view for this room
+/*
+ * Change the view for this room
*/
void change_view(void) {
int newview;
-/**
- * \brief Set the message expire policy for this room and/or floor
+/*
+ * 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."));
- http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+ AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
return;
}
- serv_printf("SPEX roompolicy|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
- serv_getln(buf, sizeof buf);
- strcpy(WC->ImportantMessage, &buf[4]);
+ Line = NewStrBuf();
+ serv_printf("SPEX room|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
+ 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]);
+ serv_printf("SPEX floor|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
+ StrBuf_ServGetln(Line);
+ GetServerStatusMsg(Line, NULL, 1, 0);
}
+ FreeStrBuf(&Line);
ReloadCurrentRoom();
- http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+
+ 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];
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"));
strcat(line, bstr("line"));
strcat(line, bstr("suffix"));
}
- else {
- http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
- 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) {
- http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+ else {
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
return;
}
Line = NewStrBuf();
- serv_puts("GNET");
+ TmpBuf = NewStrBuf();
+ if (malias)
+ serv_puts("GNET "FILE_MAILALIAS);
+ else
+ 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", NULL)), 0);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
return;
}
/** This loop works for add *or* remove. Spiffy, eh? */
Done = 0;
- extract_token(cmpb0, line, 0, '|', sizeof cmpb0);
- extract_token(cmpb1, line, 1, '|', sizeof cmpb1);
+ 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"))
}
else
{
- extract_token(cmpa0, ChrPtr(Line), 0, '|', sizeof cmpa0);
- extract_token(cmpa1, ChrPtr(Line), 1, '|', sizeof cmpa1);
- if ( (strcasecmp(cmpa0, cmpb0))
- || (strcasecmp(cmpa1, cmpb1)) ) {
- StrBufAppendBufPlain(Line, HKEY("\n"), 0);
- fwrite(SKEY(Line), 1, fp);
+ 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");
+ if (malias)
+ serv_puts("SNET "FILE_MAILALIAS);
+ else
+ 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", NULL)), 0);
+ 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"), ',');
}
serv_puts("000");
- fclose(fp);
+ serv_puts("NOOP");
+ StrBuf_ServGetln(Line);
+ if (GetServerStatus(Line, NULL) != 2) { /* WHOOOPS? ERROR? */
+ AppendImportantMessage(SRV_STATUS_MSG(Line));
+ StrBuf_ServGetln(Line); /* resync... */
+ }
+
+
FlushIgnetCfgs(&WC->CurRoom);
FreeStrBuf(&Line);
- http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+ 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), "rooms") != 0)
- )
- )
- {
- ListView = NewStrBufPlain(HKEY("rooms"));
- set_preference("roomlistview", ListView, 0);
- }
- url_do_template();
+ DeleteHash(&WC->Rooms);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("knrooms");
+ wDumpContent(1);
}
AppendImportantMessage (SKEY(Buf));
FlushRoomlist();
- http_transmit_thing(ChrPtr(do_template("floors", NULL)), 0);
+ http_transmit_thing(ChrPtr(do_template("floors")), 0);
FreeStrBuf(&Buf);
}
}
AppendImportantMessage (SKEY(Buf));
FlushRoomlist();
- http_transmit_thing(ChrPtr(do_template("floors", NULL)), 0);
+ http_transmit_thing(ChrPtr(do_template("floors")), 0);
FreeStrBuf(&Buf);
}
StrBufCutLeft(Buf, 4);
AppendImportantMessage (SKEY(Buf));
- http_transmit_thing(ChrPtr(do_template("floors", NULL)), 0);
+ http_transmit_thing(ChrPtr(do_template("floors")), 0);
FreeStrBuf(&Buf);
}
NULL);
RegisterPreference("emptyfloors", _("Show empty floors"), PRF_YESNO, NULL);
-
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);
REGISTERTokenParamDefine(QR2_SUBJECTREQ);
REGISTERTokenParamDefine(QR2_SMTP_PUBLIC);
REGISTERTokenParamDefine(QR2_MODERATED);
+ REGISTERTokenParamDefine(QR2_NOUPLMSG);
REGISTERTokenParamDefine(UA_KNOWN);
REGISTERTokenParamDefine(UA_GOTOALLOWED);
REGISTERTokenParamDefine(UA_POSTALLOWED);
REGISTERTokenParamDefine(UA_ADMINALLOWED);
REGISTERTokenParamDefine(UA_DELETEALLOWED);
+ REGISTERTokenParamDefine(UA_REPLYALLOWED);
REGISTERTokenParamDefine(UA_ISTRASH);
REGISTERTokenParamDefine(US_NEEDVALID);
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(rssclient);
REGISTERTokenParamDefine(participate);
+ REGISTERTokenParamDefine(roommailalias);
_FlushRoomList (sess);
}
-
-/*@}*/
projects / citadel.git / blobdiff