* more work into direction of DAV templates

diff --git a/webcit/marchlist.c b/webcit/marchlist.c
index 736b498a62d4ea4f1b23cdbe1705cf559305ba13..ed124e84468e45a370ff55ac39fe97b0bc168558 100644 (file)
--- a/webcit/marchlist.c
+++ b/webcit/marchlist.c
@@ -1,6 +1,5 @@
 #include "webcit.h"
 #include "webserver.h"
-#include "roomops.h"
 
 /*
  * Free a session's march list

diff --git a/webcit/roomlist.c b/webcit/roomlist.c
index ca32311fcf73022d3b4bd7219a197e33f2ab8978..b0004d105cbcaf65883830794014be17d8a2a21f 100644 (file)
--- a/webcit/roomlist.c
+++ b/webcit/roomlist.c
@@ -5,7 +5,7 @@
 
 #include "webcit.h"
 #include "webserver.h"
-#include "roomops.h"
+
 
 void DeleteFloor(void *vFloor)
 {
@@ -29,7 +29,9 @@ int SortFloorsByNameOrder(const void *vfloor1, const void *vfloor2)
        return strcmp(ChrPtr(f1->Name), ChrPtr(f2->Name));
 }
 
-HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP) {
+HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP) 
+{
+
        const char *Err;
        StrBuf *Buf;
        HashList *floors;
@@ -124,9 +126,6 @@ void DeleteFolder(void *vFolder)
        room = (folder*) vFolder;
 
        FreeStrBuf(&room->name);
-       ////FreeStrBuf(&room->ACL);
-
-       //// FreeStrBuf(&room->room);
 
        if (room->RoomNameParts != NULL)
        {
@@ -225,7 +224,6 @@ HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP)
                        Put(rooms, SKEY(room->name), room, DeleteFolder);
                }
        }
-///    SortByHashKey(rooms, 1);
 
        SubTP.Filter.ContextType = CTX_ROOMS;
        SortIt = RetrieveSort(&SubTP, NULL, 0, HKEY("fileunsorted"), 0);
@@ -419,7 +417,6 @@ int GroupchangeRoomListByFloorRoomPrivFirst(const void *room1, const void *room2
                        return 2;
                else 
                        return 1;
-///                                    wprintf("</td><td valign=top>\n");
        }
 }
 
@@ -585,8 +582,102 @@ int ConditionalRoomIsInbox(StrBuf *Target, WCTemplputParams *TP)
        return Folder->is_inbox;
 }
 
+void tmplput_ROOM_COLLECTIONTYPE(StrBuf *Target, WCTemplputParams *TP) 
+{
+       folder *Folder = (folder *)(TP->Context);
+       
+       switch(Folder->view) {
+       case VIEW_CALENDAR:
+               StrBufAppendBufPlain(Target, HKEY("vevent"), 0);
+               break;
+       case VIEW_TASKS:
+               StrBufAppendBufPlain(Target, HKEY("vtodo"), 0);
+               break;
+       case VIEW_ADDRESSBOOK:
+               StrBufAppendBufPlain(Target, HKEY("vcard"), 0);
+               break;
+       case VIEW_NOTES:
+               StrBufAppendBufPlain(Target, HKEY("vnotes"), 0);
+               break;
+       case VIEW_JOURNAL:
+               StrBufAppendBufPlain(Target, HKEY("vjournal"), 0);
+               break;
+       }
+}
+
+
+
+
+int ConditionalRoomHasGroupdavContent(StrBuf *Target, WCTemplputParams *TP)
+{
+       folder *Folder = (folder *)(TP->Context);
+
+       return ((Folder->view == VIEW_CALENDAR) || 
+               (Folder->view == VIEW_TASKS) || 
+               (Folder->view == VIEW_ADDRESSBOOK) ||
+               (Folder->view == VIEW_NOTES) ||
+               (Folder->view == VIEW_JOURNAL) );
+}
+
 
 
+int ConditionalFloorIsRESTSubFloor(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession  *WCC = WC;
+
+       /** If we have dav_depth the client just wants the _current_ room without subfloors */
+       if (WCC->Hdr->HR.dav_depth == 0)
+               return 0;
+           
+       return 1;
+}
+
+
+int ConditionalRoomIsRESTSubRoom(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession  *WCC = WC;
+       folder     *Folder = (folder *)(TP->Context);
+       HashPos    *it;
+       StrBuf     * Dir;
+       void       *vDir;
+       long        len;
+        const char *Key;
+       int i;
+
+
+
+       if (Folder->Floor != WCC->CurrentFloor)
+               return 0;
+
+       if (GetCount(WCC->Directory) != Folder->nRoomNameParts)
+               return 0;
+
+       it = GetNewHashPos(WCC->Directory, 0);
+       for (i = 0; i < Folder->nRoomNameParts; i++)
+       {
+               if (!GetNextHashPos(WCC->Directory, it, &len, &Key, &vDir) ||
+                   (vDir == NULL))
+               {
+                       DeleteHashPos(&it);
+                       return 0;
+               }
+               Dir = (StrBuf*) vDir;
+               if (strcmp(ChrPtr(Folder->RoomNameParts[i]), 
+                          ChrPtr(Dir)) != 0)
+               {
+                       DeleteHashPos(&it);
+                       return 0;
+               }
+       }
+       DeleteHashPos(&it);
+
+       /** If we have dav_depth the client just wants the _current_ room without subfloors */
+       if ((WCC->Hdr->HR.dav_depth == 0) &&
+           (i != Folder->nRoomNameParts))
+               return 0;
+
+       return 1;
+}
 
 
 void jsonRoomFlr(void) 
