Allow commands to optionally route themselves using ENCAP

[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 61e423aefee33de298b5eaafab8418eaceebebfb..8723f6ca04d15e5723f5b220f8aa7946c98bf3b3 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.
@@ -47,49 +47,39 @@ class OperChans : public ModeHandler
 class ModuleOperChans : public Module
 {
 
-       OperChans* oc;
+       OperChans oc;
  public:
        ModuleOperChans(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), oc(Me)
        {
-
-               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);
+               Implementation eventlist[] = { I_OnCheckBan, I_OnUserPreJoin };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-
        virtual int 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(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;
-                       }
+                       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 1;
                }
+               return 0;
+       }
+
+       virtual int OnCheckBan(User* user, Channel* chan)
+       {
+               if (IS_OPER(user))
+                       return chan->GetExtBanStatus(user->oper, 'O');
 
                return 0;
        }
 
        virtual ~ModuleOperChans()
        {
-               ServerInstance->Modes->DelMode(oc);
-               delete oc;
+               ServerInstance->Modes->DelMode(&oc);
        }
 
        virtual Version GetVersion()