summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/extra/m_sqlauth.cpp6
-rw-r--r--src/modules/m_cgiirc.cpp8
-rw-r--r--src/modules/m_connflood.cpp4
-rw-r--r--src/modules/m_filter.cpp14
-rw-r--r--src/modules/m_lockserv.cpp4
-rw-r--r--src/modules/m_nicklock.cpp4
-rw-r--r--src/modules/m_operlevels.cpp2
-rw-r--r--src/modules/m_sakick.cpp6
-rw-r--r--src/modules/m_sapart.cpp6
-rw-r--r--src/modules/m_saquit.cpp2
-rw-r--r--src/modules/m_servprotect.cpp2
-rw-r--r--src/modules/m_sethost.cpp2
-rw-r--r--src/modules/m_setident.cpp2
-rw-r--r--src/modules/m_setname.cpp2
-rw-r--r--src/modules/m_swhois.cpp4
15 files changed, 34 insertions, 34 deletions
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index 9043969b9..8e9d33d58 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->WriteGlobalSno('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->WriteGlobalSno('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->WriteGlobalSno('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_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index a014e6461..bb27badd2 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->WriteGlobalSno('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->WriteGlobalSno('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->WriteGlobalSno('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);
@@ -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->WriteGlobalSno('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
{
diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index a88ee3886..cb5c85755 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->WriteGlobalSno('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->WriteGlobalSno('a', "Connection throttle activated");
ServerInstance->Users->QuitUser(user, quitmsg);
return 1;
}
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 514fd7e6b..94dc2f134 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->WriteGlobalSno('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->WriteGlobalSno('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->WriteGlobalSno('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 &parameter)
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->WriteGlobalSno('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 &parameter)
{
if (RegexNameRequest(this, *i).Send() == newrxengine)
{
- ServerInstance->SNO->WriteToSnoMask('a', "Filter now using engine '%s'", RegexEngine.c_str());
+ ServerInstance->SNO->WriteGlobalSno('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->WriteGlobalSno('a', "WARNING: Regex engine '%s' is not loaded - Filter functionality disabled until this is corrected.", RegexEngine.c_str());
}
}
@@ -459,7 +459,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->WriteGlobalSno('a', "Found and activated regex module '%s' for m_filter.so.", RegexEngine.c_str());
ReadFilters(Config);
}
}
diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 7f0186228..946abc968 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->WriteGlobalSno('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->WriteGlobalSno('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 fcb82275e..b4956c7e0 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -67,7 +67,7 @@ class CommandNicklock : public Command
{
// This has to be done *here*, because this metadata must be stored netwide.
target->Extend("nick_locked", "ON");
- ServerInstance->SNO->WriteToSnoMask('a', user->nick+" used NICKLOCK to change and hold "+target->nick+" to "+parameters[1]);
+ ServerInstance->SNO->WriteGlobalSno('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))
@@ -129,7 +129,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->WriteGlobalSno('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 4cd63ff4a..8d601c1c2 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->WriteGlobalSno('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_sakick.cpp b/src/modules/m_sakick.cpp
index 769aed7ce..af70c5800 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->WriteGlobalSno('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->WriteGlobalSno('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->WriteGlobalSno('a', std::string(user->nick)+" sent remote SAKICK to kick "+dest->nick+" from "+parameters[0]);
}
return CMD_SUCCESS;
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index a47ccabb0..a945b1fb5 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->WriteGlobalSno('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->WriteGlobalSno('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->WriteGlobalSno('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 ad04ed4e6..cf965ced8 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->WriteGlobalSno('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_servprotect.cpp b/src/modules/m_servprotect.cpp
index 73462a20a..7c4aef289 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->WriteGlobalSno('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 25672bc2c..91c005bee 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->WriteGlobalSno('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 b8e9c5862..805ca4eb0 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->WriteGlobalSno('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_setname.cpp b/src/modules/m_setname.cpp
index 8b2ff7294..846edf0fe 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->WriteGlobalSno('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 c36857c14..b750d839d 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->WriteGlobalSno('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->WriteGlobalSno('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]);