final touches on dkim test harness

[citadel.git] / webcit / bbsview_renderer.c

diff --git a/webcit/bbsview_renderer.c b/webcit/bbsview_renderer.c
index fe0eb4fae797c550041ac5c1a94e5ff0f522b620..d06045d0bdeddafe264f7a0333860df8d3827490 100644 (file)
--- a/webcit/bbsview_renderer.c
+++ b/webcit/bbsview_renderer.c
@@ -6,28 +6,22 @@
  * with it, go get commit dcf99fe61379b78436c387ea3f89ebfd4ffaf635 of
  * bbsview_renderer.c and have fun.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-2012 by the citadel.org team
  *
  * This program is open source 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.
+ * modify it under the terms of the GNU General Public License, version 3.
  *
  * 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.
- *
- * 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
  */
 
 #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
@@ -81,7 +75,9 @@ 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));
@@ -184,7 +180,7 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat,
        int go_to_the_very_end = 0;
 
        if (Stat->nummsgs > 0) {
-               syslog(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);
        }
 
@@ -289,7 +285,7 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat,
                                        }
                                }
                                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))
@@ -343,7 +339,12 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat,
                                                wc_printf("[");
                                        }
                                        else {
-                                               wc_printf("<a href=\"readfwd?page=%d\">", i);
+                                               wc_printf("<a href=\"readfwd?go=");
+                                               urlescputs(ChrPtr(WC->CurRoom.name));
+                                               wc_printf("?start_reading_at=%ld\">",
+                                                       BBS->msgs[i*Stat->maxmsgs]
+                                               );
+                                               /* wc_printf("?page=%d\">", i); */
                                                wc_printf("<span class=\"moreprompt_link\">");
                                        }
                                        if (
@@ -412,9 +413,11 @@ InitModule_BBSVIEWRENDERERS
                VIEW_BBS,
                bbsview_GetParamsGetServerCall,
                NULL,
+               NULL,
                NULL, 
                bbsview_LoadMsgFromServer,
                bbsview_RenderView_or_Tail,
-               bbsview_Cleanup
+               bbsview_Cleanup,
+               NULL
        );
 }