core_hostname_lookup: find answer record of the correct type instead of assuming...

[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 69fc5e136072091529bc38988e2287b1100a65ab..b14de9ff91eeecda7d8eda473c4a858f2354db7f 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -26,60 +26,49 @@
 
 /** Handle channel mode +L
  */
-class Redirect : public ModeHandler
+class Redirect : public ParamMode<Redirect, LocalStringExt>
 {
  public:
-       Redirect(Module* Creator) : ModeHandler(Creator, "redirect", 'L', PARAM_SETONLY, MODETYPE_CHANNEL) { }
+       Redirect(Module* Creator)
+               : ParamMode<Redirect, LocalStringExt>(Creator, "redirect", 'L') { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnSet(User* source, Channel* channel, std::string& parameter)
        {
-               if (adding)
+               if (IS_LOCAL(source))
                {
-                       if (IS_LOCAL(source))
+                       if (!ServerInstance->IsChannel(parameter))
                        {
-                               if (!ServerInstance->IsChannel(parameter))
-                               {
-                                       source->WriteNumeric(403, "%s %s :Invalid channel name", source->nick.c_str(), parameter.c_str());
-                                       parameter.clear();
-                                       return MODEACTION_DENY;
-                               }
+                               source->WriteNumeric(ERR_NOSUCHCHANNEL, parameter, "Invalid channel name");
+                               return MODEACTION_DENY;
                        }
+               }
 
-                       if (IS_LOCAL(source) && !source->IsOper())
+               if (IS_LOCAL(source) && !source->IsOper())
+               {
+                       Channel* c = ServerInstance->FindChan(parameter);
+                       if (!c)
                        {
-                               Channel* c = ServerInstance->FindChan(parameter);
-                               if (!c)
-                               {
-                                       source->WriteNumeric(690, "%s :Target channel %s must exist to be set as a redirect.",source->nick.c_str(),parameter.c_str());
-                                       parameter.clear();
-                                       return MODEACTION_DENY;
-                               }
-                               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();
-                                       return MODEACTION_DENY;
-                               }
-                       }
-
-                       if (channel->GetModeParameter(this) == parameter)
+                               source->WriteNumeric(690, InspIRCd::Format("Target channel %s must exist to be set as a redirect.", parameter.c_str()));
                                return MODEACTION_DENY;
-                       /*
-                        * We used to do some checking for circular +L here, but there is no real need for this any more especially as we
-                        * now catch +L looping in PreJoin. Remove it, since O(n) logic makes me sad, and we catch it anyway. :) -- w00t
-                        */
-                       return MODEACTION_ALLOW;
-               }
-               else
-               {
-                       if (channel->IsModeSet(this))
+                       }
+                       else if (c->GetPrefixValue(source) < OP_VALUE)
                        {
-                               return MODEACTION_ALLOW;
+                               source->WriteNumeric(690, InspIRCd::Format("You must be opped on %s to set it as a redirect.", parameter.c_str()));
+                               return MODEACTION_DENY;
                        }
                }
 
-               return MODEACTION_DENY;
+               /*
+                * We used to do some checking for circular +L here, but there is no real need for this any more especially as we
+                * now catch +L looping in PreJoin. Remove it, since O(n) logic makes me sad, and we catch it anyway. :) -- w00t
+                */
+               ext.set(channel, parameter);
+               return MODEACTION_ALLOW;
+       }
 
+       void SerializeParam(Channel* chan, const std::string* str, std::string& out)
+       {
+               out += *str;
        }
 };
 
@@ -124,25 +113,25 @@ class ModuleRedirect : public Module
                        {
                                if (chan->GetUserCounter() >= ConvToInt(chan->GetModeParameter(limitmode)))
                                {
-                                       std::string channel = chan->GetModeParameter(&re);
+                                       const std::string& channel = *re.ext.get(chan);
 
                                        /* sometimes broken ulines can make circular or chained +L, avoid this */
                                        Channel* destchan = ServerInstance->FindChan(channel);
                                        if (destchan && destchan->IsModeSet(re))
                                        {
-                                               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.c_str());
+                                               user->WriteNumeric(470, cname, '*', "You may not join this channel. A redirect is set, but you may not be redirected as it is a circular loop.");
                                                return MOD_RES_DENY;
                                        }
                                        /* We check the bool value here to make sure we have it enabled, if we don't then
                                                usermode +L might be assigned to something else. */
                                        if (UseUsermode && user->IsModeSet(re_u))
                                        {
-                                               user->WriteNumeric(470, "%s %s %s :Force redirection stopped.", user->nick.c_str(), cname.c_str(), channel.c_str());
+                                               user->WriteNumeric(470, cname, channel, "Force redirection stopped.");
                                                return MOD_RES_DENY;
                                        }
                                        else
                                        {
-                                               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.c_str(), channel.c_str());
+                                               user->WriteNumeric(470, cname, channel, "You may not join this channel, so you are automatically being transferred to the redirect channel.");
                                                Channel::JoinUser(user, channel);
                                                return MOD_RES_DENY;
                                        }