X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Froomops.c;h=2ea692862e01c572c76ffe6b0be416b7db1d8f83;hb=64f430bd72e548b3b57a8d801ec16e9f904281bd;hp=301d83c5f55e00453403af932803054e9ee8cdbd;hpb=7d37340257d55a5a09d6955cd082e94976ed6492;p=citadel.git diff --git a/webcit/roomops.c b/webcit/roomops.c index 301d83c5f..2ea692862 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -39,7 +39,7 @@ ConstStr QR2FlagList[] = { {HKEY(strof(QR2_SUBJECTREQ))}, {HKEY(strof(QR2_SMTP_PUBLIC))}, {HKEY(strof(QR2_MODERATED))}, - {HKEY("")}, + {HKEY(strof(QR2_NOUPLMSG))}, {HKEY("")}, {HKEY("")}, {HKEY("")}, @@ -67,7 +67,7 @@ void _DBG_QR(long QR) 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); } @@ -90,7 +90,7 @@ void _DBG_QR2(long QR2) 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); } @@ -113,11 +113,14 @@ void dotskip(void) { } void dotgoto(void) { + wcsession *WCC = WC; 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 ((WCC->CurRoom.view != VIEW_MAILBOX) && + (WCC->CurRoom.view != WCC->CurRoom.view)) { + /* dotgoto acts like dotskip when we're in a mailbox view */ slrp_highest(); } smart_goto(sbstr("room")); @@ -127,8 +130,10 @@ void dotgoto(void) { * 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(); } /* @@ -182,6 +187,10 @@ long gotoroom(const StrBuf *gname) 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) { @@ -206,6 +215,10 @@ long gotoroom(const StrBuf *gname) } StrBuf_ServGetln(Buf); if (GetServerStatus(Buf, &err) != 2) { + if (failvisibly) { + FreeStrBuf(&Buf); + return err; + } serv_puts("GOTO _BASEROOM_"); StrBuf_ServGetln(Buf); /* @@ -706,20 +719,38 @@ void editroom(void) 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; } @@ -796,6 +827,12 @@ void editroom(void) 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 { @@ -836,11 +873,22 @@ void editroom(void) 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; } @@ -924,14 +972,24 @@ void entroom(void) 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"); @@ -961,8 +1019,16 @@ void entroom(void) 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 */ @@ -973,7 +1039,13 @@ void entroom(void) 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); @@ -1007,6 +1079,7 @@ void change_view(void) { * 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); @@ -1016,7 +1089,7 @@ void set_room_policy(void) { return; } - StrBuf *Line = NewStrBuf(); + Line = NewStrBuf(); serv_printf("SPEX room|%d|%d", ibstr("roompolicy"), ibstr("roomvalue")); StrBuf_ServGetln(Line); @@ -1049,8 +1122,12 @@ void netedit(void) { 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")); } @@ -1073,6 +1150,30 @@ void netedit(void) { 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"); @@ -1082,7 +1183,10 @@ void netedit(void) { 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)); @@ -1095,8 +1199,8 @@ void netedit(void) { /** 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")) @@ -1105,17 +1209,34 @@ void netedit(void) { } 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) { @@ -1151,6 +1272,14 @@ void netedit(void) { } 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); @@ -1360,6 +1489,7 @@ InitModule_ROOMOPS REGISTERTokenParamDefine(QR2_SUBJECTREQ); REGISTERTokenParamDefine(QR2_SMTP_PUBLIC); REGISTERTokenParamDefine(QR2_MODERATED); + REGISTERTokenParamDefine(QR2_NOUPLMSG); REGISTERTokenParamDefine(UA_KNOWN); REGISTERTokenParamDefine(UA_GOTOALLOWED); @@ -1368,6 +1498,7 @@ InitModule_ROOMOPS REGISTERTokenParamDefine(UA_POSTALLOWED); REGISTERTokenParamDefine(UA_ADMINALLOWED); REGISTERTokenParamDefine(UA_DELETEALLOWED); + REGISTERTokenParamDefine(UA_REPLYALLOWED); REGISTERTokenParamDefine(UA_ISTRASH); REGISTERTokenParamDefine(US_NEEDVALID); @@ -1395,6 +1526,8 @@ 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. */ @@ -1418,6 +1551,7 @@ InitModule_ROOMOPS } REGISTERTokenParamDefine(rssclient); REGISTERTokenParamDefine(participate); + REGISTERTokenParamDefine(roommailalias);