From 91db84b032afa90882f9bf21907c5ca40c63080d Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Mon, 31 Oct 2005 02:19:55 +0000
Subject: [PATCH] bugzilla 166

---
 citadel/ChangeLog  |  6 ++++++
 citadel/control.c  |  2 +-
 citadel/room_ops.c | 11 ++++++-----
 citadel/user_ops.c |  4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 7ca730e4f..4c97a5c2e 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,5 +1,11 @@
 $Id$
 
+Sun Oct 30 21:17:57 EST 2005 ajc
+* Log messages posted to the Aide> room indicating activity such as room
+  create/delete/edit operations now use "Room Name" rather than Room Name>
+  because users unfamiliar with the text-mode Citadel tradition may think
+  that the latter syntax is an output error.  Resolves bugzilla issue #166.
+
 Thu Oct 27 16:56:09 EDT 2005 ajc
 * THIS IS 6.61
 
diff --git a/citadel/control.c b/citadel/control.c
index 83a6c576d..f1fe23a61 100644
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -417,7 +417,7 @@ void cmd_conf(char *argbuf)
 		}
 		put_config();
 		snprintf(buf, sizeof buf,
-			 "Global system configuration edited by %s\n",
+			 "The global system configuration has been edited by %s.\n",
 			 CC->curr_user);
 		aide_message(buf);
 
diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 9d0f82b06..9e0e8f0b0 100644
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -1454,7 +1454,8 @@ void cmd_setr(char *args)
 				 "/files/%s", CC->room.QRdirname);
 		mkdir(buf, 0755);
 	}
-	snprintf(buf, sizeof buf, "%s> edited by %s\n", CC->room.QRname, CC->curr_user);
+	snprintf(buf, sizeof buf, "The room \"%s\" has been edited by %s.\n",
+		CC->room.QRname, CC->curr_user);
 	aide_message(buf);
 	cprintf("%d Ok\n", CIT_OK);
 }
@@ -1511,11 +1512,11 @@ void cmd_seta(char *new_ra)
 	if (post_notice == 1) {
 		if (strlen(usbuf.fullname) > 0)
 			snprintf(buf, sizeof buf,
-				"%s is now room aide for %s>\n",
+				"%s is now the room aide for \"%s\".\n",
 				usbuf.fullname, CC->room.QRname);
 		else
 			snprintf(buf, sizeof buf,
-				"There is now no room aide for %s>\n",
+				"There is now no room aide for \"%s\".\n",
 				CC->room.QRname);
 		aide_message(buf);
 	}
@@ -1706,7 +1707,7 @@ void cmd_kill(char *argbuf)
 		usergoto(config.c_baseroom, 0, 0, NULL, NULL);
 
 		/* tell the world what we did */
-		snprintf(msg, sizeof msg, "%s> killed by %s\n",
+		snprintf(msg, sizeof msg, "The room \"%s\" has been deleted by %s.\n",
 			 deleted_room_name, CC->curr_user);
 		aide_message(msg);
 		cprintf("%d '%s' deleted.\n", CIT_OK, deleted_room_name);
@@ -1915,7 +1916,7 @@ void cmd_cre8(char *args)
 	/* post a message in Aide> describing the new room */
 	notification_message = malloc(1024);
 	snprintf(notification_message, 1024,
-		"%s> created by %s%s%s%s%s%s\n",
+		"A new room called \"%s\" has been created by %s%s%s%s%s%s\n",
 		new_room_name,
 		CC->user.fullname,
 		((newflags & QR_MAILBOX) ? " [personal]" : ""),
diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 2d64dab9a..fcb1bdb75 100644
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -1153,7 +1153,7 @@ int CtdlInvtKick(char *iuser, int op) {
 	CtdlSetRelationship(&vbuf, &USscratch, &CC->room);
 
 	/* post a message in Aide> saying what we just did */
-	snprintf(bbb, sizeof bbb, "%s %s %s> by %s\n",
+	snprintf(bbb, sizeof bbb, "%s has been %s \"%s\" by %s.\n",
 		iuser,
 		((op == 1) ? "invited to" : "kicked out of"),
 		CC->room.QRname,
@@ -1532,7 +1532,7 @@ void cmd_asup(char *cmdbuf)
 	}
 
 	if (deleted) {
-		sprintf(notify, "User <%s> deleted by %s\n",
+		sprintf(notify, "User \"%s\" has been deleted by %s.\n",
 			usbuf.fullname, CC->user.fullname);
 		aide_message(notify);
 	}
-- 
2.39.2