Remove unneeded headers from spanningtree. This was done to the rest of the source...

[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 bb804676b8c7ed2f7fa101698297cbb1c8eb6902..69e5038612f61e9029e36f1836a18df2fcc594c4 100644 (file)
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -2,38 +2,28 @@
  *       | 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 "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Only opers may create new channels if this module is loaded */
 
 class ModuleRestrictChans : public Module
 {
-       Server* Srv;
+       
 
        std::map<irc::string,int> allowchans;
 
        void ReadConfig()
        {
-               ConfigReader* MyConf = new ConfigReader();
+               ConfigReader* MyConf = new ConfigReader(ServerInstance);
                allowchans.clear();
                for (int i = 0; i < MyConf->Enumerate("allowchannel"); i++)
                {
@@ -46,14 +36,14 @@ class ModuleRestrictChans : public Module
        }
 
  public:
-       ModuleRestrictChans(Server* Me)
-               : Module::Module(Me)
+       ModuleRestrictChans(InspIRCd* Me)
+               : Module(Me)
        {
-               Srv = Me;
+               
                ReadConfig();
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                ReadConfig();
        }
@@ -63,11 +53,11 @@ class ModuleRestrictChans : public Module
                List[I_OnUserPreJoin] = List[I_OnRehash] = 1;
        }
        
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                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)
@@ -79,38 +69,14 @@ class ModuleRestrictChans : public Module
                return 0;
        }
        
-       virtual ~ModuleRestrictChans()
+       virtual ~ModuleRestrictChans()
        {
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
-       }
-};
-
-
-class ModuleRestrictChansFactory : public ModuleFactory
-{
- public:
-       ModuleRestrictChansFactory()
-       {
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
-       
-       ~ModuleRestrictChansFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleRestrictChans(Me);
-       }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleRestrictChansFactory;
-}
-
+MODULE_INIT(ModuleRestrictChans)