diff options
| -rw-r--r-- | src/cmd_kill.cpp | 5 | ||||
| -rw-r--r-- | src/cmd_oper.cpp | 11 | ||||
| -rw-r--r-- | src/modules/extra/m_sqloper.cpp | 7 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp index 01b49ae6b..bb5d47f12 100644 --- a/src/cmd_kill.cpp +++ b/src/cmd_kill.cpp @@ -48,7 +48,7 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user) if (!IS_LOCAL(u)) { // remote kill - ServerInstance->WriteOpers("*** Remote kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]); + ServerInstance->SNO->WriteToSnoMask('k',"Remote kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]); snprintf(killreason, MAXQUIT,"[%s] Killed (%s (%s))", ServerInstance->Config->ServerName, user->nick, parameters[1]); u->WriteCommonExcept("QUIT :%s", killreason); FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason)); @@ -73,7 +73,7 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user) // local kill ServerInstance->Log(DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]); user->WriteTo(u, "KILL %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]); - ServerInstance->WriteOpers("*** Local Kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]); + ServerInstance->SNO->WriteToSnoMask('k',"Local Kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]); snprintf(killreason,MAXQUIT,"Killed (%s (%s))", user->nick, parameters[1]); userrec::QuitUser(ServerInstance, u, killreason); } @@ -83,3 +83,4 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user) user->WriteServ( "401 %s %s :No such nick/channel", user->nick, parameters[0]); } } + diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp index 6fd610322..f62d7bd7f 100644 --- a/src/cmd_oper.cpp +++ b/src/cmd_oper.cpp @@ -29,10 +29,8 @@ #include "mode.h" #include "xline.h" #include "inspstring.h" - #include "hashcomp.h" #include "socketengine.h" - #include "command_parse.h" #include "commands/cmd_oper.h" @@ -89,7 +87,7 @@ void cmd_oper::Handle (const char** parameters, int pcnt, userrec *user) if (!ServerInstance->IsNick(TypeName)) { user->WriteServ("491 %s :Invalid oper type (oper types must follow the same syntax as nicknames)",user->nick); - ServerInstance->WriteOpers("*** CONFIGURATION ERROR! Oper type invalid for OperType '%s'",OperType); + ServerInstance->SNO->WriteToSnoMask('o',"CONFIGURATION ERROR! Oper type invalid for OperType '%s'",OperType); ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type erroneous.",user->nick,user->ident,user->host); return; } @@ -105,7 +103,7 @@ void cmd_oper::Handle (const char** parameters, int pcnt, userrec *user) if (found) { /* correct oper credentials */ - ServerInstance->WriteOpers("*** %s (%s@%s) is now an IRC operator of type %s",user->nick,user->ident,user->host,OperType); + ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s",user->nick,user->ident,user->host,OperType); user->WriteServ("381 %s :You are now an IRC operator of type %s",user->nick,OperType); if (!user->modes[UM_OPERATOR]) user->Oper(OperType); @@ -115,15 +113,16 @@ void cmd_oper::Handle (const char** parameters, int pcnt, userrec *user) if (!fail2) { user->WriteServ("491 %s :Invalid oper credentials",user->nick); - ServerInstance->WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s!",user->nick,user->ident,user->host); + ServerInstance->SNO->WriteToSnoMask('o',"WARNING! Failed oper attempt by %s!%s@%s!",user->nick,user->ident,user->host); ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: user, host or password did not match.",user->nick,user->ident,user->host); } else { user->WriteServ("491 %s :Your oper block does not have a valid opertype associated with it",user->nick); - ServerInstance->WriteOpers("*** CONFIGURATION ERROR! Oper block mismatch for OperType %s",OperType); + ServerInstance->SNO->WriteToSnoMask('o',"CONFIGURATION ERROR! Oper block mismatch for OperType %s",OperType); ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type nonexistent.",user->nick,user->ident,user->host); } } return; } + diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp index 22535e163..867dab8a9 100644 --- a/src/modules/extra/m_sqloper.cpp +++ b/src/modules/extra/m_sqloper.cpp @@ -174,7 +174,7 @@ public: */ user->WriteServ( "491 %s :Invalid oper credentials", user->nick); - Srv->WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s!", user->nick, user->ident, user->host); + Srv->SNO->WriteToSnoMask('o',"WARNING! Failed oper attempt by %s!%s@%s!", user->nick, user->ident, user->host); ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: user, host or password did not match.", user->nick, user->ident, user->host); } } @@ -187,7 +187,7 @@ public: ServerInstance->Log(DEBUG, "Query failed: %s", res->error.Str()); user->WriteServ( "491 %s :Invalid oper credentials", user->nick); - Srv->WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s! (SQL query failed: %s)", user->nick, user->ident, user->host, res->error.Str()); + Srv->SNO->WriteToSnoMask('o',"WARNING! Failed oper attempt by %s!%s@%s! (SQL query failed: %s)", user->nick, user->ident, user->host, res->error.Str()); ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: user, host or password did not match.", user->nick, user->ident, user->host); } } @@ -227,7 +227,7 @@ public: if (operhost.size()) user->ChangeDisplayedHost(operhost.c_str()); - Srv->WriteOpers("*** %s (%s@%s) is now an IRC operator of type %s", user->nick, user->ident, user->host, type.c_str()); + Srv->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s", user->nick, user->ident, user->host, type.c_str()); user->WriteServ("381 %s :You are now an IRC operator of type %s", user->nick, type.c_str()); if (!user->modes[UM_OPERATOR]) @@ -274,3 +274,4 @@ extern "C" void * init_module( void ) { return new ModuleSQLOperFactory; } + |