Add OnUserPreQuit event to allow modules to change quit messages (#1629).

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 7a732f8b5c7acc43242f8a1b1b4538a8bcf88f5c..57db5d496c3dc99f3852e7a00be08e622e753fc9 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -139,7 +139,7 @@ CmdResult CommandParser::CallHandler(const std::string& commandname, const Comma
                                if (user->IsModeSet(n->second->flags_needed))
                                {
                                        /* if user has the flags, and now has the permissions, go ahead */
-                                       if (user->HasPermission(commandname))
+                                       if (user->HasCommandPermission(commandname))
                                                bOkay = true;
                                }
                        }
@@ -246,7 +246,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
                return;
 
        /* activity resets the ping pending timer */
-       user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
+       user->nextping = ServerInstance->Time() + user->MyClass->GetPingTime();
 
        if (handler->flags_needed)
        {
@@ -257,7 +257,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
                        return;
                }
 
-               if (!user->HasPermission(command))
+               if (!user->HasCommandPermission(command))
                {
                        user->CommandFloodPenalty += failpenalty;
                        user->WriteNumeric(ERR_NOPRIVILEGES, InspIRCd::Format("Permission Denied - Oper type %s does not have access to command %s",