X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsnomasks.cpp;h=4b9c9d86b29194162eff736b61bee1da848af5c9;hb=a785f350fd584d87f3b84bbaff569ecb59c29f04;hp=742214a6d60888c24646689105bcaa580e21b6e7;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/snomasks.cpp b/src/snomasks.cpp index 742214a6d..4b9c9d86b 100644 --- a/src/snomasks.cpp +++ b/src/snomasks.cpp @@ -1,76 +1,46 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -/* $Core */ #include "inspircd.h" #include -#include "snomasks.h" - -SnomaskManager::SnomaskManager() -{ - SnoMasks.clear(); - this->SetupDefaults(); -} - -SnomaskManager::~SnomaskManager() -{ - for (std::map::iterator i = SnoMasks.begin(); i != SnoMasks.end(); i++) - { - delete i->second; - } - SnoMasks.clear(); -} void SnomaskManager::FlushSnotices() { - for (std::map::iterator i = SnoMasks.begin(); i != SnoMasks.end(); i++) - { - i->second->Flush(); - } -} - -bool SnomaskManager::EnableSnomask(char letter, const std::string &type) -{ - if (SnoMasks.find(letter) == SnoMasks.end()) - { - Snomask *s = new Snomask(letter, type); - SnoMasks[letter] = s; - return true; - } - return false; + for (int i=0; i < 26; i++) + masks[i].Flush(); } -bool SnomaskManager::DisableSnomask(char letter) +void SnomaskManager::EnableSnomask(char letter, const std::string &type) { - SnoList::iterator n = SnoMasks.find(letter); - if (n != SnoMasks.end()) - { - delete n->second; // destroy the snomask - SnoMasks.erase(n); - return true; - } - return false; + if (letter >= 'a' && letter <= 'z') + masks[letter - 'a'].Description = type; } void SnomaskManager::WriteToSnoMask(char letter, const std::string &text) { - /* Only send to snomask chars which are enabled */ - SnoList::iterator n = SnoMasks.find(letter); - if (n != SnoMasks.end()) - { - n->second->SendMessage(text); - } + if (letter >= 'a' && letter <= 'z') + masks[letter - 'a'].SendMessage(text, letter); + if (letter >= 'A' && letter <= 'Z') + masks[letter - 'A'].SendMessage(text, letter); } void SnomaskManager::WriteGlobalSno(char letter, const std::string& text) @@ -104,44 +74,36 @@ void SnomaskManager::WriteGlobalSno(char letter, const char* text, ...) this->WriteGlobalSno(letter, std::string(textbuffer)); } -bool SnomaskManager::IsEnabled(char letter) -{ - return (SnoMasks.find(letter) != SnoMasks.end()); -} - -void SnomaskManager::SetupDefaults() +SnomaskManager::SnomaskManager() { - 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"); /* Linking notices */ - 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',"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('X',"REMOTEXLINE"); /* Remove Xline notice (g/z/q/k/e) */ - this->EnableSnomask('t',"STATS"); /* Local or remote stats request */ - this->EnableSnomask('f',"FLOOD"); /* Flooding notices */ + EnableSnomask('c',"CONNECT"); /* Local connect notices */ + EnableSnomask('q',"QUIT"); /* Local quit notices */ + EnableSnomask('k',"KILL"); /* Kill notices */ + EnableSnomask('l',"LINK"); /* Linking notices */ + EnableSnomask('o',"OPER"); /* Oper up/down notices */ + EnableSnomask('a',"ANNOUNCEMENT"); /* formerly WriteOpers() - generic notices to all opers */ + EnableSnomask('d',"DEBUG"); /* Debug notices */ + EnableSnomask('x',"XLINE"); /* Xline notice (g/z/q/k/e) */ + EnableSnomask('t',"STATS"); /* Local or remote stats request */ + EnableSnomask('f',"FLOOD"); /* Flooding notices */ } /*************************************************************************************/ -void Snomask::SendMessage(const std::string &message) +void Snomask::SendMessage(const std::string &message, char mysnomask) { - if (message != LastMessage) + if (ServerInstance->Config->NoSnoticeStack || message != LastMessage || mysnomask != LastLetter) { this->Flush(); LastMessage = message; + LastLetter = mysnomask; - std::string desc = this->Description; + std::string desc = Description; + if (desc.empty()) + desc = std::string("SNO-") + (char)tolower(mysnomask); + if (isupper(mysnomask)) + desc = "REMOTE" + desc; ModResult MOD_RESULT; - char mysnomask = MySnomask; ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), message.c_str()); FIRST_MOD_RESULT(OnSendSnotice, MOD_RESULT, (mysnomask, desc, message)); @@ -172,13 +134,16 @@ void Snomask::Flush() { if (Count > 1) { - std::string desc = this->Description; + std::string desc = Description; + if (desc.empty()) + desc = std::string("SNO-") + (char)tolower(LastLetter); + if (isupper(LastLetter)) + desc = "REMOTE" + desc; std::string mesg = "(last message repeated "+ConvToStr(Count)+" times)"; - char mysnomask = MySnomask; ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), mesg.c_str()); - FOREACH_MOD(I_OnSendSnotice, OnSendSnotice(mysnomask, desc, mesg)); + FOREACH_MOD(I_OnSendSnotice, OnSendSnotice(LastLetter, desc, mesg)); if (!LastBlocked) { @@ -188,7 +153,7 @@ void Snomask::Flush() while (i != ServerInstance->Users->all_opers.end()) { User* a = *i; - if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsNoticeMaskSet(mysnomask) && !a->quitting) + if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsNoticeMaskSet(LastLetter) && !a->quitting) { a->WriteServ("NOTICE %s :*** %s: %s", a->nick.c_str(), desc.c_str(), mesg.c_str()); } @@ -198,7 +163,7 @@ void Snomask::Flush() } } - LastMessage = ""; + LastMessage.clear(); LastBlocked = false; Count = 0; }