httpd connection close fixes (these need to be backported to 1.1 at some point?)...

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

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 24772aea7e7fe0c75b2af5123b52d0daef79c4e4..d1111fd864584098ff4d1eff7d7919e6d6bc54b6 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.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
@@ -21,7 +21,7 @@ class OperChans : public ModeHandler
        /* This is an oper-only mode */
        OperChans(InspIRCd* Instance) : ModeHandler(Instance, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
 
-       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)
                {
@@ -54,16 +54,14 @@ class ModuleOperChans : public Module
        {
                                
                oc = new OperChans(ServerInstance);
-               if (!ServerInstance->AddMode(oc, 'O'))
+               if (!ServerInstance->Modes->AddMode(oc))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreJoin };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreJoin] = 1;
-       }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if (!IS_OPER(user))
                {
@@ -71,7 +69,7 @@ class ModuleOperChans : public Module
                        {
                                if (chan->IsModeSet('O'))
                                {
-                                       user->WriteServ("520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
+                                       user->WriteNumeric(520, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
                                        return 1;
                                }
                        }
@@ -82,12 +80,12 @@ class ModuleOperChans : public Module
        virtual ~ModuleOperChans()
        {
                ServerInstance->Modes->DelMode(oc);
-               DELETE(oc);
+               delete oc;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+               return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
        }
 };