/*
* Lots of different room-related operations.
*
- * Copyright (c) 1996-2012 by the citadel.org team
+ * 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.
{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++;
}
- syslog(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++;
}
- syslog(9, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
+ syslog(LOG_DEBUG, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
FreeStrBuf(&QR2Vec);
}
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();
}
/*
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) {
}
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, &err) != 2) {
+ if (failvisibly) {
+ FreeStrBuf(&Buf);
+ return err;
+ }
serv_puts("GOTO _BASEROOM_");
StrBuf_ServGetln(Buf);
/*
{
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);
}
const StrBuf *er_password;
const StrBuf *er_dirname;
const StrBuf *er_roomaide;
+ const StrBuf *templ;
int succ1, succ2;
+ templ = sbstr("template");
if (!havebstr("ok_button")) {
+ putlbstr("success", 0);
AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
- output_headers(1, 1, 1, 0, 0, 0);
- do_template("room_edit");
- wDumpContent(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, 1) == 0) {
- output_headers(1, 1, 1, 0, 0, 0);
- do_template("room_edit");
- wDumpContent(1);
+ 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;
}
WCC->CurRoom.QRFlags &= ~QR_DOWNLOAD;
}
+ if (yesbstr("ulmsg")) {
+ WCC->CurRoom.QRFlags2 |= QR2_NOUPLMSG;
+ } else {
+ WCC->CurRoom.QRFlags2 &= ~QR2_NOUPLMSG;
+ }
+
if (yesbstr("visdir")) {
WCC->CurRoom.QRFlags |= QR_VISDIR;
} else {
succ2 = SaveRoomAide (&WCC->CurRoom);
if (succ1 + succ2 == 0) {
+ putlbstr("success", 1);
AppendImportantMessage (_("Your changes have been saved."), -1);
}
- output_headers(1, 1, 1, 0, 0, 0);
- do_template("room_edit");
- wDumpContent(1);
+ 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;
}
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")) {
+ template = sbstr("template");
+ if ((WCC == NULL) || !havebstr("ok_button")) {
+ putlbstr("success", 0);
AppendImportantMessage(_("Cancelled. No new room was created."), -1);
- display_main_menu();
+ 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");
Line = NewStrBuf();
StrBuf_ServGetln(Line);
if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
+ putlbstr("success", 0);
FreeStrBuf(&Line);
- display_main_menu();
+ 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 */
FreeStrBuf(&Line); /* TODO: should we care about errors? */
WCC->CurRoom.view = er_view;
- if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 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);
wDumpContent(1);
return;
}
+
Line = NewStrBuf();
- serv_printf("SPEX roompolicy|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
+ 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 floorpolicy|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
+ serv_printf("SPEX floor|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
StrBuf_ServGetln(Line);
GetServerStatusMsg(Line, NULL, 1, 0);
}
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"));
}
strcat(line, bstr("line"));
strcat(line, bstr("suffix"));
}
+ 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));
+ }
+ }
else {
output_headers(1, 1, 1, 0, 0, 0);
do_template("room_edit");
Line = NewStrBuf();
TmpBuf = NewStrBuf();
- serv_puts("GNET");
+ if (malias)
+ serv_puts("GNET "FILE_MAILALIAS);
+ else
+ serv_puts("GNET");
StrBuf_ServGetln(Line);
if (GetServerStatus(Line, NULL) != 1) {
AppendImportantMessage(SRV_STATUS_MSG(Line));
/** 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);
- StrBufAppendBuf(TmpBuf, Line, 0);
+ 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);
+ }
}
}
}
- serv_puts("SNET");
+ if (malias)
+ serv_puts("SNET "FILE_MAILALIAS);
+ else
+ serv_puts("SNET");
StrBuf_ServGetln(Line);
if (GetServerStatus(Line, NULL) != 4) {
}
serv_puts("000");
+ 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);
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);