+/* +------------------------------------+
+ * | 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])
{
{
return std::make_pair(false, parameter);
}
-}
+}
+
+void ModeChannelKey::RemoveMode(Channel* channel)
+{
+ /** +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()))
+ {
+ sprintf(moderemove,"-%c",this->GetModeChar());
+ ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
+ }
+}
+
+void ModeChannelKey::RemoveMode(User*)
+{
+}
-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->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]) || ((adding) && (!IS_LOCAL(source))))
{
strlcpy(channel->key,parameter.c_str(),32);
channel->modes[CM_KEY] = adding;
+ parameter = channel->key;
return MODEACTION_ALLOW;
}
else
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;
}
}
+