X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=d7ac3d04a3c74793d4d3885b2983c010e36e4253;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=6ee50ea0727120976c3ef8db9b2679da17653f25;hpb=fea1a27cb96a114f698eedcf90401b78406108fb;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 6ee50ea07..d7ac3d04a 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -19,160 +19,154 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" +#include "inspircd.h" #include /* $ModDesc: Provides aliases of commands. */ class Alias : public classbase { - public: - irc::string text; - std::string replace_with; - std::string requires; - bool uline; + public: + irc::string text; + std::string replace_with; + std::string requires; + bool uline; }; class ModuleAlias : public Module { - private: - Server *Srv; - ConfigReader *MyConf; - std::vector Aliases; + private: + ConfigReader *MyConf; + std::vector Aliases; - virtual void ReadAliases() + virtual void ReadAliases() + { + Aliases.clear(); + + for (int i = 0; i < MyConf->Enumerate("alias"); i++) { - Aliases.clear(); + Alias a; + std::string txt; + txt = MyConf->ReadValue("alias", "text", i); + a.text = txt.c_str(); + a.replace_with = MyConf->ReadValue("alias", "replace", i); + a.requires = MyConf->ReadValue("alias", "requires", i); - for (int i = 0; i < MyConf->Enumerate("alias"); i++) - { - Alias a; - std::string txt; - txt = MyConf->ReadValue("alias", "text", i); - a.text = txt.c_str(); - a.replace_with = MyConf->ReadValue("alias", "replace", i); - a.requires = MyConf->ReadValue("alias", "requires", i); - - a.uline = ((MyConf->ReadValue("alias", "uline", i) == "yes") || - (MyConf->ReadValue("alias", "uline", i) == "1") || - (MyConf->ReadValue("alias", "uline", i) == "true")); - - Aliases.push_back(a); - } - + a.uline = ((MyConf->ReadValue("alias", "uline", i) == "yes") || + (MyConf->ReadValue("alias", "uline", i) == "1") || + (MyConf->ReadValue("alias", "uline", i) == "true")); + + Aliases.push_back(a); } - public: - - ModuleAlias(Server* Me) - : Module::Module(Me) - { - Srv = Me; - MyConf = new ConfigReader; - ReadAliases(); - } + } - void Implements(char* List) - { - List[I_OnPreCommand] = List[I_OnRehash] = 1; - } - - virtual ~ModuleAlias() - { - DELETE(MyConf); - } + public: - virtual Version GetVersion() - { - return Version(1,0,0,1,VF_VENDOR); - } - - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated) + ModuleAlias(InspIRCd* Me) + : Module::Module(Me) + { + + MyConf = new ConfigReader(ServerInstance); + ReadAliases(); + } + + void Implements(char* List) + { + List[I_OnPreCommand] = List[I_OnRehash] = 1; + } + + virtual ~ModuleAlias() + { + DELETE(MyConf); + } + + virtual Version GetVersion() + { + return Version(1,0,0,1,VF_VENDOR); + } + + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated) + { + userrec *u = NULL; + irc::string c = command.c_str(); + /* If the command is valid, we dont want to know, + * and if theyre not registered yet, we dont want + * to know either + */ + if ((validated) || (user->registered != REG_ALL)) + return 0; + + for (unsigned int i = 0; i < Aliases.size(); i++) { - userrec *u = NULL; - irc::string c = command.c_str(); - - /* If the command is valid, we dont want to know, - * and if theyre not registered yet, we dont want - * to know either - */ - if ((validated) || (user->registered != REG_ALL)) - return 0; - - for (unsigned int i = 0; i < Aliases.size(); i++) + if (Aliases[i].text == c) { - if (Aliases[i].text == c) + if (Aliases[i].requires != "") { - if (Aliases[i].requires != "") + u = ServerInstance->FindNick(Aliases[i].requires); + if (!u) { - u = Srv->FindNick(Aliases[i].requires); - if (!u) - { - user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later."); - return 1; - } + user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later."); + return 1; } - if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline)) + } + if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline)) + { + if (!ServerInstance->ULine(u->server)) { - if (!Srv->IsUlined(u->server)) - { - Srv->SendOpers("*** NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); - user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible."); - return 1; - } + ServerInstance->WriteOpers("*** NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); + user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible."); + return 1; } - + } std::string n = ""; - for (int j = 0; j < pcnt; j++) - { - if (j) - n = n + " "; - n = n + parameters[j]; - } - /* Final param now in n as one string */ - std::stringstream stuff(Aliases[i].replace_with); - + for (int j = 0; j < pcnt; j++) + { + if (j) + n = n + " "; + n = n + parameters[j]; + } + /* Final param now in n as one string */ + std::stringstream stuff(Aliases[i].replace_with); std::string cmd = ""; - std::string target = ""; - stuff >> cmd; - stuff >> target; - + std::string target = ""; + stuff >> cmd; + stuff >> target; const char* para[2]; - para[0] = target.c_str(); - para[1] = n.c_str(); - - Srv->CallCommandHandler(cmd,para,2,user); - return 1; - } + para[0] = target.c_str(); + para[1] = n.c_str(); + ServerInstance->CallCommandHandler(cmd,para,2,user); + return 1; } - return 0; - } - - virtual void OnRehash(const std::string ¶meter) - { - DELETE(MyConf); - MyConf = new ConfigReader; - - ReadAliases(); - } + } + return 0; + } + + virtual void OnRehash(const std::string ¶meter) + { + DELETE(MyConf); + MyConf = new ConfigReader(ServerInstance); + + ReadAliases(); + } }; class ModuleAliasFactory : public ModuleFactory { - public: - ModuleAliasFactory() - { - } - - ~ModuleAliasFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleAlias(Me); - } + public: + ModuleAliasFactory() + { + } + + ~ModuleAliasFactory() + { + } + + virtual Module * CreateModule(InspIRCd* Me) + { + return new ModuleAlias(Me); + } };