X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Froom_ops.c;h=c9e651b155ab9d2f8a81a9f49caba3e07cdef84a;hb=a9d212c452ddc4c041c6b1ca30670dde9a321a07;hp=fbea0f27083633cd8218e0bc82835ef3df8b5f94;hpb=6feba01910d1fa3e1ce5ec232bce54aaf900cd6f;p=citadel.git

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index fbea0f270..c9e651b15 100644
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -1608,7 +1608,9 @@ void cmd_setr(char *args)
 		mkdir(buf, 0755);
 	}
 	snprintf(buf, sizeof buf, "The room \"%s\" has been edited by %s.\n",
-		CC->room.QRname, CC->curr_user);
+		CC->room.QRname,
+		(CC->logged_in ? CC->curr_user : "an administrator")
+	);
 	CtdlAideMessage(buf, "Room modification Message");
 	cprintf("%d Ok\n", CIT_OK);
 }
@@ -1853,7 +1855,9 @@ void cmd_kill(char *argbuf)
 
 		/* tell the world what we did */
 		snprintf(msg, sizeof msg, "The room \"%s\" has been deleted by %s.\n",
-			 deleted_room_name, CC->curr_user);
+			 deleted_room_name,
+			(CC->logged_in ? CC->curr_user : "an administrator")
+		);
 		CtdlAideMessage(msg, "Room Purger Message");
 		cprintf("%d '%s' deleted.\n", CIT_OK, deleted_room_name);
 	} else {
@@ -1914,12 +1918,20 @@ unsigned CtdlCreateRoom(char *new_room_name,
 	}
 
 	/* If the room is private, and the system administrator has elected
-	 * to automatically grant room aide privileges, do so now; otherwise,
-	 * set the room aide to undefined.
+	 * to automatically grant room aide privileges, do so now.
 	 */
 	if ((qrbuf.QRflags & QR_PRIVATE) && (CREATAIDE == 1)) {
 		qrbuf.QRroomaide = CC->user.usernum;
-	} else {
+	}
+	/* Blog owners automatically become room aides of their blogs.
+	 * (In the future we will offer a site-wide configuration setting to suppress this behavior.)
+	 */
+	else if (new_room_view == VIEW_BLOG) {
+		qrbuf.QRroomaide = CC->user.usernum;
+	}
+	/* Otherwise, set the room aide to undefined.
+	 */
+	else {
 		qrbuf.QRroomaide = (-1L);
 	}
 
@@ -2063,7 +2075,7 @@ void cmd_cre8(char *args)
 	snprintf(notification_message, 1024,
 		"A new room called \"%s\" has been created by %s%s%s%s%s%s\n",
 		new_room_name,
-		CC->user.fullname,
+		(CC->logged_in ? CC->curr_user : "an administrator"),
 		((newflags & QR_MAILBOX) ? " [personal]" : ""),
 		((newflags & QR_PRIVATE) ? " [private]" : ""),
 		((newflags & QR_GUESSNAME) ? " [hidden]" : ""),