X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanprotect.cpp;h=8e23190376ebaa95d10210a0cda5ce250b7aaf14;hb=4cb2be033bbb0eafc7ee4fa579daf7ccaca8860b;hp=8cf91d45cda6e1fcd5c527e27a480bb1633ba1a9;hpb=3d3df9c48d576f6d6ac878a2abe3ab694fa24de6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index 8cf91d45c..8e2319037 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -34,13 +34,14 @@ class ModuleChanProtect : public Module public: - ModuleChanProtect() + ModuleChanProtect(Server* Me) + : Module::Module(Me) { // here we initialise our module. Use new to create new instances of the required // classes. - Srv = new Server; + Srv = Me; Conf = new ConfigReader; // set up our modes. We're using listmodes and not normal extmodes here. @@ -52,6 +53,11 @@ class ModuleChanProtect : public Module // read our config options (main config file) FirstInGetsFounder = Conf->ReadFlag("options","noservices",0); } + + void Implements(char* List) + { + List[I_On005Numeric] = List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserJoin] = List[I_OnAccessCheck] = List[I_OnExtendedMode] = List[I_OnSendList] = List[I_OnSyncChannel] = 1; + } virtual void On005Numeric(std::string &output) { @@ -79,14 +85,14 @@ class ModuleChanProtect : public Module user->Shrink("cm_protect_"+std::string(chan->name)); } - virtual void OnUserPart(userrec* user, chanrec* channel) + virtual void OnUserPart(userrec* user, chanrec* channel, std::string partreason) { // FIX: when someone parts a channel we must remove their Extensibles! user->Shrink("cm_founder_"+std::string(channel->name)); user->Shrink("cm_protect_"+std::string(channel->name)); } - virtual void OnRehash() + virtual void OnRehash(std::string parameter) { // on a rehash we delete our classes for good measure and create them again. delete Conf; @@ -146,12 +152,12 @@ class ModuleChanProtect : public Module case AC_DEOP: if (dest->GetExt("cm_founder_"+std::string(channel->name))) { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as the're a channel founder"); + Srv->SendServ(source->fd,"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("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name)))) { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as the're protected (+a)"); + Srv->SendServ(source->fd,"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; @@ -160,12 +166,12 @@ class ModuleChanProtect : public Module case AC_KICK: if (dest->GetExt("cm_founder_"+std::string(channel->name))) { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as the're a channel founder"); + Srv->SendServ(source->fd,"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("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name)))) { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as the're protected (+a)"); + Srv->SendServ(source->fd,"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; @@ -174,12 +180,12 @@ class ModuleChanProtect : public Module case AC_DEHALFOP: if (dest->GetExt("cm_founder_"+std::string(channel->name))) { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as the're a channel founder"); + Srv->SendServ(source->fd,"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("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name)))) { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as the're protected (+a)"); + Srv->SendServ(source->fd,"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; @@ -188,12 +194,12 @@ class ModuleChanProtect : public Module case AC_DEVOICE: if (dest->GetExt("cm_founder_"+std::string(channel->name))) { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as the're a channel founder"); + Srv->SendServ(source->fd,"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("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name)))) { - Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as the're protected (+a)"); + Srv->SendServ(source->fd,"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; @@ -300,7 +306,7 @@ class ModuleChanProtect : public Module if (mode == 'q') { chanuserlist cl = Srv->GetUsers(channel); - for (int i = 0; i < cl.size(); i++) + for (unsigned int i = 0; i < cl.size(); i++) { if (cl[i]->GetExt("cm_founder_"+std::string(channel->name))) { @@ -312,7 +318,7 @@ class ModuleChanProtect : public Module if (mode == 'a') { chanuserlist cl = Srv->GetUsers(channel); - for (int i = 0; i < cl.size(); i++) + for (unsigned int i = 0; i < cl.size(); i++) { if (cl[i]->GetExt("cm_protect_"+std::string(channel->name))) { @@ -327,7 +333,6 @@ class ModuleChanProtect : public Module virtual ~ModuleChanProtect() { delete Conf; - delete Srv; } virtual Version GetVersion() @@ -335,25 +340,24 @@ class ModuleChanProtect : public Module return Version(1,0,0,0,VF_STATIC|VF_VENDOR); } - virtual string_list OnChannelSync(chanrec* chan) + virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque) { // this is called when the server is linking into a net and wants to sync channel data. // we should send our mode changes for the channel here to ensure that other servers // know whos +q/+a on the channel. chanuserlist cl = Srv->GetUsers(chan); string_list commands; - for (int i = 0; i < cl.size(); i++) + for (unsigned int i = 0; i < cl.size(); i++) { if (cl[i]->GetExt("cm_founder_"+std::string(chan->name))) { - commands.push_back("M "+std::string(chan->name)+" +q "+std::string(cl[i]->nick)); + proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+q "+std::string(cl[i]->nick)); } if (cl[i]->GetExt("cm_protect_"+std::string(chan->name))) { - commands.push_back("M "+std::string(chan->name)+" +a "+std::string(cl[i]->nick)); + proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+a "+std::string(cl[i]->nick)); } } - return commands; } }; @@ -370,9 +374,9 @@ class ModuleChanProtectFactory : public ModuleFactory { } - virtual Module * CreateModule() + virtual Module * CreateModule(Server* Me) { - return new ModuleChanProtect; + return new ModuleChanProtect(Me); } };