Fix

[user/henk/code/inspircd.git] / src / snomasks.cpp

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 136947107e98ac30885d0697c2463f5a3ff761e6..dbbc11aaf876c945553e443e5bab9799ac442bf3 100644 (file)
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -24,23 +24,40 @@ SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance)
 }
 
 SnomaskManager::~SnomaskManager()
-{
+{      
+       for (std::map<char, Snomask *>::iterator i = SnoMasks.begin(); i != SnoMasks.end(); i++)
+       {
+               delete i->second;
+       }
+       SnoMasks.clear();
 }
 
 void SnomaskManager::FlushSnotices()
 {
-       // stub.. not yet written XXX
        for (std::map<char, Snomask *>::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;
        }
@@ -88,14 +105,15 @@ 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");               /* 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('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('d',"DEBUG");                       /* Debug notices */
        this->EnableSnomask('x',"XLINE");                       /* Xline notice (g/z/q/k/e) */
        this->EnableSnomask('t',"STATS");                       /* Local or remote stats request */
@@ -122,14 +140,13 @@ void Snomask::Flush()
        if (this->LastMessage.empty())
                return;
 
-       ServerInstance->Log(DEBUG, "Flusing snomask %s", this->Description.c_str());
-
        /* Only opers can receive snotices, so we iterate the oper list */
-       for (std::list<User*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
+       for (std::list<User*>::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)
                        {
@@ -138,6 +155,17 @@ 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;
 }