Removed the unused second argument from the do_template() macro

[citadel.git] / webcit / blogview_renderer.c

diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index 949fd179a3a90ea4b29061adebb4c5e28b34b523..438e3d49eeac94569cce3ed390c6ed3f64de2955 100644 (file)
--- a/webcit/blogview_renderer.c
+++ b/webcit/blogview_renderer.c
@@ -1,12 +1,12 @@
 /* 
  * Blog view renderer module for WebCit
  *
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-2011 by the citadel.org team
  *
- * 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.
+ * 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.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +15,7 @@
  *
  * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "webcit.h"
@@ -34,6 +34,26 @@ struct blogpost {
 };
 
 
+/*
+ * Generate a permalink for a post
+ * (Call with NULL arguments to make this function wcprintf() the permalink
+ * instead of writing it to the template)
+ */
+void tmplput_blog_permalink(StrBuf *Target, WCTemplputParams *TP) {
+       char perma[SIZ];
+       
+       strcpy(perma, "/readfwd?go=");
+       urlesc(&perma[strlen(perma)], sizeof(perma)-strlen(perma), (char *)ChrPtr(WC->CurRoom.name));
+       snprintf(&perma[strlen(perma)], sizeof(perma)-strlen(perma), "?p=%d", WC->bptlid);
+       if (!Target) {
+               wc_printf("%s", perma);
+       }
+       else {
+               StrBufAppendPrintf(Target, "%s", perma);
+       }
+}
+
+
 /*
  * Destructor for 'struct blogpost' which does the rendering first.
  * By rendering from here, we eliminate the need for a separate iterator, although
@@ -45,6 +65,7 @@ void blogpost_render_and_destroy(struct blogpost *bp) {
        int i;
 
        p = atoi(BSTR("p"));    /* are we looking for a specific post? */
+       WC->bptlid = bp->top_level_id;
 
        if ( ((p == 0) || (p == bp->top_level_id)) && (bp->num_msgs > 0) ) {
                /* Show the top level post */
@@ -52,11 +73,14 @@ void blogpost_render_and_destroy(struct blogpost *bp) {
 
                if (p == 0) {
                        /* Show the number of comments */
-                       wc_printf("<a href=\"readfwd?p=%d?gotofirst=", bp->top_level_id);
+                       wc_printf("<a href=\"readfwd?p=%d?go=", bp->top_level_id);
                        urlescputs(ChrPtr(WC->CurRoom.name));
                        wc_printf("#comments\">");
                        wc_printf(_("%d comments"), bp->num_msgs - 1);
-                       wc_printf("</a>");
+                       wc_printf("</a> | <a href=\"");
+                       tmplput_blog_permalink(NULL, NULL);
+                       wc_printf("\">%s</a>", _("permalink"));
+                       wc_printf("<br><br><br>\n");
                }
                else if (bp->num_msgs < 2) {
                        wc_printf(_("%d comments"), 0);
@@ -64,6 +88,9 @@ void blogpost_render_and_destroy(struct blogpost *bp) {
                else {
                        wc_printf("<a name=\"comments\"></a>\n");
                        wc_printf(_("%d comments"), bp->num_msgs - 1);
+                       wc_printf(" | <a href=\"");
+                       tmplput_blog_permalink(NULL, NULL);
+                       wc_printf("\">%s</a>", _("permalink"));
                        wc_printf("<br>\n");
                        for (i=1; i<bp->num_msgs; ++i) {
                                read_message(WC->WBuf, HKEY("view_blog_comment"), bp->msgs[i], NULL, &Mime);
@@ -75,6 +102,12 @@ void blogpost_render_and_destroy(struct blogpost *bp) {
        if (bp->alloc_msgs > 0) {
                free(bp->msgs);
        }
+
+       /* offer the comment box */
+       if (p == bp->top_level_id) {
+               do_template("blog_comment_box");
+       }
+
        free(bp);
 }
 
@@ -120,21 +153,25 @@ struct bltr blogview_learn_thread_references(long msgnum)
 {
        StrBuf *Buf;
        StrBuf *r;
+       int len;
        struct bltr bltr = { 0, 0 } ;
        Buf = NewStrBuf();
        r = NewStrBuf();
        serv_printf("MSG0 %ld|1", msgnum);              /* top level citadel headers only */
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) == 1) {
-               while (StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) {
+               while (len = StrBuf_ServGetln(Buf), 
+                      ((len >= 0) && 
+                       ((len != 3) || strcmp(ChrPtr(Buf), "000") )))
+               {
                        if (!strncasecmp(ChrPtr(Buf), "msgn=", 5)) {
                                StrBufCutLeft(Buf, 5);
-                               bltr.id = HashLittle(ChrPtr(Buf), StrLength(Buf));
+                               bltr.id = abs(HashLittle(ChrPtr(Buf), StrLength(Buf)));
                        }
                        else if (!strncasecmp(ChrPtr(Buf), "wefw=", 5)) {
                                StrBufCutLeft(Buf, 5);          /* trim the field name */
                                StrBufExtract_token(r, Buf, 0, '|');
-                               bltr.refs = HashLittle(ChrPtr(r), StrLength(r));
+                               bltr.refs = abs(HashLittle(ChrPtr(r), StrLength(r)));
                        }
                }
        }
@@ -216,7 +253,7 @@ int blogview_sortfunc(const void *s1, const void *s2) {
 
 int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper)
 {
-       /*HashList *BLOG = (HashList *) *ViewSpecific;*/
+       /* HashList *BLOG = (HashList *) *ViewSpecific; */
 
        /*
         * No code needed here -- we render during disposition.
@@ -237,7 +274,6 @@ int blogview_Cleanup(void **ViewSpecific)
        return 0;
 }
 
-
 void 
 InitModule_BLOGVIEWRENDERERS
 (void)
@@ -251,4 +287,5 @@ InitModule_BLOGVIEWRENDERERS
                blogview_render,
                blogview_Cleanup
        );
+       RegisterNamespace("BLOG:PERMALINK", 0, 0, tmplput_blog_permalink, NULL, CTX_NONE);
 }