Remove InspIRCd* parameters and fields

[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 b6d34bf259f1616a54c57bf8fb90116c94cd514a..bc66afce5577bd14bb714662ada1484f0aa05849 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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/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;
                allowchans.clear();
                for (int i = 0; i < MyConf->Enumerate("allowchannel"); i++)
                {
@@ -46,71 +36,47 @@ class ModuleRestrictChans : public Module
        }
 
  public:
-       ModuleRestrictChans(Server* Me)
-               : Module::Module(Me)
-       {
-               Srv = Me;
+       ModuleRestrictChans()
+                       {
+
                ReadConfig();
+               Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual void OnRehash(std::string parameter)
+       virtual void OnRehash(User* user)
        {
                ReadConfig();
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreJoin] = List[I_OnRehash] = 1;
-       }
-       
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+
+       virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                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_LOCAL(user))
+                       return MOD_RES_PASSTHRU;
+
+               // channel does not yet exist (record is null, about to be created IF we were to allow it)
+               if (!chan)
                {
-                       // channel does not yet exist (record is null, about to be created IF we were to allow it)
-                       if (!chan)
+                       // user is not an oper and its not in the allow list
+                       if ((!IS_OPER(user)) && (allowchans.find(x) == allowchans.end()))
                        {
-                               WriteServ(user->fd,"530 %s %s :Only IRC operators may create new channels",user->nick,cname,cname);
-                               return 1;
+                               user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Only IRC operators may create new channels",user->nick.c_str(),cname);
+                               return MOD_RES_DENY;
                        }
                }
-               return 0;
-       }
-       
-       virtual ~ModuleRestrictChans()
-       {
-       }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,0,0,1,VF_VENDOR);
+               return MOD_RES_PASSTHRU;
        }
-};
-
 
-class ModuleRestrictChansFactory : public ModuleFactory
-{
- public:
-       ModuleRestrictChansFactory()
+       virtual ~ModuleRestrictChans()
        {
        }
-       
-       ~ModuleRestrictChansFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
+
+       virtual Version GetVersion()
        {
-               return new ModuleRestrictChans(Me);
+               return Version("Only opers may create new channels if this module is loaded",VF_VENDOR,API_VERSION);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleRestrictChansFactory;
-}
-
+MODULE_INIT(ModuleRestrictChans)