#include "webcit.h"
#include "webserver.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.
+ */
+
+#define FLOOR_PARAM_LEN 3
+const ConstStr FLOOR_PARAM_NAMES[] = {{HKEY("ID")},
+ {HKEY("NAME")},
+ {HKEY("ROOMS")}};
+
+#define ROOM_PARAM_LEN 8
+const ConstStr ROOM_PARAM_NAMES[] = {{HKEY("NAME")},
+ {HKEY("FLAG")},
+ {HKEY("FLOOR")},
+ {HKEY("LISTORDER")},
+ {HKEY("ACL")},
+ {HKEY("CURVIEW")},
+ {HKEY("DEFVIEW")},
+ {HKEY("LASTCHANGE")}};
+
void display_whok(void);
strcpy(rmname, rp->rlname);
f = rp->rlflags;
- wprintf("<a href=\"dotgoto&room=");
+ wprintf("<a href=\"dotgoto?room=");
urlescputs(rmname);
wprintf("\"");
wprintf(">");
}
-/**
- * \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\">",
+ "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)
{
serv_puts("OIMG _roompic_");
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
- wprintf("<img height=\"64px\" src=\"image&name=_roompic_&room=");
+ wprintf("<img height=\"64px\" src=\"image?name=_roompic_&room=");
urlescputs(ChrPtr(WC->wc_roomname));
wprintf("\">");
serv_puts("CLOS");
else if (WC->wc_view == VIEW_ADDRESSBOOK) {
wprintf("<img class=\"roompic\" alt=\"\" src=\""
"static/viewcontacts_48x.gif"
- "\">"
+ "\" >"
);
}
else if ( (WC->wc_view == VIEW_CALENDAR) || (WC->wc_view == VIEW_CALBRIEF) ) {
wprintf("<img class=\"roompic\" alt=\"\" src=\""
"static/calarea_48x.gif"
- "\">"
+ "\" width=\"48\" height=\"48\">"
);
}
else if (WC->wc_view == VIEW_TASKS) {
wprintf("<img class=\"roompic\" alt=\"\" src=\""
"static/taskmanag_48x.gif"
- "\">"
+ "\" width=\"48\" height=\"48\">"
);
}
else if (WC->wc_view == VIEW_NOTES) {
wprintf("<img class=\"roompic\" alt=\"\" src=\""
"static/storenotes_48x.gif"
- "\">"
+ "\" width=\"48\" height=\"48\">"
);
}
else if (WC->wc_view == VIEW_MAILBOX) {
wprintf("<img class=\"roompic\" alt=\"\" src=\""
"static/privatemess_48x.gif"
- "\">"
+ "\" width=\"48\" height=\"48\">"
);
}
else {
wprintf("<img class=\"roompic\" alt=\"\" src=\""
"static/chatrooms_48x.gif"
- "\">"
+ "\" width=\"48\" height=\"48\">"
);
}
-/**
- * \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));
+ "dotskip?room=%s",
+ 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);
if (navbar_style == navbar_default) wprintf(
"<li class=\"ungoto\">"
"<a href=\"ungoto\">"
- "<img src=\"static/ungoto2_24x.gif\" alt=\"\">"
+ "<img src=\"static/ungoto2_24x.gif\" alt=\"\" width=\"24\" height=\"24\">"
"<span class=\"navbar_link\">%s</span></A>"
"</li>\n", _("Ungoto")
);
wprintf(
"<li class=\"newmess\">"
"<a href=\"readnew\">"
- "<img src=\"static/newmess2_24x.gif\" alt=\"\">"
+ "<img src=\"static/newmess2_24x.gif\" alt=\"\" width=\"24\" height=\"24\">"
"<span class=\"navbar_link\">%s</span></A>"
"</li>\n", _("Read new messages")
);
"<li class=\"viewcontacts\">"
"<a href=\"readfwd\">"
"<img src=\"static/viewcontacts_24x.gif\" "
- "alt=\"\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("View contacts")
"<li class=\"staskday\">"
"<a href=\"readfwd?calview=day\">"
"<img src=\"static/taskday2_24x.gif\" "
- "alt=\"\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Day view")
"<li class=\"monthview\">"
"<a href=\"readfwd?calview=month\">"
"<img src=\"static/monthview2_24x.gif\" "
- "alt=\"\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Month view")
"<li class=\"monthview\">"
"<a href=\"readfwd?calview=month\">"
"<img src=\"static/monthview2_24x.gif\" "
- "alt=\"\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Calendar list")
"<li class=\"taskmanag\">"
"<a href=\"readfwd\">"
"<img src=\"static/taskmanag_24x.gif\" "
- "alt=\"\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("View tasks")
"<li class=\"viewnotes\">"
"<a href=\"readfwd\">"
"<img src=\"static/viewnotes_24x.gif\" "
- "alt=\"\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("View notes")
"<li class=\"readallmess\">"
"<a id=\"m_refresh\" href=\"readfwd\">"
"<img src=\"static/readallmess3_24x.gif\" "
- "alt=\"\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Refresh message list")
"<li class=\"readallmess\">"
"<a href=\"readfwd\">"
"<img src=\"static/readallmess3_24x.gif\" "
- "alt=\"\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Wiki home")
default:
wprintf(
"<li class=\"readallmess\">"
- "<a href=\"readfwd?startmsg=20&maxmsgs=20&is_summary=0&SortBy=date&SortOrder=2\">"
+ "<a href=\"readfwd\">"
"<img src=\"static/readallmess3_24x.gif\" "
- "alt=\"\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
"<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Read all messages")
"<li class=\"addnewcontact\">"
"<a href=\"display_enter\">"
"<img src=\"static/addnewcontact_24x.gif\" "
- "alt=\"\"><span class=\"navbar_link\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
+ "<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Add new contact")
);
if (havebstr("day" )) wprintf("?day=%s", bstr("day"));
wprintf("\">"
"<img src=\"static/addevent_24x.gif\" "
- "alt=\"\"><span class=\"navbar_link\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
+ "<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Add new event")
);
"<li class=\"newmess\">"
"<a href=\"display_enter\">"
"<img src=\"static/newmess3_24x.gif\" "
- "alt=\"\"><span class=\"navbar_link\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
+ "<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Add new task")
);
"<li class=\"enternewnote\">"
"<a href=\"add_new_note\">"
"<img src=\"static/enternewnote_24x.gif\" "
- "alt=\"\"><span class=\"navbar_link\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
+ "<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Add new note")
);
"<li class=\"newmess\">"
"<a href=\"display_enter?wikipage=%s\">"
"<img src=\"static/newmess3_24x.gif\" "
- "alt=\"\"><span class=\"navbar_link\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
+ "<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", buf, _("Edit this page")
);
"<li class=\"newmess\">"
"<a href=\"display_enter\">"
"<img src=\"static/newmess3_24x.gif\" "
- "alt=\"\"><span class=\"navbar_link\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
+ "<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Write mail")
);
"<li class=\"newmess\">"
"<a href=\"javascript:deleteAllSelectedMessages();\">"
"<img src=\"static/delete.gif\" "
- "alt=\"\"><span class=\"navbar_link\">"
+ "alt=\"\" width=\"24\" height=\"24\"><span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Delete")
);
"<li class=\"newmess\">"
"<a href=\"display_enter\">"
"<img src=\"static/newmess3_24x.gif\" "
- "alt=\"\"><span class=\"navbar_link\">"
+ "alt=\"\" width=\"24\" height=\"24\">"
+ "<span class=\"navbar_link\">"
"%s"
"</span></a></li>\n", _("Enter a message")
);
"<li class=\"skipthisroom\">"
"<a href=\"skip\" "
"title=\"%s\">"
- "<img src=\"static/skipthisroom_24x.gif\" alt=\"\">"
+ "<img src=\"static/skipthisroom_24x.gif\" alt=\"\" "
+ "width=\"24\" height=\"24\">"
"<span class=\"navbar_link\">%s</span></a>"
"</li>\n",
_("Leave all messages marked as unread, go to next room with unread messages"),
"<li class=\"markngo\">"
"<a href=\"gotonext\" "
"title=\"%s\">"
- "<img src=\"static/markngo_24x.gif\" alt=\"\">"
+ "<img src=\"static/markngo_24x.gif\" alt=\"\" "
+ "width=\"24\" height=\"24\">"
"<span class=\"navbar_link\">%s</span></a>"
"</li>\n",
_("Mark all messages as read, go to next room with unread messages"),
static long ls = (-1L);
long err = 0;
+ lprintf(9, "%s:%d gotoroom(%s)\n", __FILE__, __LINE__, ChrPtr(gname));
+
/* store ungoto information */
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);
+ lprintf(9, "%s:%d GOTO server reply: %s\n", __FILE__, __LINE__, ChrPtr(Buf));
if (GetServerStatus(Buf, &err) != 2) {
serv_puts("GOTO _BASEROOM_");
StrBuf_ServGetln(Buf);
FlushStrBuf(WC->wc_roomname);
StrBufExtract_token(WC->wc_roomname, Buf, 0, '|');
+ lprintf(9, "%s:%d extracted room name: %s\n", __FILE__, __LINE__, ChrPtr(WC->wc_roomname));
StrBufCutLeft(WC->wc_roomname, 4);
WC->room_flags = StrBufExtract_int(Buf, 4, '|');
/* highest_msg_read = extract_int(&buf[4],6);
* goto next room
*/
void smart_goto(const StrBuf *next_room) {
+ lprintf(9, "%s:%d smart_goto(%s)\n", __FILE__, __LINE__, ChrPtr(next_room));
gotoroom(next_room);
readloop(readnew);
}
/* 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(_("Administration"));
}
else {
- wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=admin\">");
+ wprintf("< tab_cell_edit\"><a href=\"display_editroom?tab=admin\">");
wprintf(_("Administration"));
wprintf("</a>");
}
wprintf(_("Configuration"));
}
else {
- wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=config\">");
+ wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=config\">");
wprintf(_("Configuration"));
wprintf("</a>");
}
wprintf(_("Message expire policy"));
}
else {
- wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=expire\">");
+ wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=expire\">");
wprintf(_("Message expire policy"));
wprintf("</a>");
}
wprintf(_("Access controls"));
}
else {
- wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=access\">");
+ wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=access\">");
wprintf(_("Access controls"));
wprintf("</a>");
}
wprintf(_("Sharing"));
}
else {
- wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=sharing\">");
+ wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=sharing\">");
wprintf(_("Sharing"));
wprintf("</a>");
}
wprintf(_("Mailing list service"));
}
else {
- wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=listserv\">");
+ wprintf("< tab_cell_edit\"><a href=\"display_editroom?tab=listserv\">");
wprintf(_("Mailing list service"));
wprintf("</a>");
}
wprintf(_("Remote retrieval"));
}
else {
- wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=feeds\">");
+ wprintf("< tab_cell_edit\"><a href=\"display_editroom?tab=feeds\">");
wprintf(_("Remote retrieval"));
wprintf("</a>");
}
extract_token(recp, buf, 1, '|', sizeof recp);
escputs(recp);
- wprintf(" <a href=\"netedit&cmd=remove&tab=listserv&line=listrecp|");
+ wprintf(" <a href=\"netedit?cmd=remove&tab=listserv&line=listrecp|");
urlescputs(recp);
wprintf("\">");
wprintf(_("(remove)"));
extract_token(recp, buf, 1, '|', sizeof recp);
escputs(recp);
- wprintf(" <a href=\"netedit&cmd=remove&tab=listserv&line="
+ wprintf(" <a href=\"netedit?cmd=remove&tab=listserv&line="
"digestrecp|");
urlescputs(recp);
wprintf("\">");
wprintf("<td>%ld</td>", extract_long(buf, 5)); /* Fetching interval */
wprintf("<td class=\"button_link\">");
- wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=pop3client|");
+ wprintf(" <a href=\"netedit?cmd=remove&tab=feeds&line=pop3client|");
urlescputs(recp);
wprintf("\">");
wprintf(_("(remove)"));
wprintf("</td>");
wprintf("<td class=\"button_link\">");
- wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=rssclient|");
+ wprintf(" <a href=\"netedit?cmd=remove&tab=feeds&line=rssclient|");
urlescputs(recp);
wprintf("\">");
wprintf(_("(remove)"));
"OnChange=\"location.href=roomlistomatic.newview.options"
"[selectedIndex].value\">\n");
- wprintf("<option %s value=\"knrooms&view=rooms\">"
+ wprintf("<option %s value=\"knrooms?view=rooms\">"
"View as room list"
"</option>\n",
( !strcasecmp(ChrPtr(ListView), "rooms") ? "SELECTED" : "" )
);
- wprintf("<option %s value=\"knrooms&view=folders\">"
+ wprintf("<option %s value=\"knrooms?view=folders\">"
"View as folder list"
"</option>\n",
( !strcasecmp(ChrPtr(ListView), "folders") ? "SELECTED" : "" )
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;
+ const StrBuf *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? */
+ floorNum = Buf2; /* hmm, should we copy Buf2 first? */
+
}
- Put(floor, FPKEY(a), Buf2, NULL);
+ Put(floor, CKEY(FLOOR_PARAM_NAMES[a]), Buf2, HFreeStrBuf);
}
- Put(floors, HKEY(floorNum), floor, NULL);
+ Put(floors, SKEY(floorNum), floor, HDeleteHash);
}
FreeStrBuf(&Buf);
return floors;
buf = NewStrBuf();
rooms = NewHash(1, NULL);
StrBufTCP_read_line(buf, &WC->serv_sock, 0, &Err);
- if (GetServerStatus(Buf, NULL) == 1)
+ 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;
+ StrBuf *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);
+ rmName = buf2;
}
- Put(room, RPKEY(i), buf2, NULL);
+ Put(room, CKEY(ROOM_PARAM_NAMES[i]), buf2, HFreeStrBuf);
}
- Put(rooms, rmName, strlen(rmName), room, NULL);
+ Put(rooms, SKEY(rmName), room, HDeleteHash);
}
SortByHashKey(rooms, 1);
/*SortByPayload(rooms, SortRoomsByListOrder); */
StrBuf *listOrderBuf1;
StrBuf *listOrderBuf2;
- GetHash(r1, RPKEY(3), (void *)&listOrderBuf1);
- GetHash(r2, RPKEY(3), (void *)&listOrderBuf2);
+ GetHash(r1, CKEY(ROOM_PARAM_NAMES[3]), (void *)&listOrderBuf1);
+ GetHash(r2, CKEY(ROOM_PARAM_NAMES[3]), (void *)&listOrderBuf2);
l1 = atoi(ChrPtr(listOrderBuf1));
l2 = atoi(ChrPtr(listOrderBuf2));
if (l1 < l2) return -1;
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 _gotonext(void) {
+ slrp_highest();
+ gotonext();
+}
+
+void dotskip(void) {
+ lprintf(9, "%s:%d dotskip?room=%s\n", __FILE__, __LINE__, ChrPtr(sbstr("room")));
+ smart_goto(sbstr("room"));
+}
+
+void _display_private(void) {
+ display_private("", 0);
+}
+
void dotgoto(void) {
if (WC->wc_view != VIEW_MAILBOX) { /* dotgoto acts like dotskip when we're in a mailbox view */
slrp_highest();
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);
+ RegisterIterator("LKRA", 0, NULL, GetRoomListHashLKRA, NULL, DeleteHash, CTX_ROOMS, CTX_NONE, IT_NOFLAG);
RegisterNamespace("ROOM:INFO", 1, 2, tmplput_ROOM_Value, CTX_ROOMS);
}