Revert "Change to blog euid storage; note new definition in libcitadel.h"

[citadel.git] / webcit / blogview_renderer.c

diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index 164c7539563fb542bded28a0e1a2254708786346..8190cb8c8ddca9a1b7b6f2c16d85bfad989a058f 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,6 +45,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 +53,12 @@ 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("<br><br><br>\n");
                }
                else if (bp->num_msgs < 2) {
                        wc_printf(_("%d comments"), 0);
@@ -85,6 +87,7 @@ void blogpost_render_and_destroy(struct blogpost *bp) {
 struct bltr {
        int id;
        int refs;
+       StrBuf *euid;
 };
 
 
@@ -120,13 +123,17 @@ struct bltr blogview_learn_thread_references(long msgnum)
 {
        StrBuf *Buf;
        StrBuf *r;
-       struct bltr bltr = { 0, 0 } ;
+       int len;
+       struct bltr bltr = { 0, 0, NULL };
        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));
@@ -136,6 +143,10 @@ struct bltr blogview_learn_thread_references(long msgnum)
                                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 */
+                               bltr.euid = NewStrBufDup(Buf);
+                       }
                }
        }
        FreeStrBuf(&Buf);
@@ -159,6 +170,11 @@ int blogview_LoadMsgFromServer(SharedMessageStatus *Stat,
 
        b = blogview_learn_thread_references(Msg->msgnum);
 
+       if (b.euid != NULL) {
+               syslog(LOG_DEBUG, "\033[7m%s\033[0m", ChrPtr(b.euid));
+               FreeStrBuf(&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*
@@ -239,24 +255,14 @@ int blogview_Cleanup(void **ViewSpecific)
 
 /*
  * Generate a permalink for a post
- *
- * FIXME THIS IS WRONG, FIND THE FOO
- *
  */
 void tmplput_blog_permalink(StrBuf *Target, WCTemplputParams *TP) {
-       int p = atoi(BSTR("p"));        /* are we looking for a specific post? */
        char perma[SIZ];
-       char encoded_perma[SIZ];
        
-       strcpy(perma, "/readfwd?gotofirst=");
+       strcpy(perma, "/readfwd?go=");
        urlesc(&perma[strlen(perma)], sizeof(perma)-strlen(perma), ChrPtr(WC->CurRoom.name));
-
-       if (p != 0) {
-               snprintf(&perma[strlen(perma)], sizeof(perma)-strlen(perma), "?p=%d", p);
-       }
-
-       CtdlEncodeBase64(encoded_perma, perma, strlen(perma), 0);
-       StrBufAppendPrintf(Target, "/B64%s", encoded_perma);
+       snprintf(&perma[strlen(perma)], sizeof(perma)-strlen(perma), "?p=%d", WC->bptlid);
+       StrBufAppendPrintf(Target, "%s", perma);
 }