This needs some general QA-ing. Add support to new parser (introduced in 1.1) for...

[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 8d066b2111e1db4740d8b7327b7aa6332f1c6dfc..6852bc6085dff4266aab59ec5f847709cfd40e5f 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -2,25 +2,18 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-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 */
@@ -29,7 +22,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)
        {
@@ -56,29 +49,24 @@ 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);
+               if (!ServerInstance->AddMode(oc, 'O'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        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)
+
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                if (!*user->oper)
                {
@@ -96,12 +84,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,1,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
        }
 };
 
@@ -117,7 +106,7 @@ class ModuleOperChansFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleOperChans(Me);
        }