Moved the struct declarations from blogview_renderer.c into webcit.h

[citadel.git] / webcit / blogview_renderer.c

diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index 215fa94ef222726e6228493cf314ab78b67b37ea..1320c5497a92b95555e96da34fba958fb4fd2858 100644 (file)
--- a/webcit/blogview_renderer.c
+++ b/webcit/blogview_renderer.c
@@ -1,7 +1,7 @@
 /* 
  * 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 open source software.  You can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -23,15 +23,24 @@
 #include "groupdav.h"
 
 
-/* 
- * Array type for a blog post.  The first message is the post; the rest are comments
+/*
+ * Generate a permalink for a post
+ * (Call with NULL arguments to make this function wcprintf() the permalink
+ * instead of writing it to the template)
  */
-struct blogpost {
-       int top_level_id;
-       long *msgs;             /* Array of msgnums for messages we are displaying */
-       int num_msgs;           /* Number of msgnums stored in 'msgs' */
-       int alloc_msgs;         /* Currently allocated size of array */
-};
+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);
+       }
+}
 
 
 /*
@@ -57,7 +66,9 @@ void blogpost_render_and_destroy(struct blogpost *bp) {
                        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) {
@@ -66,6 +77,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);
@@ -77,17 +91,14 @@ void blogpost_render_and_destroy(struct blogpost *bp) {
        if (bp->alloc_msgs > 0) {
                free(bp->msgs);
        }
-       free(bp);
-}
 
+       /* offer the comment box */
+       if (p == bp->top_level_id) {
+               do_template("blog_comment_box");
+       }
 
-/*
- * Data which gets returned from a call to blogview_learn_thread_references()
- */
-struct bltr {
-       int id;
-       int refs;
-};
+       free(bp);
+}
 
 
 /*
@@ -115,8 +126,8 @@ int blogview_GetParamsGetServerCall(SharedMessageStatus *Stat,
 
 
 /*
- * Given a 'struct blogpost' containing a msgnum, populate the id
- * and refs fields by fetching them from the Citadel server
+ * Given a msgnum, populate the id and refs fields of
+ * a "struct bltr" by fetching them from the Citadel server
  */
 struct bltr blogview_learn_thread_references(long msgnum)
 {
@@ -135,12 +146,12 @@ struct bltr blogview_learn_thread_references(long msgnum)
                {
                        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)));
                        }
                }
        }
@@ -222,7 +233,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.
@@ -243,19 +254,6 @@ int blogview_Cleanup(void **ViewSpecific)
        return 0;
 }
 
-/*
- * Generate a permalink for a post
- */
-void tmplput_blog_permalink(StrBuf *Target, WCTemplputParams *TP) {
-       char perma[SIZ];
-       
-       strcpy(perma, "/readfwd?go=");
-       urlesc(&perma[strlen(perma)], sizeof(perma)-strlen(perma), ChrPtr(WC->CurRoom.name));
-       snprintf(&perma[strlen(perma)], sizeof(perma)-strlen(perma), "?p=%d", WC->bptlid);
-       StrBufAppendPrintf(Target, "%s", perma);
-}
-
-
 void 
 InitModule_BLOGVIEWRENDERERS
 (void)