X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=7962d6a1def26cc59714260e55abe948d89de1f4;hb=43fe72edad4c5dfd1a3a700bea17c8ee7a7c3d8e;hp=94ca1e5d29ec9878b2ad306f47b3ed0b6b734b2a;hpb=0cf79792cb31326db8acd0849f5e9f8523da8eda;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index 94ca1e5d2..7962d6a1d 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -1,6 +1,8 @@ /* Support for a dancer-style /remove command, an alternative to /kick to try and avoid auto-rejoin-on-kick scripts */ /* Written by Om, 25-03-05 */ +using namespace std; + #include #include #include "users.h" @@ -18,112 +20,128 @@ Server *Srv; /* This little function just converts a chanmode character (~ & @ & +) into an integer (5 4 3 2 1) */ +/* XXX - this could be handy in the core, so it can be used elsewhere */ int chartolevel(std::string privs) { - int level; - if(privs == "~") - level = 5; - else - if(privs == "&") - level = 4; - else - if(privs == "@") - level = 3; + /* XXX - if we just passed this a char, we could do a switch. Look nicer, really. */ + + if (privs == "~") + return 5; + else if (privs == "&") + return 4; + else if (privs == "@") + return 3; + else if (privs == "%") + return 2; else - if(privs == "%") { - level = 2; - } else { - level = 1; - } - return level; + return 1; } - -void handle_remove(char **parameters, int pcnt, userrec *user) + +class cmd_remove : public command_t { - /* Look up the user we're meant to be removing from the channel */ - userrec* target = Srv->FindNick(std::string(parameters[0])); - /* And the channel we're meant to be removing them from */ - chanrec* channel = Srv->FindChannel(std::string(parameters[1])); - /* And see if the person calling the command has access to use it on the channel */ - std::string privs = Srv->ChanMode(user, channel); - /* Check what privs the person being removed has */ - std::string targetprivs = Srv->ChanMode(target, channel); - int tlevel; - int ulevel; - int n = 2; - std::string result; - - /* This turns all the parameters after the first two into a single string, so the part reason can be multi-word */ - while (n < pcnt) + public: + cmd_remove () : command_t("REMOVE", 0, 2) { - result=result + std::string(" ") + std::string(parameters[n]); - n++; + this->source = "m_remove.so"; } - - /* If the target nick exists... */ - if (target && channel) + + void Handle (char **parameters, int pcnt, userrec *user) { - for (int x = 0; x < strlen(parameters[1]); x++) + /* Look up the user we're meant to be removing from the channel */ + userrec* target = Srv->FindNick(std::string(parameters[0])); + /* And the channel we're meant to be removing them from */ + chanrec* channel = Srv->FindChannel(std::string(parameters[1])); + /* And see if the person calling the command has access to use it on the channel */ + std::string privs = Srv->ChanMode(user, channel); + /* Check what privs the person being removed has */ + std::string targetprivs = Srv->ChanMode(target, channel); + int tlevel; + int ulevel; + int n = 2; + std::string result; + + /* This turns all the parameters after the first two into a single string, so the part reason can be multi-word */ + while (n < pcnt) { - if ((parameters[1][0] != '#') || (parameters[1][x] == ' ') || (parameters[1][x] == ',')) - { - Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name"); - return; - } + result=result + std::string(" ") + std::string(parameters[n]); + n++; } - /* This is adding support for the +q and +a channel modes, basically if they are enabled, and the remover has them set. */ - /* Then we change the @|%|+ to & if they are +a, or ~ if they are +q */ - if (user->GetExt("cm_protect_"+std::string(channel->name))) - privs = std::string("&"); - if (user->GetExt("cm_founder_"+std::string(channel->name))) - privs = std::string("~"); + /* If the target nick exists... */ + if (target && channel) + { + for (unsigned int x = 0; x < strlen(parameters[1]); x++) + { + if ((parameters[1][0] != '#') || (parameters[1][x] == ' ') || (parameters[1][x] == ',')) + { + Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name"); + return; + } + } - /* Now it's the same idea, except for the target */ - if (target->GetExt("cm_protect_"+std::string(channel->name))) - targetprivs = std::string("&"); - if (target->GetExt("cm_founder_"+std::string(channel->name))) - targetprivs = std::string("~"); + /* This is adding support for the +q and +a channel modes, basically if they are enabled, and the remover has them set. */ + /* Then we change the @|%|+ to & if they are +a, or ~ if they are +q */ + if (user->GetExt("cm_protect_"+std::string(channel->name))) + privs = std::string("&"); + if (user->GetExt("cm_founder_"+std::string(channel->name))) + privs = std::string("~"); + + /* Now it's the same idea, except for the target */ + if (target->GetExt("cm_protect_"+std::string(channel->name))) + targetprivs = std::string("&"); + if (target->GetExt("cm_founder_"+std::string(channel->name))) + targetprivs = std::string("~"); + + tlevel = chartolevel(targetprivs); + ulevel = chartolevel(privs); - tlevel = chartolevel(targetprivs); - ulevel = chartolevel(privs); - - /* If the user calling the command is either an admin, owner, operator or a half-operator on the channel */ - if(ulevel > 1) - { - /* For now, we'll let everyone remove their level and below, eg ops can remove ops, halfops, voices, and those with no mode (no moders actually are set to 1) */ - if(ulevel >= tlevel) + /* If the user calling the command is either an admin, owner, operator or a half-operator on the channel */ + if(ulevel > 1) + { + /* For now, we'll let everyone remove their level and below, eg ops can remove ops, halfops, voices, and those with no mode (no moders actually are set to 1) */ + if(ulevel >= tlevel) + { + Srv->PartUserFromChannel(target,std::string(parameters[1]), "Remove by "+std::string(user->nick)+":"+result); + Srv->SendTo(NULL,user,"NOTICE "+std::string(channel->name)+" : "+std::string(user->nick)+" removed "+std::string(target->nick)+ " from the channel"); + Srv->SendTo(NULL,target,"NOTICE "+std::string(target->nick)+" :*** "+std::string(user->nick)+" removed you from "+std::string(channel->name)+" with the message:"+std::string(result)); + } + else + { + Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** You do not have access to remove "+std::string(target->nick)+" from the "+std::string(channel->name)); + } + } + else { - Srv->PartUserFromChannel(target,std::string(parameters[1]), "Remove by "+std::string(user->nick)+":"+result); - Srv->SendTo(NULL,user,"NOTICE "+std::string(channel->name)+" : "+std::string(user->nick)+" removed "+std::string(target->nick)+ " from the channel"); - Srv->SendTo(NULL,target,"NOTICE "+std::string(target->nick)+" :*** "+std::string(user->nick)+" removed you from "+std::string(channel->name)+" with the message:"+std::string(result)); - } else { - Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** You do not have access to remove "+std::string(target->nick)+" from the "+std::string(channel->name)); + Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** You do not have access to use /remove on "+std::string(channel->name)); } - } else { - Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** You do not have access to use /remove on "+std::string(channel->name)); } } -} - +}; class ModuleRemove : public Module { + cmd_remove* mycommand; public: - ModuleRemove() + ModuleRemove(Server* Me) + : Module::Module(Me) { - Srv = new Server; - Srv->AddCommand("REMOVE", handle_remove, 0, 3); + Srv = Me; + mycommand = new cmd_remove(); + Srv->AddCommand(mycommand); } + + virtual void On005Numeric(std::string &output) + { + output = output + std::string(" REMOVE"); + } virtual ~ModuleRemove() { - delete Srv; } virtual Version GetVersion() { - return Version(1,0,0,0); + return Version(1,0,0,1,VF_VENDOR); } }; @@ -141,9 +159,9 @@ class ModuleRemoveFactory : public ModuleFactory { } - virtual Module * CreateModule() + virtual Module * CreateModule(Server* Me) { - return new ModuleRemove; + return new ModuleRemove(Me); } };