X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=2309b9ac06cd840bc4adacc2f3b4ef7721c61669;hb=c3e52465901f11226616a2a93393c3d07295b45d;hp=dbbc11aaf876c945553e443e5bab9799ac442bf3;hpb=fefc5fbd382573dfa73750eb4872ae00e39edbd6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/snomasks.cpp b/src/snomasks.cpp index dbbc11aaf..2309b9ac0 100644 --- a/src/snomasks.cpp +++ b/src/snomasks.cpp @@ -40,24 +40,11 @@ void SnomaskManager::FlushSnotices() } } -bool SnomaskManager::SetLocalOnly(char letter, bool local) -{ - SnoList::iterator n = SnoMasks.find(letter); - if (n != SnoMasks.end()) - { - n->second->LocalOnly = local; - return n->second->LocalOnly; - } - - ServerInstance->Logs->Log("SNOMASK", DEFAULT, "Snomask %d not found, unmatched modules?", letter); - return true; -} - -bool SnomaskManager::EnableSnomask(char letter, const std::string &type, bool local) +bool SnomaskManager::EnableSnomask(char letter, const std::string &type) { if (SnoMasks.find(letter) == SnoMasks.end()) { - Snomask *s = new Snomask(ServerInstance, letter, type, local); + Snomask *s = new Snomask(ServerInstance, letter, type); SnoMasks[letter] = s; return true; } @@ -105,15 +92,15 @@ bool SnomaskManager::IsEnabled(char letter) void SnomaskManager::SetupDefaults() { - this->EnableSnomask('c',"CONNECT", true); /* Local connect notices */ - this->EnableSnomask('C',"REMOTECONNECT"); /* Remote connect notices */ - this->EnableSnomask('q',"QUIT", true); /* Local quit notices */ - this->EnableSnomask('Q',"REMOTEQUIT"); /* Remote quit notices */ - this->EnableSnomask('k',"KILL", true); /* Kill notices */ - this->EnableSnomask('K',"REMOTEKILL"); /* Remote kill notices */ + this->EnableSnomask('c',"CONNECT"); /* Local connect notices */ + this->EnableSnomask('C',"REMOTECONNECT"); /* Remote connect notices */ + this->EnableSnomask('q',"QUIT"); /* Local quit notices */ + this->EnableSnomask('Q',"REMOTEQUIT"); /* Remote quit notices */ + this->EnableSnomask('k',"KILL"); /* Kill notices */ + this->EnableSnomask('K',"REMOTEKILL"); /* Remote kill notices */ this->EnableSnomask('l',"LINK"); /* Link notices */ this->EnableSnomask('o',"OPER"); /* 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('d',"DEBUG"); /* Debug notices */ this->EnableSnomask('x',"XLINE"); /* Xline notice (g/z/q/k/e) */ this->EnableSnomask('t',"STATS"); /* Local or remote stats request */ @@ -155,17 +142,6 @@ void Snomask::Flush() } } - if (!LocalOnly) - { - // XXX this is a bit ugly. - std::string sno; - sno += MySnomask; - - ServerInstance->PI->SendSNONotice(sno, this->Description + ": " + this->LastMessage); - if (Count > 1) - ServerInstance->PI->SendSNONotice(sno, this->Description + ": (last message repeated " + ConvToStr(Count) + " times)"); - } - LastMessage = ""; Count = 1; }