Allow commands to optionally route themselves using ENCAP

[user/henk/code/inspircd.git] / src / modules / extra / m_geoip.cpp

diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp
index 0e5723bc554771a71a595e4be849782f868680a8..21a57a2830e7dfac18aded9ab58749b0b003646c 100644 (file)
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -31,7 +31,7 @@ class ModuleGeoIP : public Module
  public:
        ModuleGeoIP(InspIRCd *Me) : Module(Me)
        {
-               OnRehash(NULL, "");
+               OnRehash(NULL);
                Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
                ServerInstance->Modules->Attach(eventlist, this, 2);
 
@@ -44,10 +44,10 @@ class ModuleGeoIP : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                GeoBans.clear();
 
@@ -73,12 +73,12 @@ class ModuleGeoIP : public Module
                        {
                                std::map<std::string, std::string>::iterator x = GeoBans.find(c);
                                if (x != GeoBans.end())
-                                       User::QuitUser(ServerInstance, user,  x->second);
+                                       ServerInstance->Users->QuitUser(user,  x->second);
                        }
                        else
                        {
                                if (banunknown)
-                                       User::QuitUser(ServerInstance, user, "Could not identify your country of origin. Access denied.");
+                                       ServerInstance->Users->QuitUser(user, "Could not identify your country of origin. Access denied.");
                        }
                }
                return 0;