Fix some indenting.

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

diff --git a/src/modules/extra/m_rline.cpp b/src/modules/extra/m_rline.cpp
index 15bd60bc080f02c9496a54b37058c192fc484f0a..1503f04d9b3f348a198179b9fdc9f0790b4b3ba5 100644 (file)
--- a/src/modules/extra/m_rline.cpp
+++ b/src/modules/extra/m_rline.cpp
@@ -47,7 +47,7 @@ class CoreExport RLine : public XLine
                if (!regex)
                {
                        ServerInstance->SNO->WriteToSnoMask('x',"Error in regular expression: %s at offset %d: %s\n", regexs, erroffset, error);
-                       throw CoreException("Bad regex pattern.");
+                       throw ModuleException("Bad regex pattern.");
                }
        }
 
@@ -131,10 +131,10 @@ class CommandRLine : public Command
                this->source = "m_rline.so";
        }
 
-       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
 
-               if (pcnt >= 3)
+               if (parameters.size() >= 3)
                {
                        // Adding - XXX todo make this respect <insane> tag perhaps..
 
@@ -143,7 +143,7 @@ class CommandRLine : public Command
 
                        try
                        {
-                               r = new RLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]);
+                               r = new RLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2].c_str(), parameters[0].c_str());
                        }
                        catch (...)
                        {
@@ -156,12 +156,12 @@ class CommandRLine : public Command
                                {
                                        if (!duration)
                                        {
-                                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent R-Line for %s.", user->nick, parameters[0]);
+                                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent R-Line for %s.", user->nick, parameters[0].c_str());
                                        }
                                        else
                                        {
                                                time_t c_requires_crap = duration + ServerInstance->Time();
-                                               ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-Line for %s, expires on %s", user->nick, parameters[0],
+                                               ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-Line for %s, expires on %s", user->nick, parameters[0].c_str(),
                                                                ServerInstance->TimeString(c_requires_crap).c_str());
                                        }
 
@@ -170,20 +170,20 @@ class CommandRLine : public Command
                                else
                                {
                                        delete r;
-                                       user->WriteServ("NOTICE %s :*** R-Line for %s already exists", user->nick, parameters[0]);
+                                       user->WriteServ("NOTICE %s :*** R-Line for %s already exists", user->nick, parameters[0].c_str());
                                }
                        }
                }
                else
                {
-                       if (ServerInstance->XLines->DelLine(parameters[0], "R", user))
+                       if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "R", user))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s Removed R-Line on %s.",user->nick,parameters[0]);
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s Removed R-Line on %s.",user->nick,parameters[0].c_str());
                        }
                        else
                        {
                                // XXX todo implement stats
-                               user->WriteServ("NOTICE %s :*** R-Line %s not found in list, try /stats g.",user->nick,parameters[0]);
+                               user->WriteServ("NOTICE %s :*** R-Line %s not found in list, try /stats g.",user->nick,parameters[0].c_str());
                        }
                }
 
@@ -244,20 +244,20 @@ class ModuleRLine : public Module
                MatchOnNickChange = Conf.ReadFlag("rline", "matchonnickchange", 1);
        }
 
-       virtual int OnUserPostNick(User *user, const std::string &oldnick)
+       virtual void OnUserPostNick(User *user, const std::string &oldnick)
        {
                if (!IS_LOCAL(user))
-                       return 0;
+                       return;
 
                if (!MatchOnNickChange)
-                       return 0;
+                       return;
 
-               XLine *r = ServerInstance->XLines->MatchesLine("R", user);
+               XLine *rl = ServerInstance->XLines->MatchesLine("R", user);
 
-               if (r)
+               if (rl)
                {
                        // Bang! :D
-                       r->Apply(user);
+                       rl->Apply(user);
                }
        }