Bring in new dkim code

[citadel.git] / webcit / roomops.c

diff --git a/webcit/roomops.c b/webcit/roomops.c
index a5b019f5453545fd3d4d5667387fa0b3d78a0731..2adf938d7f693a41865b894f928ffe9a22cb993a 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -11,7 +11,7 @@
 // GNU General Public License for more details.
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 ConstStr QRFlagList[] = {
        {HKEY(strof(QR_PERMANENT))},
@@ -103,7 +103,7 @@ void dotgoto(void) {
                readloop(readnew, eUseDefault);
                return;
        }
-       if (WC->CurRoom.view != VIEW_MAILBOX) {
+       if ((WC->CurRoom.view != VIEW_MAILBOX) && (WC->CurRoom.view != VIEW_JSON_LIST)) {
                // dotgoto acts like dotskip when we're in a mailbox view
                slrp_highest();
        }
@@ -273,7 +273,7 @@ void ParseGoto(folder *room, StrBuf *Line) {
                room->RAFlags |= UA_ADMINALLOWED;
        }
 
-       room->UsersNewMAilboxMessages = StrBufExtractNext_long(Line, &Pos, '|');
+       StrBufExtractNext_long(Line, &Pos, '|');                        // position 9 is unused
        room->floorid = StrBufExtractNext_int(Line, &Pos, '|');
        room->view = StrBufExtractNext_long(Line, &Pos, '|');
        room->defview = StrBufExtractNext_long(Line, &Pos, '|');
@@ -1179,7 +1179,7 @@ void netedit(void) {
                        for (i=0; i<num_addrs; ++i) {
                                strcpy(line, bstr("prefix"));
                                extract_token(buf, bstr("line"), i, ',', sizeof buf);
-                               striplt(buf);
+                               string_trim(buf);
                                strcat(line, buf);
                                strcat(line, bstr("suffix"));
                                serv_puts(line);