Fix the base path being used for more than just the install prefix.

[user/henk/code/inspircd.git] / src / xline.cpp

diff --git a/src/xline.cpp b/src/xline.cpp
index 4a70700a7427f91e4ac3554a221a78f13e494b2b..e4c6b6fb39e8354571f065a4227c2612c3197dd4 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -67,15 +67,15 @@ class ELineFactory : public XLineFactory
 class KLineFactory : public XLineFactory
 {
  public:
-        KLineFactory() : XLineFactory("K") { }
+       KLineFactory() : XLineFactory("K") { }
 
        /** Generate a KLine
         */
-        XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
-        {
-                IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
-                return new KLine(set_time, duration, source, reason, ih.first, ih.second);
-        }
+       XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
+       {
+               IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
+               return new KLine(set_time, duration, source, reason, ih.first, ih.second);
+       }
 };
 
 /** An XLineFactory specialized to generate QLine* pointers
@@ -83,14 +83,14 @@ class KLineFactory : public XLineFactory
 class QLineFactory : public XLineFactory
 {
  public:
-        QLineFactory() : XLineFactory("Q") { }
+       QLineFactory() : XLineFactory("Q") { }
 
        /** Generate a QLine
         */
-        XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
-        {
-                return new QLine(set_time, duration, source, reason, xline_specific_mask);
-        }
+       XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
+       {
+               return new QLine(set_time, duration, source, reason, xline_specific_mask);
+       }
 };
 
 /** An XLineFactory specialized to generate ZLine* pointers
@@ -98,14 +98,14 @@ class QLineFactory : public XLineFactory
 class ZLineFactory : public XLineFactory
 {
  public:
-        ZLineFactory() : XLineFactory("Z") { }
+       ZLineFactory() : XLineFactory("Z") { }
 
        /** Generate a ZLine
         */
-        XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
-        {
-                return new ZLine(set_time, duration, source, reason, xline_specific_mask);
-        }
+       XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
+       {
+               return new ZLine(set_time, duration, source, reason, xline_specific_mask);
+       }
 };
 
 
@@ -608,7 +608,7 @@ bool KLine::Matches(User *u)
        if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
        {
                if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) ||
-                   InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
+                       InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
                {
                        return true;
                }
@@ -631,7 +631,7 @@ bool GLine::Matches(User *u)
        if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
        {
                if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) ||
-                   InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
+                       InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
                {
                        return true;
                }
@@ -650,7 +650,7 @@ bool ELine::Matches(User *u)
        if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
        {
                if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) ||
-                   InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
+                       InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
                {
                        return true;
                }
@@ -688,6 +688,7 @@ bool QLine::Matches(User *u)
 void QLine::Apply(User* u)
 {
        /* Force to uuid on apply of Q-line, no need to disconnect anymore :) */
+       u->WriteNumeric(RPL_SAVENICK, u->uuid, "Your nickname has been Q-lined.");
        u->ChangeNick(u->uuid);
 }