X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=30aba781c8f9a021320fac4f31a9bfb45f629424;hb=fd6ee21f2f55875984884a8413d61012e066029f;hp=fbf2209292fd1d57b2beb7f9c9b055a28625a3c0;hpb=6ab1d0dffb8084bf6a2ad8a446a3836fa3760c8a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index fbf220929..30aba781c 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -25,9 +25,12 @@ using namespace std; #include "modules.h" #include "helperfuncs.h" #include "hashcomp.h" +#include "configreader.h" +#include "inspircd.h" + + + -static Server *Srv; - class TimedBan : public classbase { public: @@ -42,7 +45,7 @@ timedbans TimedBanList; class cmd_tban : public command_t { public: - cmd_tban () : command_t("TBAN", 0, 3) + cmd_tban (InspIRCd* Instance) : command_t(Instance,"TBAN", 0, 3) { this->source = "m_timedbans.so"; syntax = " "; @@ -50,35 +53,35 @@ class cmd_tban : public command_t void Handle (const char** parameters, int pcnt, userrec *user) { - chanrec* channel = Srv->FindChannel(parameters[0]); + chanrec* channel = ServerInstance->FindChan(parameters[0]); if (channel) { - std::string cm = Srv->ChanMode(user,channel); - if ((cm == "%") || (cm == "@")) + int cm = channel->GetStatus(user); + if ((cm == STATUS_HOP) || (cm == STATUS_OP)) { - if (!Srv->IsValidMask(parameters[2])) + if (!ServerInstance->IsValidMask(parameters[2])) { - Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid ban mask"); + user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask"); return; } for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) { if (!strcasecmp(i->data,parameters[2])) { - Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0])); + user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0])); return; } } TimedBan T; std::string channelname = parameters[0]; - unsigned long expire = Srv->CalcDuration(parameters[1]) + time(NULL); - if (Srv->CalcDuration(parameters[1]) < 1) + unsigned long expire = ServerInstance->CalcDuration(parameters[1]) + time(NULL); + if (ServerInstance->CalcDuration(parameters[1]) < 1) { - Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid ban time"); + user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time"); return; } char duration[MAXBUF]; - snprintf(duration,MAXBUF,"%lu",Srv->CalcDuration(parameters[1])); + snprintf(duration,MAXBUF,"%lu",ServerInstance->CalcDuration(parameters[1])); std::string mask = parameters[2]; const char *setban[32]; setban[0] = parameters[0]; @@ -86,7 +89,7 @@ class cmd_tban : public command_t setban[2] = parameters[2]; // use CallCommandHandler to make it so that the user sets the mode // themselves - Srv->CallCommandHandler("MODE",setban,3,user); + ServerInstance->CallCommandHandler("MODE",setban,3,user); /* Check if the ban was actually added (e.g. banlist was NOT full) */ bool was_added = false; for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) @@ -98,14 +101,14 @@ class cmd_tban : public command_t T.mask = mask; T.expire = expire; TimedBanList.push_back(T); - channel->WriteChannelWithServ(Srv->GetServerName().c_str(), "NOTICE %s :%s added a timed ban on %s lasting for %s seconds.", channel->name, user->nick, mask.c_str(), duration); + channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s added a timed ban on %s lasting for %s seconds.", channel->name, user->nick, mask.c_str(), duration); } return; } - else WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name); + else user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name); return; } - WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]); + user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]); } }; @@ -113,12 +116,12 @@ class ModuleTimedBans : public Module { cmd_tban* mycommand; public: - ModuleTimedBans(Server* Me) + ModuleTimedBans(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; - mycommand = new cmd_tban(); - Srv->AddCommand(mycommand); + + mycommand = new cmd_tban(ServerInstance); + ServerInstance->AddCommand(mycommand); TimedBanList.clear(); } @@ -157,11 +160,11 @@ class ModuleTimedBans : public Module { if (curtime > i->expire) { - chanrec* cr = Srv->FindChannel(i->channel); + chanrec* cr = ServerInstance->FindChan(i->channel); again = true; if (cr) { - cr->WriteChannelWithServ(Srv->GetServerName().c_str(), "NOTICE %s :Timed ban on %s expired.", cr->name, i->mask.c_str()); + cr->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :Timed ban on %s expired.", cr->name, i->mask.c_str()); const char *setban[3]; setban[0] = i->channel.c_str(); setban[1] = "-b"; @@ -171,10 +174,10 @@ class ModuleTimedBans : public Module // back to, so we create it a fake user that isnt in the user // hash and set its descriptor to FD_MAGIC_NUMBER so the data // falls into the abyss :p - userrec* temp = new userrec; + userrec* temp = new userrec(ServerInstance); temp->fd = FD_MAGIC_NUMBER; temp->server = ""; - Srv->SendMode(setban,3,temp); + ServerInstance->SendMode(setban,3,temp); /* FIX: Send mode remotely*/ std::deque n; n.push_back(i->channel); @@ -214,7 +217,7 @@ class ModuleTimedBansFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleTimedBans(Me); }