Fixes for bug #493, tidyups to clearing of channel modes on losing FJOIN. Module...

[user/henk/code/inspircd.git] / src / modes / cmode_k.cpp

diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp
index e54aa688aed34277a26135d56fac8d4c9ee413c5..194c0efcbc0a14c679cdd9421dd1d2c9f3e5e680 100644 (file)
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -1,14 +1,27 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
 #include "modes/cmode_k.h"
 
-ModeChannelKey::ModeChannelKey() : ModeHandler('k', 1, 1, false, MODETYPE_CHANNEL, false)
+ModeChannelKey::ModeChannelKey(InspIRCd* Instance) : ModeHandler(Instance, 'k', 1, 1, false, MODETYPE_CHANNEL, false)
 {
 }
 
-std::pair<bool,std::string> ModeChannelKey::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelKey::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {       
         if (channel->modes[CM_KEY])
         {
@@ -18,30 +31,59 @@ std::pair<bool,std::string> ModeChannelKey::ModeSet(userrec* source, userrec* de
         {
                 return std::make_pair(false, parameter);
         }
-}       
+}
+
+void ModeChannelKey::RemoveMode(Channel* channel, irc::modestacker* stack)
+{
+       /** +k needs a parameter when being removed,
+        * so we have a special-case RemoveMode here for it
+        */
+       char moderemove[MAXBUF];
+       const char* parameters[] = { channel->name, moderemove, channel->key };
+
+       if (channel->IsModeSet(this->GetModeChar()))
+       {
+               if (stack)
+                       stack->Push(this->GetModeChar(), channel->key);
+               else
+               {
+                       sprintf(moderemove,"-%c",this->GetModeChar());
+                       ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
+               }
+       }
+}
+
+void ModeChannelKey::RemoveMode(User*, irc::modestacker* stack)
+{
+}
 
-bool ModeChannelKey::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+bool ModeChannelKey::CheckTimeStamp(time_t, time_t, const std::string &their_param, const std::string &our_param, Channel*)
 {
        /* When TS is equal, the alphabetically later channel key wins */
        return (their_param < our_param);
 }
 
-ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
 {
        if ((channel->modes[CM_KEY] != adding) || (!IS_LOCAL(source)))
        {
                if (((channel->modes[CM_KEY]) && (strcasecmp(parameter.c_str(),channel->key))) && (IS_LOCAL(source)))
                {
                        /* Key is currently set and the correct key wasnt given */
-                       log(DEBUG,"Key Cond 2");
                        return MODEACTION_DENY;
                }
                else if ((!channel->modes[CM_KEY]) || ((adding) && (!IS_LOCAL(source))))
                {
                        /* Key isnt currently set */
-                       strlcpy(channel->key,parameter.c_str(),32);
-                       channel->modes[CM_KEY] = adding;
-                       return MODEACTION_ALLOW;
+                       if ((parameter.length()) && (parameter.rfind(' ') == std::string::npos))
+                       {
+                               strlcpy(channel->key,parameter.c_str(),32);
+                               channel->modes[CM_KEY] = adding;
+                               parameter = channel->key;
+                               return MODEACTION_ALLOW;
+                       }
+                       else
+                               return MODEACTION_DENY;
                }
                else if (((channel->modes[CM_KEY]) && (!strcasecmp(parameter.c_str(),channel->key))) || ((!adding) && (!IS_LOCAL(source))))
                {
@@ -50,12 +92,11 @@ ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec*
                        channel->modes[CM_KEY] = adding;
                        return MODEACTION_ALLOW;
                }
-               log(DEBUG,"Key Cond three");
                return MODEACTION_DENY;
        }
        else
        {
-               log(DEBUG,"Key Condition one");
                return MODEACTION_DENY;
        }
 }
+