Should now work with ports bound to all interfaces

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

diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 54691f05d809857ad66b5a0b986741d419deefb2..86f5e946a38e51973653cd4a0f2647343e7c5faf 100644 (file)
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -187,7 +187,7 @@ class ChanFounder : public ModeHandler, public FounderProtectBase
        {
        }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                User* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
 
@@ -208,7 +208,7 @@ class ChanFounder : public ModeHandler, public FounderProtectBase
                else
                {
                        // whoops, someones being naughty!
-                       source->WriteServ("468 %s %s :Only servers may set channel mode +q",source->nick, channel->name);
+                       source->WriteNumeric(468, "%s %s :Only servers may set channel mode +q",source->nick, channel->name);
                        parameter.clear();
                        return MODEACTION_DENY;
                }
@@ -249,7 +249,7 @@ class ChanProtect : public ModeHandler, public FounderProtectBase
        {
        }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                User* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
 
@@ -270,7 +270,7 @@ class ChanProtect : public ModeHandler, public FounderProtectBase
                else
                {
                        // bzzzt, wrong answer!
-                       source->WriteServ("482 %s %s :You are not a channel founder",source->nick, channel->name);
+                       source->WriteNumeric(482, "%s %s :You are not a channel founder",source->nick, channel->name);
                        return MODEACTION_DENY;
                }
        }
@@ -308,8 +308,12 @@ class ModuleChanProtect : public Module
                cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers);
                cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers);
 
-               if (!ServerInstance->AddMode(cp) || !ServerInstance->AddMode(cf))
+               if (!ServerInstance->Modes->AddMode(cp) || !ServerInstance->Modes->AddMode(cf))
+               {
+                       delete cp;
+                       delete cf;
                        throw ModuleException("Could not add new modes!");
+               }
 
                Implementation eventlist[] = { I_OnUserKick, I_OnUserPart, I_OnRehash, I_OnUserPreJoin, I_OnPostJoin, I_OnAccessCheck, I_OnSyncChannel };
                ServerInstance->Modules->Attach(eventlist, this, 7);
@@ -358,9 +362,9 @@ class ModuleChanProtect : public Module
                        cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers);
                        cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers);
                        /* These wont fail, we already owned the mode characters before */
-                       ServerInstance->AddMode(cp);
-                       ServerInstance->AddMode(cf);
-                       ServerInstance->WriteOpers("*** WARNING: +qa prefixes were enabled or disabled via a REHASH. Clients will probably need to reconnect to pick up this change.");
+                       ServerInstance->Modes->AddMode(cp);
+                       ServerInstance->Modes->AddMode(cf);
+                       ServerInstance->SNO->WriteToSnoMask('A', "WARNING: +qa prefixes were enabled or disabled via a REHASH. Clients will probably need to reconnect to pick up this change.");
                }
        }
        
@@ -415,12 +419,12 @@ class ModuleChanProtect : public Module
                        case AC_DEOP:
                                if (dest->GetExt(founder,dummyptr))
                                {
-                                       source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're a channel founder");
+                                       source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're a channel founder");
                                        return ACR_DENY;
                                }
                                if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
                                {
-                                       source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)");
+                                       source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)");
                                        return ACR_DENY;
                                }
                        break;
@@ -429,12 +433,12 @@ class ModuleChanProtect : public Module
                        case AC_KICK:
                                if (dest->GetExt(founder,dummyptr))
                                {
-                                       source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're a channel founder");
+                                       source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're a channel founder");
                                        return ACR_DENY;
                                }
                                if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
                                {
-                                       source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're protected (+a)");
+                                       source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're protected (+a)");
                                        return ACR_DENY;
                                }
                        break;
@@ -443,12 +447,12 @@ class ModuleChanProtect : public Module
                        case AC_DEHALFOP:
                                if (dest->GetExt(founder,dummyptr))
                                {
-                                       source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're a channel founder");
+                                       source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're a channel founder");
                                        return ACR_DENY;
                                }
                                if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
                                {
-                                       source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're protected (+a)");
+                                       source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're protected (+a)");
                                        return ACR_DENY;
                                }
                        break;
@@ -457,12 +461,12 @@ class ModuleChanProtect : public Module
                        case AC_DEVOICE:
                                if (dest->GetExt(founder,dummyptr))
                                {
-                                       source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're a channel founder");
+                                       source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're a channel founder");
                                        return ACR_DENY;
                                }
                                if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
                                {
-                                       source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're protected (+a)");
+                                       source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're protected (+a)");
                                        return ACR_DENY;
                                }
                        break;
@@ -482,7 +486,7 @@ class ModuleChanProtect : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
        virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)