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 f8ba6cd2706e938bae293bde1d069d027e561835..1320c5497a92b95555e96da34fba958fb4fd2858 100644 (file)
--- a/webcit/blogview_renderer.c
+++ b/webcit/blogview_renderer.c
@@ -23,16 +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 */
-       char euid[BLOG_EUIDBUF_SIZE];   /* please do not change this to a StrBuf */
-};
+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);
+       }
+}
 
 
 /*
@@ -54,13 +62,13 @@ void blogpost_render_and_destroy(struct blogpost *bp) {
 
                if (p == 0) {
                        /* Show the number of comments */
-                       wc_printf("<a href=\"readfwd");
-                       wc_printf("?p=%d", bp->top_level_id);
-                       wc_printf("?euid=");    urlescputs(bp->euid);   /* FIXME not really */
-                       wc_printf("?go=");      urlescputs(ChrPtr(WC->CurRoom.name));
+                       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) {
@@ -69,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);
@@ -80,18 +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;
-       char euid[BLOG_EUIDBUF_SIZE];   /* please do not change this to a StrBuf */
-};
+       free(bp);
+}
 
 
 /*
@@ -119,15 +126,15 @@ 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)
 {
        StrBuf *Buf;
        StrBuf *r;
        int len;
-       struct bltr bltr = { 0, 0, "" } ;
+       struct bltr bltr = { 0, 0 } ;
        Buf = NewStrBuf();
        r = NewStrBuf();
        serv_printf("MSG0 %ld|1", msgnum);              /* top level citadel headers only */
@@ -139,16 +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));
-                       }
-                       else if (!strncasecmp(ChrPtr(Buf), "exti=", 5)) {
-                               StrBufCutLeft(Buf, 5);          /* trim the field name */
-                               safestrncpy(bltr.euid, ChrPtr(Buf), sizeof(bltr.euid));
+                               bltr.refs = abs(HashLittle(ChrPtr(r), StrLength(r)));
                        }
                }
        }
@@ -173,10 +176,6 @@ int blogview_LoadMsgFromServer(SharedMessageStatus *Stat,
 
        b = blogview_learn_thread_references(Msg->msgnum);
 
-       if (!IsEmptyStr(b.euid)) {
-               syslog(LOG_DEBUG, "\033[7m%s\033[0m", b.euid);
-       }
-
        /* FIXME an optimization here -- one we ought to perform -- is to exit this
         * function immediately if the viewer is only interested in a single post and
         * that message ID is neither the id nor the refs.  Actually, that might *be*
@@ -188,7 +187,6 @@ int blogview_LoadMsgFromServer(SharedMessageStatus *Stat,
                if (!bp) return(200);
                memset(bp, 0, sizeof (struct blogpost));
                bp->top_level_id = b.id;
-               strcpy(bp->euid, b.euid);
                Put(BLOG, (const char *)&b.id, sizeof(b.id), bp,
                                        (DeleteHashDataFunc)blogpost_render_and_destroy);
        }
@@ -235,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.
@@ -256,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)