]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_redirect.cpp
Remove custom members for +lk storage
[user/henk/code/inspircd.git] / src / modules / m_redirect.cpp
index 0cbbf751ac8865c3c3c196aa34a58a22a97b1f5e..c81ab2a706e953c29c2b4539c2cb011f82e2704d 100644 (file)
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
 
@@ -25,7 +22,7 @@ class Redirect : public ModeHandler
  public:
        Redirect(InspIRCd* Instance) : ModeHandler(Instance, 'L', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+       ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
        {
                if (channel->IsModeSet('L'))
                        return std::make_pair(true, channel->GetModeParameter('L'));
@@ -33,22 +30,22 @@ class Redirect : public ModeHandler
                        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, Channel* 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 &parameter, bool adding)
+
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
-                       chanrec* c = NULL;
+                       Channel* c = NULL;
 
-                       if (!ServerInstance->IsChannel(parameter.c_str()))
+                       if (IS_LOCAL(source) && !ServerInstance->IsChannel(parameter.c_str(), ServerInstance->Config->Limits.ChanMax))
                        {
-                               source->WriteServ("403 %s %s :Invalid channel name",source->nick, parameter.c_str());
-                               parameter = "";
+                               source->WriteNumeric(403, "%s %s :Invalid channel name", source->nick.c_str(), parameter.c_str());
+                               parameter.clear();
                                return MODEACTION_DENY;
                        }
 
@@ -60,17 +57,17 @@ class Redirect : public ModeHandler
                                {
                                        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 = "";
+                                               source->WriteNumeric(690, "%s :Circular or chained +L to %s not allowed (Channel already has +L). Pack of wild dogs has been unleashed.",source->nick.c_str(),parameter.c_str());
+                                               parameter.clear();
                                                return MODEACTION_DENY;
                                        }
                                        else
                                        {
                                                for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++)
                                                {
-                                                       if ((i->second != channel) && (i->second->IsModeSet('L')) && (irc::string(i->second->GetModeParameter('L').c_str()) == irc::string(channel->name)))
+                                                       if ((i->second != channel) && (i->second->IsModeSet('L')) && (irc::string(i->second->GetModeParameter('L').c_str()) == channel->name))
                                                        {
-                                                               source->WriteServ("690 %s :Circular or chained +L to %s not allowed (Already forwarded here from %s). Angry monkeys dispatched.",source->nick,parameter.c_str(),i->second->name);
+                                                               source->WriteNumeric(690, "%s :Circular or chained +L to %s not allowed (Already forwarded here from %s). Angry monkeys dispatched.",source->nick.c_str(), parameter.c_str(), i->second->name.c_str());
                                                                return MODEACTION_DENY;
                                                        }
                                                }
@@ -92,52 +89,50 @@ class Redirect : public ModeHandler
                }
 
                return MODEACTION_DENY;
-               
+
        }
 };
 
 class ModuleRedirect : public Module
 {
-       
+
        Redirect* re;
-       
+
  public:
+
        ModuleRedirect(InspIRCd* Me)
                : Module(Me)
        {
-               
+
                re = new Redirect(ServerInstance);
-               if (!ServerInstance->AddMode(re, 'L'))
+               if (!ServerInstance->Modes->AddMode(re))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreJoin };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
-       
-       void Implements(char* List)
-       {
-               List[I_OnUserPreJoin] = 1;
-       }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if (chan)
                {
-                       if (chan->IsModeSet('L') && chan->limit)
+                       if (chan->IsModeSet('L') && chan->modes[CM_LIMIT])
                        {
-                               if (chan->GetUserCounter() >= chan->limit)
+                               if (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str()))
                                {
                                        std::string channel = chan->GetModeParameter('L');
 
                                        /* sometimes broken ulines can make circular or chained +L, avoid this */
-                                       chanrec* destchan = NULL;
+                                       Channel* destchan = NULL;
                                        destchan = ServerInstance->FindChan(channel);
                                        if (destchan && destchan->IsModeSet('L'))
                                        {
-                                               user->WriteServ("470 %s :%s is full, but has a circular redirect (+L), not following redirection to %s", user->nick, cname, channel.c_str());
+                                               user->WriteNumeric(470, "%s :%s is full, but has a circular redirect (+L), not following redirection to %s", user->nick.c_str(), 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, "", ServerInstance->Time(true));
+                                       user->WriteNumeric(470, "%s :%s has become full, so you are automatically being transferred to the linked channel %s", user->nick.c_str(), cname, channel.c_str());
+                                       Channel::JoinUser(ServerInstance, user, channel.c_str(), false, "", false, ServerInstance->Time());
                                        return 1;
                                }
                        }
@@ -148,37 +143,13 @@ class ModuleRedirect : public Module
        virtual ~ModuleRedirect()
        {
                ServerInstance->Modes->DelMode(re);
-               DELETE(re);
-       }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               delete re;
        }
-};
-
 
-class ModuleRedirectFactory : public ModuleFactory
-{
- public:
-       ModuleRedirectFactory()
-       {
-       }
-       
-       ~ModuleRedirectFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
+       virtual Version GetVersion()
        {
-               return new ModuleRedirect(Me);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
 };
 
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleRedirectFactory;
-}
-
+MODULE_INIT(ModuleRedirect)