#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 ¶meter)
+ModePair ModeChannelKey::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter)
{
if (channel->modes[CM_KEY])
{
}
}
+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 ¶meter, 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;
+ if ((parameter.length()) && (parameter.rfind(' ') == std::string::npos))
+ {
+ strlcpy(channel->key,parameter.c_str(),32);
+ channel->modes[CM_KEY] = adding;
+ return MODEACTION_ALLOW;
+ }
+ else
+ return MODEACTION_DENY;
}
- 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;
}
}