@@ -614,13 +705,15 @@ InitModule_ROOMLIST
        RegisterNamespace("FLOOR:ID", 0, 0, tmplput_FLOOR_ID, CTX_FLOORS);
        RegisterNamespace("FLOOR:NAME", 0, 1, tmplput_FLOOR_NAME, CTX_FLOORS);
        RegisterNamespace("FLOOR:NROOMS", 0, 0, tmplput_FLOOR_NROOMS, CTX_FLOORS);
+       RegisterConditional(HKEY("COND:ROOM:REST:ISSUBFLOOR"), 0, ConditionalFloorIsRESTSubFloor, CTX_FLOORS);
 
-
+       RegisterIterator("LFLR", 0, NULL, GetFloorListHash, NULL, NULL, CTX_FLOORS, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE);
 
        RegisterIterator("LKRA", 0, NULL, GetRoomListHashLKRA, NULL, DeleteHash, CTX_ROOMS, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE);
 
        RegisterNamespace("ROOM:INFO:FLOORID", 0, 1, tmplput_ROOM_FLOORID, CTX_ROOMS);
        RegisterNamespace("ROOM:INFO:NAME", 0, 1, tmplput_ROOM_NAME, CTX_ROOMS);
+       RegisterNamespace("ROOM:INFO:PRINT_NAME", 0, 1, tmplput_ROOM_NAME, CTX_ROOMS);/// TODO!
        RegisterNamespace("ROOM:INFO:BASENAME", 0, 1, tmplput_ROOM_BASENAME, CTX_ROOMS);
        RegisterNamespace("ROOM:INFO:LEVELNTIMES", 1, 2, tmplput_ROOM_LEVEL_N_TIMES, CTX_ROOMS);
 
@@ -630,10 +723,12 @@ InitModule_ROOMLIST
        RegisterNamespace("ROOM:INFO:VIEW", 0, 1, tmplput_ROOM_VIEW, CTX_ROOMS);
        RegisterNamespace("ROOM:INFO:DEFVIEW", 0, 1, tmplput_ROOM_DEFVIEW, CTX_ROOMS);
        RegisterNamespace("ROOM:INFO:LASTCHANGE", 0, 1, tmplput_ROOM_LASTCHANGE, CTX_ROOMS);
+       RegisterNamespace("ROOM:INFO:COLLECTIONTYPE", 0, 1, tmplput_ROOM_COLLECTIONTYPE, CTX_ROOMS);
        RegisterNamespace("ROOM:INFO:FLOOR:ID", 0, 0, tmplput_ROOM_FLOOR_ID, CTX_ROOMS);
        RegisterNamespace("ROOM:INFO:FLOOR:NAME", 0, 1, tmplput_ROOM_FLOOR_NAME, CTX_ROOMS);
        RegisterNamespace("ROOM:INFO:FLOOR:NROOMS", 0, 0, tmplput_ROOM_FLOOR_NROOMS, CTX_ROOMS);
 
