X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=49c5c5e42e32ff8d49f30985149e4a4dd3bb36ea;hb=244a65e8556328642350575c4a94ee8fc1b676b4;hp=460f97a188b9398c84ff90b8f35825c2adf6baa0;hpb=712a0e5ff36e5ba052c5d1accf5f5943be4a6e8a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index 460f97a18..49c5c5e42 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -731,10 +731,8 @@ void LocalUser::FullConnect()
 	this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version %s",this->nick.c_str(),ServerInstance->Config->ServerName.c_str(),BRANCH);
 	this->WriteNumeric(RPL_SERVERCREATED, "%s :This server was created %s %s", this->nick.c_str(), __TIME__, __DATE__);
 
-	std::string umlist = ServerInstance->Modes->UserModeList();
-	std::string cmlist = ServerInstance->Modes->ChannelModeList();
-	std::string pmlist = ServerInstance->Modes->ParaModeList();
-	this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName.c_str(), BRANCH, umlist.c_str(), cmlist.c_str(), pmlist.c_str());
+	const std::string& modelist = ServerInstance->Modes->GetModeListFor004Numeric();
+	this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName.c_str(), BRANCH, modelist.c_str());
 
 	ServerInstance->ISupport.SendTo(this);
 	this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
@@ -795,17 +793,16 @@ bool User::ChangeNick(const std::string& newnick, bool force)
 		return false;
 	}
 
-	ModResult MOD_RESULT;
-
-	if (force)
-		ServerInstance->NICKForced.set(this, 1);
-	FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (this, newnick));
-	ServerInstance->NICKForced.set(this, 0);
-
-	if (MOD_RESULT == MOD_RES_DENY)
+	if (!force)
 	{
-		ServerInstance->stats->statsCollisions++;
-		return false;
+		ModResult MOD_RESULT;
+		FIRST_MOD_RESULT(OnUserPreNick, MOD_RESULT, (this, newnick));
+
+		if (MOD_RESULT == MOD_RES_DENY)
+		{
+			ServerInstance->stats->statsCollisions++;
+			return false;
+		}
 	}
 
 	if (assign(newnick) == assign(nick))
@@ -1017,14 +1014,9 @@ void LocalUser::Write(const std::string& text)
  */
 void LocalUser::Write(const char *text, ...)
 {
-	va_list argsPtr;
-	char textbuffer[MAXBUF];
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	this->Write(std::string(textbuffer));
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
+	this->Write(textbuffer);
 }
 
 void User::WriteServ(const std::string& text)
@@ -1037,14 +1029,9 @@ void User::WriteServ(const std::string& text)
  */
 void User::WriteServ(const char* text, ...)
 {
-	va_list argsPtr;
-	char textbuffer[MAXBUF];
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	this->WriteServ(std::string(textbuffer));
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
+	this->WriteServ(textbuffer);
 }
 
 void User::WriteNotice(const std::string& text)
@@ -1054,14 +1041,9 @@ void User::WriteNotice(const std::string& text)
 
 void User::WriteNumeric(unsigned int numeric, const char* text, ...)
 {
-	va_list argsPtr;
-	char textbuffer[MAXBUF];
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	this->WriteNumeric(numeric, std::string(textbuffer));
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
+	this->WriteNumeric(numeric, textbuffer);
 }
 
 void User::WriteNumeric(unsigned int numeric, const std::string &text)
@@ -1089,14 +1071,9 @@ void User::WriteFrom(User *user, const std::string &text)
 
 void User::WriteFrom(User *user, const char* text, ...)
 {
-	va_list argsPtr;
-	char textbuffer[MAXBUF];
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	this->WriteFrom(user, std::string(textbuffer));
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
+	this->WriteFrom(user, textbuffer);
 }
 
 
@@ -1104,14 +1081,9 @@ void User::WriteFrom(User *user, const char* text, ...)
 
 void User::WriteTo(User *dest, const char *data, ...)
 {
-	char textbuffer[MAXBUF];
-	va_list argsPtr;
-
-	va_start(argsPtr, data);
-	vsnprintf(textbuffer, MAXBUF, data, argsPtr);
-	va_end(argsPtr);
-
-	this->WriteTo(dest, std::string(textbuffer));
+	std::string textbuffer;
+	VAFORMAT(textbuffer, data, data);
+	this->WriteTo(dest, textbuffer);
 }
 
 void User::WriteTo(User *dest, const std::string &data)
@@ -1121,36 +1093,24 @@ void User::WriteTo(User *dest, const std::string &data)
 
 void User::WriteCommon(const char* text, ...)
 {
-	char textbuffer[MAXBUF];
-	va_list argsPtr;
-
 	if (this->registered != REG_ALL || quitting)
 		return;
 
-	int len = snprintf(textbuffer,MAXBUF,":%s ",this->GetFullHost().c_str());
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer + len, MAXBUF - len, text, argsPtr);
-	va_end(argsPtr);
-
-	this->WriteCommonRaw(std::string(textbuffer), true);
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
+	textbuffer = ":" + this->GetFullHost() + " " + textbuffer;
+	this->WriteCommonRaw(textbuffer, true);
 }
 
 void User::WriteCommonExcept(const char* text, ...)
 {
-	char textbuffer[MAXBUF];
-	va_list argsPtr;
-
 	if (this->registered != REG_ALL || quitting)
 		return;
 
-	int len = snprintf(textbuffer,MAXBUF,":%s ",this->GetFullHost().c_str());
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer + len, MAXBUF - len, text, argsPtr);
-	va_end(argsPtr);
-
-	this->WriteCommonRaw(std::string(textbuffer), false);
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
+	textbuffer = ":" + this->GetFullHost() + " " + textbuffer;
+	this->WriteCommonRaw(textbuffer, false);
 }
 
 void User::WriteCommonRaw(const std::string &line, bool include_self)
@@ -1249,14 +1209,9 @@ void FakeUser::SendText(const std::string& line)
 
 void User::SendText(const char *text, ...)
 {
-	va_list argsPtr;
-	char line[MAXBUF];
-
-	va_start(argsPtr, text);
-	vsnprintf(line, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	SendText(std::string(line));
+	std::string line;
+	VAFORMAT(line, text, text);
+	SendText(line);
 }
 
 void User::SendText(const std::string &LinePrefix, std::stringstream &TextStream)
@@ -1446,13 +1401,8 @@ bool User::ChangeIdent(const char* newident)
 
 void User::SendAll(const char* command, const char* text, ...)
 {
-	char textbuffer[MAXBUF];
-	va_list argsPtr;
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
 	const std::string message = ":" + this->GetFullHost() + " " + command + " $* :" + textbuffer;
 
 	for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)