Merge m_restrictchans and m_regonlycreate due to converging functionality (#1541).

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 7466f385b565ec3895879590bca90b91c9357e61..6f9d15502d28d47be552e4d0d996a3f38a8ae8e4 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -130,7 +130,11 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
                        ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Positive hit for " + New->GetIPString());
                        if (!ServerInstance->Config->XLineMessage.empty())
                                New->WriteNumeric(ERR_YOUREBANNEDCREEP, ServerInstance->Config->XLineMessage);
-                       this->QuitUser(New, b->Reason);
+
+                       if (ServerInstance->Config->HideBans)
+                               this->QuitUser(New, b->Type + "-Lined", &b->Reason);
+                       else
+                               this->QuitUser(New, b->Reason);
                        return;
                }
                else
@@ -217,6 +221,7 @@ void UserManager::QuitUser(User* user, const std::string& quitreason, const std:
 
        uuidlist.erase(user->uuid);
        user->PurgeEmptyChannels();
+       user->UnOper();
 }
 
 void UserManager::AddClone(User* user)