X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=aac0b9ce079d7f3fff6264a8d8d57512e16d1780;hb=8c71a2a6304f0d77aa7738e04a44f366a158cadd;hp=feb62f8582169a9825679aa873577082a92ac6aa;hpb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index feb62f858..aac0b9ce0 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -102,37 +102,17 @@ class AChannel_M : public SimpleChannelModeHandler
 	AChannel_M(Module* Creator) : SimpleChannelModeHandler(Creator, "regmoderated", 'M') { }
 };
 
-static bool ReadCGIIRCExt(const char* extname, User* user, const std::string*& out)
-{
-	ExtensionItem* wiext = ServerInstance->Extensions.GetItem(extname);
-	if (!wiext)
-		return false;
-
-	if (wiext->creator->ModuleSourceFile != "m_cgiirc.so")
-		return false;
-
-	StringExtItem* stringext = static_cast<StringExtItem*>(wiext);
-	std::string* addr = stringext->get(user);
-	if (!addr)
-		return false;
-
-	out = addr;
-	return true;
-}
-
 class AccountExtItemImpl : public AccountExtItem
 {
  public:
 	AccountExtItemImpl(Module* mod)
-		: AccountExtItem("accountname", mod)
+		: AccountExtItem("accountname", ExtensionItem::EXT_USER, mod)
 	{
 	}
 
 	void unserialize(SerializeFormat format, Extensible* container, const std::string& value)
 	{
-		User* user = dynamic_cast<User*>(container);
-		if (!user)
-			return;
+		User* user = static_cast<User*>(container);
 
 		StringExtItem::unserialize(format, container, value);
 		if (!value.empty())
@@ -140,17 +120,8 @@ class AccountExtItemImpl : public AccountExtItem
 			// Logged in
 			if (IS_LOCAL(user))
 			{
-				const std::string* host = &user->dhost;
-				if (user->registered != REG_ALL)
-				{
-					if (!ReadCGIIRCExt("cgiirc_webirc_hostname", user, host))
-					{
-						ReadCGIIRCExt("cgiirc_webirc_ip", user, host);
-					}
-				}
-
-				user->WriteNumeric(900, "%s!%s@%s %s :You are now logged in as %s",
-					user->nick.c_str(), user->ident.c_str(), host->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();
@@ -175,6 +146,7 @@ class ModuleServicesAccount : public Module
  public:
 	ModuleServicesAccount() : m1(this), m2(this), m3(this), m4(this), m5(this),
 		accountname(this)
+		, checking_ban(false)
 	{
 	}
 
@@ -205,12 +177,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