Add config <options:disablehmac> to support disabling of HMAC, and tidy up to detect...

[user/henk/code/inspircd.git] / src / modules / m_silence_ext.cpp

diff --git a/src/modules/m_silence_ext.cpp b/src/modules/m_silence_ext.cpp
index 19abc679f983672cd5b8b4a5cc4bb700793e4f9b..ba76abc294dc7f7623ad118822925e04a041debf 100644 (file)
--- a/src/modules/m_silence_ext.cpp
+++ b/src/modules/m_silence_ext.cpp
@@ -2,20 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include <stdio.h>
 #include <string>
 #include <vector>
@@ -219,7 +214,7 @@ class cmd_silence : public command_t
        /* turn the mask into a nice human readable format */
        std::string DecompPattern (const int pattern)
        {
-               std::string out = "";
+               std::string out;
                if ((pattern & SILENCE_PRIVATE) > 0)
                        out += ",privatemessages";
                if ((pattern & SILENCE_CHANNEL) > 0)
@@ -258,7 +253,7 @@ class ModuleSilence : public Module
                List[I_OnBuildExemptList] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = List[I_OnUserPreInvite] = 1;
        }
 
-       virtual void OnUserQuit(userrec* user, const std::string &reason)
+       virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
        {
                // when the user quits tidy up any silence list they might have just to keep things tidy
                silencelist* sl;
@@ -310,6 +305,9 @@ class ModuleSilence : public Module
 
        virtual int PreText(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list, int silence_type)
        {
+               if (!IS_LOCAL(user))
+                       return 0;
+
                if (target_type == TYPE_USER)
                {
                        return MatchPattern((userrec*)dest, user, silence_type);
@@ -317,37 +315,9 @@ class ModuleSilence : public Module
                else if (target_type == TYPE_CHANNEL)
                {
                        chanrec* chan = (chanrec*)dest;
-                       int public_silence = (silence_type == SILENCE_PRIVATE ? SILENCE_CHANNEL : SILENCE_CNOTICE);
-
                        if (chan)
                        {
-                               CUList *ulist;
-                               switch (status)
-                               {
-                                       case '@':
-                                               ulist = chan->GetOppedUsers();
-                                               break;
-                                       case '%':
-                                               ulist = chan->GetHalfoppedUsers();
-                                               break;
-                                       case '+':
-                                               ulist = chan->GetVoicedUsers();
-                                               break;
-                                       default:
-                                               ulist = chan->GetUsers();
-                                               break;
-                               }
-       
-                               for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                               {
-                                       if ((IS_LOCAL(i->second)) && (user != i->second))
-                                       {
-                                               if (MatchPattern(i->second, user, public_silence) == 1)
-                                               {
-                                                       exempt_list[i->second] = i->second;
-                                               }
-                                       }
-                               }
+                               this->OnBuildExemptList((silence_type == SILENCE_PRIVATE ? MSG_PRIVMSG : MSG_NOTICE), chan, user, status, exempt_list);
                        }
                }
                return 0;
@@ -376,16 +346,8 @@ class ModuleSilence : public Module
                {
                        for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++)
                        {
-                               if ((match(source->GetFullHost(), c->first.c_str())) && ( ((c->second & pattern) > 0)) || ((c->second & SILENCE_ALL) > 0))
-                               {
-                                       if (((c->second & SILENCE_EXCLUDE) > 0))
-                                       {
-                                               return 0;
-                                       }
-                                       else {
-                                               return 1;
-                                       }
-                               }
+                               if (((((c->second & pattern) > 0)) || ((c->second & SILENCE_ALL) > 0)) && (ServerInstance->MatchText(source->GetFullHost(), c->first)))
+                                       return !(((c->second & SILENCE_EXCLUDE) > 0));
                        }
                }
                return 0;