Reasonably sized fix - when adding modes in modules, be sure to check the return...

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

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 23f26647f505aa14940b84c301599eeac9afa6e9..1410c7d98982e728f3ff53f6632d183ccac4de8f 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -2,20 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include <stdio.h>
 #include <map>
 #include "users.h"
@@ -38,7 +33,8 @@ class joinfloodsettings : public classbase
        time_t unlocktime;
        int counter;
        bool locked;
-
+    InspIRCd* ServerInstance;
+    
        joinfloodsettings() : secs(0), joins(0) {};
 
        joinfloodsettings(int b, int c) : secs(b), joins(c)
@@ -139,6 +135,7 @@ class JoinFlood : public ModeHandler
                                else data++;
                        }
                        if (secs)
+
                        {
                                /* Set up the flood parameters for this channel */
                                int njoins = atoi(joins);
@@ -226,7 +223,8 @@ class ModuleJoinFlood : public Module
        {
                
                jf = new JoinFlood(ServerInstance);
-               ServerInstance->AddMode(jf, 'j');
+               if (!ServerInstance->AddMode(jf, 'j'))
+                       throw ModuleException("Could not add new modes!");
        }
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
@@ -284,7 +282,7 @@ class ModuleJoinFlood : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };