Changed 'free software' to 'open source' to piss off Richard Stallman

[citadel.git] / webcit / blogview_renderer.c

diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index 643d9c5f4db033f1e9cd07ddf5c26f001212c046..5da977ba3cf7152d9fe73b63e4e491bbd7fd79d2 100644 (file)
--- a/webcit/blogview_renderer.c
+++ b/webcit/blogview_renderer.c
@@ -3,10 +3,10 @@
  *
  * Copyright (c) 1996-2010 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"
@@ -45,10 +45,11 @@ 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 */
-               read_message(WC->WBuf, HKEY("view_message"), bp->msgs[0], NULL, &Mime);
+               read_message(WC->WBuf, HKEY("view_blog_post"), bp->msgs[0], NULL, &Mime);
 
                if (p == 0) {
                        /* Show the number of comments */
@@ -65,11 +66,9 @@ void blogpost_render_and_destroy(struct blogpost *bp) {
                        wc_printf("<a name=\"comments\"></a>\n");
                        wc_printf(_("%d comments"), bp->num_msgs - 1);
                        wc_printf("<br>\n");
-                       wc_printf("<blockquote>");
                        for (i=1; i<bp->num_msgs; ++i) {
-                               read_message(WC->WBuf, HKEY("view_message"), bp->msgs[i], NULL, &Mime);
+                               read_message(WC->WBuf, HKEY("view_blog_comment"), bp->msgs[i], NULL, &Mime);
                        }
-                       wc_printf("</blockquote>");
                }
        }
 
@@ -239,6 +238,21 @@ int blogview_Cleanup(void **ViewSpecific)
        return 0;
 }
 
+/*
+ * Generate a permalink for a post
+ */
+void tmplput_blog_permalink(StrBuf *Target, WCTemplputParams *TP) {
+       char perma[SIZ];
+       char encoded_perma[SIZ];
+       
+       strcpy(perma, "/readfwd?gotofirst=");
+       urlesc(&perma[strlen(perma)], sizeof(perma)-strlen(perma), ChrPtr(WC->CurRoom.name));
+       snprintf(&perma[strlen(perma)], sizeof(perma)-strlen(perma), "?p=%d", WC->bptlid);
+
+       CtdlEncodeBase64(encoded_perma, perma, strlen(perma), 0);
+       StrBufAppendPrintf(Target, "/B64%s", encoded_perma);
+}
+
 
 void 
 InitModule_BLOGVIEWRENDERERS
@@ -253,4 +267,5 @@ InitModule_BLOGVIEWRENDERERS
                blogview_render,
                blogview_Cleanup
        );
+       RegisterNamespace("BLOG:PERMALINK", 0, 0, tmplput_blog_permalink, NULL, CTX_NONE);
 }