Update Event and Request APIs

[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 f1f547fbee20c3f5212696bedc6d11005e287d21..13b35fdfbd6586bf15ce78b48494da206ffcd157 100644 (file)
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -29,9 +29,8 @@ class ModuleGeoIP : public Module
 
 
  public:
-       ModuleGeoIP(InspIRCd *Me) : Module(Me)
-       {
-               OnRehash(NULL, "");
+       ModuleGeoIP()   {
+               OnRehash(NULL);
                Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
                ServerInstance->Modules->Attach(eventlist, this, 2);
 
@@ -44,14 +43,14 @@ class ModuleGeoIP : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("Provides a way to restrict users by country using GeoIP lookup", VF_VENDOR, API_VERSION);
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                GeoBans.clear();
 
-               ConfigReader conf(ServerInstance);
+               ConfigReader conf;
 
                banunknown = conf.ReadFlag("geoip", "banunknown", 0);
 
@@ -63,7 +62,7 @@ class ModuleGeoIP : public Module
                }
        }
 
-       virtual int OnUserRegister(User* user)
+       virtual ModResult OnUserRegister(User* user)
        {
                /* only do lookups on local users */
                if (IS_LOCAL(user))
@@ -81,7 +80,7 @@ class ModuleGeoIP : public Module
                                        ServerInstance->Users->QuitUser(user, "Could not identify your country of origin. Access denied.");
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 };