bugzilla 166

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 7ca730e4fd6921081108e9aa656842c4c7be87a8..4c97a5c2e562e0daaf0fe0c42097b5d262ca8d44 100644 (file)
--- 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 83a6c576daafe474b62fac4a7320dfbe1f4e8135..f1fe23a61289cbe596169673b5b7285149100820 100644 (file)
--- 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 9d0f82b06cadf43b082279a819715067b3a116c8..9e0e8f0b0f73b7de11fca87b17bb37473a8b8e8f 100644 (file)
--- 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 2d64dab9a6c5267fe3464bb0ecf80764c9447cfb..fcb1bdb759d0b1fe1e121c350f96356dd0ac8239 100644 (file)
--- 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);
        }