Add access checking for m_autoop

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

diff --git a/src/modules/m_muteban.cpp b/src/modules/m_muteban.cpp
index 8a3d40896939bb065a48e51a035a3d7d709765cf..1445889aebc3f3b56826a905b0dc83c75f0daec6 100644 (file)
--- a/src/modules/m_muteban.cpp
+++ b/src/modules/m_muteban.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -19,8 +19,7 @@ class ModuleQuietBan : public Module
 {
  private:
  public:
-       ModuleQuietBan(InspIRCd* Me) : Module(Me)
-       {
+       ModuleQuietBan()        {
                Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 3);
        }
@@ -31,41 +30,27 @@ class ModuleQuietBan : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("Implements extban +b m: - mute bans",VF_OPTCOMMON|VF_VENDOR);
        }
 
-       virtual int OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               if (!IS_LOCAL(user))
-                       return 0;
+               if (!IS_LOCAL(user) || target_type != TYPE_CHANNEL)
+                       return MOD_RES_PASSTHRU;
 
-               if (target_type == TYPE_CHANNEL)
+               Channel* chan = static_cast<Channel*>(dest);
+               if (chan->GetExtBanStatus(user, 'm') == MOD_RES_DENY && chan->GetPrefixValue(user) < VOICE_VALUE)
                {
-                       if (((Channel *)dest)->GetExtBanStatus(user, 'm') < 0)
-                       {
-                               user->WriteNumeric(404, "%s %s :Cannot send to channel (you're muted)",user->nick.c_str(), ((Channel *)dest)->name.c_str());
-                               return 1;
-                       }
+                       user->WriteNumeric(404, "%s %s :Cannot send to channel (you're muted)", user->nick.c_str(), chan->name.c_str());
+                       return MOD_RES_DENY;
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               if (!IS_LOCAL(user))
-                       return 0;
-
-               if (target_type == TYPE_CHANNEL)
-               {
-                       if (((Channel *)dest)->GetExtBanStatus(user, 'm') < 0)
-                       {
-                               user->WriteNumeric(404, "%s %s :Cannot send to channel (you're muted)",user->nick.c_str(), ((Channel *)dest)->name.c_str());
-                               return 1;
-                       }
-               }
-
-               return 0;
+               return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
        }
 
        virtual void On005Numeric(std::string &output)