The module hook is kinda required.

[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 c584fa1ac2fe4d12970ad812f3a4aaa3c258b3fe..cc00b53f508cafca8f52cf1dcbaa07596e349cb2 100644 (file)
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -22,7 +22,7 @@ class PrivacyMode : public ModeHandler
  public:
        PrivacyMode(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_USER, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
@@ -40,7 +40,7 @@ class PrivacyMode : public ModeHandler
                                return MODEACTION_ALLOW;
                        }
                }
-               
+
                return MODEACTION_DENY;
        }
 };
@@ -52,22 +52,22 @@ class ModulePrivacyMode : public Module
        ModulePrivacyMode(InspIRCd* Me) : Module(Me)
        {
                pm = new PrivacyMode(ServerInstance);
-               if (!ServerInstance->AddMode(pm))
+               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()
        {
                ServerInstance->Modes->DelMode(pm);
                delete pm;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0, VF_COMMON|VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON|VF_VENDOR, API_VERSION);
        }
 
        virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
@@ -77,7 +77,7 @@ class ModulePrivacyMode : public Module
                        User* t = (User*)dest;
                        if (!IS_OPER(user) && (t->IsModeSet('c')) && (!ServerInstance->ULine(user->server)) && !user->SharesChannelWith(t))
                        {
-                               user->WriteServ("531 %s %s :You are not permitted to send private messages to this user (+c set)", user->nick, t->nick);
+                               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 1;
                        }
                }