diff options
42 files changed, 98 insertions, 96 deletions
diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 409444e0c..94a4a55fe 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -531,7 +531,7 @@ CmdResult CommandReload::Handle(const std::vector<std::string>& parameters, User if (ServerInstance->Parser->ReloadCommand(parameters[0], user)) { user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick.c_str(), parameters[0].c_str()); - ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str()); return CMD_SUCCESS; } else diff --git a/src/commands.cpp b/src/commands.cpp index 34fc71168..6c390b8bf 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -45,7 +45,7 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user) float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100; if (percent > (float)atof(itrigger)) { - SNO->WriteToSnoMask('A', "\2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),mask.c_str(),percent); + SNO->WriteToSnoMask('a', "\2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),mask.c_str(),percent); return true; } return false; @@ -74,7 +74,7 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user) float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100; if (percent > (float)atof(itrigger)) { - SNO->WriteToSnoMask('A', "\2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),ip.c_str(),percent); + SNO->WriteToSnoMask('a', "\2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),ip.c_str(),percent); return true; } return false; @@ -103,7 +103,7 @@ bool InspIRCd::NickMatchesEveryone(const std::string &nick, User* user) float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100; if (percent > (float)atof(itrigger)) { - SNO->WriteToSnoMask('A', "\2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),nick.c_str(),percent); + SNO->WriteToSnoMask('a', "\2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),nick.c_str(),percent); return true; } return false; diff --git a/src/commands/cmd_die.cpp b/src/commands/cmd_die.cpp index 1d360f1b3..4fcbdae40 100644 --- a/src/commands/cmd_die.cpp +++ b/src/commands/cmd_die.cpp @@ -40,7 +40,7 @@ CmdResult CommandDie::Handle (const std::vector<std::string>& parameters, User * else { ServerInstance->Logs->Log("COMMAND",SPARSE, "Failed /DIE command from %s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->host.c_str()); - ServerInstance->SNO->WriteToSnoMask('A', "Failed DIE Command from %s!%s@%s.",user->nick.c_str(),user->ident.c_str(),user->host.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Failed DIE Command from %s!%s@%s.",user->nick.c_str(),user->ident.c_str(),user->host.c_str()); return CMD_FAILURE; } return CMD_SUCCESS; diff --git a/src/commands/cmd_loadmodule.cpp b/src/commands/cmd_loadmodule.cpp index 616a5d482..c6dbd8069 100644 --- a/src/commands/cmd_loadmodule.cpp +++ b/src/commands/cmd_loadmodule.cpp @@ -25,7 +25,7 @@ CmdResult CommandLoadmodule::Handle (const std::vector<std::string>& parameters, { if (ServerInstance->Modules->Load(parameters[0].c_str())) { - ServerInstance->SNO->WriteToSnoMask('A', "NEW MODULE: %s loaded %s",user->nick.c_str(), parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "NEW MODULE: %s loaded %s",user->nick.c_str(), parameters[0].c_str()); user->WriteNumeric(975, "%s %s :Module successfully loaded.",user->nick.c_str(), parameters[0].c_str()); return CMD_SUCCESS; } diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp index d9d72800e..e34051611 100644 --- a/src/commands/cmd_rehash.cpp +++ b/src/commands/cmd_rehash.cpp @@ -50,7 +50,7 @@ CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, Use std::string m = user->nick + " is rehashing config file " + ServerConfig::CleanFilename(ServerInstance->ConfigFileName) + " on " + ServerInstance->Config->ServerName; - ServerInstance->SNO->WriteToSnoMask('A', m); + ServerInstance->SNO->WriteToSnoMask('a', m); /* Don't do anything with the logs here -- logs are restarted * after the config thread has completed. diff --git a/src/commands/cmd_reloadmodule.cpp b/src/commands/cmd_reloadmodule.cpp index 39471a651..a94493455 100644 --- a/src/commands/cmd_reloadmodule.cpp +++ b/src/commands/cmd_reloadmodule.cpp @@ -23,16 +23,16 @@ CmdResult CommandReloadmodule::Handle (const std::vector<std::string>& parameter { if (ServerInstance->Modules->Unload(parameters[0].c_str())) { - ServerInstance->SNO->WriteToSnoMask('A', "RELOAD MODULE: %s unloaded %s",user->nick.c_str(), parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "RELOAD MODULE: %s unloaded %s",user->nick.c_str(), parameters[0].c_str()); if (ServerInstance->Modules->Load(parameters[0].c_str())) { - ServerInstance->SNO->WriteToSnoMask('A', "RELOAD MODULE: %s reloaded %s",user->nick.c_str(), parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "RELOAD MODULE: %s reloaded %s",user->nick.c_str(), parameters[0].c_str()); user->WriteNumeric(975, "%s %s :Module successfully reloaded.",user->nick.c_str(), parameters[0].c_str()); return CMD_SUCCESS; } } - ServerInstance->SNO->WriteToSnoMask('A', "RELOAD MODULE: %s unsuccessfully reloaded %s",user->nick.c_str(), parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "RELOAD MODULE: %s unsuccessfully reloaded %s",user->nick.c_str(), parameters[0].c_str()); user->WriteNumeric(975, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str()); return CMD_FAILURE; } diff --git a/src/commands/cmd_restart.cpp b/src/commands/cmd_restart.cpp index 376c52cca..3a60e1092 100644 --- a/src/commands/cmd_restart.cpp +++ b/src/commands/cmd_restart.cpp @@ -24,7 +24,7 @@ CmdResult CommandRestart::Handle (const std::vector<std::string>& parameters, Us ServerInstance->Logs->Log("COMMAND",DEFAULT,"Restart: %s",user->nick.c_str()); if (!ServerInstance->PassCompare(user, ServerInstance->Config->restartpass, parameters[0].c_str(), ServerInstance->Config->powerhash)) { - ServerInstance->SNO->WriteToSnoMask('A', "RESTART command from %s!%s@%s, restarting server.", user->nick.c_str(), user->ident.c_str(), user->host.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "RESTART command from %s!%s@%s, restarting server.", user->nick.c_str(), user->ident.c_str(), user->host.c_str()); try { @@ -38,7 +38,7 @@ CmdResult CommandRestart::Handle (const std::vector<std::string>& parameters, Us } else { - ServerInstance->SNO->WriteToSnoMask('A', "Failed RESTART Command from %s!%s@%s.", user->nick.c_str(), user->ident.c_str(), user->host.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Failed RESTART Command from %s!%s@%s.", user->nick.c_str(), user->ident.c_str(), user->host.c_str()); return CMD_FAILURE; } diff --git a/src/commands/cmd_unloadmodule.cpp b/src/commands/cmd_unloadmodule.cpp index 7eea383b1..931dfdcbd 100644 --- a/src/commands/cmd_unloadmodule.cpp +++ b/src/commands/cmd_unloadmodule.cpp @@ -25,7 +25,7 @@ CmdResult CommandUnloadmodule::Handle (const std::vector<std::string>& parameter { if (ServerInstance->Modules->Unload(parameters[0].c_str())) { - ServerInstance->SNO->WriteToSnoMask('A', "MODULE UNLOADED: %s unloaded %s", user->nick.c_str(), parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "MODULE UNLOADED: %s unloaded %s", user->nick.c_str(), parameters[0].c_str()); user->WriteNumeric(973, "%s %s :Module successfully unloaded.",user->nick.c_str(), parameters[0].c_str()); } else diff --git a/src/configreader.cpp b/src/configreader.cpp index d8f733929..e23f5750d 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -739,10 +739,10 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, } else { - ServerInstance->SNO->WriteToSnoMask('A', "There were errors in the configuration file:"); + ServerInstance->SNO->WriteToSnoMask('a', "There were errors in the configuration file:"); while (start < errors.length()) { - ServerInstance->SNO->WriteToSnoMask('A', errors.substr(start, 360)); + ServerInstance->SNO->WriteToSnoMask('a', errors.substr(start, 360)); start += 360; } } @@ -1230,7 +1230,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) if (bail) printf("Warning: Oper type '%s' has a missing class named '%s', this does nothing!\n", item, classname.c_str()); else - ServerInstance->SNO->WriteToSnoMask('A', "Warning: Oper type '%s' has a missing class named '%s', this does nothing!", item, classname.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Warning: Oper type '%s' has a missing class named '%s', this does nothing!", item, classname.c_str()); } } } @@ -1276,7 +1276,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) { if (ServerInstance->Modules->Unload(removing->c_str())) { - ServerInstance->SNO->WriteToSnoMask('A', "*** REHASH UNLOADED MODULE: %s",removing->c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "*** REHASH UNLOADED MODULE: %s",removing->c_str()); if (!useruid.empty()) { @@ -1285,7 +1285,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) user->WriteNumeric(RPL_UNLOADEDMODULE, "%s %s :Module %s successfully unloaded.",user->nick.c_str(), removing->c_str(), removing->c_str()); } else - ServerInstance->SNO->WriteToSnoMask('A', "Module %s successfully unloaded.", removing->c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Module %s successfully unloaded.", removing->c_str()); rem++; } @@ -1298,7 +1298,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s %s :Failed to unload module %s: %s",user->nick.c_str(), removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError().c_str()); } else - ServerInstance->SNO->WriteToSnoMask('A', "Failed to unload module %s: %s", removing->c_str(), ServerInstance->Modules->LastError().c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Failed to unload module %s: %s", removing->c_str(), ServerInstance->Modules->LastError().c_str()); } } } @@ -1309,7 +1309,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) { if (ServerInstance->Modules->Load(adding->c_str())) { - ServerInstance->SNO->WriteToSnoMask('A', "*** REHASH LOADED MODULE: %s",adding->c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "*** REHASH LOADED MODULE: %s",adding->c_str()); if (!useruid.empty()) { User* user = ServerInstance->FindNick(useruid); @@ -1317,7 +1317,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) user->WriteNumeric(RPL_LOADEDMODULE, "%s %s :Module %s successfully loaded.",user->nick.c_str(), adding->c_str(), adding->c_str()); } else - ServerInstance->SNO->WriteToSnoMask('A', "Module %s successfully loaded.", adding->c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Module %s successfully loaded.", adding->c_str()); add++; } @@ -1330,7 +1330,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) user->WriteNumeric(ERR_CANTLOADMODULE, "%s %s :Failed to load module %s: %s",user->nick.c_str(), adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError().c_str()); } else - ServerInstance->SNO->WriteToSnoMask('A', "Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str()); } } } @@ -1347,7 +1347,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick.c_str()); } else - ServerInstance->SNO->WriteToSnoMask('A', "*** Successfully rehashed server."); + ServerInstance->SNO->WriteToSnoMask('a', "*** Successfully rehashed server."); } } diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp index 7a88bb8ea..9043969b9 100644 --- a/src/modules/extra/m_sqlauth.cpp +++ b/src/modules/extra/m_sqlauth.cpp @@ -140,7 +140,7 @@ public: else { if (verbose) - ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), req.error.Str()); + ServerInstance->SNO->WriteToSnoMask('a', "Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), req.error.Str()); return false; } } @@ -166,13 +166,13 @@ public: else if (verbose) { /* No rows in result, this means there was no record matching the user */ - ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (SQL query returned no matches)", user->nick.c_str(), user->ident.c_str(), user->host.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Forbidden connection from %s!%s@%s (SQL query returned no matches)", user->nick.c_str(), user->ident.c_str(), user->host.c_str()); user->Extend("sqlauth_failed"); } } else if (verbose) { - ServerInstance->SNO->WriteToSnoMask('A', "Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), res->error.Str()); + ServerInstance->SNO->WriteToSnoMask('a', "Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), res->error.Str()); user->Extend("sqlauth_failed"); } } diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 17ae1e135..dbab1a7c8 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -295,7 +295,7 @@ class ModuleAlias : public Module { if (!ServerInstance->ULine(u->server)) { - ServerInstance->SNO->WriteToSnoMask('A', "NOTICE -- Service "+a->RequiredNick+" required by alias "+std::string(a->AliasedCommand.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); + ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+std::string(a->AliasedCommand.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is an imposter! Please inform an IRC operator as soon as possible."); return 1; } diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp index 891a04740..1707412cf 100644 --- a/src/modules/m_blockamsg.cpp +++ b/src/modules/m_blockamsg.cpp @@ -137,7 +137,7 @@ class ModuleBlockAmsg : public Module { // Block it... if(action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS) - ServerInstance->SNO->WriteToSnoMask('A', "%s had an /amsg or /ame denied", user->nick.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame denied", user->nick.c_str()); if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS) ServerInstance->Users->QuitUser(user, "Global message (/amsg or /ame) detected"); diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 452f1539a..39e956272 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -194,7 +194,7 @@ class ModuleCBan : public Module { // Channel is banned. user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick.c_str(), cname, rl->reason); - ServerInstance->SNO->WriteToSnoMask('A', "%s tried to join %s which is CBANed (%s)", user->nick.c_str(), cname, rl->reason); + ServerInstance->SNO->WriteToSnoMask('a', "%s tried to join %s which is CBANed (%s)", user->nick.c_str(), cname, rl->reason); ServerInstance->PI->SendSNONotice("A", user->nick + " tried to join " + std::string(cname) + " which is CBANed (" + std::string(rl->reason) + ")"); return 1; } diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 96d2d97a2..a014e6461 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -75,7 +75,7 @@ class CommandWebirc : public Command user->Extend("cgiirc_realhost", new std::string(user->host)); user->Extend("cgiirc_realip", new std::string(user->GetIPString())); if (notify) - ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick.c_str(), user->host.c_str(), parameters[2].c_str(), user->host.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick.c_str(), user->host.c_str(), parameters[2].c_str(), user->host.c_str()); user->Extend("cgiirc_webirc_hostname", new std::string(parameters[2])); user->Extend("cgiirc_webirc_ip", new std::string(parameters[3])); return CMD_LOCALONLY; @@ -83,7 +83,7 @@ class CommandWebirc : public Command } } - ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s tried to use WEBIRC, but didn't match any configured webirc blocks.", user->GetFullRealHost().c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s tried to use WEBIRC, but didn't match any configured webirc blocks.", user->GetFullRealHost().c_str()); return CMD_FAILURE; } }; @@ -110,7 +110,7 @@ class CGIResolver : public Resolver if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) { if (notify) - ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick.c_str(), them->host.c_str(), result.c_str(), typ.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick.c_str(), them->host.c_str(), result.c_str(), typ.c_str()); them->host.assign(result,0, 64); them->dhost.assign(result, 0, 64); @@ -127,7 +127,7 @@ class CGIResolver : public Resolver if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) { if (notify) - ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick.c_str(), them->host.c_str(), typ.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick.c_str(), them->host.c_str(), typ.c_str()); } } @@ -355,7 +355,7 @@ public: { /* We were given a IP in the password, we don't do DNS so they get this is as their host as well. */ if(NotifyOpers) - ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick.c_str(), user->host.c_str(), user->password.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick.c_str(), user->host.c_str(), user->password.c_str()); } else { @@ -370,7 +370,7 @@ public: catch (...) { if (NotifyOpers) - ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host.c_str()); } } @@ -426,7 +426,7 @@ public: user->InvalidateCache(); if(NotifyOpers) - ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host.c_str()); } return true; diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp index 3f366d0d2..ccc306a11 100644 --- a/src/modules/m_chghost.cpp +++ b/src/modules/m_chghost.cpp @@ -65,7 +65,7 @@ class CommandChghost : public Command if ((dest->ChangeDisplayedHost(parameters[1].c_str())) && (!ServerInstance->ULine(user->server))) { // fix by brain - ulines set hosts silently - ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost); + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost); } /* ChangeDisplayedHost fixes it for us */ diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp index 870ad188a..4943e3df8 100644 --- a/src/modules/m_chgident.cpp +++ b/src/modules/m_chgident.cpp @@ -58,7 +58,7 @@ class CommandChgident : public Command dest->ChangeIdent(parameters[1].c_str()); if (!ServerInstance->ULine(user->server)) - ServerInstance->SNO->WriteToSnoMask('A', "%s used CHGIDENT to change %s's ident to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->ident.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "%s used CHGIDENT to change %s's ident to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->ident.c_str()); /* route it! */ return CMD_SUCCESS; diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp index 3111da9cf..68134534e 100644 --- a/src/modules/m_chgname.cpp +++ b/src/modules/m_chgname.cpp @@ -52,7 +52,7 @@ class CommandChgname : public Command if (IS_LOCAL(dest)) { dest->ChangeName(parameters[1].c_str()); - ServerInstance->SNO->WriteToSnoMask('A', "%s used CHGNAME to change %s's real name to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->fullname.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "%s used CHGNAME to change %s's real name to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->fullname.c_str()); return CMD_LOCALONLY; /* name change routed by FNAME in spanningtree now */ } diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp index 5423bab32..a88ee3886 100644 --- a/src/modules/m_connflood.cpp +++ b/src/modules/m_connflood.cpp @@ -80,7 +80,7 @@ public: { /* expire throttle */ throttled = 0; - ServerInstance->SNO->WriteToSnoMask('A', "Connection throttle deactivated"); + ServerInstance->SNO->WriteToSnoMask('a', "Connection throttle deactivated"); return 0; } @@ -93,7 +93,7 @@ public: if (conns >= maxconns) { throttled = 1; - ServerInstance->SNO->WriteToSnoMask('A', "Connection throttle activated"); + ServerInstance->SNO->WriteToSnoMask('a', "Connection throttle activated"); ServerInstance->Users->QuitUser(user, quitmsg); return 1; } diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index 4a7a8931f..be2e86eb5 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -154,7 +154,7 @@ class DNSBLResolver : public Resolver break; } - ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost().c_str(), ConfEntry->name.c_str(), bitmask); + ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost().c_str(), ConfEntry->name.c_str(), bitmask); } else ConfEntry->stats_misses++; @@ -260,25 +260,25 @@ class ModuleDNSBL : public Module /* yeah, logic here is a little messy */ if ((e->bitmask <= 0) && (DNSBLConfEntry::A_BITMASK == e->type)) { - ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): invalid bitmask",i); + ServerInstance->SNO->WriteToSnoMask('a', "DNSBL(#%d): invalid bitmask",i); } else if (e->name.empty()) { - ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid name",i); + ServerInstance->SNO->WriteToSnoMask('a', "DNSBL(#%d): Invalid name",i); } else if (e->domain.empty()) { - ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid domain",i); + ServerInstance->SNO->WriteToSnoMask('a', "DNSBL(#%d): Invalid domain",i); } else if (e->banaction == DNSBLConfEntry::I_UNKNOWN) { - ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid banaction", i); + ServerInstance->SNO->WriteToSnoMask('a', "DNSBL(#%d): Invalid banaction", i); } else { if (e->reason.empty()) { - ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): empty reason, using defaults",i); + ServerInstance->SNO->WriteToSnoMask('a', "DNSBL(#%d): empty reason, using defaults",i); e->reason = "Your IP has been blacklisted."; } diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index bb99ffa60..55094b429 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -144,7 +144,7 @@ class CommandFilter : public Command if (Base->DeleteFilter(parameters[0])) { user->WriteServ("NOTICE %s :*** Removed filter '%s'", user->nick.c_str(), parameters[0].c_str()); - ServerInstance->SNO->WriteToSnoMask('A', std::string("FILTER: ")+user->nick+" removed filter '"+parameters[0]+"'"); + ServerInstance->SNO->WriteToSnoMask('a', std::string("FILTER: ")+user->nick+" removed filter '"+parameters[0]+"'"); return CMD_SUCCESS; } else @@ -195,7 +195,7 @@ class CommandFilter : public Command type.c_str(), (duration ? ", duration " : ""), (duration ? parameters[3].c_str() : ""), flags.c_str(), reason.c_str()); - ServerInstance->SNO->WriteToSnoMask('A', std::string("FILTER: ")+user->nick+" added filter '"+freeform+"', type '"+type+"', "+(duration ? "duration "+parameters[3]+", " : "")+"flags '"+flags+"', reason: "+reason); + ServerInstance->SNO->WriteToSnoMask('a', std::string("FILTER: ")+user->nick+" added filter '"+freeform+"', type '"+type+"', "+(duration ? "duration "+parameters[3]+", " : "")+"flags '"+flags+"', reason: "+reason); return CMD_SUCCESS; } @@ -282,7 +282,7 @@ int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::stri } if (f->action == "block") { - ServerInstance->SNO->WriteToSnoMask('A', std::string("FILTER: ")+user->nick+" had their message filtered, target was "+target+": "+f->reason); + ServerInstance->SNO->WriteToSnoMask('a', std::string("FILTER: ")+user->nick+" had their message filtered, target was "+target+": "+f->reason); if (target_type == TYPE_CHANNEL) user->WriteNumeric(404, "%s %s :Message to channel blocked and opers notified (%s)",user->nick.c_str(), target.c_str(), f->reason.c_str()); else @@ -423,7 +423,7 @@ void FilterBase::OnRehash(User* user, const std::string ¶meter) if (RegexEngine == newrxengine) return; - ServerInstance->SNO->WriteToSnoMask('A', "Dumping all filters due to regex engine change (was '%s', now '%s')", RegexEngine.c_str(), newrxengine.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Dumping all filters due to regex engine change (was '%s', now '%s')", RegexEngine.c_str(), newrxengine.c_str()); //ServerInstance->XLines->DelAll("R"); } rxengine = NULL; @@ -436,14 +436,14 @@ void FilterBase::OnRehash(User* user, const std::string ¶meter) { if (RegexNameRequest(this, *i).Send() == newrxengine) { - ServerInstance->SNO->WriteToSnoMask('A', "Filter now using engine '%s'", RegexEngine.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Filter now using engine '%s'", RegexEngine.c_str()); rxengine = *i; } } } if (!rxengine) { - ServerInstance->SNO->WriteToSnoMask('A', "WARNING: Regex engine '%s' is not loaded - Filter functionality disabled until this is corrected.", RegexEngine.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "WARNING: Regex engine '%s' is not loaded - Filter functionality disabled until this is corrected.", RegexEngine.c_str()); } delete MyConf; @@ -461,7 +461,7 @@ void FilterBase::OnLoadModule(Module* mod, const std::string& name) * on startup or on load are applied right now. */ ConfigReader Config(ServerInstance); - ServerInstance->SNO->WriteToSnoMask('A', "Found and activated regex module '%s' for m_filter.so.", RegexEngine.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Found and activated regex module '%s' for m_filter.so.", RegexEngine.c_str()); ReadFilters(Config); } } diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp index 203dd1c52..22035178c 100644 --- a/src/modules/m_globalload.cpp +++ b/src/modules/m_globalload.cpp @@ -35,7 +35,7 @@ class CommandGloadmodule : public Command { if (ServerInstance->Modules->Load(parameters[0].c_str())) { - ServerInstance->SNO->WriteToSnoMask('A', "NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0].c_str(), user->nick.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0].c_str(), user->nick.c_str()); user->WriteNumeric(975, "%s %s :Module successfully loaded.",user->nick.c_str(), parameters[0].c_str()); } else @@ -44,7 +44,7 @@ class CommandGloadmodule : public Command } } else - ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBAL LOAD BY '%s' (not loaded here)",parameters[0].c_str(), user->nick.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBAL LOAD BY '%s' (not loaded here)",parameters[0].c_str(), user->nick.c_str()); return CMD_SUCCESS; } @@ -69,7 +69,7 @@ class CommandGunloadmodule : public Command { if (ServerInstance->Modules->Unload(parameters[0].c_str())) { - ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str()); user->WriteNumeric(973, "%s %s :Module successfully unloaded.",user->nick.c_str(), parameters[0].c_str()); } else @@ -78,7 +78,7 @@ class CommandGunloadmodule : public Command } } else - ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0].c_str(), user->nick.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0].c_str(), user->nick.c_str()); return CMD_SUCCESS; } @@ -112,12 +112,12 @@ class CommandGreloadmodule : public Command ok = false; user->WriteNumeric(974, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str()); } - ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBALLY RELOADED BY '%s'",parameters[0].c_str(), user->nick.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY RELOADED BY '%s'",parameters[0].c_str(), user->nick.c_str()); if (ok) user->WriteNumeric(975, "%s %s :Module successfully loaded.",user->nick.c_str(), parameters[0].c_str()); } else - ServerInstance->SNO->WriteToSnoMask('A', "MODULE '%s' GLOBAL RELOAD BY '%s' (not reloaded here)",parameters[0].c_str(), user->nick.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBAL RELOAD BY '%s' (not reloaded here)",parameters[0].c_str(), user->nick.c_str()); return CMD_SUCCESS; } diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp index 860bf5c4a..1236859da 100644 --- a/src/modules/m_invisible.cpp +++ b/src/modules/m_invisible.cpp @@ -95,7 +95,7 @@ class InvisibleMode : public ModeHandler } } - ServerInstance->SNO->WriteToSnoMask('A', "\2NOTICE\2: Oper %s has become %svisible (%cQ)", dest->GetFullHost().c_str(), adding ? "in" : "", adding ? '+' : '-'); + ServerInstance->SNO->WriteToSnoMask('a', "\2NOTICE\2: Oper %s has become %svisible (%cQ)", dest->GetFullHost().c_str(), adding ? "in" : "", adding ? '+' : '-'); return MODEACTION_ALLOW; } else @@ -184,7 +184,7 @@ void ModuleInvisible::OnUserJoin(User* user, Channel* channel, bool sync, bool & silent = true; /* Because we silenced the event, make sure it reaches the user whos joining (but only them of course) */ this->WriteCommonFrom(user, channel, "JOIN %s", channel->name.c_str()); - ServerInstance->SNO->WriteToSnoMask('A', "\2NOTICE\2: Oper %s has joined %s invisibly (+Q)", user->GetFullHost().c_str(), channel->name.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "\2NOTICE\2: Oper %s has joined %s invisibly (+Q)", user->GetFullHost().c_str(), channel->name.c_str()); } } diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp index 02a3a6c9b..7f0186228 100644 --- a/src/modules/m_lockserv.cpp +++ b/src/modules/m_lockserv.cpp @@ -38,7 +38,7 @@ public: { locked = true; user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server); - ServerInstance->SNO->WriteToSnoMask('A', "Oper %s used LOCKSERV to temporarily close for new connections", user->nick.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Oper %s used LOCKSERV to temporarily close for new connections", user->nick.c_str()); /* Dont send to the network */ return CMD_LOCALONLY; } @@ -61,7 +61,7 @@ public: { locked = false; user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server); - ServerInstance->SNO->WriteToSnoMask('A', "Oper %s used UNLOCKSERV to allow for new connections", user->nick.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Oper %s used UNLOCKSERV to allow for new connections", user->nick.c_str()); /* Dont send to the network */ return CMD_LOCALONLY; } diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index 265b2f58a..cedd708fc 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -64,7 +64,7 @@ class CommandNicklock : public Command if (target) { target->Extend("nick_locked", "ON"); - ServerInstance->SNO->WriteToSnoMask('A', user->nick+" used NICKLOCK to change and hold "+target->nick+" to "+parameters[1]); + ServerInstance->SNO->WriteToSnoMask('a', user->nick+" used NICKLOCK to change and hold "+target->nick+" to "+parameters[1]); /* Only send out nick from local server */ if (IS_LOCAL(target)) @@ -77,7 +77,7 @@ class CommandNicklock : public Command * tell everybody. Note user is still nick locked on their old * nick instead. */ - ServerInstance->SNO->WriteToSnoMask('A', oldnick+" failed nickchange on NICKLOCK (from "+newnick+" to "+parameters[1]+") Locked to "+newnick+" instead"); + ServerInstance->SNO->WriteToSnoMask('a', oldnick+" failed nickchange on NICKLOCK (from "+newnick+" to "+parameters[1]+") Locked to "+newnick+" instead"); ServerInstance->PI->SendSNONotice("A", oldnick+" failed nickchange on NICKLOCK (from "+newnick+" to "+parameters[1]+") Locked to "+newnick+" instead"); } } @@ -126,7 +126,7 @@ class CommandNickunlock : public Command } /* If we made it this far, the command is going out on the wire so send local snotice */ - ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]); + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]); if (target) { diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp index 1ac92bb0a..4cd63ff4a 100644 --- a/src/modules/m_operlevels.cpp +++ b/src/modules/m_operlevels.cpp @@ -71,7 +71,7 @@ class ModuleOperLevels : public Module } if (dest_level > source_level) { - ServerInstance->SNO->WriteToSnoMask('A', "Oper %s (level %ld) attempted to /kill a higher oper: %s (level %ld): Reason: %s",source->nick.c_str(),source_level,dest->nick.c_str(),dest_level,reason.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Oper %s (level %ld) attempted to /kill a higher oper: %s (level %ld): Reason: %s",source->nick.c_str(),source_level,dest->nick.c_str(),dest_level,reason.c_str()); dest->WriteServ("NOTICE %s :*** Oper %s attempted to /kill you!",dest->nick.c_str(),source->nick.c_str()); source->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper %s is a higher level than you",source->nick.c_str(),dest->nick.c_str()); return 1; diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp index 6645d26ef..cada9890c 100644 --- a/src/modules/m_sajoin.cpp +++ b/src/modules/m_sajoin.cpp @@ -57,7 +57,7 @@ class CommandSajoin : public Command { if (n->HasUser(dest)) { - ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]); + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]); return CMD_SUCCESS; } else @@ -74,7 +74,7 @@ class CommandSajoin : public Command } else { - ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" sent remote SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]); + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" sent remote SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]); return CMD_SUCCESS; } } diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp index 391fc81af..a9e7c3c0e 100644 --- a/src/modules/m_sakick.cpp +++ b/src/modules/m_sakick.cpp @@ -63,14 +63,14 @@ class CommandSakick : public Command Channel* n = ServerInstance->FindChan(parameters[1]); if (!n) { - ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" SAKICKed "+dest->nick+" on "+parameters[0]); + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" SAKICKed "+dest->nick+" on "+parameters[0]); return CMD_SUCCESS; } else { if (!n->HasUser(dest)) { - ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" SAKICKed "+dest->nick+" on "+parameters[0]); + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" SAKICKed "+dest->nick+" on "+parameters[0]); return CMD_SUCCESS; } else @@ -82,7 +82,7 @@ class CommandSakick : public Command } else { - ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" sent remote SAKICK to kick "+dest->nick+" from "+parameters[0]); + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" sent remote SAKICK to kick "+dest->nick+" from "+parameters[0]); } return CMD_SUCCESS; diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp index 932ed88b6..b9b02752f 100644 --- a/src/modules/m_samode.cpp +++ b/src/modules/m_samode.cpp @@ -35,7 +35,8 @@ class CommandSamode : public Command if (ServerInstance->Modes->GetLastParse().length()) { - ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse()); + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse()); + ServerInstance->PI->SendSNONotice("A", user->nick + " used SAMODE: " + ServerInstance->Modes->GetLastParse()); std::string channel = parameters[0]; ServerInstance->PI->SendMode(channel, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate()); diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp index 824b3fa6a..e74968500 100644 --- a/src/modules/m_sanick.cpp +++ b/src/modules/m_sanick.cpp @@ -60,12 +60,12 @@ class CommandSanick : public Command std::string newnick = target->nick; if (target->ForceNickChange(parameters[1].c_str())) { - ServerInstance->SNO->WriteToSnoMask('A', oldnick+" used SANICK to change "+newnick+" to "+parameters[1]); + ServerInstance->SNO->WriteToSnoMask('a', oldnick+" used SANICK to change "+newnick+" to "+parameters[1]); ServerInstance->PI->SendSNONotice("A", oldnick+" used SANICK to change "+newnick+" to "+parameters[1]); } else { - ServerInstance->SNO->WriteToSnoMask('A', oldnick+" failed SANICK (from "+newnick+" to "+parameters[1]+")"); + ServerInstance->SNO->WriteToSnoMask('a', oldnick+" failed SANICK (from "+newnick+" to "+parameters[1]+")"); ServerInstance->PI->SendSNONotice("A", oldnick+" failed SANICK (from "+newnick+" to "+parameters[1]+")"); } /* Yes, hit target and we have sent our NICK out, we can now bail */ diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp index e3af0f8cd..a47ccabb0 100644 --- a/src/modules/m_sapart.cpp +++ b/src/modules/m_sapart.cpp @@ -56,14 +56,14 @@ class CommandSapart : public Command Channel* n = ServerInstance->FindChan(parameters[1]); if (!n) { - ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]); + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]); return CMD_SUCCESS; } else { if (!n->HasUser(dest)) { - ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]); + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]); return CMD_SUCCESS; } else @@ -75,7 +75,7 @@ class CommandSapart : public Command } else { - ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" sent remote SAPART to make "+dest->nick+" part "+parameters[1]); + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" sent remote SAPART to make "+dest->nick+" part "+parameters[1]); } return CMD_SUCCESS; diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp index 784990a98..ad04ed4e6 100644 --- a/src/modules/m_saquit.cpp +++ b/src/modules/m_saquit.cpp @@ -38,7 +38,7 @@ class CommandSaquit : public Command return CMD_FAILURE; } - ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+parameters[1]); + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+parameters[1]); // Pass the command on, so the client's server can quit it properly. if (!IS_LOCAL(dest)) diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp index cf2cb3faa..67756158a 100644 --- a/src/modules/m_satopic.cpp +++ b/src/modules/m_satopic.cpp @@ -40,7 +40,7 @@ class CommandSATopic : public Command // 3rd parameter overrides access checks target->SetTopic(user, newTopic, true); - ServerInstance->SNO->WriteToSnoMask('A', user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic); + ServerInstance->SNO->WriteToSnoMask('a', user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic); ServerInstance->PI->SendSNONotice("A", user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic); return CMD_LOCALONLY; diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp index 5dcf40931..73462a20a 100644 --- a/src/modules/m_servprotect.cpp +++ b/src/modules/m_servprotect.cpp @@ -110,7 +110,7 @@ class ModuleServProtectMode : public Module if (dst->IsModeSet('k')) { src->WriteNumeric(485, "%s :You are not permitted to kill %s services!", src->nick.c_str(), ServerInstance->Config->Network); - ServerInstance->SNO->WriteToSnoMask('A', std::string(src->nick)+" tried to kill service "+dst->nick+" ("+reason+")"); + ServerInstance->SNO->WriteToSnoMask('a', std::string(src->nick)+" tried to kill service "+dst->nick+" ("+reason+")"); return 1; } return 0; diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp index 552d4f034..25672bc2c 100644 --- a/src/modules/m_sethost.cpp +++ b/src/modules/m_sethost.cpp @@ -53,7 +53,7 @@ class CommandSethost : public Command if (user->ChangeDisplayedHost(parameters[0].c_str())) { - ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost); + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost); return CMD_LOCALONLY; } diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp index 867404ddb..b8e9c5862 100644 --- a/src/modules/m_setident.cpp +++ b/src/modules/m_setident.cpp @@ -48,7 +48,7 @@ class CommandSetident : public Command } user->ChangeIdent(parameters[0].c_str()); - ServerInstance->SNO->WriteToSnoMask('A', "%s used SETIDENT to change their ident to '%s'", user->nick.c_str(), user->ident.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "%s used SETIDENT to change their ident to '%s'", user->nick.c_str(), user->ident.c_str()); return CMD_SUCCESS; } diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp index dcd44e96a..4001e5ee9 100644 --- a/src/modules/m_setidle.cpp +++ b/src/modules/m_setidle.cpp @@ -39,7 +39,7 @@ class CommandSetidle : public Command // minor tweak - we cant have signon time shorter than our idle time! if (user->signon > user->idle_lastmsg) user->signon = user->idle_lastmsg; - ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SETIDLE to set their idle time to "+ConvToStr(idle)+" seconds"); + ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SETIDLE to set their idle time to "+ConvToStr(idle)+" seconds"); user->WriteNumeric(944, "%s :Idle time set.",user->nick.c_str()); return CMD_LOCALONLY; diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp index 936f65968..8b2ff7294 100644 --- a/src/modules/m_setname.cpp +++ b/src/modules/m_setname.cpp @@ -43,7 +43,7 @@ class CommandSetname : public Command if (user->ChangeName(parameters[0].c_str())) { - ServerInstance->SNO->WriteToSnoMask('A', "%s used SETNAME to change their GECOS to %s", user->nick.c_str(), parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "%s used SETNAME to change their GECOS to %s", user->nick.c_str(), parameters[0].c_str()); return CMD_SUCCESS; } diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index b41b8fd93..c36857c14 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -44,7 +44,7 @@ class CommandSwhois : public Command // We already had it set... if (!ServerInstance->ULine(user->server)) // Ulines set SWHOISes silently - ServerInstance->SNO->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick.c_str(), dest->nick.c_str(), text->c_str(), parameters[1].c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "%s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick.c_str(), dest->nick.c_str(), text->c_str(), parameters[1].c_str()); dest->Shrink("swhois"); delete text; @@ -52,7 +52,7 @@ class CommandSwhois : public Command else if (!ServerInstance->ULine(user->server)) { // Ulines set SWHOISes silently - ServerInstance->SNO->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois to '%s'", user->nick.c_str(), dest->nick.c_str(), parameters[1].c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "%s used SWHOIS to set %s's extra whois to '%s'", user->nick.c_str(), dest->nick.c_str(), parameters[1].c_str()); } text = new std::string(parameters[1]); diff --git a/src/server.cpp b/src/server.cpp index c7ebc187e..5000d32d9 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -48,7 +48,7 @@ void InspIRCd::Exit(int status) void RehashHandler::Call(const std::string &reason) { - Server->SNO->WriteToSnoMask('A', "Rehashing config file %s %s",ServerConfig::CleanFilename(Server->ConfigFileName), reason.c_str()); + Server->SNO->WriteToSnoMask('a', "Rehashing config file %s %s",ServerConfig::CleanFilename(Server->ConfigFileName), reason.c_str()); Server->RehashUsersAndChans(); FOREACH_MOD_I(Server, I_OnGarbageCollect, OnGarbageCollect()); if (!Server->ConfigThread) diff --git a/src/snomasks.cpp b/src/snomasks.cpp index 6c3824ae7..2e682675d 100644 --- a/src/snomasks.cpp +++ b/src/snomasks.cpp @@ -102,7 +102,8 @@ void SnomaskManager::SetupDefaults() this->EnableSnomask('L',"REMOTELINK"); /* Remote linking notices */ this->EnableSnomask('o',"OPER"); /* Oper up/down notices */ this->EnableSnomask('O',"REMOTEOPER"); /* Remote oper up/down notices */ - this->EnableSnomask('A',"ANNOUNCEMENT"); /* formerly WriteOpers() - generic notices to all opers */ + this->EnableSnomask('a',"ANNOUNCEMENT"); /* formerly WriteOpers() - generic notices to all opers */ + this->EnableSnomask('A',"REMOTEANNOUNCEMENT"); /* formerly WriteOpers() - generic notices to all opers */ this->EnableSnomask('d',"DEBUG"); /* Debug notices */ this->EnableSnomask('x',"XLINE"); /* Xline notice (g/z/q/k/e) */ this->EnableSnomask('t',"STATS"); /* Local or remote stats request */ diff --git a/src/usermanager.cpp b/src/usermanager.cpp index d930fd039..da8061fba 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -31,7 +31,7 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache catch (...) { Instance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkies have been unleashed."); - Instance->SNO->WriteToSnoMask('A', "WARNING *** Duplicate UUID allocated!"); + Instance->SNO->WriteToSnoMask('a', "WARNING *** Duplicate UUID allocated!"); return; } @@ -106,7 +106,7 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache if ((this->local_users.size() > Instance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)Instance->SE->GetMaxFds())) { - Instance->SNO->WriteToSnoMask('A', "Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit); + Instance->SNO->WriteToSnoMask('a', "Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit); this->QuitUser(New,"No more connections allowed"); return; } diff --git a/src/users.cpp b/src/users.cpp index a755c4dd7..c84bc00d9 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -612,7 +612,7 @@ bool User::AddBuffer(const std::string &a) if (this->MyClass && !this->HasPrivPermission("users/flood/increased-buffers") && recvq.length() > this->MyClass->GetRecvqMax()) { ServerInstance->Users->QuitUser(this, "RecvQ exceeded"); - ServerInstance->SNO->WriteToSnoMask('A', "User %s RecvQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)recvq.length(),this->MyClass->GetRecvqMax()); + ServerInstance->SNO->WriteToSnoMask('a', "User %s RecvQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)recvq.length(),this->MyClass->GetRecvqMax()); return false; } @@ -679,7 +679,7 @@ void User::AddWriteBuf(const std::string &data) * to repeatedly add the text to the sendq! */ ServerInstance->Users->QuitUser(this, "SendQ exceeded"); - ServerInstance->SNO->WriteToSnoMask('A', "User %s SendQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)sendq.length() + data.length(),this->MyClass->GetSendqMax()); + ServerInstance->SNO->WriteToSnoMask('a', "User %s SendQ of %lu exceeds connect class maximum of %lu",this->nick.c_str(),(unsigned long int)sendq.length() + data.length(),this->MyClass->GetSendqMax()); return; } @@ -902,13 +902,13 @@ void User::CheckClass() else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal())) { ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (local)"); - ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString()); + ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString()); return; } else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal())) { ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (global)"); - ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString()); + ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString()); return; } |