\n");
/* end tabbed dialog */
- wprintf(""
);
@@ -1313,36 +1127,38 @@ void display_editroom(void)
/* begin content of whatever tab is open now */
if (!strcmp(tab, "admin")) {
- wprintf("
");
+ wc_printf("
");
serv_puts("GETR");
serv_getln(buf, sizeof buf);
if (!strncmp(buf, "550", 3)) {
- wprintf("
%s
\n",
+ wc_printf("
%s
\n",
_("Higher access is required to access this function.")
);
}
else if (buf[0] != '2') {
- wprintf("
%s
\n", &buf[4]);
+ wc_printf("
%s
\n", &buf[4]);
}
else {
extract_token(er_name, &buf[4], 0, '|', sizeof er_name);
@@ -1352,209 +1168,209 @@ void display_editroom(void)
er_floor = extract_int(&buf[4], 4);
er_flags2 = extract_int(&buf[4], 7);
- wprintf("
");
+ wc_printf("
");
}
/* Sharing the room with other Citadel nodes... */
if (!strcmp(tab, "sharing")) {
- wprintf("
");
+ wc_printf("
");
shared_with = strdup("");
not_shared_with = strdup("");
@@ -1615,99 +1431,99 @@ void display_editroom(void)
}
/* Display the stuff */
- wprintf("
"
+ wc_printf("
"
""
"| ");
- wprintf(_("Shared with"));
- wprintf(" | "
+ wc_printf(_("Shared with"));
+ wc_printf(""
"");
- wprintf(_("Not shared with"));
- wprintf(" |
\n"
+ wc_printf(_("Not shared with"));
+ wc_printf("\n"
"\n");
- wprintf("| ");
- wprintf(_("Remote node name"));
- wprintf(" | ");
- wprintf(_("Remote room name"));
- wprintf(" | ");
- wprintf(_("Actions"));
- wprintf(" | \n");
+ wc_printf("\n");
- wprintf("\n");
- wprintf("| ");
- wprintf(_("Remote node name"));
- wprintf(" | ");
- wprintf(_("Remote room name"));
- wprintf(" | ");
- wprintf(_("Actions"));
- wprintf(" | \n");
+ wc_printf("
\n");
+ wc_printf(" | \n");
+ wc_printf("\n");
- wprintf(" | "
+ wc_printf("
\n");
+ wc_printf(" |
"
"
\n"
"%s- ", _("Notes:"));
- wprintf(_("When sharing a room, "
+ wc_printf(_("When sharing a room, "
"it must be shared from both ends. Adding a node to "
"the 'shared' list sends messages out, but in order to"
" receive messages, the other nodes must be configured"
@@ -1719,19 +1535,19 @@ void display_editroom(void)
"
\n"
));
- wprintf("");
+ wc_printf("
");
}
/* Mailing list management */
if (!strcmp(tab, "listserv")) {
room_states RoomFlags;
- wprintf("
\n");
address_book_popup();
wDumpContent(1);
@@ -2424,47 +2240,47 @@ void display_whok(void)
extract_token(room, &buf[4], 0, '|', sizeof room);
- wprintf("
\n");
address_book_popup();
wDumpContent(1);
}
@@ -2506,31 +2322,31 @@ void display_entroom(void)
svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Create a new room"));
do_template("beginbox", NULL);
- wprintf("
");
serv_printf("MESG roomaccess");
serv_getln(buf, sizeof buf);
if (buf[0] == '1') {
@@ -2746,40 +2562,40 @@ void display_private(char *rname, int req_pass)
FreeStrBuf(&Buf);
- wprintf("
");
- wprintf(_("If you know the name of a hidden (guess-name) or "
+ wc_printf("
");
+ wc_printf(_("If you know the name of a hidden (guess-name) or "
"passworded room, you can enter that room by typing "
"its name below. Once you gain access to a private "
"room, it will appear in your regular room listings "
"so you don't have to keep returning here."));
- wprintf("
\n");
do_template("endbox", NULL);
@@ -2813,7 +2629,7 @@ void goto_private(void)
return;
}
output_headers(1, 1, 1, 0, 0, 0);
- wprintf("%s\n", &buf[4]);
+ wc_printf("%s\n", &buf[4]);
wDumpContent(1);
return;
}
@@ -2826,24 +2642,24 @@ void display_zap(void)
{
output_headers(1, 1, 2, 0, 0, 0);
- wprintf("
\n");
+ wc_printf("
\n");
- wprintf(_("If you select this option,
%s will "
+ wc_printf(_("If you select this option,
%s will "
"disappear from your room list. Is this what you wish "
"to do?
\n"), ChrPtr(WC->wc_roomname));
- wprintf("
\n");
+ wc_printf("
\n");
wDumpContent(1);
}
@@ -3077,363 +2893,6 @@ void change_view(void) {
do_change_view(view);
}
-
-/**
- * \brief One big expanded tree list view --- like a folder list
- * \param fold the folder to view
- * \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) {
- char buf[SIZ];
- int levels;
- int i;
- int has_subfolders = 0;
- int *parents;
-
- parents = malloc(max_folders * sizeof(int));
-
- /** BEGIN TREE MENU */
- wprintf("
Loading folder list...
\n");
-
- /** include NanoTree */
- wprintf("\n");
-
- /** initialize NanoTree */
- wprintf("\n"
- );
-
- free(parents);
- /** END TREE MENU */
-}
-
-/**
- * \brief Boxes and rooms and lists ... oh my!
- * \param fold the folder to view
- * \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) {
- char buf[256];
- char floor_name[256];
- char old_floor_name[256];
- int levels, oldlevels;
- int i, t;
- int num_boxes = 0;
- static int columns = 3;
- int boxes_per_column = 0;
- int current_column = 0;
- int nf;
-
- strcpy(floor_name, "");
- strcpy(old_floor_name, "");
-
- nf = num_floors;
- while (nf % columns != 0) ++nf;
- boxes_per_column = (nf / columns);
- if (boxes_per_column < 1) boxes_per_column = 1;
-
- /** Outer table (for columnization) */
- wprintf("
"
- "| ");
-
- levels = 0;
- oldlevels = 0;
- for (i=0; i");
-
- ++num_boxes;
- if ((num_boxes % boxes_per_column) == 0) {
- ++current_column;
- if (current_column < columns) {
- wprintf(" | \n");
- }
- }
- }
- strcpy(old_floor_name, floor_name);
-
- if (levels == 1) {
- StrBuf *Buf;
- WCTemplputParams SubTP;
-
- Buf = NewStrBufPlain(floor_name, -1);
- memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.Filter.ContextType = CTX_STRBUF;
- SubTP.Context = Buf;
- DoTemplate(HKEY("beginbox"), NULL, &SubTP);
-
- FreeStrBuf(&Buf);
- }
-
- oldlevels = levels;
-
- if (levels > 1) {
- wprintf(" ");
- if (levels>2) for (t=0; t<(levels-2); ++t) wprintf(" ");
- if (fold[i].selectable) {
- wprintf("");
- }
- else {
- wprintf("");
- }
- if (fold[i].hasnewmsgs) {
- wprintf("");
- }
- else {
- wprintf("");
- }
- extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
- escputs(buf);
- wprintf("");
- if (fold[i].selectable) {
- wprintf("");
- }
- else {
- wprintf("");
- }
- if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
- wprintf(" (INBOX)");
- }
- wprintf("
\n");
- }
- }
- /** End the final inner box */
- do_template("endbox", NULL);
-
- wprintf(" |
\n");
-}
-
-/**
- * \brief print a floor div???
- * \param which_floordiv name of the floordiv???
- */
-void set_floordiv_expanded(void) {
- wcsession *WCC = WC;
- StrBuf *FloorDiv;
-
- FloorDiv = NewStrBuf();
- StrBufExtract_token(FloorDiv, WCC->Hdr->HR.ReqLine, 0, '/');
- set_preference("floordiv_expanded", FloorDiv, 1);
- WCC->floordiv_expanded = FloorDiv;
-}
-
-/**
- * \brief view the iconbar
- * \param fold the folder to view
- * \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) {
- char buf[256];
- char floor_name[256];
- char old_floor_name[256];
- char floordivtitle[256];
- char floordiv_id[32];
- int levels, oldlevels;
- int i, t;
- char *icon = NULL;
-
- strcpy(floor_name, "");
- strcpy(old_floor_name, "");
-
- levels = 0;
- oldlevels = 0;
- for (i=0; i
\n");
- wprintf("\n"); /** floordiv */
- }
- strcpy(old_floor_name, floor_name);
-
- if (levels == 1) {
- /** Begin floor */
- stresc(floordivtitle, 256, floor_name, 0, 0);
- sprintf(floordiv_id, "floordiv%d", i);
- wprintf("
"
- "%s\n", floordiv_id, floordivtitle);
- wprintf("
",
- floordiv_id,
- (!strcasecmp(floordiv_id, ChrPtr(WC->floordiv_expanded)) ? "block" : "none")
- );
- }
-
- oldlevels = levels;
-
- if (levels > 1) {
- wprintf("
\n"); /** roomdiv */
- }
- }
- wprintf("
\n"); /** floordiv */
-
-
-}
-
-
-
/**
* \brief Burn the cached folder list.
* \param age How old the cahce needs to be before we burn it.
@@ -3452,189 +2911,6 @@ void burn_folder_cache(time_t age)
-
-/**
- * \brief Show the room list.
- * (only should get called by
- * knrooms() because that's where output_headers() is called from)
- * \param viewpref the view preferences???
- */
-
-void list_all_rooms_by_floor(const char *viewpref) {
- StrBuf *Buf;
- char buf[SIZ];
- int swap = 0;
- struct folder *fold = NULL;
- struct folder ftmp;
- int max_folders = 0;
- int alloc_folders = 0;
- int *floor_mapping;
- int IDMax;
- int i, j;
- int ShowEmptyFloors;
- int ra_flags = 0;
- int flags = 0;
- int num_floors = 1; /** add an extra one for private folders */
- char buf3[SIZ];
-
- /** If our cached folder list is very old, burn it. */
- burn_folder_cache(300);
-
- /** Can we do the iconbar roomlist from cache? */
- if ((WC->cache_fold != NULL) && (!strcasecmp(viewpref, "iconbar"))) {
- 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(Buf);
- FreeStrBuf(&Buf);
- /** Start with the mailboxes */
- max_folders = 1;
- alloc_folders = 1;
- fold = malloc(sizeof(struct folder));
- memset(fold, 0, sizeof(struct folder));
- strcpy(fold[0].name, "My folders");
- fold[0].is_mailbox = 1;
-
- /** Then add floors */
- serv_puts("LFLR");
- serv_getln(buf, sizeof buf);
- if (buf[0]=='1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- if (max_folders >= alloc_folders) {
- alloc_folders = max_folders + 100;
- fold = realloc(fold,
- alloc_folders * sizeof(struct folder));
- }
- memset(&fold[max_folders], 0, sizeof(struct folder));
- 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);
- ++max_folders;
- ++num_floors;
- }
- IDMax = 0;
- for (i=0; i
= alloc_folders) {
- alloc_folders = max_folders + 100;
- fold = realloc(fold,
- alloc_folders * sizeof(struct folder));
- }
- memset(&fold[max_folders], 0, sizeof(struct folder));
- extract_token(fold[max_folders].room, buf, 0, '|', sizeof fold[max_folders].room);
- ra_flags = extract_int(buf, 5);
- flags = extract_int(buf, 1);
- fold[max_folders].floor = extract_int(buf, 2);
- fold[max_folders].hasnewmsgs =
- ((ra_flags & UA_HASNEWMSGS) ? 1 : 0 );
- if (flags & QR_MAILBOX) {
- fold[max_folders].is_mailbox = 1;
- }
- fold[max_folders].view = extract_int(buf, 6);
- room_to_folder(fold[max_folders].name,
- fold[max_folders].room,
- fold[max_folders].floor,
- fold[max_folders].is_mailbox);
- fold[max_folders].selectable = 1;
- /* Increase the room count for the associtaed floor */
- if (fold[max_folders].is_mailbox) {
- fold[0].num_rooms++;
- }
- else {
- i = floor_mapping[fold[max_folders].floor];
- fold[i].num_rooms++;
- }
- ++max_folders;
- }
-
- /*
- * Remove any floors that don't have rooms
- */
- get_pref_yesno("emptyfloors", &ShowEmptyFloors, 0);
- if (ShowEmptyFloors)
- {
- for (i=0; i 0) {
- memcpy(&ftmp, &fold[j], sizeof(struct folder));
- memcpy(&fold[j], &fold[j+1],
- sizeof(struct folder));
- memcpy(&fold[j+1], &ftmp,
- sizeof(struct folder));
- }
- }
- }
-
-
- if (!strcasecmp(viewpref, "folders")) {
- do_folder_view(fold, max_folders, num_floors);
- }
- else if (!strcasecmp(viewpref, "hackish_view")) {
- for (i=0; i\n");
- }
- }
- else if (!strcasecmp(viewpref, "iconbar")) {
- do_iconbar_view(fold, max_folders, num_floors);
- }
- else {
- do_rooms_view(fold, max_folders, num_floors);
- }
-
- /* Don't free the folder list ... cache it for future use! */
- if (WC->cache_fold != NULL) {
- free(WC->cache_fold);
- }
- WC->cache_fold = fold;
- WC->cache_max_folders = max_folders;
- WC->cache_num_floors = num_floors;
- WC->cache_timestamp = time(NULL);
- free(floor_mapping);
-}
-
-
/**
* \brief Do either a known rooms list or a folders list, depending on the
* user's preference
@@ -3643,11 +2919,9 @@ void knrooms(void)
{
StrBuf *ListView = NULL;
- output_headers(1, 1, 2, 0, 0, 0);
-
/** Determine whether the user is trying to change views */
if (havebstr("view")) {
- ListView = NewStrBufPlain(bstr("view"), -1);
+ ListView = NewStrBufDup(SBSTR("view"));
set_preference("roomlistview", ListView, 1);
}
/** Sanitize the input so its safe */
@@ -3656,62 +2930,15 @@ void knrooms(void)
(strcasecmp(ChrPtr(ListView), "table") != 0)))
{
if (ListView == NULL) {
- ListView = NewStrBufPlain("rooms", sizeof("rooms") - 1);
+ ListView = NewStrBufPlain(HKEY("rooms"));
set_preference("roomlistview", ListView, 0);
}
else {
- StrBufPrintf(ListView, "rooms");
+ StrBufPlain(ListView, HKEY("rooms"));
save_preferences();
}
}
-
- /** title bar */
- wprintf("\n");
- wprintf("
");
- wprintf("
");
- if (!strcasecmp(ChrPtr(ListView), "rooms")) {
- wprintf(_("Room list"));
- }
- else if (!strcasecmp(ChrPtr(ListView), "folders")) {
- wprintf(_("Folder list"));
- }
- else if (!strcasecmp(ChrPtr(ListView), "table")) {
- wprintf(_("Room list"));
- }
- wprintf("
\n");
-
- /** offer the ability to switch views */
- wprintf("
");
- wprintf("
\n");
- wprintf("- ");
- offer_start_page(NULL, &NoCtx);
- wprintf("
");
- wprintf("");
- wprintf("
\n");
-
- /** Display the room list in the user's preferred format */
- list_all_rooms_by_floor(ChrPtr(ListView));
- wDumpContent(1);
+ url_do_template();
}
@@ -3743,130 +2970,21 @@ void set_room_policy(void) {
display_editroom();
}
-HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP) {
- /* todo: check context */
- const char *Err;
- StrBuf *Buf;
- StrBuf *Buf2;
- HashList *floors;
- HashList *floor;
- 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
Context);
- void *value;
- GetHash(floor, TKEY(0), &value);
- val = (StrBuf *)value;
- StrECMAEscAppend(TemplBuffer, val, 0);
-}
-HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP)
-{
- serv_puts("LKRA");
- return GetRoomListHash(Target, TP);
-}
-HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP)
-{
- /* TODO: Check context */
- HashList *rooms;
- HashList *room;
- StrBuf *buf;
- StrBuf *buf2;
- const char *Err;
- 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 l2) return +1;
- else return 0;
-}
-void tmplput_ROOM_Value(StrBuf *TemplBuffer, WCTemplputParams *TP)
-{
- void *value;
- StrBuf *val;
- HashList *room = (HashList *)(TP->Context);
-
- GetHash(room, TKEY(0), &value);
- val = (StrBuf *)value;
- StrECMAEscAppend(TemplBuffer, val, 0);
-}
-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(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();
}
@@ -3875,9 +2993,9 @@ void dotgoto(void) {
void tmplput_roombanner(StrBuf *Target, WCTemplputParams *TP)
{
- wprintf("\n");
+ wc_printf("
\n");
embed_room_banner(NULL, navbar_default);
- wprintf("
\n");
+ wc_printf("
![\"\"](\"static/ungoto2_24x.gif\")
"
+ "![\"\"](\"static/newmess2_24x.gif\")
"
+ "![](\"static/viewcontacts_24x.gif\")
"
+ "alt=\"\" width=\"24\" height=\"24\">"
"![](\"static/taskday2_24x.gif\")
"
+ "alt=\"\" width=\"24\" height=\"24\">"
"![](\"static/monthview2_24x.gif\")
"
+ "alt=\"\" width=\"24\" height=\"24\">"
"![](\"static/taskmanag_24x.gif\")
"
+ "alt=\"\" width=\"24\" height=\"24\">"
"![](\"static/viewnotes_24x.gif\")
"
+ "alt=\"\" width=\"24\" height=\"24\">"
"![](\"static/readallmess3_24x.gif\")
"
+ "alt=\"\" width=\"24\" height=\"24\">"
"![](\"static/addnewcontact_24x.gif\")
![](\"static/addevent_24x.gif\")
![](\"static/newmess3_24x.gif\")
![](\"static/enternewnote_24x.gif\")
![](\"static/delete.gif\")
![\"\"](\"static/skipthisroom_24x.gif\")
"
+ "![\"\"](\"static/markngo_24x.gif\")
"
+ "![\"](\"static/rss_16x.png\")
");
- wprintf(_("Feed URL"));
- wprintf("