Change to using Instance->Log (InspIRCd::Log) rather than log() macro

[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 2f06ba55c91514df72c9ab76c3e88edff521a9e8..6e5ba0269f9723fc1c2e5f384898da2da27a7bf3 100644 (file)
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -4,11 +4,11 @@
 #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(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
 {       
         if (channel->modes[CM_KEY])
         {
@@ -20,34 +20,42 @@ std::pair<bool,std::string> ModeChannelKey::ModeSet(userrec* source, userrec* de
         }
 }       
 
+bool ModeChannelKey::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* 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)
 {
-       if (channel->modes[CM_KEY] != adding)
+       if ((channel->modes[CM_KEY] != adding) || (!IS_LOCAL(source)))
        {
-               if ((channel->modes[CM_KEY]) && (strcasecmp(parameter.c_str(),channel->key)))
+               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])
+               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;
                }
-               else if ((channel->modes[CM_KEY]) && (!strcasecmp(parameter.c_str(),channel->key)))
+               else if (((channel->modes[CM_KEY]) && (!strcasecmp(parameter.c_str(),channel->key))) || ((!adding) && (!IS_LOCAL(source))))
                {
                        /* Key is currently set, and correct key was given */
                        *channel->key = 0;
                        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;
        }
 }