* ---------------------------------------------------
*/
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "inspircd.h"
/* $ModDesc: Provides channel mode +L (limit redirection) */
public:
Redirect(InspIRCd* Instance) : ModeHandler(Instance, 'L', 1, 0, false, MODETYPE_CHANNEL, false) { }
- ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter)
- {
- if (channel->IsModeSet('L'))
- return std::make_pair(true, channel->GetModeParameter('L'));
- else
- return std::make_pair(false, parameter);
- }
+ ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter)
+ {
+ if (channel->IsModeSet('L'))
+ return std::make_pair(true, channel->GetModeParameter('L'));
+ else
+ return std::make_pair(false, parameter);
+ }
- bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+ bool 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 one wins */
return (their_param < our_param);
- }
+ }
ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding)
{
if (!ServerInstance->IsChannel(parameter.c_str()))
{
source->WriteServ("403 %s %s :Invalid channel name",source->nick, parameter.c_str());
- parameter = "";
+ parameter.clear();
return MODEACTION_DENY;
}
if ((c == channel) || (c->IsModeSet('L')))
{
source->WriteServ("690 %s :Circular or chained +L to %s not allowed (Channel already has +L). Pack of wild dogs has been unleashed.",source->nick,parameter.c_str());
- parameter = "";
+ parameter.clear();
return MODEACTION_DENY;
}
else
public:
ModuleRedirect(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
re = new Redirect(ServerInstance);
destchan = ServerInstance->FindChan(channel);
if (destchan && destchan->IsModeSet('L'))
{
- user->WriteServ("470 %s :%s has a circular redirect (+L), not following redirection to %s", user->nick, cname, channel.c_str());
- return 0;
+ user->WriteServ("470 %s :%s is full, but has a circular redirect (+L), not following redirection to %s", user->nick, cname, channel.c_str());
+ return 1;
}
user->WriteServ("470 %s :%s has become full, so you are automatically being transferred to the linked channel %s", user->nick, cname, channel.c_str());
- chanrec::JoinUser(ServerInstance, user, channel.c_str(), false);
+ chanrec::JoinUser(ServerInstance, user, channel.c_str(), false, "", ServerInstance->Time(true));
return 1;
}
}
}
};
-
-class ModuleRedirectFactory : public ModuleFactory
-{
- public:
- ModuleRedirectFactory()
- {
- }
-
- ~ModuleRedirectFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleRedirect(Me);
- }
-
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleRedirectFactory;
-}
-
+MODULE_INIT(ModuleRedirect)