X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=98001e952a1a6909ad991b070de5c24a43a04300;hb=bc4828bbbde8a596b80b8f1d2c7349551f0f43b8;hp=f922703f28a61a431a12b984d28dca528e746640;hpb=1c774ea51f6799ca18a1028486f2812fe487ebdc;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/snomasks.cpp b/src/snomasks.cpp index f922703f2..98001e952 100644 --- a/src/snomasks.cpp +++ b/src/snomasks.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -24,19 +24,40 @@ SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance) } SnomaskManager::~SnomaskManager() -{ +{ + for (std::map::iterator i = SnoMasks.begin(); i != SnoMasks.end(); i++) + { + delete i->second; + } + SnoMasks.clear(); } void SnomaskManager::FlushSnotices() { - // stub.. not yet written XXX + for (std::map::iterator i = SnoMasks.begin(); i != SnoMasks.end(); i++) + { + i->second->Flush(); + } } -bool SnomaskManager::EnableSnomask(char letter, const std::string &type) +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) { if (SnoMasks.find(letter) == SnoMasks.end()) { - Snomask *s = new Snomask(ServerInstance, letter, type); + Snomask *s = new Snomask(ServerInstance, letter, type, local); SnoMasks[letter] = s; return true; } @@ -84,15 +105,16 @@ bool SnomaskManager::IsEnabled(char letter) void SnomaskManager::SetupDefaults() { - 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('c',"CONNECT", true); /* Local connect notices */ + this->EnableSnomask('C',"REMOTECONNECT", true); /* Remote connect notices */ + this->EnableSnomask('q',"QUIT", true); /* Local quit notices */ + this->EnableSnomask('Q',"REMOTEQUIT", true); /* Remote quit notices */ + this->EnableSnomask('k',"KILL", true); /* 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('d',"DEBUG"); /* Debug notices */ + this->EnableSnomask('A',"ANNOUNCEMENT"); /* formerly WriteOpers() - generic notices to all opers */ + this->EnableSnomask('d',"DEBUG", true); /* Debug notices */ this->EnableSnomask('x',"XLINE"); /* Xline notice (g/z/q/k/e) */ this->EnableSnomask('t',"STATS"); /* Local or remote stats request */ this->EnableSnomask('f',"FLOOD"); /* Flooding notices */ @@ -106,7 +128,6 @@ void Snomask::SendMessage(const std::string &message) { this->Flush(); LastMessage = message; - Count = 1; } else { @@ -116,12 +137,16 @@ void Snomask::SendMessage(const std::string &message) void Snomask::Flush() { + if (this->LastMessage.empty()) + return; + /* Only opers can receive snotices, so we iterate the oper list */ - for (std::list::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++) + for (std::list::iterator i = ServerInstance->Users->all_opers.begin(); i != ServerInstance->Users->all_opers.end(); i++) { User* a = *i; - if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsModeSet('n') && a->IsNoticeMaskSet(MySnomask)) + if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsModeSet('n') && a->IsNoticeMaskSet(MySnomask) && !a->quitting) { + a->WriteServ("NOTICE %s :*** %s: %s", a->nick, this->Description.c_str(), this->LastMessage.c_str()); if (Count > 1) { @@ -129,4 +154,18 @@ 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; }