fix some unitialised vectors and tidy up a bit.

[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 e9af24ad09337ca2f004676f521f122f6f395ded..4153fa3550927c823e6c5ae12b22b3e88ce4c2b3 100644 (file)
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -22,7 +22,7 @@ class PrivacyMode : public ModeHandler
  public:
        PrivacyMode(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_USER, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
@@ -52,41 +52,39 @@ class ModulePrivacyMode : public Module
        ModulePrivacyMode(InspIRCd* Me) : Module(Me)
        {
                pm = new PrivacyMode(ServerInstance);
-               if (!ServerInstance->AddMode(pm, 'c'))
+               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);
+               delete pm;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0, VF_COMMON|VF_VENDOR, API_VERSION);
+               return Version(1,2,0,0, VF_COMMON|VF_VENDOR, API_VERSION);
        }
 
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_USER)
                {
-                       userrec* t = (userrec*)dest;
+                       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(531, "%s %s :You are not permitted to send private messages to this user (+c set)", user->nick, t->nick);
                                return 1;
                        }
                }
                return 0;
        }
 
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
        }