#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);
/*
* load the list of floors
*/
-void load_floorlist(void)
+void load_floorlist(StrBuf *Buf)
{
int a;
- char buf[SIZ];
+ int Done = 0;
for (a = 0; a < MAX_FLOORS; ++a)
floorlist[a][0] = 0;
serv_puts("LFLR");
- serv_getln(buf, sizeof buf);
- if (buf[0] != '1') {
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 1) {
strcpy(floorlist[0], "Main Floor");
return;
}
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- extract_token(floorlist[extract_int(buf, 0)], buf, 1, '|', sizeof floorlist[0]);
- }
-}
-
-
-/*
- * 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;
+ while (!Done && (StrBuf_ServGetln(Buf)>=0)) {
+ if ( (StrLength(Buf)==3) &&
+ !strcmp(ChrPtr(Buf), "000")) {
+ Done = 1;
+ break;
}
+ extract_token(floorlist[StrBufExtract_int(Buf, 0, '|')], ChrPtr(Buf), 1, '|', sizeof floorlist[0]);
}
}
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)
{
output_headers(1, 1, 1, 0, 0, 0);
memset(&SubTP, 0, sizeof(WCTemplputParams));
Buf = NewStrBufPlain(_("Zapped (forgotten) rooms"), -1);
- SubTP.ContextType = CTX_STRBUF;
+ SubTP.Filter.ContextType = CTX_STRBUF;
SubTP.Context = Buf;
DoTemplate(HKEY("beginbox"), NULL, &SubTP);
}
-/**
- * \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)
{
wprintf("<form name=\"searchomatic\" action=\"do_search\">\n");
wprintf("<div style=\"display: inline;\"><input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
- wprintf("<label for=\"search_name\">");
+ wprintf("<label for=\"srchquery\">");
wprintf(_("Search: "));
wprintf("</label><input ");
- wprintf("%s", serv_info.serv_fulltext_enabled ? "" : "disabled ");
- wprintf("type=\"text\" name=\"query\" id=\"srchquery\" size=\"15\" maxlength=\"128\" "
- "id=\"search_name\" class=\"inputbox\">\n"
+ wprintf("%s", WC->serv_info->serv_fulltext_enabled ? "" : "disabled ");
+ wprintf("type=\"text\" name=\"query\" id=\"srchquery\" size=\"15\" maxlength=\"128\" class=\"inputbox\">\n"
);
wprintf("</div></form>\n");
}
-/**
- * \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
*
*/
void embed_room_banner(char *got, int navbar_style) {
+ wcsession *WCC = WC;
char buf[256];
char buf2[1024];
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.
*/
- snprintf(WC->this_page, sizeof(WC->this_page), "dotskip&room=%s",
- ChrPtr(WC->wc_roomname));
+ if (WCC->Hdr->this_page == NULL) {
+ WCC->Hdr->this_page = NewStrBuf();
+ }
+ StrBufPrintf(WCC->Hdr->this_page,
+ "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")
"<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", _("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")
);
+ wprintf(
+ "<li class=\"newmess\">"
+ "<a href=\"javascript:deleteAllSelectedMessages();\">"
+ "<img src=\"static/delete.gif\" "
+ "alt=\"\" width=\"24\" height=\"24\"><span class=\"navbar_link\">"
+ "%s"
+ "</span></a></li>\n", _("Delete")
+ );
break;
default:
wprintf(
"<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"),
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) {
serv_puts("GOTO _BASEROOM_");
StrBuf_ServGetln(Buf);
- if (GetServerStatus(Buf, &err) != 2) {
+ /*
+ * well, we know that this is the fallback case,
+ * but we're interested that the first command
+ * didn't work out in first place.
+ */
+ if (GetServerStatus(Buf, NULL) != 2) {
FreeStrBuf(&Buf);
return err;
}
}
-/**
- * \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];
*/
void display_editroom(void)
{
+ StrBuf *Buf;
char buf[SIZ];
char cmd[1024];
char node[256];
tab = bstr("tab");
if (IsEmptyStr(tab)) tab = "admin";
- load_floorlist();
+ Buf = NewStrBuf();
+ load_floorlist(Buf);
+ FreeStrBuf(&Buf);
output_headers(1, 1, 1, 0, 0, 0);
wprintf("<div class=\"fix_scrollbar_bug\">");
/* 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>");
}
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");
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(_("The URL for subscribe/unsubscribe is: "));
wprintf("<TT>%s://%s/listsub</TT></td></tr>\n",
(is_https ? "https" : "http"),
- WC->http_host);
+ ChrPtr(WC->Hdr->HR.http_host));
/* Public posting? */
wprintf("<tr><td>");
wprintf(_("Allow non-subscribers to mail to this room."));
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)"));
FreeStrBuf(&Buf);
return;
}
+
+ er_name = NewStrBuf();
+ er_password = NewStrBuf();
+ er_dirname = NewStrBuf();
+ er_roomaide = NewStrBuf();
+
StrBufCutLeft(Buf, 4);
StrBufExtract_token(er_name, Buf, 0, '|');
StrBufExtract_token(er_password, Buf, 1, '|');
*/
void display_entroom(void)
{
+ StrBuf *Buf;
int i;
char buf[SIZ];
+ Buf = NewStrBuf();
serv_puts("CRE8 0");
serv_getln(buf, sizeof buf);
if (buf[0] != '2') {
strcpy(WC->ImportantMessage, &buf[4]);
display_main_menu();
+ FreeStrBuf(&Buf);
return;
}
wprintf("<tr class=\"odd\"><td>");
wprintf(_("Resides on floor: "));
wprintf("</td><td>");
- load_floorlist();
+ load_floorlist(Buf);
wprintf("<select name=\"er_floor\" size=\"1\">\n");
for (i = 0; i < 128; ++i)
if (!IsEmptyStr(floorlist[i])) {
do_template("endbox", NULL);
wDumpContent(1);
+ FreeStrBuf(&Buf);
}
Buf = NewStrBufPlain(_("Go to a hidden room"), -1);
memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.ContextType = CTX_STRBUF;
+ SubTP.Filter.ContextType = CTX_STRBUF;
SubTP.Context = Buf;
DoTemplate(HKEY("beginbox"), NULL, &SubTP);
Buf = NewStrBufPlain(floor_name, -1);
memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.ContextType = CTX_STRBUF;
+ SubTP.Filter.ContextType = CTX_STRBUF;
SubTP.Context = Buf;
DoTemplate(HKEY("beginbox"), NULL, &SubTP);
StrBuf *FloorDiv;
FloorDiv = NewStrBuf();
- StrBufAppendBuf(FloorDiv, WCC->UrlFragment2, 0);
+ StrBufExtract_token(FloorDiv, WCC->Hdr->HR.ReqLine, 0, '/');
set_preference("floordiv_expanded", FloorDiv, 1);
WCC->floordiv_expanded = FloorDiv;
}
*/
void list_all_rooms_by_floor(const char *viewpref) {
+ StrBuf *Buf;
char buf[SIZ];
int swap = 0;
struct folder *fold = NULL;
do_iconbar_view(WC->cache_fold, WC->cache_max_folders, WC->cache_num_floors);
return;
}
+ Buf = NewStrBuf();
/** Grab the floor table so we know how to build the list... */
- load_floorlist();
-
+ load_floorlist(Buf);
+ FreeStrBuf(&Buf);
/** Start with the mailboxes */
max_folders = 1;
alloc_folders = 1;
/** title bar */
wprintf("<div id=\"banner\">\n");
- wprintf("<div class=\"room_banner\">");
+ wprintf("<div class=\"room_banner\" id=\"room_banner\">");
wprintf("<h1>");
if (!strcasecmp(ChrPtr(ListView), "rooms")) {
wprintf(_("Room list"));
wprintf(_("Room list"));
}
wprintf("</h1></div>\n");
-
+
/** offer the ability to switch views */
+ wprintf("<div id=\"actiondiv\">");
wprintf("<ul class=\"room_actions\">\n");
wprintf("<li class=\"start_page\">");
offer_start_page(NULL, &NoCtx);
"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" : "" )
wprintf("</select>");
wprintf("</form></li>");
- wprintf("</ul></div>\n");
+ wprintf("</ul></div></div>\n");
wprintf("<div id=\"content\" class=\"service\">\n");
Buf = NewStrBuf();
serv_puts("LFLR"); /* get floors */
StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err); /* '100', we hope */
- if (ChrPtr(Buf)[0] == '1') while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(Buf), "000")) {
+ if (GetServerStatus(Buf, NULL) == 1)
+ while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(Buf), "000")) {
int a;
- const char *floorNum;
+ 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 (ChrPtr(buf)[0] == '1') while(StrBufTCP_read_line(buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(buf), "000")) {
+ if (GetServerStatus(buf, NULL) == 1)
+ while(StrBufTCP_read_line(buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(buf), "000")) {
int i;
- const char *rmName;
+ 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;
val = (StrBuf *)value;
StrECMAEscAppend(TemplBuffer, val, 0);
}
-void jsonRoomFlr(void) {
+void jsonRoomFlr(void)
+{
/* Send as our own (application/json) content type */
- hprintf("HTTP/1.1 200 OK\r\n");
- hprintf("Content-type: application/json; charset=utf-8\r\n");
- hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(serv_info.serv_software));
- hprintf("Connection: close\r\n");
- hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
- begin_burst();
- DoTemplate(HKEY("json_roomflr"),NULL,&NoCtx);
- end_burst();
+ hprintf("HTTP/1.1 200 OK\r\n");
+ hprintf("Content-type: application/json; charset=utf-8\r\n");
+ hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software));
+ hprintf("Connection: close\r\n");
+ hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
+ begin_burst();
+ 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();
}
(WCC->is_mailbox) ));
}
+int ConditionalIsRoomtype(StrBuf *Target, WCTemplputParams *TP)
+{
+ wcsession *WCC = WC;
+
+ if ((WCC == NULL) ||
+ (TP->Tokens->nParameters < 3) ||
+ (TP->Tokens->Params[2]->Type != TYPE_STR)||
+ (TP->Tokens->Params[2]->len < 7))
+ return 0;
+
+ switch(WCC->wc_view) {
+ case VIEW_BBS:
+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_BBS"));
+ case VIEW_MAILBOX:
+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_MAILBOX"));
+ case VIEW_ADDRESSBOOK:
+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_ADDRESSBOOK"));
+ case VIEW_TASKS:
+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_TASKS"));
+ case VIEW_NOTES:
+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_NOTES"));
+ case VIEW_WIKI:
+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_WIKI"));
+ case VIEW_JOURNAL:
+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_JOURNAL"));
+ case VIEW_CALENDAR:
+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_CALENDAR"));
+ case VIEW_CALBRIEF:
+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_CALBRIEF"));
+ default:
+ return 0;
+ }
+}
+
void
InitModule_ROOMOPS
(void)
{
- RegisterPreference(HKEY("roomlistview"),
+ RegisterPreference("roomlistview",
_("Room list view"),
PRF_STRING,
NULL);
- RegisterPreference(HKEY("emptyfloors"), _("Show empty floors"), PRF_YESNO, NULL);
+ RegisterPreference("emptyfloors", _("Show empty floors"), PRF_YESNO, NULL);
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);
WebcitAddUrlHandler(HKEY("json_roomflr"), jsonRoomFlr, 0);
RegisterNamespace("ROOMBANNER", 0, 1, tmplput_roombanner, 0);
+ RegisterConditional(HKEY("COND:ROOM:TYPE_IS"), 0, ConditionalIsRoomtype, CTX_NONE);
RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PERMANENT"), 0, ConditionalRoomHas_QR_PERMANENT, CTX_NONE);
RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_INUSE"), 0, ConditionalRoomHas_QR_INUSE, CTX_NONE);
RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PRIVATE"), 0, ConditionalRoomHas_QR_PRIVATE, 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);
+ RegisterIterator("LKRA", 0, NULL, GetRoomListHashLKRA, NULL, DeleteHash, CTX_ROOMS, CTX_NONE, IT_NOFLAG);
RegisterNamespace("ROOM:INFO", 1, 2, tmplput_ROOM_Value, CTX_ROOMS);
}
+
+
+void
+SessionDestroyModule_ROOMOPS
+(wcsession *sess)
+{
+ if (sess->cache_fold != NULL) {
+ free(sess->cache_fold);
+ }
+
+ free_march_list(sess);
+}
/*@}*/
projects / citadel.git / blobdiff