+       RegisterConditional(HKEY("COND:ROOM:REST:ISSUBROOM"), 0, ConditionalRoomIsRESTSubRoom, CTX_ROOMS);
 
        RegisterConditional(HKEY("COND:ROOM:INFO:IS_INBOX"), 0, ConditionalRoomIsInbox, CTX_ROOMS);
        RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_KNOWN"), 0, ConditionalRoomHas_UA_KNOWN, CTX_ROOMS);
@@ -643,6 +738,9 @@ InitModule_ROOMLIST
        RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_POSTALLOWED"), 0, ConditionalRoomHas_UA_POSTALLOWED, CTX_ROOMS);
        RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_ADMINALLOWED"), 0, ConditionalRoomHas_UA_ADMINALLOWED, CTX_ROOMS);
        RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_DELETEALLOWED"), 0, ConditionalRoomHas_UA_DELETEALLOWED, CTX_ROOMS);
+       RegisterConditional(HKEY("COND:ROOM:GROUPDAV_CONTENT"), 0, ConditionalRoomHasGroupdavContent, CTX_ROOMS);
+
+
 
        RegisterSortFunc(HKEY("byfloorroom"),
                         NULL, 0,

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 2810dd00104a6659f04a7be22102abc2d7417730..0c60a04b02bfc7a478fffe9d390c8f28a8bd4062 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -5,7 +5,6 @@
 
 #include "webcit.h"
 #include "webserver.h"
-#include "roomops.h"
 #define MAX_FLOORS 128
 
 char floorlist[MAX_FLOORS][SIZ];       /* list of our floor names */

diff --git a/webcit/roomops.h b/webcit/roomops.h
index 2f7cb66541b27f6e6804fbde7e785b666d5e5f62..d2b706cba0b1c449f1c403fe8dee9768326f1fea 100644 (file)
--- a/webcit/roomops.h
+++ b/webcit/roomops.h
@@ -84,3 +84,4 @@ typedef struct _folder {
 
 }folder;
 
+HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP);

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 25b13ab1f673c107521595500f725c771594fd96..8ba672388132075024e1207bdbd43dc894a07b72 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -530,9 +530,12 @@ void ReadPostData(void)
 void ParseREST_URL(void)
 {
        StrBuf *Buf;
+       StrBuf *pFloor = NULL;
        wcsession *WCC = WC;
        long i = 0;
        const char *pCh = NULL;
+       HashList *Floors;
+       void *vFloor;
 
        WCC->Directory = NewHash(1, Flathash);
 
@@ -541,11 +544,23 @@ void ParseREST_URL(void)
                                       Buf, &pCh,  '/') >= 0)
        {
                Put(WCC->Directory, IKEY(i), Buf, HFreeStrBuf);
+               if (i==0)
+                       pFloor = Buf;
                i++;
                Buf = NewStrBuf();
        }
        if (i == 0)
                FreeStrBuf(&Buf);
+       else if (pFloor != NULL)
+       {
+               Floors = GetFloorListHash(NULL, NULL);
+               
+               if (Floors != NULL)
+               {
+                       if (GetHash(Floors, SKEY(pFloor), &vFloor))
+                               WCC->CurrentFloor = (floor*) vFloor;
+               }
+       }
 }
 
 
@@ -833,7 +848,8 @@ void
 SessionDetachModule_WEBCIT
 (wcsession *sess)
 {
-       DeleteHash(&sess->Hdr->urlstrings);// TODO?
+       DeleteHash(&sess->Directory);
+
        if (sess->upload_length > 0) {
                FreeStrBuf(&sess->upload);
                sess->upload_length = 0;

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 0c876429e6b86b3999334626341aa7dc57dbaef4..3a003556117f71961649c7ce975ecfaea1a0605f 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -90,6 +90,7 @@
 #include "messages.h"
 #include "paramhandling.h"
 #include "preferences.h"
+#include "roomops.h"
 
 #ifdef HAVE_OPENSSL
 /* Work around RedHat's b0rken OpenSSL includes */
@@ -447,6 +448,7 @@ struct wcsession {
        char ImportantMessage[SIZ];
        StrBuf *ImportantMsg;
        HashList *Directory;                    /* Parts of the directory URL in snippets */
+       const floor *CurrentFloor;              /**< when Parsing REST, which floor are we on? */
 
 /* accounting */
        StrBuf *wc_username;                    /* login name of current user */