Rename User::nping to nextping for consistency with lastping.

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

diff --git a/src/users.cpp b/src/users.cpp
index b00992141ac5b0ed8a6ee5792f550d4e267fb12a..4050337c7a2e7ed6ab9b02564136d508ff044c14 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -97,7 +97,7 @@ LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::so
        , quitting_sendq(false)
        , lastping(true)
        , exempt(false)
-       , nping(0)
+       , nextping(0)
        , idle_lastmsg(0)
        , CommandFloodPenalty(0)
        , already_sent(0)
@@ -377,17 +377,6 @@ void User::Oper(OperInfo* info)
        if (info->oper_block)
                opername = info->oper_block->getString("name");
 
-       if (IS_LOCAL(this))
-       {
-               LocalUser* l = IS_LOCAL(this);
-               std::string vhost = oper->getConfig("vhost");
-               if (!vhost.empty())
-                       l->ChangeDisplayedHost(vhost);
-               std::string opClass = oper->getConfig("class");
-               if (!opClass.empty())
-                       l->SetClass(opClass);
-       }
-
        ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')",
                nick.c_str(), ident.c_str(), GetRealHost().c_str(), oper->name.c_str(), opername.c_str());
        this->WriteNumeric(RPL_YOUAREOPER, InspIRCd::Format("You are now %s %s", strchr("aeiouAEIOU", oper->name[0]) ? "an" : "a", oper->name.c_str()));
@@ -514,7 +503,7 @@ void LocalUser::CheckClass(bool clone_count)
                }
        }
 
-       this->nping = ServerInstance->Time() + a->GetPingTime();
+       this->nextping = ServerInstance->Time() + a->GetPingTime();
 }
 
 bool LocalUser::CheckLines(bool doZline)