Check for windows drive letters on the start of paths and treat them the same as...

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

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 08b98c0027845980ec7dfd2f9c455d25b541088a..2309b9ac06cd840bc4adacc2f3b4ef7721c61669 100644 (file)
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -24,7 +24,12 @@ 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()
@@ -88,14 +93,14 @@ bool SnomaskManager::IsEnabled(char letter)
 void SnomaskManager::SetupDefaults()
 {
        this->EnableSnomask('c',"CONNECT");                     /* Local connect notices */
-       this->EnableSnomask('C',"REMOTECONNECT");               /* Remote 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('Q',"REMOTEQUIT");          /* Remote quit notices */
        this->EnableSnomask('k',"KILL");                        /* Kill notices */
-       this->EnableSnomask('K',"REMOTEKILL");                  /* Remote 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 */
@@ -137,10 +142,6 @@ void Snomask::Flush()
                }
        }
 
-       ServerInstance->PI->SendSNONotice(MySnomask, this->Description + ": " + this->LastMessage);
-       if (Count > 1)
-               ServerInstance->PI->SendSNONotice(MySnomask, this->Description + ": (last message repeated " + Count + " times)");
-
        LastMessage = "";
        Count = 1;
 }