X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=387658ac6d3deb92625a4cfce970703a3a71e693;hb=927f436c1c2f26e4a44f9f86f044e5e742981ffe;hp=9bc7705040f4a9156f1e0fa3cf235396f3f42d56;hpb=561ca4e2562c1e7a745bd942b7c87d2cd8bfdb5e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index 9bc770504..387658ac6 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -27,10 +27,11 @@ static unsigned long* already_sent = NULL;
 void InitializeAlreadySent(SocketEngine* SE)
 {
 	already_sent = new unsigned long[SE->GetMaxFds()];
+	memset(already_sent, 0, sizeof(already_sent));
 }
 
 /* XXX: Used for speeding up WriteCommon operations */
-unsigned long uniq_id = 0;
+unsigned long uniq_id = 1;
 
 std::string User::ProcessNoticeMasks(const char *sm)
 {
@@ -916,12 +917,11 @@ void User::FullConnect()
 
 	this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network);
 	this->WriteNumeric(001, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick, ServerInstance->Config->Network, this->nick, this->ident, this->host);
-	this->WriteNumeric(002, "%s :Your host is %s, running version %s",this->nick,ServerInstance->Config->ServerName,VERSION);
+	this->WriteNumeric(002, "%s :Your host is %s, running version InspIRCd-1.2",this->nick,ServerInstance->Config->ServerName);
 	this->WriteNumeric(003, "%s :This server was created %s %s", this->nick, __TIME__, __DATE__);
-	this->WriteNumeric(004, "%s %s %s %s %s %s", this->nick, ServerInstance->Config->ServerName, VERSION, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
+	this->WriteNumeric(004, "%s %s InspIRCd-1.2 %s %s %s", this->nick, ServerInstance->Config->ServerName, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
 
 	ServerInstance->Config->Send005(this);
-
 	this->WriteNumeric(42, "%s %s :your unique ID", this->nick, this->uuid);
 
 
@@ -989,46 +989,29 @@ void User::InvalidateCache()
 
 bool User::ForceNickChange(const char* newnick)
 {
-	/*
-	 * XXX this makes no sense..
-	 * why do we do nothing for change on users not REG_ALL?
-	 * why do we trigger events twice for everyone previously (and just them now)
-	 * i think the first if () needs removing totally, or? -- w00t
-	 */
-	if (this->registered != REG_ALL)
-	{
-		int MOD_RESULT = 0;
+	int MOD_RESULT = 0;
 
-		this->InvalidateCache();
+	this->InvalidateCache();
 
-		FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
+	FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
 
-		if (MOD_RESULT)
-		{
-			ServerInstance->stats->statsCollisions++;
-			return false;
-		}
-
-		if (ServerInstance->XLines->MatchesLine("Q",newnick))
-		{
-			ServerInstance->stats->statsCollisions++;
-			return false;
-		}
+	if (MOD_RESULT)
+	{
+		ServerInstance->stats->statsCollisions++;
+		return false;
 	}
-	else
+
+	std::deque<classbase*> dummy;
+	Command* nickhandler = ServerInstance->Parser->GetHandler("NICK");
+	if (nickhandler) // wtfbbq, when would this not be here
 	{
-		std::deque<classbase*> dummy;
-		Command* nickhandler = ServerInstance->Parser->GetHandler("NICK");
-		if (nickhandler) // wtfbbq, when would this not be here
-		{
-			nickhandler->HandleInternal(1, dummy);
-			bool result = (ServerInstance->Parser->CallHandler("NICK", &newnick, 1, this) == CMD_SUCCESS);
-			nickhandler->HandleInternal(0, dummy);
-			return result;
-		}
+		nickhandler->HandleInternal(1, dummy);
+		bool result = (ServerInstance->Parser->CallHandler("NICK", &newnick, 1, this) == CMD_SUCCESS);
+		nickhandler->HandleInternal(0, dummy);
+		return result;
 	}
 
-	// Unreachable.
+	// Unreachable, we hope
 	return false;
 }