Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[user/henk/code/inspircd.git] / src / modules / m_kicknorejoin.cpp

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index f0244388e95fa55563d1a56bba6a3fcfd4f993b0..2c485fe34bc37ab4276893e60990b7034615ff93 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -68,6 +68,12 @@ class KickRejoin : public ModeHandler
                        }
                        else
                        {
+                               if (!adding)
+                               {
+                                       channel->SetModeParam('J', parameter.c_str(), adding);
+                                       return MODEACTION_ALLOW;
+                               }
+
                                std::string cur_param = channel->GetModeParameter('J');
                                if (cur_param == parameter)
                                {
@@ -115,7 +121,7 @@ public:
                ServerInstance->AddMode(kr, 'J');
        }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                if (chan)
                {
@@ -206,7 +212,7 @@ public:
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };