CHANSERV: tidy up suspend/unsuspend wall/log messages.

diff --git a/chanserv/usercmds/suspenduser.c b/chanserv/usercmds/suspenduser.c
index 59611b07ed93763c64197659e34499a5a3cce2ae..63b96392251eec57f8ff3d66a37601082f768ceb 100644 (file)
--- a/chanserv/usercmds/suspenduser.c
+++ b/chanserv/usercmds/suspenduser.c
@@ -175,8 +175,8 @@ int csu_dosuspenduser(void *source, int cargc, char **cargv) {
 
   stype = (gline)?((gline == 2)?"instant gline":"delayed gline"):"normal";    
 
-  chanservwallmessage("%s (%s) used SUSPENDUSER (%s) on %s (expires: %s), reason: %s", sender->nick, rup->username, stype, vrup->username, expires?expiresbuf:"never", reason);
-  cs_log(sender, "SUSPENDUSER (%s) %s (expires: %s), reason: %s", stype, vrup->username, expires?expiresbuf:"never", reason);
+  chanservwallmessage("%s (%s) used SUSPENDUSER on %s, type: %s, expires: %s, reason: %s", sender->nick, rup->username, vrup->username, stype, expires?expiresbuf:"never", reason);
+  cs_log(sender, "SUSPENDUSER %s (%s, expires: %s, reason: %s)", vrup->username, stype, expires?expiresbuf:"never", reason);
 
   if (gline) {
     dgwait=(gline==2)?0:rand()%900;

diff --git a/chanserv/usercmds/unsuspenduser.c b/chanserv/usercmds/unsuspenduser.c
index f0fa59406a35bc12b675f4a8692f126cc052de5f..0b3089167f2ce4022052292c4b45a86560cd6d03 100644 (file)
--- a/chanserv/usercmds/unsuspenduser.c
+++ b/chanserv/usercmds/unsuspenduser.c
@@ -87,8 +87,8 @@ int csu_dounsuspenduser(void *source, int cargc, char **cargv) {
   csuspendedby = suspendedby?suspendedby->username:"(unknown)";
   csuspendreason = vrup->suspendreason?vrup->suspendreason->content:"(no reason)";
 
-  chanservwallmessage("%s (%s) used UNSUSPENDUSER on %s (type: %s, suspended by: %s, suspension reason: %s), unsuspension reason: %s", sender->nick, rup->username, action, vrup->username, csuspendedby, csuspendreason, unsuspendreason);
-  cs_log(sender,"UNSUSPENDUSER %s (type: %s, suspended by: %s, suspension reason: %s), unsuspension reason: %s", action, vrup->username, csuspendedby, csuspendreason, unsuspendreason);
+  chanservwallmessage("%s (%s) used UNSUSPENDUSER on %s, type: %s, suspended by: %s, suspension reason: %s, unsuspend reason: %s", sender->nick, rup->username, vrup->username, action, csuspendedby, csuspendreason, unsuspendreason);
+  cs_log(sender,"UNSUSPENDUSER %s (%s, by: %s reason: %s), reason: %s", vrup->username, action, csuspendedby, csuspendreason, unsuspendreason);
 
   vrup->flags&=(~(QUFLAG_GLINE|QUFLAG_DELAYEDGLINE|QUFLAG_SUSPENDED));
   vrup->suspendby=0;