X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=ac87f1187992cc943d1dab44cc9de778473ffcdb;hb=95c5aa91953db978879ec21c236a871257fe7036;hp=91db5200a98b3b9fefa8db5cb0df5dd782942ec0;hpb=8f7cdd5b61112802973470e74a87da52ee064920;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index 91db5200a..ac87f1187 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -692,6 +692,7 @@ void User::UnOper()
 	ServerInstance->Users->all_opers.remove(this);
 
 	this->modes[UM_OPERATOR] = 0;
+	FOREACH_MOD(I_OnPostDeoper, OnPostDeoper(this));
 }
 
 /* adds or updates an entry in the whowas list */
@@ -837,6 +838,7 @@ void LocalUser::FullConnect()
 void User::InvalidateCache()
 {
 	/* Invalidate cache */
+	cachedip.clear();
 	cached_fullhost.clear();
 	cached_hostip.clear();
 	cached_makehost.clear();
@@ -1001,15 +1003,13 @@ irc::sockets::cidr_mask User::GetCIDRMask()
 
 bool User::SetClientIP(const char* sip, bool recheck_eline)
 {
-	cachedip.clear();
-	cached_hostip.clear();
+	this->InvalidateCache();
 	return irc::sockets::aptosa(sip, 0, client_sa);
 }
 
 void User::SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline)
 {
-	cachedip.clear();
-	cached_hostip.clear();
+	this->InvalidateCache();
 	memcpy(&client_sa, &sa, sizeof(irc::sockets::sockaddrs));
 }
 
@@ -1321,26 +1321,19 @@ void User::SendText(const char *text, ...)
 
 void User::SendText(const std::string &LinePrefix, std::stringstream &TextStream)
 {
-	char line[MAXBUF];
-	int start_pos = LinePrefix.length();
-	int pos = start_pos;
-	memcpy(line, LinePrefix.data(), pos);
+	std::string line;
 	std::string Word;
 	while (TextStream >> Word)
 	{
-		int len = Word.length();
-		if (pos + len + 12 > MAXBUF)
+		size_t lineLength = LinePrefix.length() + line.length() + Word.length() + 13;
+		if (lineLength > MAXBUF)
 		{
-			line[pos] = '\0';
-			SendText(std::string(line));
-			pos = start_pos;
+			SendText(LinePrefix + line);
+			line.clear();
 		}
-		line[pos] = ' ';
-		memcpy(line + pos + 1, Word.data(), len);
-		pos += len + 1;
+		line += " " + Word;
 	}
-	line[pos] = '\0';
-	SendText(std::string(line));
+	SendText(LinePrefix + line);
 }
 
 /* return 0 or 1 depending if users u and u2 share one or more common channels
@@ -1405,6 +1398,8 @@ void User::DoHostCycle(const std::string &quitline)
 
 	FOREACH_MOD(I_OnBuildNeighborList,OnBuildNeighborList(this, include_c, exceptions));
 
+	// Users shouldn't see themselves quitting when host cycling
+	exceptions.erase(this);
 	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
 	{
 		LocalUser* u = IS_LOCAL(i->first);