Rip flood/threshold out of config classes also.

[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 7bc132515625fea795162c0d0179dd844109d0da..61e423aefee33de298b5eaafab8418eaceebebfb 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -63,15 +63,14 @@ class ModuleOperChans : public Module
 
        virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
-               bool banned = false;
-
                if (!IS_OPER(user))
                {
                        if (chan)
                        {
                                if (chan->IsModeSet('O'))
                                {
-                                       banned = true;
+                                       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;
                                }
                        }
                }
@@ -79,16 +78,11 @@ class ModuleOperChans : public Module
                {
                        if (chan && chan->IsExtBanned(user->oper, 'O'))
                        {
-                               banned = true;
+                               user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  chan->name.c_str());
+                               return 1;
                        }
                }
 
-               if (banned)
-               {
-                       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;
-               }
-
                return 0;
        }
 
@@ -100,7 +94,7 @@ class ModuleOperChans : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+               return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
        }
 };