diff --git a/modules/core/m_kick.c b/modules/core/m_kick.c index 937b05b..b32bf9b 100644 --- a/modules/core/m_kick.c +++ b/modules/core/m_kick.c @@ -211,7 +211,7 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p get_oper_name(source_p), who->name, chptr->chname, comment); sendto_server(NULL, chptr, NOCAPS, NOCAPS, ":%s WALLOPS :%s is overriding KICK [%s] on [%s] [%s]", - use_id(source_p), get_oper_name(source_p), who->name, chptr->chname, comment); + me.name, get_oper_name(source_p), who->name, chptr->chname, comment); } /* jdc diff --git a/modules/m_invite.c b/modules/m_invite.c index f96194e..8dd0a73 100644 --- a/modules/m_invite.c +++ b/modules/m_invite.c @@ -155,7 +155,7 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char get_oper_name(source_p), target_p->name, chptr->chname); sendto_server(NULL, chptr, NOCAPS, NOCAPS, ":%s WALLOPS :%s is overriding INVITE [%s] on [%s]", - use_id(source_p), get_oper_name(source_p), target_p->name, chptr->chname); + me.name, get_oper_name(source_p), target_p->name, chptr->chname); } else { diff --git a/modules/m_topic.c b/modules/m_topic.c index 4b6d44b..ff72fb4 100644 --- a/modules/m_topic.c +++ b/modules/m_topic.c @@ -125,7 +125,7 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char * get_oper_name(source_p), chptr->chname); sendto_server(NULL, chptr, NOCAPS, NOCAPS, ":%s WALLOPS :%s is overriding TOPIC on [%s]", - use_id(source_p), get_oper_name(source_p), chptr->chname); + me.name, get_oper_name(source_p), chptr->chname); } else { diff --git a/src/channel.c b/src/channel.c index 02d5c3d..0191f1f 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1818,7 +1818,7 @@ void user_join(struct Client * client_p, struct Client * source_p, const char * get_oper_name(source_p), chptr->chname); sendto_server(NULL, chptr, NOCAPS, NOCAPS, ":%s WALLOPS :%s is overriding JOIN to [%s]", - use_id(source_p), get_oper_name(source_p), chptr->chname); + me.name, get_oper_name(source_p), chptr->chname); } else if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) || (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL)) diff --git a/src/chmode.c b/src/chmode.c index a4b26ba..23491f7 100644 --- a/src/chmode.c +++ b/src/chmode.c @@ -804,7 +804,7 @@ chm_ban(struct Client *source_p, struct Channel *chptr, get_oper_name(source_p), chptr->chname, mode_type == CHFL_INVEX ? "invex" : "exempt"); sendto_server(NULL, chptr, NOCAPS, NOCAPS, ":%s WALLOPS :%s is overriding modes on %s: (%s list)", - use_id(source_p), get_oper_name(source_p), chptr->chname, mode_type == CHFL_INVEX ? "invex" : "exempt"); + me.name, get_oper_name(source_p), chptr->chname, mode_type == CHFL_INVEX ? "invex" : "exempt"); } else { @@ -2146,7 +2146,7 @@ set_channel_mode(struct Client *client_p, struct Client *source_p, get_oper_name(source_p), chptr->chname, modebuf, parabuf); sendto_server(NULL, chptr, NOCAPS, NOCAPS, ":%s WALLOPS :%s is overriding modes on %s: %s %s", - use_id(source_p), get_oper_name(source_p), chptr->chname, modebuf, parabuf); + me.name, get_oper_name(source_p), chptr->chname, modebuf, parabuf); } } else @@ -2193,7 +2193,7 @@ set_channel_mode(struct Client *client_p, struct Client *source_p, get_oper_name(source_p), chptr->chname, modebuf, parabuf); sendto_server(NULL, chptr, NOCAPS, NOCAPS, ":%s WALLOPS :%s is overriding modes on %s: %s %s", - use_id(source_p), get_oper_name(source_p), chptr->chname, modebuf, parabuf); + me.name, get_oper_name(source_p), chptr->chname, modebuf, parabuf); } } }