X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_geoip.cpp;h=3561d1a5da2f21d18bbb61c4acf072b88f4145dc;hb=3ccf0065d43db80f31c6404aeac4d65551481508;hp=7696146e8466443459b986590c3be7d3f27c4f7f;hpb=4ab1c43c1eee708fc50a4808f714a731891b75e8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp
index 7696146e8..3561d1a5d 100644
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -27,7 +27,6 @@
 # pragma comment(lib, "GeoIP.lib")
 #endif
 
-/* $ModDesc: Provides a way to restrict users by country using GeoIP lookup */
 /* $LinkerFlags: -lGeoIP */
 
 class ModuleGeoIP : public Module
@@ -35,7 +34,7 @@ class ModuleGeoIP : public Module
 	LocalStringExt ext;
 	GeoIP* gi;
 
-	void SetExt(LocalUser* user)
+	std::string* SetExt(LocalUser* user)
 	{
 		const char* c = GeoIP_country_code_by_addr(gi, user->GetIPString().c_str());
 		if (!c)
@@ -43,6 +42,7 @@ class ModuleGeoIP : public Module
 
 		std::string* cc = new std::string(c);
 		ext.set(user, cc);
+		return cc;
 	}
 
  public:
@@ -56,11 +56,8 @@ class ModuleGeoIP : public Module
 		if (gi == NULL)
 				throw ModuleException("Unable to initialize geoip, are you missing GeoIP.dat?");
 
-		ServerInstance->Modules->AddService(ext);
-		Implementation eventlist[] = { I_OnSetConnectClass, I_OnStats };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-
-		for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i)
+		const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+		for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
 		{
 			LocalUser* user = *i;
 			if ((user->registered == REG_ALL) && (!ext.get(user)))
@@ -85,7 +82,7 @@ class ModuleGeoIP : public Module
 	{
 		std::string* cc = ext.get(user);
 		if (!cc)
-			SetExt(user);
+			cc = SetExt(user);
 
 		std::string geoip = myclass->config->getString("geoip");
 		if (geoip.empty())
@@ -105,7 +102,9 @@ class ModuleGeoIP : public Module
 
 		unsigned int unknown = 0;
 		std::map<std::string, unsigned int> results;
-		for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i)
+
+		const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+		for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
 		{
 			std::string* cc = ext.get(*i);
 			if (cc)
@@ -114,7 +113,7 @@ class ModuleGeoIP : public Module
 				unknown++;
 		}
 
-		std::string p = ServerInstance->Config->ServerName + " 801 " + user->nick + " :GeoIPSTATS ";
+		std::string p = "801 " + user->nick + " :GeoIPSTATS ";
 		for (std::map<std::string, unsigned int>::const_iterator i = results.begin(); i != results.end(); ++i)
 		{
 			out.push_back(p + i->first + " " + ConvToStr(i->second));