Fix REMOVE maxparams

[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 148528174b1bf472bd237e26e4e2200e1895953a..32d54bce7a2a72ce495f7812b1b0519b0585142f 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -19,9 +19,9 @@ class OperChans : public ModeHandler
 {
  public:
        /* This is an oper-only mode */
-       OperChans(InspIRCd* Instance) : ModeHandler(Instance, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
+       OperChans(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'O', PARAM_NONE, MODETYPE_CHANNEL) { oper = true; }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -46,46 +46,35 @@ class OperChans : public ModeHandler
 
 class ModuleOperChans : public Module
 {
-       
-       OperChans* oc;
+       OperChans oc;
  public:
        ModuleOperChans(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), oc(Me, this)
        {
-                               
-               oc = new OperChans(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(oc))
+               if (!ServerInstance->Modes->AddMode(&oc))
                        throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnUserPreJoin };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               ServerInstance->Modules->Attach(I_OnUserPreJoin, this);
        }
 
-
-       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+       ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
-               if (!IS_OPER(user))
+               if (chan && chan->IsModeSet('O') && !IS_OPER(user))
                {
-                       if (chan)
-                       {
-                               if (chan->IsModeSet('O'))
-                               {
-                                       user->WriteNumeric(520, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick.c_str(), 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()
+
+       ~ModuleOperChans()
        {
-               ServerInstance->Modes->DelMode(oc);
-               delete oc;
+               ServerInstance->Modes->DelMode(&oc);
        }
-       
-       virtual Version GetVersion()
+
+       Version GetVersion()
        {
-               return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+               return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
        }
 };