]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/snomasks.cpp
Fix various issues with the nationalchars module.
[user/henk/code/inspircd.git] / src / snomasks.cpp
index c166bd72d3a52869baa755eb534ae3e90b8e095c..4b9c9d86b29194162eff736b61bee1da848af5c9 100644 (file)
@@ -1,76 +1,53 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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 <http://www.gnu.org/licenses/>.
  */
 
-/* $Core */
 
 #include "inspircd.h"
 #include <stdarg.h>
-#include "snomasks.h"
-
-SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance)
-{
-       SnoMasks.clear();
-       this->SetupDefaults();
-}
-
-SnomaskManager::~SnomaskManager()
-{
-       for (std::map<char, Snomask *>::iterator i = SnoMasks.begin(); i != SnoMasks.end(); i++)
-       {
-               delete i->second;
-       }
-       SnoMasks.clear();
-}
 
 void SnomaskManager::FlushSnotices()
 {
-       for (std::map<char, Snomask *>::iterator i = SnoMasks.begin(); i != SnoMasks.end(); i++)
-       {
-               i->second->Flush();
-       }
+       for (int i=0; i < 26; i++)
+               masks[i].Flush();
 }
 
-bool SnomaskManager::EnableSnomask(char letter, const std::string &type)
+void SnomaskManager::EnableSnomask(char letter, const std::string &type)
 {
-       if (SnoMasks.find(letter) == SnoMasks.end())
-       {
-               Snomask *s = new Snomask(ServerInstance, letter, type);
-               SnoMasks[letter] = s;
-               return true;
-       }
-       return false;
+       if (letter >= 'a' && letter <= 'z')
+               masks[letter - 'a'].Description = type;
 }
 
-bool SnomaskManager::DisableSnomask(char letter)
+void SnomaskManager::WriteToSnoMask(char letter, const std::string &text)
 {
-       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'].SendMessage(text, letter);
+       if (letter >= 'A' && letter <= 'Z')
+               masks[letter - 'A'].SendMessage(text, letter);
 }
 
-void SnomaskManager::WriteToSnoMask(char letter, const std::string &text)
+void SnomaskManager::WriteGlobalSno(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);
-       }
+       WriteToSnoMask(letter, text);
+       letter = toupper(letter);
+       ServerInstance->PI->SendSNONotice(std::string(1, letter), text);
 }
 
 void SnomaskManager::WriteToSnoMask(char letter, const char* text, ...)
@@ -85,83 +62,108 @@ void SnomaskManager::WriteToSnoMask(char letter, const char* text, ...)
        this->WriteToSnoMask(letter, std::string(textbuffer));
 }
 
-bool SnomaskManager::IsEnabled(char letter)
+void SnomaskManager::WriteGlobalSno(char letter, const char* text, ...)
 {
-       return (SnoMasks.find(letter) != SnoMasks.end());
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+
+       this->WriteGlobalSno(letter, std::string(textbuffer));
 }
 
-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('d',"DEBUG");                       /* 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 */
+       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 = Description;
+               if (desc.empty())
+                       desc = std::string("SNO-") + (char)tolower(mysnomask);
+               if (isupper(mysnomask))
+                       desc = "REMOTE" + desc;
+               ModResult MOD_RESULT;
+               ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), message.c_str());
+
+               FIRST_MOD_RESULT(OnSendSnotice, MOD_RESULT, (mysnomask, desc, message));
+
+               LastBlocked = (MOD_RESULT == MOD_RES_DENY);
+
+               if (!LastBlocked)
+               {
+                       /* Only opers can receive snotices, so we iterate the oper list */
+                       std::list<User*>::iterator i = ServerInstance->Users->all_opers.begin();
+
+                       while (i != ServerInstance->Users->all_opers.end())
+                       {
+                               User* a = *i;
+                               if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsNoticeMaskSet(mysnomask) && !a->quitting)
+                               {
+                                       a->WriteServ("NOTICE %s :*** %s: %s", a->nick.c_str(), desc.c_str(), message.c_str());
+                               }
+
+                               i++;
+                       }
+               }
        }
-       else
-       {
-               Count++;
-       }
+       Count++;
 }
 
 void Snomask::Flush()
 {
-       if (this->LastMessage.empty())
-               return;
-
-       ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", this->Description.c_str(), this->LastMessage.c_str());
        if (Count > 1)
-               ServerInstance->Logs->Log("snomask", DEFAULT, "%s: (last message repeated %u times)", this->Description.c_str(), Count);
-
-
-       int MOD_RESULT = 0;
-       char mysnomask = MySnomask;
-       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)";
 
-       FOREACH_RESULT(I_OnSendSnotice, OnSendSnotice(mysnomask, desc, this->LastMessage));
+               ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), mesg.c_str());
 
-       if (MOD_RESULT != 1) // 1 blocks the message
-       {
-               /* Only opers can receive snotices, so we iterate the oper list */
-               std::list<User*>::iterator i = ServerInstance->Users->all_opers.begin();
+               FOREACH_MOD(I_OnSendSnotice, OnSendSnotice(LastLetter, desc, mesg));
 
-               while (i != ServerInstance->Users->all_opers.end())
+               if (!LastBlocked)
                {
-                       User* a = *i;
-                       if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsNoticeMaskSet(mysnomask) && !a->quitting)
-                       {
+                       /* Only opers can receive snotices, so we iterate the oper list */
+                       std::list<User*>::iterator i = ServerInstance->Users->all_opers.begin();
 
-                               a->WriteServ("NOTICE %s :*** %s: %s", a->nick.c_str(), desc.c_str(), this->LastMessage.c_str());
-                               if (Count > 1)
+                       while (i != ServerInstance->Users->all_opers.end())
+                       {
+                               User* a = *i;
+                               if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsNoticeMaskSet(LastLetter) && !a->quitting)
                                {
-                                       a->WriteServ("NOTICE %s :*** %s: (last message repeated %u times)", a->nick.c_str(), this->Description.c_str(), Count);
+                                       a->WriteServ("NOTICE %s :*** %s: %s", a->nick.c_str(), desc.c_str(), mesg.c_str());
                                }
-                       }
 
-                       i++;
+                               i++;
+                       }
                }
-       }
 
-       LastMessage = "";
-       Count = 1;
+       }
+       LastMessage.clear();
+       LastBlocked = false;
+       Count = 0;
 }