X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=fff8653b36986afa3bbed70430887ccddd936de0;hb=3c8b0ea13b84b52b95c7e0b17f1ddf208045d665;hp=57a86b0cde18b1e0a42ffd0e87c08118aef2b9da;hpb=dd36852a52e8541306b76c5b88bce8ab9b36654c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 57a86b0cd..fff8653b3 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -292,7 +292,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 	{
 		if (user->registered == REG_ALL)
 		{
-			user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str());
+			user->WriteNumeric(421, "%s %s :Unknown command",user->nick,command.c_str());
 		}
 		ServerInstance->stats->statsUnknown++;
 		return true;
@@ -316,33 +316,33 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 	{
 		if (!user->IsModeSet(cm->second->flags_needed))
 		{
-			user->WriteServ("481 %s :Permission Denied - You do not have the required operator privileges",user->nick);
+			user->WriteNumeric(481, "%s :Permission Denied - You do not have the required operator privileges",user->nick);
 			return do_more;
 		}
 		if (!user->HasPermission(command))
 		{
-			user->WriteServ("481 %s :Permission Denied - Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
+			user->WriteNumeric(481, "%s :Permission Denied - Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
 			return do_more;
 		}
 	}
 	if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
 	{
 		/* command is disabled! */
-		user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
+		user->WriteNumeric(421, "%s %s :This command has been disabled.",user->nick,command.c_str());
 		ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)",
 				command.c_str(), user->nick, user->ident, user->host);
 		return do_more;
 	}
 	if (items < cm->second->min_params)
 	{
-		user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str());
+		user->WriteNumeric(461, "%s %s :Not enough parameters.", user->nick, command.c_str());
 		if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length()))
-			user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
+			user->WriteNumeric(304, "%s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
 		return do_more;
 	}
 	if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg()))
 	{
-		user->WriteServ("451 %s :You have not registered",command.c_str());
+		user->WriteNumeric(451, "%s :You have not registered",command.c_str());
 		return do_more;
 	}
 	else
@@ -426,7 +426,7 @@ bool CommandParser::CreateCommand(Command *f, void* so_handle)
 			RFCCommands[f->command] = so_handle;
 		else
 		{
-			ServerInstance->Log(DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded.");
+			ServerInstance->Logs->Log("COMMAND",DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded.");
 			return false;
 		}
 	}
@@ -451,7 +451,7 @@ bool CommandParser::FindSym(void** v, void* h, const std::string &name)
 	const char* err = dlerror();
 	if (err && !(*v))
 	{
-		ServerInstance->Log(SPARSE, "Error loading core command %s: %s\n", name.c_str(), err);
+		ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s\n", name.c_str(), err);
 		return false;
 	}
 	return true;
@@ -523,7 +523,7 @@ const char* CommandParser::LoadCommand(const char* name)
 	/* Command already exists? Succeed silently - this is needed for REHASH */
 	if (RFCCommands.find(name) != RFCCommands.end())
 	{
-		ServerInstance->Log(DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name);
+		ServerInstance->Logs->Log("COMMAND",DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name);
 		return NULL;
 	}
 
@@ -533,7 +533,7 @@ const char* CommandParser::LoadCommand(const char* name)
 	if (!h)
 	{
 		const char* n = dlerror();
-		ServerInstance->Log(SPARSE, "Error loading core command %s: %s", name, n);
+		ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s", name, n);
 		return n;
 	}