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 59d401ebb363d6d6573de127dfea386ae8e9835f..c785f6705c682d5730df95a171922ab90d43756e 100644 (file)
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -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)
 {
 }
 
@@ -61,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))