X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Froomops.c;h=2ea692862e01c572c76ffe6b0be416b7db1d8f83;hb=64f430bd72e548b3b57a8d801ec16e9f904281bd;hp=edc09dec0eb1ca2ca74d5508a41471276217283b;hpb=13ff6dc18c5cf4587aafffa47ac61c774c988261;p=citadel.git diff --git a/webcit/roomops.c b/webcit/roomops.c index edc09dec0..2ea692862 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -5,17 +5,11 @@ * * 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" @@ -45,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("")}, @@ -73,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); } @@ -96,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); } @@ -119,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")); @@ -133,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(); } /* @@ -188,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) { @@ -212,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); /* @@ -354,20 +361,30 @@ void ParseGoto(folder *room, StrBuf *Line) */ void delete_room(void) { - StrBuf *Line; + StrBuf *Line = NewStrBuf(); + const StrBuf *GoBstr; - serv_puts("KILL 1"); - StrBuf_ServGetln(Line); - if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) { - display_main_menu(); - } else { - StrBuf *Buf; - - FlushRoomlist (); - Buf = NewStrBufPlain(HKEY("_BASEROOM_")); - smart_goto(Buf); - FreeStrBuf(&Buf); + 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); } @@ -683,8 +700,10 @@ void toggle_self_service(void) { WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SMTP_PUBLIC; SetCurrentRoomFlags (&WCC->CurRoom); - - http_transmit_thing(ChrPtr(do_template("room_edit")), 0); + + output_headers(1, 1, 1, 0, 0, 0); + do_template("room_edit"); + wDumpContent(1); } @@ -700,114 +719,133 @@ void editroom(void) 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")) { + putlbstr("success", 0); AppendImportantMessage(_("Cancelled. Changes were not saved."), -1); - http_transmit_thing(ChrPtr(do_template("room_edit")), 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; } + if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0) { - http_transmit_thing(ChrPtr(do_template("room_edit")), 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"); @@ -834,9 +872,23 @@ void editroom(void) 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")), 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; } @@ -905,7 +957,9 @@ void do_invt_kick(void) } } - http_transmit_thing(ChrPtr(do_template("room_edit")), 0); + output_headers(1, 1, 1, 0, 0, 0); + do_template("room_edit"); + wDumpContent(1); } @@ -918,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"); @@ -955,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 */ @@ -967,8 +1039,16 @@ 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) ) { - http_transmit_thing(ChrPtr(do_template("room_edit")), 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); } @@ -1003,22 +1083,28 @@ void set_room_policy(void) { if (!havebstr("ok_button")) { AppendImportantMessage(_("Cancelled. Changes were not saved."), -1); - http_transmit_thing(ChrPtr(do_template("room_edit")), 0); + output_headers(1, 1, 1, 0, 0, 0); + do_template("room_edit"); + 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); } FreeStrBuf(&Line); ReloadCurrentRoom(); - http_transmit_thing(ChrPtr(do_template("room_edit")), 0); + + output_headers(1, 1, 1, 0, 0, 0); + do_template("room_edit"); + wDumpContent(1); } @@ -1036,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")); } @@ -1060,26 +1150,57 @@ 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 { - http_transmit_thing(ChrPtr(do_template("room_edit")), 0); + output_headers(1, 1, 1, 0, 0, 0); + do_template("room_edit"); + wDumpContent(1); return; } 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)); FreeStrBuf(&Line); - http_transmit_thing(ChrPtr(do_template("room_edit")), 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")) @@ -1088,22 +1209,41 @@ 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) { AppendImportantMessage(SRV_STATUS_MSG(Line)); - http_transmit_thing(ChrPtr(do_template("room_edit")), 0); + output_headers(1, 1, 1, 0, 0, 0); + do_template("room_edit"); + wDumpContent(1); FreeStrBuf(&Line); FreeStrBuf(&TmpBuf); return; @@ -1132,10 +1272,20 @@ 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); - http_transmit_thing(ChrPtr(do_template("room_edit")), 0); + output_headers(1, 1, 1, 0, 0, 0); + do_template("room_edit"); + wDumpContent(1); } /* @@ -1295,7 +1445,6 @@ InitModule_ROOMOPS NULL); RegisterPreference("emptyfloors", _("Show empty floors"), PRF_YESNO, NULL); - WebcitAddUrlHandler(HKEY("json_roomflr"), "", 0, jsonRoomFlr, 0); WebcitAddUrlHandler(HKEY("delete_floor"), "", 0, delete_floor, 0); @@ -1340,6 +1489,7 @@ InitModule_ROOMOPS REGISTERTokenParamDefine(QR2_SUBJECTREQ); REGISTERTokenParamDefine(QR2_SMTP_PUBLIC); REGISTERTokenParamDefine(QR2_MODERATED); + REGISTERTokenParamDefine(QR2_NOUPLMSG); REGISTERTokenParamDefine(UA_KNOWN); REGISTERTokenParamDefine(UA_GOTOALLOWED); @@ -1348,6 +1498,7 @@ InitModule_ROOMOPS REGISTERTokenParamDefine(UA_POSTALLOWED); REGISTERTokenParamDefine(UA_ADMINALLOWED); REGISTERTokenParamDefine(UA_DELETEALLOWED); + REGISTERTokenParamDefine(UA_REPLYALLOWED); REGISTERTokenParamDefine(UA_ISTRASH); REGISTERTokenParamDefine(US_NEEDVALID); @@ -1375,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. */ @@ -1398,6 +1551,7 @@ InitModule_ROOMOPS } REGISTERTokenParamDefine(rssclient); REGISTERTokenParamDefine(participate); + REGISTERTokenParamDefine(roommailalias);