Make logevent keys consistently use '_' again.

diff --git a/doc/disorder_protocol.5.in b/doc/disorder_protocol.5.in
index 85c16a25f7aaaff881f8f758da8a1e481b4b5915..f2efe2520ef8e941d0edf9e176320814cb845fea 100644 (file)
--- a/doc/disorder_protocol.5.in
+++ b/doc/disorder_protocol.5.in
@@ -620,7 +620,7 @@ A track started playing.
 .B resume
 The current track was resumed.
 .TP
-.B rights-changed \fIRIGHTS\fR
+.B rights_changed \fIRIGHTS\fR
 User's rights were changed.
 .TP
 .B scratched
@@ -630,16 +630,16 @@ To simplify client implementation, \fBstate\fR commands reflecting the current
 state are sent at the start of the log.
 .RE
 .TB
-.B user-add \fIUSERNAME\fR
+.B user_add \fIUSERNAME\fR
 A user was created.
 .TP
-.B user-delete \fIUSERNAME\fR
+.B user_delete \fIUSERNAME\fR
 A user was deleted.
 .TP
-.B user-edit \fIUSERNAME\fR \fIPROPERTY\fR
+.B user_edit \fIUSERNAME\fR \fIPROPERTY\fR
 Some property of a user was edited.
 .TP
-.B user-confirm \fIUSERNAME\fR
+.B user_confirm \fIUSERNAME\fR
 A user's login was confirmed (via the web interface).
 .TP
 .B volume \fILEFT\fR \fIRIGHT\fR

diff --git a/lib/trackdb.c b/lib/trackdb.c
index 0b10d72413a86ff6ea89c412545794b640e967e0..42871046a4a68aea6a5dfa1730615bacb6354a17 100644 (file)
--- a/lib/trackdb.c
+++ b/lib/trackdb.c
@@ -2681,7 +2681,7 @@ int trackdb_adduser(const char *user,
            user, rights, email);
     else
       info("created user '%s' with rights '%s'", user, rights);
-    eventlog("user-add", user, (char *)0);
+    eventlog("user_add", user, (char *)0);
     return 0;
   }
 }
@@ -2699,7 +2699,7 @@ int trackdb_deluser(const char *user) {
     return -1;
   }
   info("deleted user '%s'", user);
-  eventlog("user-delete", user, (char *)0);
+  eventlog("user_delete", user, (char *)0);
   return 0;
 }
 
@@ -2780,7 +2780,7 @@ int trackdb_edituserinfo(const char *user,
     error(0, "unknown user '%s'", user);
     return -1;
   } else {
-    eventlog("user-edit", user, key, (char *)0);
+    eventlog("user_edit", user, key, (char *)0);
     return 0;
   }
 }
@@ -2848,7 +2848,7 @@ int trackdb_confirm(const char *user, const char *confirmation,
   switch(e) {
   case 0:
     info("registration confirmed for user '%s'", user);
-    eventlog("user-confirm", user, (char *)0);
+    eventlog("user_confirm", user, (char *)0);
     return 0;
   case DB_NOTFOUND:
     error(0, "confirmation for nonexistent user '%s'", user);

diff --git a/server/server.c b/server/server.c
index 1bfa29a05367fb4031c60f545567d07ea03a8458..ad3a7ab9e773663ad6989fc883fe03339fa68426 100644 (file)
--- a/server/server.c
+++ b/server/server.c
@@ -879,8 +879,8 @@ static void logclient(const char *msg, void *user) {
     c->lo = 0;
     return;
   }
-  /* user-* messages are restricted */
-  if(!strncmp(msg, "user-", 5)) {
+  /* user_* messages are restricted */
+  if(!strncmp(msg, "user_", 5)) {
     /* They are only sent to admin users */
     if(!(c->rights & RIGHT_ADMIN))
       return;
@@ -1254,9 +1254,9 @@ static int c_edituser(struct conn *c,
             /* Notify any log connections */
             if(d->lo)
               sink_printf(ev_writer_sink(d->w),
-                          "%"PRIxMAX" rights-changed %s\n",
+                          "%"PRIxMAX" rights_changed %s\n",
                           (uintmax_t)time(0),
-                          new_rights);
+                          quoteutf8(new_rights));
           }
         }
       }