Convert more modules

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

diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index abfb6f580ac80eacc2303f47ed6eb59a81ec54af..4f8bc04bd64e53a02d8f780cc6851c2f378dec63 100644 (file)
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -2,28 +2,20 @@
  *       | 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.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <map>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
-#include "inspircd.h"
-
 /* $ModDesc: Only opers may create new channels if this module is loaded */
 
 class ModuleRestrictChans : public Module
@@ -48,13 +40,13 @@ class ModuleRestrictChans : public Module
 
  public:
        ModuleRestrictChans(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                ReadConfig();
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                ReadConfig();
        }
@@ -68,7 +60,7 @@ class ModuleRestrictChans : public Module
        {
                irc::string x = cname;
                // user is not an oper and its not in the allow list
-               if ((!*user->oper) && (allowchans.find(x) == allowchans.end()))
+               if ((!IS_OPER(user)) && (allowchans.find(x) == allowchans.end()))
                {
                        // channel does not yet exist (record is null, about to be created IF we were to allow it)
                        if (!chan)
@@ -80,7 +72,7 @@ class ModuleRestrictChans : public Module
                return 0;
        }
        
-       virtual ~ModuleRestrictChans()
+       virtual ~ModuleRestrictChans()
        {
        }
        
@@ -110,7 +102,7 @@ class ModuleRestrictChansFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleRestrictChansFactory;
 }