Replace OnAccessCheck with OnPreMode to remove a number of redundant checks

[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 a09131354a6bdc8eb4f7b46b4568964eb2ae0917..c785f6705c682d5730df95a171922ab90d43756e 100644 (file)
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,7 +17,7 @@
 #include "users.h"
 #include "modes/cmode_k.h"
 
-ModeChannelKey::ModeChannelKey(InspIRCd* Instance) : ModeHandler(Instance, 'k', 1, 1, false, MODETYPE_CHANNEL, false)
+ModeChannelKey::ModeChannelKey(InspIRCd* Instance) : ModeHandler(Instance, NULL, 'k', 1, 1, false, MODETYPE_CHANNEL, false)
 {
 }
 
@@ -40,15 +40,18 @@ void ModeChannelKey::RemoveMode(Channel* channel, irc::modestacker* stack)
         * so we have a special-case RemoveMode here for it
         */
 
-       if (channel->IsModeSet(this->GetModeChar()))
+       if (channel->IsModeSet('k'))
        {
                if (stack)
                {
-                       stack->Push(this->GetModeChar(), channel->GetModeParameter('k'));
+                       stack->Push('k', channel->GetModeParameter('k'));
                }
                else
                {
-                       std::vector<std::string> parameters; parameters.push_back(channel->name); parameters.push_back("-k"); parameters.push_back(channel->GetModeParameter('k'));
+                       std::vector<std::string> parameters;
+                       parameters.push_back(channel->name);
+                       parameters.push_back("-k");
+                       parameters.push_back(channel->GetModeParameter('k'));
                        ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
                }
        }
@@ -58,13 +61,7 @@ void ModeChannelKey::RemoveMode(User*, irc::modestacker* stack)
 {
 }
 
-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(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
+ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
 {
        bool exists = channel->IsModeSet('k');
        if (IS_LOCAL(source))
@@ -91,11 +88,16 @@ ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, s
        if (parameter.rfind(' ') != std::string::npos)
                return MODEACTION_DENY;
 
-       std::string ckey;
-       ckey.assign(parameter, 0, 32);
-       parameter = ckey;
-       if (adding && exists)
-               channel->SetMode('k', false);
-       channel->SetModeParam('k', parameter.c_str(), adding);
+       if (adding)
+       {
+               std::string ckey;
+               ckey.assign(parameter, 0, 32);
+               parameter = ckey;
+               channel->SetModeParam('k', parameter);
+       }
+       else
+       {
+               channel->SetModeParam('k', "");
+       }
        return MODEACTION_ALLOW;
 }