Remove support for advertising the SSL ports in RPL_ISUPPORT.

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

diff --git a/src/users.cpp b/src/users.cpp
index 2458e156530eacd881d4df8a63523eaf6a7e893a..eb91a9cb5d6156c8fbdd29ad2b86f7696b79752b 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -357,7 +357,7 @@ void User::Oper(OperInfo* info)
 
        this->SetMode(opermh, true);
        this->oper = info;
-       this->WriteServ("MODE %s :+o", this->nick.c_str());
+       this->WriteCommand("MODE", "+o");
        FOREACH_MOD(OnOper, (this, info->name));
 
        std::string opername;
@@ -818,7 +818,7 @@ void User::Write(const char *text, ...)
 
 void LocalUser::Write(const std::string& text)
 {
-       if (!ServerInstance->SE->BoundsCheckFd(&eh))
+       if (!SocketEngine::BoundsCheckFd(&eh))
                return;
 
        if (text.length() > ServerInstance->Config->Limits.MaxLine - 2)
@@ -863,9 +863,9 @@ void User::WriteServ(const char* text, ...)
        this->WriteServ(textbuffer);
 }
 
-void User::WriteNotice(const std::string& text)
+void User::WriteCommand(const char* command, const std::string& text)
 {
-       this->WriteServ("NOTICE " + (this->registered == REG_ALL ? this->nick : "*") + " :" + text);
+       this->WriteServ(command + (this->registered & REG_NICK ? " " + this->nick : " *") + " " + text);
 }
 
 void User::WriteNumeric(unsigned int numeric, const char* text, ...)
@@ -885,7 +885,7 @@ void User::WriteNumeric(unsigned int numeric, const std::string &text)
                return;
 
        const std::string message = InspIRCd::Format(":%s %03u %s %s", ServerInstance->Config->ServerName.c_str(),
-               numeric, !this->nick.empty() ? this->nick.c_str() : "*", text.c_str());
+               numeric, this->registered & REG_NICK ? this->nick.c_str() : "*", text.c_str());
        this->Write(message);
 }
 
@@ -1239,7 +1239,7 @@ void LocalUser::SetClass(const std::string &explicit_name)
 
                        if (regdone && !c->config->getString("password").empty())
                        {
-                               if (ServerInstance->PassCompare(this, c->config->getString("password"), password, c->config->getString("hash")))
+                               if (!ServerInstance->PassCompare(this, c->config->getString("password"), password, c->config->getString("hash")))
                                {
                                        ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Bad password, skipping");
                                        continue;