* Port [3446] to 1.2.14

 * Reformat CTCP logging. (fixes #358)



svn: 3447

doc/UPDATES

@@ -46,6 +46,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Fix segfault with cmd_set and adding to empty lists.
 * Cleaned up some bugs in the 'getin' system.
 * Add '$n' expansion into realname.
+* Reformat CTCP logging. (fixes #358)
 
 1.2.13 - http://wraith.shatow.net/milestone/1.2.13
 * Fix cmd_chanset accepting invalid flags

src/mod/irc.mod/chan.c

@@ -2945,7 +2945,7 @@ static int gotmsg(char *from, char *msg)
 	      if (!strcmp(code, "ACTION")) {
                 irc_log(chan, "* %s %s", nick, ctcp);
 	      } else {
-                irc_log(chan, "CTCP %s: %s from %s (%s) to %s", code, ctcp, nick, from, to);
+                irc_log(chan, "CTCP %s: from %s (%s) to %s: %s", code, nick, from, to, ctcp);
 	      }
 	  }
 	}

src/mod/server.mod/servmsg.c

@@ -496,7 +496,7 @@ static int gotmsg(char *from, char *msg)
 	  if ((to[0] == '$') || strchr(to, '.')) {
 	    if (!ignoring) {
 	      /* Don't interpret */
-	      putlog(LOG_PUBLIC, to, "CTCP %s: %s from %s (%s) to %s", code, ctcp, nick, uhost, to);
+	      putlog(LOG_PUBLIC, to, "CTCP %s from %s (%s) to %s: %s", code, nick, uhost, to, ctcp);
             }
           } else {
 	    u = get_user_by_host(from);
@@ -526,7 +526,7 @@ static int gotmsg(char *from, char *msg)
 	      if (!strcmp(code, "ACTION")) {
                 putlog(LOG_MSGS, "*", "* %s (%s): %s", nick, uhost, ctcp);
               } else {
-                putlog(LOG_MSGS, "*", "CTCP %s: %s from %s (%s)", code, ctcp, nick, uhost);
+                putlog(LOG_MSGS, "*", "CTCP %s: from %s (%s): %s", code, nick, uhost, ctcp);
               }			/* I love a good close cascade ;) */
 	    }
 	  }