X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_geoip.cpp;h=d21a82149b423cbbe84fca796fff24f5dbddff5f;hb=6fe1f4e1136f2ab95a88e68af1894bf6002d03f4;hp=142c5fbcfc1c14477fca78df1ab2f24d1211175f;hpb=992674362c5f64bdb8e1942eeaa7612524529cd6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp
index 142c5fbcf..d21a82149 100644
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -46,7 +46,9 @@ class ModuleGeoIP : public Module
 	}
 
  public:
-	ModuleGeoIP() : ext("geoip_cc", this), gi(NULL)
+	ModuleGeoIP()
+		: ext("geoip_cc", ExtensionItem::EXT_USER, this)
+		, gi(NULL)
 	{
 	}
 
@@ -56,7 +58,8 @@ class ModuleGeoIP : public Module
 		if (gi == NULL)
 				throw ModuleException("Unable to initialize geoip, are you missing GeoIP.dat?");
 
-		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)))
@@ -101,7 +104,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)
@@ -110,7 +115,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));