diff options
author | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-04-16 15:51:05 +0000 |
---|---|---|
committer | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-04-16 15:51:05 +0000 |
commit | 929cd28544c59d122a8d36b2b5e3a394aa03108b (patch) | |
tree | 0cde4c4c2d9b3bd8fea2f159df5eb5725034541a /src/modules/m_filter.cpp | |
parent | f2813657c825033a18af138a6ea49f7561f4bccb (diff) |
Convert snomask 'A' into snomask 'a' for local announcements, add snomask 'A' for remote announcements.
Make SAMODE send a snotice to 'a' and remote to 'A' - fixes bug #822, reported by Taros
We really need a wrapper to use these, but, for now it's usable.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11304 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_filter.cpp')
-rw-r--r-- | src/modules/m_filter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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); } } |