From eb75382b7eb4a6017edb726ea54d6d5ae6286f86 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@uncensored.citadel.org>
Date: Wed, 25 May 2011 18:13:34 -0400
Subject: [PATCH] Reinstated the use of EUID/UUID in blog posts; however this
 time they are not being used in the permalinks. We really just need them so
 we can do uuid tags in the feed.

---
 citadel/euidindex.c              |  1 +
 citadel/modules/blog/serv_blog.c | 28 ++++++++++++++++++----------
 libcitadel/lib/libcitadel.h      |  1 +
 libcitadel/lib/tools.c           |  5 ++++-
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/citadel/euidindex.c b/citadel/euidindex.c
index 8bad12925..dbc89adaa 100644
--- a/citadel/euidindex.c
+++ b/citadel/euidindex.c
@@ -74,6 +74,7 @@ int DoesThisRoomNeedEuidIndexing(struct ctdlroom *qrbuf) {
 		case VIEW_TASKS:	return(1);
 		case VIEW_NOTES:	return(1);
 		case VIEW_WIKI:		return(1);
+		case VIEW_BLOG:		return(1);
 	}
 	
 	return(0);
diff --git a/citadel/modules/blog/serv_blog.c b/citadel/modules/blog/serv_blog.c
index 6997a057e..fb95d613b 100644
--- a/citadel/modules/blog/serv_blog.c
+++ b/citadel/modules/blog/serv_blog.c
@@ -1,11 +1,11 @@
 /*
  * Support for blog rooms
  *
- * Copyright (c) 1999-2010 by the citadel.org team
+ * Copyright (c) 1999-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
+ * 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,
@@ -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 "sysdep.h"
@@ -59,10 +59,10 @@
 #include "ctdl_module.h"
 
 /*
- * sd sdhfksdjhkjsdfhk jsdhfkjsdfhkjsd hkfjhsdkjfhsdkjfhksdjfhsd
+ * Pre-save hook for saving a message in a blog room.
+ * (Do we want to only do this for top-level messages?)
  */
 int blog_upload_beforesave(struct CtdlMessage *msg) {
-	char buf[SIZ];
 
 	/* Only run this hook for blog rooms */
 	if (CC->room.QRdefaultview != VIEW_BLOG) {
@@ -72,10 +72,18 @@ int blog_upload_beforesave(struct CtdlMessage *msg) {
 	/* 
 	 * If the message doesn't have an EUID, give it one.
 	 */
-	if (msg->cm_fields['E'] != NULL)
+	if (msg->cm_fields['E'] == NULL)
 	{
-		generate_uuid(buf);
-		msg->cm_fields['E'] = strdup(buf);
+		char uuid[BLOG_EUIDBUF_SIZE];
+		generate_uuid(uuid);
+		msg->cm_fields['E'] = strdup(uuid);
+	}
+
+	/*
+	 * We also want to define a maximum length, whether we generated it or not.
+	 */
+	else if (strlen(msg->cm_fields['E']) >= BLOG_EUIDBUF_SIZE) {
+		msg->cm_fields['E'][BLOG_EUIDBUF_SIZE-1] = 0;
 	}
 
 	/* Now allow the save to complete. */
diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index f47c4a241..13737c39c 100644
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -89,6 +89,7 @@ typedef enum _room_views {
 	VIEW_MAX
 } ROOM_VIEWS;
 
+#define BLOG_EUIDBUF_SIZE	40
 
 #ifndef IsEmptyStr
 #define IsEmptyStr(a) ((a)[0] == '\0')
diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c
index db8fe3af8..0c012e795 100644
--- a/libcitadel/lib/tools.c
+++ b/libcitadel/lib/tools.c
@@ -858,8 +858,11 @@ char *strcpy(char *dest, const char *src) {
  * Generate a new, globally unique UID parameter for a calendar etc. object
  */
 void generate_uuid(char *buf) {
-	static int seq = 0;
+	static int seq = (-1);
 
+	if (seq == (-1)) {
+		seq = (int)rand();
+	}
 	++seq;
 	seq = (seq % 0x0FFF) ;
 
-- 
2.30.2