Change User::oper to an OperInfo reference

[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 16c988ce8c69841f5a0fa939799df423c453a681..205d9a412b3427633d63d3e4ba0100762dec354e 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -2,25 +2,16 @@
  *       | 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.
  *
  * ---------------------------------------------------
  */
 
-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 */
 
@@ -28,9 +19,9 @@ class OperChans : public ModeHandler
 {
  public:
        /* This is an oper-only mode */
-       OperChans() : ModeHandler('O', 0, 0, false, MODETYPE_CHANNEL, true) { }
+       OperChans(Module* Creator) : ModeHandler(Creator, "operonly", 'O', PARAM_NONE, MODETYPE_CHANNEL) { oper = true; }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -55,77 +46,50 @@ class OperChans : public ModeHandler
 
 class ModuleOperChans : public Module
 {
-       Server* Srv;
-       OperChans* oc;
+       OperChans oc;
  public:
-       ModuleOperChans(Server* Me)
-               : Module::Module(Me)
+       ModuleOperChans() : oc(this)
        {
-               Srv = Me;
-               // Add a mode +O for channels with no parameters                
-               oc = new OperChans();
-               Srv->AddMode(oc, 'O');
+               if (!ServerInstance->Modes->AddMode(&oc))
+                       throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric, I_OnUserPreJoin };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
-       void Implements(char* List)
-       {
-               List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
-       }
-       
-       virtual void On005Numeric(std::string &output)
-       {
-               InsertMode(output,"O",4);
-       }
-       
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
-               if (!*user->oper)
+               if (chan && chan->IsModeSet('O') && !IS_OPER(user))
                {
-                       if (chan)
-                       {
-                               if (chan->IsModeSet('O'))
-                               {
-                                       user->WriteServ("520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
-                                       return 1;
-                               }
-                       }
+                       user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join %s (+O is set)",
+                               user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
+                       return MOD_RES_DENY;
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
-       
-       virtual ~ModuleOperChans()
-       {
-               DELETE(oc);
-       }
-       
-       virtual Version GetVersion()
+
+       ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               if (mask[0] == 'O' && mask[1] == ':')
+               {
+                       if (IS_OPER(user) && InspIRCd::Match(user->oper->name, mask.substr(2)))
+                               return MOD_RES_DENY;
+               }
+               return MOD_RES_PASSTHRU;
        }
-};
 
-
-class ModuleOperChansFactory : public ModuleFactory
-{
- public:
-       ModuleOperChansFactory()
+       void On005Numeric(std::string &output)
        {
+               ServerInstance->AddExtBanChar('O');
        }
-       
-       ~ModuleOperChansFactory()
+
+       ~ModuleOperChans()
        {
        }
-       
-       virtual Module * CreateModule(Server* Me)
+
+       Version GetVersion()
        {
-               return new ModuleOperChans(Me);
+               return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR | VF_COMMON);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleOperChansFactory;
-}
-
+MODULE_INIT(ModuleOperChans)