Annotations

[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 ebe4bc654d80b2be1fd691416c38063b50b67858..53d21cae96e70a757791958f677f3fa8f127d8a4 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -16,11 +16,10 @@
 
 using namespace std;
 
-#include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
 
@@ -28,7 +27,7 @@ class OperChans : public ModeHandler
 {
  public:
        /* This is an oper-only mode */
-       OperChans() : ModeHandler('O', 0, 0, false, MODETYPE_CHANNEL, true) { }
+       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)
        {
@@ -55,28 +54,22 @@ class OperChans : public ModeHandler
 
 class ModuleOperChans : public Module
 {
-       Server* Srv;
+       
        OperChans* oc;
  public:
-       ModuleOperChans(Server* Me)
+       ModuleOperChans(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               // Add a mode +O for channels with no parameters                
-               oc = new OperChans();
-               Srv->AddMode(oc, 'O');
+                               
+               oc = new OperChans(ServerInstance);
+               ServerInstance->AddMode(oc, 'O');
        }
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
-       }
-       
-       virtual void On005Numeric(std::string &output)
-       {
-               InsertMode(output,"O",4);
+               List[I_OnUserPreJoin] = 1;
        }
-       
+
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
        {
                if (!*user->oper)
@@ -85,7 +78,7 @@ class ModuleOperChans : public Module
                        {
                                if (chan->IsModeSet('O'))
                                {
-                                       WriteServ(user->fd,"520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
+                                       user->WriteServ("520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
                                        return 1;
                                }
                        }
@@ -95,12 +88,13 @@ class ModuleOperChans : public Module
        
        virtual ~ModuleOperChans()
        {
+               ServerInstance->Modes->DelMode(oc);
                DELETE(oc);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1,0,0,0,VF_VENDOR|VF_COMMON);
        }
 };
 
@@ -116,7 +110,7 @@ class ModuleOperChansFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleOperChans(Me);
        }