#include "webcit.h"
#include "webserver.h"
+#include "roomops.h"
#define MAX_FLOORS 128
-char floorlist[MAX_FLOORS][SIZ]; /**< list of our floor names */
-
-char *viewdefs[9]; /**< the different kinds of available views */
-
-/** See GetFloorListHash and GetRoomListHash for info on these. Basically we pull LFLR/LKRA etc. and set up a room HashList with these keys. */
-const char FLOOR_PARAM_NAMES[(FLOOR_PARAM_LEN + 1)][15] = {"ID",
- "NAME",
- "ROOMS"};
-const char ROOM_PARAM_NAMES[(ROOM_PARAM_LEN + 1)][20] = {"NAME",
- "FLAG",
- "FLOOR",
- "LISTORDER",
- "ACL",
- "CURVIEW",
- "DEFVIEW",
- "LASTCHANGE"};
-/* Because avoiding strlen at run time is a Good Thing(TM) */
-const int FLOOR_PARAM_NAMELEN[(FLOOR_PARAM_LEN +1)] = {2, 4, 5};
-const int ROOM_PARAM_NAMELEN[(ROOM_PARAM_LEN +1)] = {4, 4, 5, 9, 3, 7, 7, 8};
+
+char floorlist[MAX_FLOORS][SIZ]; /* list of our floor names */
+
+char *viewdefs[9]; /* the different kinds of available views */
+
+/* See GetFloorListHash and GetRoomListHash for info on these.
+ * Basically we pull LFLR/LKRA etc. and set up a room HashList with these keys.
+ */
void display_whok(void);
}
-/*
- * Free a session's march list
- */
-void free_march_list(wcsession *wcf)
-{
- struct march *mptr;
-
- while (wcf->march != NULL) {
- mptr = wcf->march->next;
- free(wcf->march);
- wcf->march = mptr;
- }
-
-}
-
-
-
-/*
- * remove a room from the march list
- */
-void remove_march(const StrBuf *aaa)
-{
- struct march *mptr, *mptr2;
-
- if (WC->march == NULL)
- return;
-
- if (!strcasecmp(WC->march->march_name, ChrPtr(aaa))) {
- mptr = WC->march->next;
- free(WC->march);
- WC->march = mptr;
- return;
- }
- mptr2 = WC->march;
- for (mptr = WC->march; mptr != NULL; mptr = mptr->next) {
- if (!strcasecmp(mptr->march_name, ChrPtr(aaa))) {
- mptr2->next = mptr->next;
- free(mptr);
- mptr = mptr2;
- } else {
- mptr2 = mptr;
- }
- }
-}
-
-
/*
}
-/**
- * \brief Room ordering stuff (compare first by floor, then by order)
- * \param r1 first roomlist to compare
- * \param r2 second roomlist co compare
- * \return are they the same???
+/*
+ * Room ordering stuff (compare first by floor, then by order)
*/
int rordercmp(struct roomlisting *r1, struct roomlisting *r2)
{
}
-/**
- * \brief Common code for all room listings
- * \param variety what???
+/*
+ * Common code for all room listings
*/
void listrms(char *variety)
{
struct roomlisting *rp;
struct roomlisting *rs;
- /** Ask the server for a room list */
+ /* Ask the server for a room list */
serv_puts(variety);
serv_getln(buf, sizeof buf);
if (buf[0] != '1') {
room_tree_list(rl);
- /**
+ /*
* If no rooms were listed, print an nbsp to make the cell
* borders show up anyway.
*/
}
-/**
- * \brief list all forgotten rooms
+/*
+ * list all forgotten rooms
*/
void zapped_list(void)
{
}
-/**
- * \brief read this room's info file (set v to 1 for verbose mode)
+/*
+ * read this room's info file (set v to 1 for verbose mode)
*/
void readinfo(StrBuf *Target, WCTemplputParams *TP)
{
wprintf("<div class=\"infos\" "
"onclick=\"javascript:Effect.Appear('room_infos', { duration: 0.5 });\" "
- ">");
+ ">"
+ );
escputs(briefinfo);
wprintf("</div><div id=\"room_infos\" style=\"display:none;\">");
wprintf("<img class=\"close_infos\" "
"onclick=\"javascript:Effect.Fade('room_infos', { duration: 0.5 });\" "
"src=\"static/closewindow.gif\" alt=\"%s\" width=\"16\" height=\"16\">",
_("Close window")
- );
+ );
escputs(fullinfo);
wprintf("</div>");
}
-/**
- * \brief Display room banner icon.
- * The server doesn't actually
- * need the room name, but we supply it in order to
- * keep the browser from using a cached icon from
- * another room.
+/*
+ * Display room banner icon.
+ * The server doesn't actually need the room name, but we supply it in
+ * order to keep the browser from using a cached icon from another room.
*/
void embed_room_graphic(StrBuf *Target, WCTemplputParams *TP)
{
-/**
- * \brief Display the current view and offer an option to change it
+/*
+ * Display the current view and offer an option to change it
*/
void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
{
"[selectedIndex].value\">\n");
for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
- /**
+ /*
* Only offer the views that make sense, given the default
* view for the room. For example, don't offer a Calendar
* view in a non-Calendar room.
*/
if (
(i == WC->wc_view)
- || (i == WC->wc_default_view) /**< default */
- || ( (i == 0) && (WC->wc_default_view == 1) ) /**< mail or bulletin */
- || ( (i == 1) && (WC->wc_default_view == 0) ) /**< mail or bulletin */
- /** || ( (i == 7) && (WC->wc_default_view == 3) ) (calendar list temporarily disabled) */
+ || (i == WC->wc_default_view) /* default */
+ || ( (i == 0) && (WC->wc_default_view == 1) ) /* mail or bulletin */
+ || ( (i == 1) && (WC->wc_default_view == 0) ) /* mail or bulletin */
+ /* || ( (i == 7) && (WC->wc_default_view == 3) ) (calendar list temporarily disabled) */
) {
wprintf("<option %s value=\"changeview?view=%d\">",
}
-/**
- * \brief Display a search box
+/*
+ * Display a search box
*/
void embed_search_o_matic(StrBuf *Target, WCTemplputParams *TP)
{
}
-/**
- * \brief Embed the room banner
+/*
+ * Embed the room banner
*
- * \param got The information returned from a GOTO server command
- * \param navbar_style Determines which navigation buttons to display
+ * got The information returned from a GOTO server command
+ * navbar_style Determines which navigation buttons to display
*
*/
char with_files[256];
int file_count=0;
- /**
+ /*
* We need to have the information returned by a GOTO server command.
* If it isn't supplied, we fake it by issuing our own GOTO.
*/
got = buf;
}
- /** The browser needs some information for its own use */
+ /* The browser needs some information for its own use */
wprintf("<script type=\"text/javascript\"> \n"
" room_is_trash = %d; \n"
"</script>\n",
WC->wc_is_trash
- );
+ );
- /**
+ /*
* If the user happens to select the "make this my start page" link,
* we want it to remember the URL as a "/dotskip" one instead of
* a "skip" or "gotonext" or something like that.
*/
- if (WCC->Hdr->this_page == NULL)
+ if (WCC->Hdr->this_page == NULL) {
WCC->Hdr->this_page = NewStrBuf();
+ }
StrBufPrintf(WCC->Hdr->this_page,
"dotskip?room=%s",
- ChrPtr(WC->wc_roomname));
+ ChrPtr(WC->wc_roomname)
+ );
- /** Check for new mail. */
+ /* Check for new mail. */
WC->new_mail = extract_int(&got[4], 9);
WC->wc_view = extract_int(&got[4], 11);
strcpy(WC->ugname, ChrPtr(WC->wc_roomname));
WC->uglsn = ls;
Buf = NewStrBuf();
- /** move to the new room */
+
+ /* move to the new room */
serv_printf("GOTO %s", ChrPtr(gname));
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, &err) != 2) {
}
-/**
- * \brief Locate the room on the march list which we most want to go to.
- * Each room
- * is measured given a "weight" of preference based on various factors.
- * \param desired_floor the room number on the citadel server
- * \return the roomname
- */
-char *pop_march(int desired_floor)
-{
- static char TheRoom[128];
- int TheFloor = 0;
- int TheOrder = 32767;
- int TheWeight = 0;
- int weight;
- struct march *mptr = NULL;
-
- strcpy(TheRoom, "_BASEROOM_");
- if (WC->march == NULL)
- return (TheRoom);
-
- for (mptr = WC->march; mptr != NULL; mptr = mptr->next) {
- weight = 0;
- if ((strcasecmp(mptr->march_name, "_BASEROOM_")))
- weight = weight + 10000;
- if (mptr->march_floor == desired_floor)
- weight = weight + 5000;
-
- weight = weight + ((128 - (mptr->march_floor)) * 128);
- weight = weight + (128 - (mptr->march_order));
-
- if (weight > TheWeight) {
- TheWeight = weight;
- strcpy(TheRoom, mptr->march_name);
- TheFloor = mptr->march_floor;
- TheOrder = mptr->march_order;
- }
- }
- return (TheRoom);
-}
-
-
-
-/*
- * Goto next room having unread messages.
- *
- * We want to skip over rooms that the user has already been to, and take the
- * user back to the lobby when done. The room we end up in is placed in
- * newroom - which is set to 0 (the lobby) initially.
- * We start the search in the current room rather than the beginning to prevent
- * two or more concurrent users from dragging each other back to the same room.
- */
-void gotonext(void)
-{
- char buf[256];
- struct march *mptr = NULL;
- struct march *mptr2 = NULL;
- char room_name[128];
- StrBuf *next_room;
- int ELoop = 0;
-
- /*
- * First check to see if the march-mode list is already allocated.
- * If it is, pop the first room off the list and go there.
- */
-
- if (WC->march == NULL) {
- serv_puts("LKRN");
- serv_getln(buf, sizeof buf);
- if (buf[0] == '1')
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- if (IsEmptyStr(buf)) {
- if (ELoop > 10000)
- return;
- if (ELoop % 100 == 0)
- sleeeeeeeeeep(1);
- ELoop ++;
- continue;
- }
- extract_token(room_name, buf, 0, '|', sizeof room_name);
- if (strcasecmp(room_name, ChrPtr(WC->wc_roomname))) {
- mptr = (struct march *) malloc(sizeof(struct march));
- mptr->next = NULL;
- safestrncpy(mptr->march_name, room_name, sizeof mptr->march_name);
- mptr->march_floor = extract_int(buf, 2);
- mptr->march_order = extract_int(buf, 3);
- if (WC->march == NULL)
- WC->march = mptr;
- else
- mptr2->next = mptr;
- mptr2 = mptr;
- }
- buf[0] = '\0';
- }
- /*
- * add _BASEROOM_ to the end of the march list, so the user will end up
- * in the system base room (usually the Lobby>) at the end of the loop
- */
- mptr = (struct march *) malloc(sizeof(struct march));
- mptr->next = NULL;
- mptr->march_order = 0;
- mptr->march_floor = 0;
- strcpy(mptr->march_name, "_BASEROOM_");
- if (WC->march == NULL) {
- WC->march = mptr;
- } else {
- mptr2 = WC->march;
- while (mptr2->next != NULL)
- mptr2 = mptr2->next;
- mptr2->next = mptr;
- }
- /*
- * ...and remove the room we're currently in, so a <G>oto doesn't make us
- * walk around in circles
- */
- remove_march(WC->wc_roomname);
- }
- if (WC->march != NULL) {
- next_room = NewStrBufPlain(pop_march(-1), -1);/*TODO: migrate march to strbuf */
- } else {
- next_room = NewStrBufPlain(HKEY("_BASEROOM_"));
- }
-
-
- smart_goto(next_room);
- FreeStrBuf(&next_room);
-}
-
-
/*
* goto next room
*/
}
-/*
- * un-goto the previous room
- */
-void ungoto(void)
-{
- StrBuf *Buf;
-
- if (!strcmp(WC->ugname, "")) {
- smart_goto(WC->wc_roomname);
- return;
- }
- serv_printf("GOTO %s", WC->ugname);
- Buf = NewStrBuf();
- StrBuf_ServGetln(Buf);
- if (GetServerStatus(Buf, NULL) != 2) {
- smart_goto(WC->wc_roomname);
- FreeStrBuf(&Buf);
- return;
- }
- if (WC->uglsn >= 0L) {
- serv_printf("SLRP %ld", WC->uglsn);
- StrBuf_ServGetln(Buf);
- }
- FlushStrBuf(Buf);
- StrBufAppendBufPlain(Buf, WC->ugname, -1, 0);
- strcpy(WC->ugname, "");
- smart_goto(Buf);
- FreeStrBuf(&Buf);
-}
-
typedef struct __room_states {
char password[SIZ];
char dirname[SIZ];
/* print the tabbed dialog */
wprintf("<div align=\"center\">");
- wprintf("<table id=\"AdminTabs\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\""
+ wprintf("<table id=\"AdminTabs\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">"
"<tr align=\"center\" style=\"cursor:pointer\"><td> </td>"
);
wprintf("');\">\n");
wprintf(_("Delete this room"));
wprintf("</a>\n"
- "<li><a href=\"display_editroompic\">\n");
+ "<li><a href=\"display_editroompic?which_room=");
+ urlescputs(ChrPtr(WC->wc_roomname));
+ wprintf("\">\n");
wprintf(_("Set or change the icon for this room's banner"));
wprintf("</a>\n"
"<li><a href=\"display_editinfo\">\n");
* \param max_folders how many folders???
* \param num_floors hom many floors???
*/
-void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
+void do_folder_view(struct __ofolder *fold, int max_folders, int num_floors) {
char buf[SIZ];
int levels;
int i;
* \param max_folders how many folders???
* \param num_floors hom many floors???
*/
-void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
+void do_rooms_view(struct __ofolder *fold, int max_folders, int num_floors) {
char buf[256];
char floor_name[256];
char old_floor_name[256];
* \param max_folders how many folders???
* \param num_floors hom many floors???
*/
-void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
+void do_iconbar_view(struct __ofolder *fold, int max_folders, int num_floors) {
char buf[256];
char floor_name[256];
char old_floor_name[256];
StrBuf *Buf;
char buf[SIZ];
int swap = 0;
- struct folder *fold = NULL;
- struct folder ftmp;
+ struct __ofolder *fold = NULL;
+ struct __ofolder ftmp;
int max_folders = 0;
int alloc_folders = 0;
int *floor_mapping;
/** Start with the mailboxes */
max_folders = 1;
alloc_folders = 1;
- fold = malloc(sizeof(struct folder));
- memset(fold, 0, sizeof(struct folder));
+ fold = malloc(sizeof(struct __ofolder));
+ memset(fold, 0, sizeof(struct __ofolder));
strcpy(fold[0].name, "My folders");
fold[0].is_mailbox = 1;
if (max_folders >= alloc_folders) {
alloc_folders = max_folders + 100;
fold = realloc(fold,
- alloc_folders * sizeof(struct folder));
+ alloc_folders * sizeof(struct __ofolder));
}
- memset(&fold[max_folders], 0, sizeof(struct folder));
+ memset(&fold[max_folders], 0, sizeof(struct __ofolder));
extract_token(fold[max_folders].name, buf, 1, '|', sizeof fold[max_folders].name);
extract_token(buf3, buf, 0, '|', SIZ);
fold[max_folders].floor = atol (buf3);
if (max_folders >= alloc_folders) {
alloc_folders = max_folders + 100;
fold = realloc(fold,
- alloc_folders * sizeof(struct folder));
+ alloc_folders * sizeof(struct __ofolder));
}
- memset(&fold[max_folders], 0, sizeof(struct folder));
+ memset(&fold[max_folders], 0, sizeof(struct __ofolder));
extract_token(fold[max_folders].room, buf, 0, '|', sizeof fold[max_folders].room);
ra_flags = extract_int(buf, 5);
flags = extract_int(buf, 1);
{
if (fold[i].num_rooms == 0) {
for (j=i; j<max_folders; j++) {
- memcpy(&fold[j], &fold[j+1], sizeof(struct folder));
+ memcpy(&fold[j], &fold[j+1], sizeof(struct __ofolder));
}
max_folders--;
num_floors--;
}
}
if (swap > 0) {
- memcpy(&ftmp, &fold[j], sizeof(struct folder));
+ memcpy(&ftmp, &fold[j], sizeof(struct __ofolder));
memcpy(&fold[j], &fold[j+1],
- sizeof(struct folder));
+ sizeof(struct __ofolder));
memcpy(&fold[j+1], &ftmp,
- sizeof(struct folder));
+ sizeof(struct __ofolder));
}
}
}
display_editroom();
}
+void DeleteFloor(void *vFloor)
+{
+ floor *Floor;
+ Floor = (floor*) vFloor;
+ FreeStrBuf(&Floor->Name);
+ free(Floor);
+}
+
HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP) {
- /* todo: check context */
const char *Err;
StrBuf *Buf;
- StrBuf *Buf2;
HashList *floors;
- HashList *floor;
- floors = NewHash(1, NULL);
+ floor *Floor;
+ const char *Pos;
+ wcsession *WCC = WC;
+
+ if (WCC->Floors != NULL)
+ return WCC->Floors;
+ WCC->Floors = floors = NewHash(1, NULL);
Buf = NewStrBuf();
serv_puts("LFLR"); /* get floors */
StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err); /* '100', we hope */
if (GetServerStatus(Buf, NULL) == 1)
- while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(Buf), "000")) {
- int a;
- const char *floorNum = NULL;
- floor = NewHash(1, NULL);
- for(a=0; a<FLOOR_PARAM_LEN; a++) {
- Buf2 = NewStrBuf();
- StrBufExtract_token(Buf2, Buf, a, '|');
- if (a==0) {
- floorNum = ChrPtr(Buf2); /* hmm, should we copy Buf2 first? */
- }
- Put(floor, FPKEY(a), Buf2, NULL);
- }
- Put(floors, HKEY(floorNum), floor, NULL);
+ {
+ while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(Buf), "000"))
+ {
+
+ Pos = NULL;
+
+ Floor = malloc(sizeof(floor));
+ Floor->ID = StrBufExtractNext_long(Buf, &Pos, '|');
+ Floor->Name = NewStrBufPlain(NULL, StrLength(Buf));
+ StrBufExtract_NextToken(Floor->Name, Buf, &Pos, '|');
+ Floor->NRooms = StrBufExtractNext_long(Buf, &Pos, '|');
+
+ Put(floors, IKEY(Floor->ID), Floor, DeleteFloor);
}
+ }
FreeStrBuf(&Buf);
return floors;
}
-void tmplput_FLOOR_Value(StrBuf *TemplBuffer, WCTemplputParams *TP)
+void tmplput_FLOOR_ID(StrBuf *Target, WCTemplputParams *TP)
{
- StrBuf *val;
- HashList *floor = (HashList *)(TP->Context);
- void *value;
- GetHash(floor, TKEY(0), &value);
- val = (StrBuf *)value;
- StrECMAEscAppend(TemplBuffer, val, 0);
+ floor *Floor = (floor *)(TP->Context);
+
+ StrBufAppendPrintf(Target, "%d", Floor->ID);
+}
+
+void tmplput_FLOOR_NAME(StrBuf *Target, WCTemplputParams *TP)
+{
+ floor *Floor = (floor *)(TP->Context);
+
+ StrBufAppendTemplate(Target, TP, Floor->Name, 0);
+}
+
+void tmplput_FLOOR_NROOMS(StrBuf *Target, WCTemplputParams *TP)
+{
+ floor *Floor = (floor *)(TP->Context);
+
+ StrBufAppendPrintf(Target, "%d", Floor->NRooms);
}
HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP)
{
serv_puts("LKRA");
return GetRoomListHash(Target, TP);
}
+
+void DeleteFolder(void *vFolder)
+{
+ folder *room;
+ room = (folder*) vFolder;
+
+ FreeStrBuf(&room->name);
+ FreeStrBuf(&room->ACL);
+
+ //// FreeStrBuf(&room->room);
+
+ free(room);
+}
+
+
HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP)
{
/* TODO: Check context */
HashList *rooms;
- HashList *room;
- StrBuf *buf;
- StrBuf *buf2;
+ folder *room;
+ StrBuf *Buf;
+ wcsession *WCC = WC;
+ const char *Pos;
const char *Err;
- buf = NewStrBuf();
+ void *vFloor;
+
+ Buf = NewStrBuf();
rooms = NewHash(1, NULL);
- StrBufTCP_read_line(buf, &WC->serv_sock, 0, &Err);
- if (GetServerStatus(buf, NULL) == 1)
- while(StrBufTCP_read_line(buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(buf), "000")) {
- int i;
- const char *rmName = NULL;
- room = NewHash(1, NULL);
- for(i=0; i<ROOM_PARAM_LEN; i++) {
- buf2 = NewStrBuf();
- StrBufExtract_token(buf2, buf, i, '|');
- if (i==0) {
- rmName = ChrPtr(buf2);
- }
- Put(room, RPKEY(i), buf2, HFreeStrBuf);
- }
- Put(rooms, rmName, strlen(rmName), room, HDeleteHash);
+ StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err);
+ if (GetServerStatus(Buf, NULL) == 1)
+ {
+ while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err),
+ strcmp(ChrPtr(Buf), "000"))
+ {
+
+ Pos = NULL;
+ room = (folder*) malloc (sizeof(folder));
+ memset(room, 0, sizeof(folder));
+
+ room->name = NewStrBufPlain(NULL, StrLength(Buf));
+ StrBufExtract_NextToken(room->name, Buf, &Pos, '|');
+
+ room->QRFlags = StrBufExtractNext_long(Buf, &Pos, '|');
+ room->floorid = StrBufExtractNext_long(Buf, &Pos, '|');
+
+ room->listorder = StrBufExtractNext_long(Buf, &Pos, '|');
+
+ room->ACL = NewStrBufPlain(NULL, StrLength(Buf));
+ StrBufExtract_NextToken(room->ACL, Buf, &Pos, '|');
+
+ room->view = StrBufExtractNext_long(Buf, &Pos, '|');
+ room->defview = StrBufExtractNext_long(Buf, &Pos, '|');
+ room->lastchange = StrBufExtractNext_long(Buf, &Pos, '|');
+
+
+ GetHash(WCC->Floors, IKEY(room->floorid), &vFloor);
+ room->Floor = (const floor*) vFloor;
+ Put(rooms, SKEY(room->name), room, DeleteFolder);
}
+ }
SortByHashKey(rooms, 1);
/*SortByPayload(rooms, SortRoomsByListOrder); */
- FreeStrBuf(&buf);
+ FreeStrBuf(&Buf);
return rooms;
}
+
/** Unused function that orders rooms by the listorder flag */
int SortRoomsByListOrder(const void *room1, const void *room2)
{
- int l1;
- int l2;
- HashList *r1 = (HashList *)GetSearchPayload(room1);
- HashList *r2 = (HashList *)GetSearchPayload(room2);
- StrBuf *listOrderBuf1;
- StrBuf *listOrderBuf2;
+ folder *r1 = (folder*) room1;
+ folder *r2 = (folder*) room2;
+
+ if (r1->listorder == r2->listorder) return 0;
+ if (r1->listorder > r2->listorder) return 1;
+ return -1;
+}
+
+int SortRoomsByFloorAndName(const void *room1, const void *room2)
+{
+ folder *r1 = (folder*) room1;
+ folder *r2 = (folder*) room2;
- GetHash(r1, RPKEY(3), (void *)&listOrderBuf1);
- GetHash(r2, RPKEY(3), (void *)&listOrderBuf2);
- l1 = atoi(ChrPtr(listOrderBuf1));
- l2 = atoi(ChrPtr(listOrderBuf2));
- if (l1 < l2) return -1;
- else if (l1 > l2) return +1;
- else return 0;
+ if (r1->Floor != r2->Floor)
+ return strcmp(ChrPtr(r1->Floor->Name),
+ ChrPtr(r2->Floor->Name));
+ return strcmp (ChrPtr(r1->name),
+ ChrPtr(r2->name));
+}
+
+
+
+void tmplput_ROOM_NAME(StrBuf *Target, WCTemplputParams *TP)
+{
+ folder *Folder = (folder *)(TP->Context);
+
+ StrBufAppendTemplate(Target, TP, Folder->name, 0);
+}
+
+void tmplput_ROOM_ACL(StrBuf *Target, WCTemplputParams *TP)
+{
+ folder *Folder = (folder *)(TP->Context);
+
+ StrBufAppendTemplate(Target, TP, Folder->ACL, 0);
+}
+
+
+void tmplput_ROOM_QRFLAGS(StrBuf *Target, WCTemplputParams *TP)
+{
+ folder *Folder = (folder *)(TP->Context);
+ StrBufAppendPrintf(Target, "%d", Folder->QRFlags);
}
-void tmplput_ROOM_Value(StrBuf *TemplBuffer, WCTemplputParams *TP)
+
+
+
+void tmplput_ROOM_FLOORID(StrBuf *Target, WCTemplputParams *TP)
{
- void *value;
- StrBuf *val;
- HashList *room = (HashList *)(TP->Context);
+ folder *Folder = (folder *)(TP->Context);
+ StrBufAppendPrintf(Target, "%d", Folder->floorid);
+}
- GetHash(room, TKEY(0), &value);
- val = (StrBuf *)value;
- StrECMAEscAppend(TemplBuffer, val, 0);
+void tmplput_ROOM_LISTORDER(StrBuf *Target, WCTemplputParams *TP)
+{
+ folder *Folder = (folder *)(TP->Context);
+ StrBufAppendPrintf(Target, "%d", Folder->listorder);
+}
+void tmplput_ROOM_VIEW(StrBuf *Target, WCTemplputParams *TP)
+{
+ folder *Folder = (folder *)(TP->Context);
+ StrBufAppendPrintf(Target, "%d", Folder->view);
+}
+void tmplput_ROOM_DEFVIEW(StrBuf *Target, WCTemplputParams *TP)
+{
+ folder *Folder = (folder *)(TP->Context);
+ StrBufAppendPrintf(Target, "%d", Folder->defview);
+}
+void tmplput_ROOM_LASTCHANGE(StrBuf *Target, WCTemplputParams *TP)
+{
+ folder *Folder = (folder *)(TP->Context);
+ StrBufAppendPrintf(Target, "%d", Folder->lastchange);
}
+
void jsonRoomFlr(void)
{
/* Send as our own (application/json) content type */
DoTemplate(HKEY("json_roomflr"),NULL,&NoCtx);
end_burst();
}
+
void tmplput_RoomName(StrBuf *Target, WCTemplputParams *TP)
{
StrBufAppendTemplate(Target, TP, WC->wc_roomname, 0);
}
-void _gotonext(void) { slrp_highest(); gotonext(); }
-void dotskip(void) {smart_goto(sbstr("room"));}
-void _display_private(void) { display_private("", 0); }
+
+void _display_private(void) {
+ display_private("", 0);
+}
+
void dotgoto(void) {
+ if (!havebstr("room")) {
+ readloop(readnew);
+ return;
+ }
if (WC->wc_view != VIEW_MAILBOX) { /* dotgoto acts like dotskip when we're in a mailbox view */
slrp_highest();
}
RegisterNamespace("ROOMNAME", 0, 1, tmplput_RoomName, 0);
WebcitAddUrlHandler(HKEY("knrooms"), knrooms, 0);
- WebcitAddUrlHandler(HKEY("gotonext"), _gotonext, NEED_URL);
- WebcitAddUrlHandler(HKEY("skip"), gotonext, NEED_URL);
- WebcitAddUrlHandler(HKEY("ungoto"), ungoto, NEED_URL);
WebcitAddUrlHandler(HKEY("dotgoto"), dotgoto, NEED_URL);
WebcitAddUrlHandler(HKEY("dotskip"), dotskip, NEED_URL);
WebcitAddUrlHandler(HKEY("display_private"), _display_private, 0);
RegisterConditional(HKEY("COND:ROOM:EDITACCESS"), 0, ConditionalHaveRoomeditRights, CTX_NONE);
RegisterNamespace("ROOM:UNGOTO", 0, 0, tmplput_ungoto, 0);
- RegisterIterator("FLOORS", 0, NULL, GetFloorListHash, NULL, DeleteHash, CTX_FLOORS, CTX_NONE, IT_NOFLAG);
- RegisterNamespace("FLOOR:INFO", 1, 2, tmplput_FLOOR_Value, CTX_FLOORS);
- RegisterIterator("LKRA", 0, NULL, GetRoomListHashLKRA, NULL, NULL, CTX_ROOMS, CTX_NONE, IT_NOFLAG);
- RegisterNamespace("ROOM:INFO", 1, 2, tmplput_ROOM_Value, CTX_ROOMS);
+ RegisterIterator("FLOORS", 0, NULL, GetFloorListHash, NULL, NULL, CTX_FLOORS, CTX_NONE, IT_NOFLAG);
+
+ 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);
+
+
+
+ RegisterIterator("LKRA", 0, NULL, GetRoomListHashLKRA, NULL, DeleteHash, CTX_ROOMS, CTX_NONE, IT_NOFLAG);
+
+ 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:ACL", 0, 1, tmplput_ROOM_ACL, CTX_ROOMS);
+ RegisterNamespace("ROOM:INFO:QRFLAGS", 0, 1, tmplput_ROOM_QRFLAGS, CTX_ROOMS);
+ RegisterNamespace("ROOM:INFO:LISTORDER", 0, 1, tmplput_ROOM_LISTORDER, CTX_ROOMS);
+ 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);
}
}
free_march_list(sess);
+ DeleteHash(&sess->Floors);
}
/*@}*/
projects / citadel.git / blobdiff