m_spanningtree Remove unneeded #includes

[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 877ba87d7fcb297dc2eff272cb4a04d369a14371..fad0dceca0708e3498387aca8a4e746cdfefff43 100644 (file)
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -35,15 +35,13 @@ class ModulePrivacyMode : public Module
  public:
        ModulePrivacyMode() : pm(this)
        {
-               if (!ServerInstance->Modes->AddMode(&pm))
-                       throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-
-       virtual ~ModulePrivacyMode()
+       void init()
        {
+               ServerInstance->Modules->AddService(pm);
+               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual Version GetVersion()
@@ -56,7 +54,7 @@ class ModulePrivacyMode : public Module
                if (target_type == TYPE_USER)
                {
                        User* t = (User*)dest;
-                       if (!IS_OPER(user) && (t->IsModeSet('c')) && (!ServerInstance->ULine(user->server)) && !user->SharesChannelWith(t))
+                       if (!user->IsOper() && (t->IsModeSet('c')) && (!ServerInstance->ULine(user->server)) && !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());
                                return MOD_RES_DENY;
@@ -71,5 +69,4 @@ class ModulePrivacyMode : public Module
        }
 };
 
-
 MODULE_INIT(ModulePrivacyMode)