Add optional oper override umode +O.

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

diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp
index 9401bcd5c4adbffe1552e593aeb5aca1338683d6..678be0c4338352ae5df23e271b96d69b8c6adc0a 100644 (file)
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -19,28 +19,13 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Adds user mode +c, which if set, users must be on a common channel with you to private message you */
-
-/** Handles user mode +c
- */
-class PrivacyMode : public SimpleUserModeHandler
-{
- public:
-       PrivacyMode(Module* Creator) : SimpleUserModeHandler(Creator, "deaf_commonchan", 'c') { }
-};
-
 class ModulePrivacyMode : public Module
 {
-       PrivacyMode pm;
+       SimpleUserModeHandler pm;
  public:
-       ModulePrivacyMode() : pm(this)
-       {
-       }
-
-       void init() CXX11_OVERRIDE
+       ModulePrivacyMode()
+               : pm(this, "deaf_commonchan", 'c')
        {
-               ServerInstance->Modules->AddService(pm);
-               ServerInstance->Modules->Attach(I_OnUserPreMessage, this);
        }
 
        Version GetVersion() CXX11_OVERRIDE
@@ -53,9 +38,9 @@ class ModulePrivacyMode : public Module
                if (target_type == TYPE_USER)
                {
                        User* t = (User*)dest;
-                       if (!user->IsOper() && (t->IsModeSet(pm)) && (!ServerInstance->ULine(user->server)) && !user->SharesChannelWith(t))
+                       if (!user->IsOper() && (t->IsModeSet(pm)) && (!user->server->IsULine()) && !user->SharesChannelWith(t))
                        {
-                               user->WriteNumeric(ERR_CANTSENDTOUSER, "%s %s :You are not permitted to send private messages to this user (+c set)", user->nick.c_str(), t->nick.c_str());
+                               user->WriteNumeric(ERR_CANTSENDTOUSER, t->nick, "You are not permitted to send private messages to this user (+c set)");
                                return MOD_RES_DENY;
                        }
                }