* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
#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(NULL, 'k', PARAM_ALWAYS, MODETYPE_CHANNEL)
{
}
ModePair ModeChannelKey::ModeSet(User*, User*, Channel* channel, const std::string ¶meter)
-{
- if (channel->modes[CM_KEY])
- {
- return std::make_pair(true, channel->key);
- }
- else
- {
- return std::make_pair(false, parameter);
- }
+{
+ if (channel->modes[CM_KEY])
+ {
+ std::string ckey = channel->GetModeParameter('k');
+ return std::make_pair(true, ckey);
+ }
+ else
+ {
+ return std::make_pair(false, parameter);
+ }
}
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->key);
+ {
+ 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->key);
+ 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);
}
}
{
}
-bool ModeChannelKey::CheckTimeStamp(time_t, time_t, const std::string &their_param, const std::string &our_param, Channel*)
+ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding)
{
- /* 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 ¶meter, bool adding, bool servermode)
-{
- if ((channel->modes[CM_KEY] != adding) || (!IS_LOCAL(source)))
+ bool exists = channel->IsModeSet('k');
+ if (IS_LOCAL(source))
{
- if (((channel->modes[CM_KEY]) && (strcasecmp(parameter.c_str(),channel->key))) && (IS_LOCAL(source)))
+ if (exists == adding)
+ return MODEACTION_DENY;
+ if (exists && (parameter != channel->GetModeParameter('k')))
{
/* Key is currently set and the correct key wasnt given */
return MODEACTION_DENY;
}
- else if ((!channel->modes[CM_KEY]) || ((adding) && (!IS_LOCAL(source))))
- {
- /* Key isnt currently set */
- if ((parameter.length()) && (parameter.rfind(' ') == std::string::npos))
- {
- strlcpy(channel->key,parameter.c_str(),32);
- channel->modes[CM_KEY] = adding;
- parameter = channel->key;
- return MODEACTION_ALLOW;
- }
- else
- return MODEACTION_DENY;
- }
- else if (((channel->modes[CM_KEY]) && (!strcasecmp(parameter.c_str(),channel->key))) || ((!adding) && (!IS_LOCAL(source))))
+ } else {
+ if (exists && adding && parameter == channel->GetModeParameter('k'))
{
- /* Key is currently set, and correct key was given */
- *channel->key = 0;
- channel->modes[CM_KEY] = adding;
- return MODEACTION_ALLOW;
+ /* no-op, don't show */
+ return MODEACTION_DENY;
}
+ }
+
+ /* invalid keys */
+ if (!parameter.length())
+ return MODEACTION_DENY;
+
+ if (parameter.rfind(' ') != std::string::npos)
return MODEACTION_DENY;
+
+ if (adding)
+ {
+ std::string ckey;
+ ckey.assign(parameter, 0, 32);
+ parameter = ckey;
+ channel->SetModeParam('k', parameter);
}
else
{
- return MODEACTION_DENY;
+ channel->SetModeParam('k', "");
}
+ return MODEACTION_ALLOW;
}
-