ident: Change idents with the ChangeIdent method.

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 9c84101e19c248dc258781297a836bf7d96096ad..ccdc58dc235cec6021998872fd50aa458916de70 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -294,7 +294,7 @@ bool XLineManager::AddLine(XLine* line, User* user)
 
 // deletes a line, returns true if the line existed and was removed
 
-bool XLineManager::DelLine(const char* hostmask, const std::string &type, User* user, bool simulate)
+bool XLineManager::DelLine(const char* hostmask, const std::string& type, std::string& reason, User* user, bool simulate)
 {
        ContainerIter x = lookup_lines.find(type);
 
@@ -306,6 +306,8 @@ bool XLineManager::DelLine(const char* hostmask, const std::string &type, User*
        if (y == x->second.end())
                return false;
 
+       reason.assign(y->second->reason);
+
        if (simulate)
                return true;
 
@@ -329,7 +331,7 @@ void ELine::Unset()
        ServerInstance->XLines->CheckELines();
 }
 
-// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
+// returns a pointer to the reason if a nickname matches a Q-line, NULL if it didn't match
 
 XLine* XLineManager::MatchesLine(const std::string &type, User* user)
 {
@@ -523,13 +525,13 @@ bool XLine::IsBurstable()
 
 void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
 {
-       const std::string banReason = line + "-Lined: " + reason;
+       const std::string banReason = line + "-lined: " + reason;
 
        if (!ServerInstance->Config->XLineMessage.empty())
                u->WriteNumeric(ERR_YOUREBANNEDCREEP, ServerInstance->Config->XLineMessage);
 
        if (ServerInstance->Config->HideBans)
-               ServerInstance->Users->QuitUser(u, line + "-Lined", &banReason);
+               ServerInstance->Users->QuitUser(u, line + "-lined", &banReason);
        else
                ServerInstance->Users->QuitUser(u, banReason);
 
@@ -629,7 +631,7 @@ bool QLine::Matches(User *u)
 
 void QLine::Apply(User* u)
 {
-       /* Force to uuid on apply of qline, no need to disconnect any more :) */
+       /* Force to uuid on apply of Q-line, no need to disconnect anymore :) */
        u->ChangeNick(u->uuid);
 }
 
@@ -667,7 +669,7 @@ bool GLine::Matches(const std::string &str)
 
 void ELine::OnAdd()
 {
-       /* When adding one eline, only check the one eline */
+       /* When adding one E-line, only check the one E-line */
        const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
        for (UserManager::LocalList::const_iterator u2 = list.begin(); u2 != list.end(); u2++)
        {
@@ -681,7 +683,7 @@ void XLine::DisplayExpiry()
 {
        bool onechar = (type.length() == 1);
        ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %ld seconds ago): %s",
-               type.c_str(), (onechar ? "-Line" : ""), Displayable().c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time), reason.c_str());
+               type.c_str(), (onechar ? "-line" : ""), Displayable().c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time), reason.c_str());
 }
 
 const std::string& ELine::Displayable()