Revert automated conversion by Special, as it (unfortunately) neglects some details...

[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 15ef0faf93a944e4d41f7be8767c5d7f1b14a970..207c468b14583e48f6c49f27b40a18d0ba7bde82 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
@@ -24,7 +21,7 @@ class OperChans : public ModeHandler
        /* This is an oper-only mode */
        OperChans(InspIRCd* Instance) : ModeHandler(Instance, 'O', 0, 0, false, MODETYPE_CHANNEL, 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, bool)
        {
                if (adding)
                {
@@ -49,24 +46,22 @@ class OperChans : public ModeHandler
 
 class ModuleOperChans : public Module
 {
-       
+
        OperChans* oc;
  public:
        ModuleOperChans(InspIRCd* Me)
                : Module(Me)
        {
-                               
+
                oc = new OperChans(ServerInstance);
-               if (!ServerInstance->AddMode(oc, 'O'))
+               if (!ServerInstance->Modes->AddMode(oc))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreJoin };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreJoin] = 1;
-       }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if (!IS_OPER(user))
                {
@@ -74,48 +69,33 @@ class ModuleOperChans : public Module
                        {
                                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);
+                                       user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
                                        return 1;
                                }
                        }
                }
+               else
+               {
+                       if (chan && chan->IsExtBanned(user->oper, 'O'))
+                       {
+                               user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  chan->name.c_str());
+                               return 1;
+                       }
+               }
+
                return 0;
        }
-       
-       virtual ~ModuleOperChans()
+
+       virtual ~ModuleOperChans()
        {
                ServerInstance->Modes->DelMode(oc);
-               DELETE(oc);
-       }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,1,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+               delete oc;
        }
-};
 
-
-class ModuleOperChansFactory : public ModuleFactory
-{
- public:
-       ModuleOperChansFactory()
-       {
-       }
-       
-       ~ModuleOperChansFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
+       virtual Version GetVersion()
        {
-               return new ModuleOperChans(Me);
+               return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
        }
-       
 };
 
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleOperChansFactory;
-}
-
+MODULE_INIT(ModuleOperChans)