+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ * the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
#include "inspircd.h"
#include "mode.h"
#include "channels.h"
{
}
-ModePair ModeChannelKey::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter)
+ModePair ModeChannelKey::ModeSet(User*, User*, Channel* channel, const std::string ¶meter)
{
if (channel->modes[CM_KEY])
{
}
}
-void ModeChannelKey::RemoveMode(chanrec* channel)
+void ModeChannelKey::RemoveMode(Channel* channel, irc::modestacker* stack)
{
/** +k needs a parameter when being removed,
* so we have a special-case RemoveMode here for it
*/
- char moderemove[MAXBUF];
- const char* parameters[] = { channel->name, moderemove, channel->key };
if (channel->IsModeSet(this->GetModeChar()))
{
- userrec* n = new userrec(ServerInstance);
-
- sprintf(moderemove,"-%c",this->GetModeChar());
- n->SetFd(FD_MAGIC_NUMBER);
-
- ServerInstance->SendMode(parameters, 3, n);
-
- delete n;
+ if (stack)
+ stack->Push(this->GetModeChar(), channel->key);
+ else
+ {
+ std::vector<std::string> parameters; parameters.push_back(channel->name); parameters.push_back("-k"); parameters.push_back(channel->key);
+ ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
+ }
}
}
-void ModeChannelKey::RemoveMode(userrec* user)
+void ModeChannelKey::RemoveMode(User*, irc::modestacker* stack)
{
}
-bool ModeChannelKey::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+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(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding)
+ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding, bool servermode)
{
- if ((channel->modes[CM_KEY] != adding) || (!IS_LOCAL(source)))
+ if ((channel->IsModeSet('k') != adding) || (!IS_LOCAL(source)))
{
- if (((channel->modes[CM_KEY]) && (strcasecmp(parameter.c_str(),channel->key))) && (IS_LOCAL(source)))
+ if (((channel->IsModeSet('k')) && (parameter != channel->key)) && (IS_LOCAL(source)))
{
/* Key is currently set and the correct key wasnt given */
return MODEACTION_DENY;
}
- else if ((!channel->modes[CM_KEY]) || ((adding) && (!IS_LOCAL(source))))
+ else if ((!channel->IsModeSet('k')) || ((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;
+ channel->key.assign(parameter, 0, 32);
+ channel->SetMode('k', 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 (((channel->IsModeSet('k')) && (parameter == channel->key)) || ((!adding) && (!IS_LOCAL(source))))
{
/* Key is currently set, and correct key was given */
- *channel->key = 0;
- channel->modes[CM_KEY] = adding;
+ channel->key.clear();
+ channel->SetMode('k', adding);
return MODEACTION_ALLOW;
}
return MODEACTION_DENY;