X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fbbsview_renderer.c;h=67f42b12fb025aa4f9d7079bbcefcb2d5247c5bf;hb=HEAD;hp=19ee628d1783638178d34734b5fc22f2c79d4f57;hpb=b5f37c703901b0516479f1c713ed05a6bdaaab1b;p=citadel.git diff --git a/webcit/bbsview_renderer.c b/webcit/bbsview_renderer.c index 19ee628d1..d06045d0b 100644 --- a/webcit/bbsview_renderer.c +++ b/webcit/bbsview_renderer.c @@ -1,34 +1,27 @@ /* - * $Id$ - * * BBS View renderer module for WebCit * * Note: we briefly had a dynamic UI for this. I thought it was cool, but * it was not received well by the user community. If you want to play - * with it, go get r8256 of bbsview_renderer.c and have fun. - * - * Copyright (c) 1996-2010 by the citadel.org team + * with it, go get commit dcf99fe61379b78436c387ea3f89ebfd4ffaf635 of + * bbsview_renderer.c and have fun. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * Copyright (c) 1996-2012 by the citadel.org team * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License, version 3. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. */ #define RANGE 5 #include "webcit.h" -#include "webserver.h" -#include "groupdav.h" + +#include "dav.h" /* * Data which gets passed around between the various functions in this module @@ -40,6 +33,8 @@ struct bbsview { long lastseen; /* The number of the last seen message in this room */ int alloc_msgs; /* Currently allocated size of array */ int requested_page; /* Which page number did the user request? */ + int num_pages; /* Total number of pages in this room */ + long start_reading_at; /* Start reading at the page containing this message */ }; @@ -54,13 +49,15 @@ long bbsview_get_last_seen(void) serv_puts("GTSN"); serv_getln(buf, sizeof buf); if (buf[0] == '2') { + char *colon_pos; + char *comma_pos; - char *comma_pos = strchr(buf, ','); /* kill first comma and everything to its right */ + comma_pos = strchr(buf, ','); /* kill first comma and everything to its right */ if (comma_pos) { *comma_pos = 0; } - char *colon_pos = strchr(buf, ':'); /* kill first colon and everything to its left */ + colon_pos = strchr(buf, ':'); /* kill first colon and everything to its left */ if (colon_pos) { strcpy(buf, ++colon_pos); } @@ -78,20 +75,33 @@ int bbsview_GetParamsGetServerCall(SharedMessageStatus *Stat, void **ViewSpecific, long oper, char *cmd, - long len) + long len, + char *filter, + long flen) { struct bbsview *BBS = malloc(sizeof(struct bbsview)); memset(BBS, 0, sizeof(struct bbsview)); *ViewSpecific = BBS; - Stat->startmsg = -1; /* not used here */ + Stat->startmsg = (-1); /* not used here */ Stat->sortit = 1; /* not used here */ Stat->num_displayed = DEFAULT_MAXMSGS; /* not used here */ BBS->requested_page = 0; BBS->lastseen = bbsview_get_last_seen(); + BBS->start_reading_at = 0; + + /* By default, the requested page is the first one. */ + if (havebstr("start_reading_at")) { + BBS->start_reading_at = lbstr("start_reading_at"); + BBS->requested_page = (-4); + } + + /* However, if we are asked to start with a specific message number, make sure + * we start on the page containing that message + */ - /* If a specific page was requested, make sure we go there */ - if (havebstr("page")) { + /* Or, if a specific page was requested, make sure we go there */ + else if (havebstr("page")) { BBS->requested_page = ibstr("page"); } @@ -167,20 +177,66 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat, const StrBuf *Mime; int start_index = 0; int end_index = 0; + int go_to_the_very_end = 0; if (Stat->nummsgs > 0) { - lprintf(9, "sorting %d messages\n", BBS->num_msgs); + syslog(LOG_DEBUG, "sorting %d messages\n", BBS->num_msgs); qsort(BBS->msgs, (size_t)(BBS->num_msgs), sizeof(long), bbsview_sortfunc); } - /* If the requested page number is "whichever page on which new messages start" - * then change that to an actual page number now. + if ((BBS->num_msgs % Stat->maxmsgs) == 0) { + BBS->num_pages = BBS->num_msgs / Stat->maxmsgs; + } + else { + BBS->num_pages = (BBS->num_msgs / Stat->maxmsgs) + 1; + } + + /* If the requested page number is -4, + * it means "whichever page on which msg#xxxxx starts" + * Change to the page number which contains that message. + */ + if (BBS->requested_page == (-4)) { + if (BBS->num_msgs == 0) { + BBS->requested_page = 0; + } + else { + for (i=0; inum_msgs; ++i) { + if ( + (BBS->msgs[i] >= BBS->start_reading_at) + && (BBS->requested_page == (-4)) + ) { + BBS->requested_page = (i / Stat->maxmsgs) ; + } + } + } + } + + /* If the requested page number is -3, + * it means "whichever page on which new messages start" + * Change that to an actual page number now. */ if (BBS->requested_page == (-3)) { if (BBS->num_msgs == 0) { + /* + * The room is empty; just start at the top and leave it there. + */ BBS->requested_page = 0; } + else if ( + (BBS->num_msgs > 0) + && (BBS->lastseen <= BBS->msgs[0]) + ) { + /* + * All messages are new; this is probably the user's first visit to the room, + * so start at the last page instead of showing ancient history. + */ + BBS->requested_page = BBS->num_pages - 1; + go_to_the_very_end = 1; + } else { + /* + * Some messages are old and some are new. Go to the start of new messages. + */ for (i=0; inum_msgs; ++i) { if ( (BBS->msgs[i] > BBS->lastseen) @@ -200,10 +256,14 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat, BBS->requested_page = 0; } else { - BBS->requested_page = (BBS->num_msgs / Stat->maxmsgs); + BBS->requested_page = BBS->num_pages - 1; } } + /* keep the requested page within bounds */ + if (BBS->requested_page < 0) BBS->requested_page = 0; + if (BBS->requested_page >= BBS->num_pages) BBS->requested_page = BBS->num_pages - 1; + start_index = BBS->requested_page * Stat->maxmsgs; if (start_index < 0) start_index = 0; end_index = start_index + Stat->maxmsgs - 1; @@ -219,31 +279,43 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat, && ( (i == 0) || (BBS->msgs[i-1] <= BBS->lastseen) ) ) { /* new messages start here */ - do_template("start_of_new_msgs", NULL); - StrBufAppendPrintf(WC->trailing_javascript, "location.href=\"#newmsgs\";\n"); + do_template("start_of_new_msgs"); + if (!go_to_the_very_end) { + StrBufAppendPrintf(WC->trailing_javascript, "location.href=\"#newmsgs\";\n"); + } } if (BBS->msgs[i] > 0L) { - read_message(WC->WBuf, HKEY("view_message"), BBS->msgs[i], NULL, &Mime); + read_message(WC->WBuf, HKEY("view_message"), BBS->msgs[i], NULL, &Mime, NULL); } if ( (i == (BBS->num_msgs - 1)) && (BBS->msgs[i] <= BBS->lastseen) ) { /* no new messages */ - do_template("no_new_msgs", NULL); - StrBufAppendPrintf(WC->trailing_javascript, "location.href=\"#nonewmsgs\";\n"); + do_template("no_new_msgs"); + if (!go_to_the_very_end) { + StrBufAppendPrintf(WC->trailing_javascript, "location.href=\"#nonewmsgs\";\n"); + } } } } else if ( (seq == 0) || (seq == 2) ) { + int first; + int last; /* Display the selecto-bar with the page numbers */ wc_printf("
"); + if (seq == 2) { + wc_printf(""); + } wc_printf(_("Go to page: ")); + if (seq == 2) { + wc_printf(""); + } - int first = 0; - int last = ( (Stat->maxmsgs > 0) ? (BBS->num_msgs / Stat->maxmsgs) : 0 ); + first = 0; + last = BBS->num_pages - 1; for (i=0; i<=last; ++i) { @@ -267,7 +339,12 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat, wc_printf("["); } else { - wc_printf("", i); + wc_printf("CurRoom.name)); + wc_printf("?start_reading_at=%ld\">", + BBS->msgs[i*Stat->maxmsgs] + ); + /* wc_printf("?page=%d\">", i); */ wc_printf(""); } if ( @@ -283,7 +360,7 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat, wc_printf(_("Last")); } else { - wc_printf("%d", i + 1); // change to one-based for display + wc_printf("%d", i + 1); /* change to one-based for display */ } if (i == BBS->requested_page) { wc_printf("]"); @@ -307,6 +384,9 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat, } } + if (go_to_the_very_end) { + StrBufAppendPrintf(WC->trailing_javascript, "location.href=\"#end_of_msgs\";\n"); + } return(0); } @@ -333,9 +413,11 @@ InitModule_BBSVIEWRENDERERS VIEW_BBS, bbsview_GetParamsGetServerCall, NULL, + NULL, NULL, bbsview_LoadMsgFromServer, bbsview_RenderView_or_Tail, - bbsview_Cleanup + bbsview_Cleanup, + NULL ); }