Sort CAPAB CHANMODES and USERMODES

[user/henk/code/inspircd.git] / src / modules / m_redirect.cpp

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index fc743402e8290abb6404365e75dce514c2f034c2..eeca44e7d43a77c91653448ecd5af5d9aa9cd491 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,17 +20,9 @@
 class Redirect : public ModeHandler
 {
  public:
-       Redirect(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'L', 1, 0, false, MODETYPE_CHANNEL, false) { }
+       Redirect(Module* Creator) : ModeHandler(Creator, "redirect", 'L', PARAM_SETONLY, MODETYPE_CHANNEL) { }
 
-       ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
-       {
-               if (channel->IsModeSet('L'))
-                       return std::make_pair(true, channel->GetModeParameter('L'));
-               else
-                       return std::make_pair(false, parameter);
-       }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool server)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -44,7 +36,7 @@ class Redirect : public ModeHandler
                                }
                        }
 
-                       if (IS_LOCAL(source) && !IS_OPER(source) && !server)
+                       if (IS_LOCAL(source) && !IS_OPER(source))
                        {
                                Channel* c = ServerInstance->FindChan(parameter);
                                if (!c)
@@ -53,7 +45,7 @@ class Redirect : public ModeHandler
                                        parameter.clear();
                                        return MODEACTION_DENY;
                                }
-                               else if (c->GetStatus(source) < STATUS_OP)
+                               else if (c->GetPrefixValue(source) < OP_VALUE)
                                {
                                        source->WriteNumeric(690, "%s :You must be opped on %s to set it as a redirect.",source->nick.c_str(),parameter.c_str());
                                        parameter.clear();
@@ -89,8 +81,8 @@ class ModuleRedirect : public Module
 
  public:
 
-       ModuleRedirect(InspIRCd* Me)
-               : Module(Me), re(Me, this)
+       ModuleRedirect()
+               : re(this)
        {
 
                if (!ServerInstance->Modes->AddMode(&re))
@@ -100,11 +92,11 @@ class ModuleRedirect : public Module
        }
 
 
-       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+       virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if (chan)
                {
-                       if (chan->IsModeSet('L') && chan->modes[CM_LIMIT])
+                       if (chan->IsModeSet('L') && chan->IsModeSet('l'))
                        {
                                if (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str()))
                                {
@@ -116,26 +108,25 @@ class ModuleRedirect : public Module
                                        if (destchan && destchan->IsModeSet('L'))
                                        {
                                                user->WriteNumeric(470, "%s %s * :You may not join this channel. A redirect is set, but you may not be redirected as it is a circular loop.", user->nick.c_str(), cname);
-                                               return 1;
+                                               return MOD_RES_DENY;
                                        }
 
                                        user->WriteNumeric(470, "%s %s %s :You may not join this channel, so you are automatically being transferred to the redirect channel.", user->nick.c_str(), cname, channel.c_str());
-                                       Channel::JoinUser(ServerInstance, user, channel.c_str(), false, "", false, ServerInstance->Time());
-                                       return 1;
+                                       Channel::JoinUser(user, channel.c_str(), false, "", false, ServerInstance->Time());
+                                       return MOD_RES_DENY;
                                }
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual ~ModuleRedirect()
        {
-               ServerInstance->Modes->DelMode(&re);
        }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides channel mode +L (limit redirection)", VF_VENDOR);
        }
 };