Allow commands to optionally route themselves using ENCAP

[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 95642729d89a65c2d92a139a5b29e8294718d215..1e84719554a7151c95b525faa70a1970b4a98dd0 100644 (file)
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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,38 +40,32 @@ class PrivacyMode : public ModeHandler
                                return MODEACTION_ALLOW;
                        }
                }
-               
+
                return MODEACTION_DENY;
        }
 };
 
 class ModulePrivacyMode : public Module
 {
-       PrivacyMode* pm;
+       PrivacyMode pm;
  public:
-       ModulePrivacyMode(InspIRCd* Me) : Module(Me)
+       ModulePrivacyMode(InspIRCd* Me) : Module(Me), pm(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);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
-       }
-       
+
        virtual ~ModulePrivacyMode()
        {
-               ServerInstance->Modes->DelMode(pm);
-               delete pm;
+               ServerInstance->Modes->DelMode(&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)
@@ -81,7 +75,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;
                        }
                }