Fix access checks on chanprotect preventing use of SAMODE

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

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 779cb541ebaf18a028224e1d718d8f9b6a1f315c..be1477a16cfeba9df48837f1ffa83c0e197dbae7 100644 (file)
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -53,7 +53,7 @@ static int SILENCE_EXCLUDE    = 0x0040; /* x  exclude this pattern  */
 class CommandSVSSilence : public Command
 {
  public:
-       CommandSVSSilence(InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"SVSSILENCE", 0, 2)
+       CommandSVSSilence(Module* Creator) : Command(Creator,"SVSSILENCE", 2)
        {
                syntax = "<target> {[+|-]<mask> <p|c|i|n|t|a|x>}";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END); /* we watch for a nick. not a UID. */
@@ -94,7 +94,7 @@ class CommandSilence : public Command
        unsigned int& maxsilence;
  public:
        SimpleExtItem<silencelist> ext;
-       CommandSilence (InspIRCd* Instance, Module* Creator, unsigned int &max) : Command(Instance, Creator, "SILENCE", 0, 0),
+       CommandSilence(Module* Creator, unsigned int &max) : Command(Creator, "SILENCE", 0),
                maxsilence(max), ext("silence_list", Creator)
        {
                syntax = "{[+|-]<mask> <p|c|i|n|t|a|x>}";
@@ -271,7 +271,7 @@ class ModuleSilence : public Module
  public:
 
        ModuleSilence(InspIRCd* Me)
-               : Module(Me), maxsilence(32), cmdsilence(Me, this, maxsilence), cmdsvssilence(Me, this)
+               : Module(Me), maxsilence(32), cmdsilence(this, maxsilence), cmdsvssilence(this)
        {
                OnRehash(NULL);
                ServerInstance->AddCommand(&cmdsilence);
@@ -298,30 +298,15 @@ class ModuleSilence : public Module
        void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text)
        {
                int public_silence = (message_type == MSG_PRIVMSG ? SILENCE_CHANNEL : SILENCE_CNOTICE);
-               CUList *ulist;
-               switch (status)
-               {
-                       case '@':
-                               ulist = chan->GetOppedUsers();
-                               break;
-                       case '%':
-                               ulist = chan->GetHalfoppedUsers();
-                               break;
-                       case '+':
-                               ulist = chan->GetVoicedUsers();
-                               break;
-                       default:
-                               ulist = chan->GetUsers();
-                               break;
-               }
+               const UserMembList *ulist = chan->GetUsers();
 
-               for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+               for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
                {
                        if (IS_LOCAL(i->first))
                        {
                                if (MatchPattern(i->first, sender, public_silence) == MOD_RES_ALLOW)
                                {
-                                       exempt_list[i->first] = i->first->nick;
+                                       exempt_list.insert(i->first);
                                }
                        }
                }