X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=9630128e0b1716865df4ba028d9c263e4d4355d7;hb=bd6ca75281a84d42b8643a805ebdff82b020419e;hp=533dd2ad998ae2124c1146b73081b6601a56c417;hpb=3b5353a00bd545085be42c55fbbadd6a041d04f5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 533dd2ad9..9630128e0 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -46,7 +46,7 @@ class Channel_r : public ModeHandler
 		}
 		else
 		{
-			source->WriteNumeric(500, "%s :Only a server may modify the +r channel mode", source->nick.c_str());
+			source->WriteNumeric(500, ":Only a server may modify the +r channel mode");
 		}
 		return MODEACTION_DENY;
 	}
@@ -72,7 +72,7 @@ class User_r : public ModeHandler
 		}
 		else
 		{
-			source->WriteNumeric(500, "%s :Only a server may modify the +r user mode", source->nick.c_str());
+			source->WriteNumeric(500, ":Only a server may modify the +r user mode");
 		}
 		return MODEACTION_DENY;
 	}
@@ -121,8 +121,10 @@ class AccountExtItemImpl : public AccountExtItem
 		{
 			// Logged in
 			if (IS_LOCAL(user))
-				user->WriteNumeric(900, "%s %s %s :You are now logged in as %s",
-					user->nick.c_str(), user->GetFullHost().c_str(), value.c_str(), value.c_str());
+			{
+				user->WriteNumeric(900, "%s %s :You are now logged in as %s",
+					user->GetFullHost().c_str(), value.c_str(), value.c_str());
+			}
 
 			AccountEvent(creator, user, value).Send();
 		}
@@ -142,9 +144,11 @@ class ModuleServicesAccount : public Module
 	Channel_r m4;
 	User_r m5;
 	AccountExtItemImpl accountname;
+	bool checking_ban;
  public:
 	ModuleServicesAccount() : m1(this), m2(this), m3(this), m4(this), m5(this),
 		accountname(this)
+		, checking_ban(false)
 	{
 	}
 
@@ -161,13 +165,13 @@ class ModuleServicesAccount : public Module
 
 		if (account)
 		{
-			ServerInstance->SendWhoisLine(source, dest, 330, "%s %s %s :is logged in as", source->nick.c_str(), dest->nick.c_str(), account->c_str());
+			ServerInstance->SendWhoisLine(source, dest, 330, "%s %s :is logged in as", dest->nick.c_str(), account->c_str());
 		}
 
 		if (dest->IsModeSet(m5))
 		{
 			/* user is registered */
-			ServerInstance->SendWhoisLine(source, dest, 307, "%s %s :is a registered nick", source->nick.c_str(), dest->nick.c_str());
+			ServerInstance->SendWhoisLine(source, dest, 307, "%s :is a registered nick", dest->nick.c_str());
 		}
 	}
 
@@ -175,12 +179,7 @@ class ModuleServicesAccount : public Module
 	{
 		/* On nickchange, if they have +r, remove it */
 		if (user->IsModeSet(m5) && assign(user->nick) != oldnick)
-		{
-			std::vector<std::string> modechange;
-			modechange.push_back(user->nick);
-			modechange.push_back("-r");
-			ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient, ModeParser::MODE_LOCALONLY);
-		}
+			m5.RemoveMode(user);
 	}
 
 	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
@@ -199,7 +198,7 @@ class ModuleServicesAccount : public Module
 			if (c->IsModeSet(m2) && !is_registered && res != MOD_RES_ALLOW)
 			{
 				// user messaging a +M channel and is not registered
-				user->WriteNumeric(477, user->nick+" "+c->name+" :You need to be identified to a registered account to message this channel");
+				user->WriteNumeric(477, c->name+" :You need to be identified to a registered account to message this channel");
 				return MOD_RES_DENY;
 			}
 		}
@@ -210,7 +209,7 @@ class ModuleServicesAccount : public Module
 			if (u->IsModeSet(m3) && !is_registered)
 			{
 				// user messaging a +R user and is not registered
-				user->WriteNumeric(477, ""+ user->nick +" "+ u->nick +" :You need to be identified to a registered account to message this user");
+				user->WriteNumeric(477, u->nick +" :You need to be identified to a registered account to message this user");
 				return MOD_RES_DENY;
 			}
 		}
@@ -219,8 +218,7 @@ class ModuleServicesAccount : public Module
 
 	ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE
 	{
-		static bool checking = false;
-		if (checking)
+		if (checking_ban)
 			return MOD_RES_PASSTHRU;
 
 		if ((mask.length() > 2) && (mask[1] == ':'))
@@ -240,9 +238,9 @@ class ModuleServicesAccount : public Module
 
 				/* If we made it this far we know the user isn't registered
 					so just deny if it matches */
-				checking = true;
+				checking_ban = true;
 				bool result = chan->CheckBan(user, mask.substr(2));
-				checking = false;
+				checking_ban = false;
 
 				if (result)
 					return MOD_RES_DENY;
@@ -266,7 +264,7 @@ class ModuleServicesAccount : public Module
 				if (!is_registered)
 				{
 					// joining a +R channel and not identified
-					user->WriteNumeric(477, user->nick + " " + chan->name + " :You need to be identified to a registered account to join this channel");
+					user->WriteNumeric(477, chan->name + " :You need to be identified to a registered account to join this channel");
 					return MOD_RES_DENY;
 				}
 			}
@@ -288,4 +286,3 @@ class ModuleServicesAccount : public Module
 };
 
 MODULE_INIT(ModuleServicesAccount)
-