Better error message for erroring on loading server cert - give certfile/keyfile...

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

diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 3b15ec89e82386e8fb57f7ff4097eeb5a717b422..5fdb1804293bff54a033c7872caf0a8d64cff5cb 100644 (file)
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -15,12 +15,12 @@
 #include "m_regex.h"
 #include "xline.h"
 
-static Module* rxengine = 0;
-static Module* mymodule = 0; /* Needed to let RLine send request! */
+static Module* rxengine = NULL;
+static Module* mymodule = NULL; /* Needed to let RLine send request! */
 
 /* $ModDesc: RLINE: Regexp user banning. */
 
-class CoreExport RLine : public XLine
+class RLine : public XLine
 {
  public:
 
@@ -42,15 +42,10 @@ class CoreExport RLine : public XLine
                        throw ModuleException("Regex engine not set or loaded!");
                }
 
-               try
-               {
-                       regex = RegexFactoryRequest(mymodule, rxengine, regexs).Create();
-               }
-               catch (ModuleException& ex)
-               {
-                       ServerInstance->SNO->WriteToSnoMask('x', "Bad regex: %s", ex.GetReason());
-                       throw ex;
-               }
+               /* This can throw on failure, but if it does we DONT catch it here, we catch it and display it
+                * where the object is created, we might not ALWAYS want it to output stuff to snomask x all the time
+                */
+               regex = RegexFactoryRequest(mymodule, rxengine, regexs).Create();
        }
 
        /** Destructor
@@ -62,28 +57,13 @@ class CoreExport RLine : public XLine
 
        bool Matches(User *u)
        {
-               std::string compare = std::string(u->nick) + "!" + u->ident + "@" + u->host + " " + u->fullname;
-
-               ServerInstance->Logs->Log("m_rline",DEBUG, "Matching " + matchtext + " against string " + compare);
-
-               if (regex->Matches(compare))
-               {
-                       // Bang. :D
-                       return true;
-               }
-
-               return false;
+               std::string compare = u->nick + "!" + u->ident + "@" + u->host + " " + u->fullname;
+               return regex->Matches(compare);
        }
 
        bool Matches(const std::string &compare)
        {
-               if (regex->Matches(compare))
-               {
-                       // Bang. :D
-                       return true;
-               }
-
-               return false;
+               return regex->Matches(compare);
        }
 
        void Apply(User* u)
@@ -109,10 +89,12 @@ class CoreExport RLine : public XLine
 
 /** An XLineFactory specialized to generate RLine* pointers
  */
-class CoreExport RLineFactory : public XLineFactory
+class RLineFactory : public XLineFactory
 {
  public:
-       RLineFactory(InspIRCd* Instance) : XLineFactory(Instance, "R") { }
+       RLineFactory(InspIRCd* Instance) : XLineFactory(Instance, "R")
+       {
+       }
 
        /** Generate a RLine
         */
@@ -120,6 +102,10 @@ class CoreExport RLineFactory : public XLineFactory
        {
                return new RLine(ServerInstance, set_time, duration, source, reason, xline_specific_mask);
        }
+
+       ~RLineFactory()
+       {
+       }
 };
 
 /** Handle /RLINE
@@ -130,9 +116,10 @@ class CommandRLine : public Command
        std::string rxengine;
 
  public:
-       CommandRLine (InspIRCd* Instance) : Command(Instance,"RLINE", "o", 1)
+       CommandRLine (InspIRCd* Instance) : Command(Instance,"RLINE", "o", 1, 3)
        {
                this->source = "m_rline.so";
+               this->syntax = "<regex> [<rline-duration>] :<reason>";
        }
 
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
@@ -160,13 +147,12 @@ class CommandRLine : public Command
                                {
                                        if (!duration)
                                        {
-                                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent R-Line for %s.", user->nick.c_str(), parameters[0].c_str());
+                                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent R-Line for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].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.c_str(), parameters[0].c_str(),
-                                                               ServerInstance->TimeString(c_requires_crap).c_str());
+                                               ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-Line for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
                                        }
 
                                        ServerInstance->XLines->ApplyLines();