Clean up crash on destruction of statics at exit

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

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index e88f5c58bde9e22bfd7b3672ed99a4fc1c40371c..9d0e0f54ecf1bde906450ecf16f7a09c98a629ba 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.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.
@@ -27,115 +27,71 @@
  * Now supports CIDR and IP addresses -- Brain
  */
 
-class InspIRCd* ServerInstance;
-
 /** Handles channel mode +I
  */
 class InviteException : public ListModeBase
 {
  public:
-       InviteException(InspIRCd* Instance) : ListModeBase(Instance, 'I', "End of Channel Invite Exception List", 346, 347, true) { }
+       InviteException(Module* Creator) : ListModeBase(Creator, "invex", 'I', "End of Channel Invite Exception List", 346, 347, true) { }
 };
 
 class ModuleInviteException : public Module
 {
-       InviteException* ie;
+       InviteException ie;
 public:
-       ModuleInviteException(InspIRCd* Me) : Module(Me)
+       ModuleInviteException() : ie(this)
        {
-               ie = new InviteException(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(ie))
+               if (!ServerInstance->Modes->AddMode(&ie))
                        throw ModuleException("Could not add new modes!");
-               ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 
-               ie->DoImplements(this);
-               Implementation eventlist[] = { I_OnRequest, I_On005Numeric, I_OnCheckInvite };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ie.DoImplements(this);
+               Implementation eventlist[] = { I_On005Numeric, I_OnCheckInvite };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::string &output)
        {
                output.append(" INVEX=I");
        }
 
-       virtual int OnCheckInvite(User* user, Channel* chan)
+       ModResult OnCheckInvite(User* user, Channel* chan)
        {
                if(chan != NULL)
                {
-                       modelist* list;
-                       chan->GetExt(ie->GetInfoKey(), list);
-                       if (list)
-                       {
-                               std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
-                               for (modelist::iterator it = list->begin(); it != list->end(); it++)
-                               {
-                                       if(InspIRCd::Match(user->GetFullRealHost(), it->mask) || InspIRCd::Match(user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
-                                       {
-                                               // They match an entry on the list, so let them in.
-                                               return 1;
-                                       }
-                               }
-                       }
-                       // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything.
-               }
-
-               return 0;
-       }
-
-       virtual const char* OnRequest(Request* request)
-       {
-               ListModeRequest* LM = (ListModeRequest*)request;
-               if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
-               {
-                       modelist* list;
-                       LM->chan->GetExt(ie->GetInfoKey(), list);
+                       modelist* list = ie.extItem.get(chan);
                        if (list)
                        {
-                               std::string mask = std::string(LM->user->nick) + "!" + LM->user->ident + "@" + LM->user->GetIPString();
                                for (modelist::iterator it = list->begin(); it != list->end(); it++)
                                {
-                                       if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || InspIRCd::Match(LM->user->GetFullHost(), it->mask.c_str()) || (InspIRCd::MatchCIDR(mask, it->mask)))
+                                       if (chan->CheckBan(user, it->mask))
                                        {
-                                               // They match an entry
-                                               return (char*)it->mask.c_str();
+                                               return MOD_RES_ALLOW;
                                        }
                                }
-                               return NULL;
                        }
                }
-               return NULL;
-       }
 
-       virtual void OnCleanup(int target_type, void* item)
-       {
-               ie->DoCleanup(target_type, item);
-       }
-
-       virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
-       {
-               ie->DoSyncChannel(chan, proto, opaque);
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnChannelDelete(Channel* chan)
+       void OnCleanup(int target_type, void* item)
        {
-               ie->DoChannelDelete(chan);
+               ie.DoCleanup(target_type, item);
        }
 
-       virtual void OnRehash(User* user, const std::string &param)
+       void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
-               ie->DoRehash();
+               ie.DoSyncChannel(chan, proto, opaque);
        }
 
-       virtual Version GetVersion()
+       void OnRehash(User* user)
        {
-               return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
+               ie.DoRehash();
        }
 
-       ~ModuleInviteException()
+       Version GetVersion()
        {
-               ServerInstance->Modes->DelMode(ie);
-               delete ie;
-               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
+               return Version("Provides support for the +I channel mode", VF_VENDOR | VF_COMMON);
        }
 };