Note to self, cast time_t to long int for printf... thanks Ankit for pointing this...

[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 549e4008dfbeffafb3a841d08b4b2ef049c46884..b8f7f2415d269a6e1c3b003dda34bcfe40ddf6fc 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-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -46,13 +46,13 @@ class OperChans : public ModeHandler
 
 class ModuleOperChans : public Module
 {
-       
+
        OperChans* oc;
  public:
        ModuleOperChans(InspIRCd* Me)
                : Module(Me)
        {
-                               
+
                oc = new OperChans(ServerInstance);
                if (!ServerInstance->Modes->AddMode(oc))
                        throw ModuleException("Could not add new modes!");
@@ -61,7 +61,7 @@ class ModuleOperChans : public Module
        }
 
 
-       virtual int OnUserPreJoin(User* user, Channel* 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))
                {
@@ -69,23 +69,32 @@ 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()
        {
                ServerInstance->Modes->DelMode(oc);
                delete oc;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+               return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
        }
 };