X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=f8dcc8755e35c3c32b9e06a71b8f449111735f2d;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=06281d2e72d41e8b31601b5bce8b21117f816240;hpb=b759870d742f1611ff64ca899e083d5467ebcf3b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 06281d2e7..f8dcc8755 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2014, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2014, 2018-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2016, 2018 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
@@ -39,7 +39,7 @@ bool InspIRCd::PassCompare(Extensible* ex, const std::string& data, const std::s
 		return false;
 
 	/* We dont handle any hash types except for plaintext - Thanks tra26 */
-	if (!hashtype.empty() && hashtype != "plaintext")
+	if (!hashtype.empty() && !stdalgo::string::equalsci(hashtype, "plaintext"))
 		return false;
 
 	return TimingSafeCompare(data, input);
@@ -231,7 +231,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
 		// Iterator to the first excess parameter
 		const CommandBase::Params::iterator firstexcess = lastkeep + 1;
 
-		// Append all excess parameter(s) to the last parameter, seperated by spaces
+		// Append all excess parameter(s) to the last parameter, separated by spaces
 		for (CommandBase::Params::const_iterator i = firstexcess; i != command_p.end(); ++i)
 		{
 			lastkeep->push_back(' ');
@@ -243,7 +243,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
 	}
 
 	/*
-	 * We call OnPreCommand here seperately if the command exists, so the magic above can
+	 * We call OnPreCommand here separately if the command exists, so the magic above can
 	 * truncate to max_params if necessary. -- w00t
 	 */
 	ModResult MOD_RESULT;
@@ -283,17 +283,15 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
 	if (command_p.size() < handler->min_params)
 	{
 		user->CommandFloodPenalty += failpenalty;
-		user->WriteNumeric(ERR_NEEDMOREPARAMS, command, "Not enough parameters.");
-		if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (handler->syntax.length()))
-			user->WriteNumeric(RPL_SYNTAX, handler->name, handler->syntax);
+		handler->TellNotEnoughParameters(user, command_p);
 		FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
 		return;
 	}
 
-	if ((user->registered != REG_ALL) && (!handler->WorksBeforeReg()))
+	if ((user->registered != REG_ALL) && (!handler->works_before_reg))
 	{
 		user->CommandFloodPenalty += failpenalty;
-		user->WriteNumeric(ERR_NOTREGISTERED, command, "You have not registered");
+		handler->TellNotRegistered(user, command_p);
 		FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
 	}
 	else
@@ -325,48 +323,6 @@ void CommandParser::RemoveCommand(Command* x)
 		cmdlist.erase(n);
 }
 
-CommandBase::CommandBase(Module* mod, const std::string& cmd, unsigned int minpara, unsigned int maxpara)
-	: ServiceProvider(mod, cmd, SERVICE_COMMAND)
-	, flags_needed(0)
-	, min_params(minpara)
-	, max_params(maxpara)
-	, use_count(0)
-	, works_before_reg(false)
-	, allow_empty_last_param(true)
-	, Penalty(1)
-{
-}
-
-CommandBase::~CommandBase()
-{
-}
-
-void CommandBase::EncodeParameter(std::string& parameter, unsigned int index)
-{
-}
-
-RouteDescriptor CommandBase::GetRouting(User* user, const Params& parameters)
-{
-	return ROUTE_LOCALONLY;
-}
-
-Command::Command(Module* mod, const std::string& cmd, unsigned int minpara, unsigned int maxpara)
-	: CommandBase(mod, cmd, minpara, maxpara)
-	, force_manual_route(false)
-{
-}
-
-Command::~Command()
-{
-	ServerInstance->Parser.RemoveCommand(this);
-}
-
-void Command::RegisterService()
-{
-	if (!ServerInstance->Parser.AddCommand(this))
-		throw ModuleException("Command already exists: " + name);
-}
-
 void CommandParser::ProcessBuffer(LocalUser* user, const std::string& buffer)
 {
 	ClientProtocol::ParseOutput parseoutput;