If the user's nick is just a case change, the TS is NOT updated (thanks jilles)

[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 b32ad5c2ba2aabcae72d61bb055b40240b01cc9a..f6a29af35f68bd64056a85896c25950e79b6c496 100644 (file)
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -1,3 +1,16 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 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"
@@ -22,19 +35,16 @@ ModePair ModeChannelKey::ModeSet(userrec* source, userrec* dest, chanrec* channe
 
 void ModeChannelKey::RemoveMode(chanrec* channel)
 {
+       /** +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()))
        {
-               userrec* n = new userrec(ServerInstance);
-
                sprintf(moderemove,"-%c",this->GetModeChar());
-               n->SetFd(FD_MAGIC_NUMBER);
-
-               ServerInstance->SendMode(parameters, 3, n);
-
-               delete n;
+               ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
        }
 }
 
@@ -55,7 +65,6 @@ ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec*
                if (((channel->modes[CM_KEY]) && (strcasecmp(parameter.c_str(),channel->key))) && (IS_LOCAL(source)))
                {
                        /* Key is currently set and the correct key wasnt given */
-                       ServerInstance->Log(DEBUG,"Key Cond 2");
                        return MODEACTION_DENY;
                }
                else if ((!channel->modes[CM_KEY]) || ((adding) && (!IS_LOCAL(source))))
@@ -65,6 +74,7 @@ ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec*
                        {
                                strlcpy(channel->key,parameter.c_str(),32);
                                channel->modes[CM_KEY] = adding;
+                               parameter = channel->key;
                                return MODEACTION_ALLOW;
                        }
                        else
@@ -77,12 +87,11 @@ ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec*
                        channel->modes[CM_KEY] = adding;
                        return MODEACTION_ALLOW;
                }
-               ServerInstance->Log(DEBUG,"Key Cond three");
                return MODEACTION_DENY;
        }
        else
        {
-               ServerInstance->Log(DEBUG,"Key Condition one");
                return MODEACTION_DENY;
        }
 }
+