X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=d386337f2e9567b7ea235f868821db42eaf53ef1;hb=244a65e8556328642350575c4a94ee8fc1b676b4;hp=f05ffcd90425771bdec232dc1fd531dd27a12931;hpb=2d2e0469b8ac7c64c9dc22f7074db8fc245e2f13;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index f05ffcd90..d386337f2 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -148,6 +148,9 @@ CmdResult CommandParser::CallHandler(const std::string &commandname, const std::
 
 	if (n != cmdlist.end())
 	{
+		if ((!parameters.empty()) && (parameters.back().empty()) && (!n->second->allow_empty_last_param))
+			return CMD_INVALID;
+
 		if (parameters.size() >= n->second->min_params)
 		{
 			bool bOkay = false;
@@ -293,11 +296,11 @@ bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 		if (!user->HasPermission(command))
 		{
 			user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to command %s",
-				user->nick.c_str(), user->oper->NameStr(), command.c_str());
+				user->nick.c_str(), user->oper->name.c_str(), command.c_str());
 			return do_more;
 		}
 	}
-	if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
+	if ((user->registered == REG_ALL) && (!user->IsOper()) && (cm->second->IsDisabled()))
 	{
 		/* command is disabled! */
 		if (ServerInstance->Config->DisabledDontExist)
@@ -314,6 +317,10 @@ bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 				command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str());
 		return do_more;
 	}
+
+	if ((!command_p.empty()) && (command_p.back().empty()) && (!cm->second->allow_empty_last_param))
+		command_p.pop_back();
+
 	if (command_p.size() < cm->second->min_params)
 	{
 		user->WriteNumeric(ERR_NEEDMOREPARAMS, "%s %s :Not enough parameters.", user->nick.c_str(), command.c_str());
@@ -364,7 +371,7 @@ bool CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user)
 	if (!user || buffer.empty())
 		return true;
 
-	ServerInstance->Logs->Log("USERINPUT", RAWIO, "C[%s] I :%s %s",
+	ServerInstance->Logs->Log("USERINPUT", LOG_RAWIO, "C[%s] I :%s %s",
 		user->uuid.c_str(), user->nick.c_str(), buffer.c_str());
 	return ProcessCommand(user,buffer);
 }