Convert more modules

[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 03444ea1a612b4344ba0a19e20657b7f35bb3a6e..404a021836a1fd802443d76915bcaff0d382e47c 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -2,24 +2,19 @@
  *       | 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 "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
 
@@ -58,11 +53,12 @@ class ModuleOperChans : public Module
        OperChans* oc;
  public:
        ModuleOperChans(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                                
                oc = new OperChans(ServerInstance);
-               ServerInstance->AddMode(oc, 'O');
+               if (!ServerInstance->AddMode(oc, 'O'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        void Implements(char* List)
@@ -70,9 +66,9 @@ class ModuleOperChans : public Module
                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)
+               if (!IS_OPER(user))
                {
                        if (chan)
                        {
@@ -86,7 +82,7 @@ class ModuleOperChans : public Module
                return 0;
        }
        
-       virtual ~ModuleOperChans()
+       virtual ~ModuleOperChans()
        {
                ServerInstance->Modes->DelMode(oc);
                DELETE(oc);
@@ -94,7 +90,7 @@ class ModuleOperChans : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR);
+               return Version(1,1,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
        }
 };
 
@@ -118,7 +114,7 @@ class ModuleOperChansFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleOperChansFactory;
 }