X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=d7ac3d04a3c74793d4d3885b2983c010e36e4253;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=837750da85fa6a9bf9c7e7648f7ae3ee7c7c2d99;hpb=090e7863df54f91ab206141ef5ef9395afcbd752;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 837750da8..d7ac3d04a 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.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: * * @@ -19,144 +19,154 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" +#include "inspircd.h" #include /* $ModDesc: Provides aliases of commands. */ -class Alias +class Alias : public classbase { - public: - std::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; - public: - /* XXX - small issue, why is this marked public when it's not (really) intended for external use */ - virtual void ReadAliases() - { - Aliases.clear(); - - for (int i = 0; i < MyConf->Enumerate("alias"); i++) - { - Alias a; - a.text = MyConf->ReadValue("alias", "text", i); - 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); - } - - } - - ModuleAlias() - { - Srv = new Server; - MyConf = new ConfigReader; + private: + ConfigReader *MyConf; + std::vector Aliases; - ReadAliases(); - } + virtual void ReadAliases() + { + Aliases.clear(); - virtual ~ModuleAlias() + for (int i = 0; i < MyConf->Enumerate("alias"); i++) { - delete Srv; - delete MyConf; + 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); } + + } + + public: - virtual Version GetVersion() - { - return Version(1,0,0,1,VF_VENDOR); - } + ModuleAlias(InspIRCd* Me) + : Module::Module(Me) + { + + MyConf = new ConfigReader(ServerInstance); + ReadAliases(); + } + void Implements(char* List) + { + List[I_OnPreCommand] = List[I_OnRehash] = 1; + } - virtual void OnServerRaw(std::string &raw, bool inbound, userrec* user) - { - char data[MAXBUF]; - char *dptr; - userrec *u = NULL; + virtual ~ModuleAlias() + { + DELETE(MyConf); + } + + virtual Version GetVersion() + { + return Version(1,0,0,1,VF_VENDOR); + } - if (inbound) + 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++) + { + if (Aliases[i].text == c) { - strncpy(data, raw.c_str(),MAXBUF); - dptr = data; - - for (unsigned int i = 0; i < Aliases.size(); i++) + if (Aliases[i].requires != "") { - if (!strncasecmp(Aliases[i].text.c_str(),data,Aliases[i].text.length())) + u = ServerInstance->FindNick(Aliases[i].requires); + if (!u) { - if (Aliases[i].requires != "") - { - u = Srv->FindNick(Aliases[i].requires); - } - - if ((Aliases[i].requires != "") && (!u)) - { - Srv->SendServ(user->fd,"401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later."); - raw = "PONG :"+Srv->GetServerName(); - return; - } - if (Aliases[i].uline) - { - if (!Srv->IsUlined(u->server)) - { - Srv->SendOpers("*** NOTICE -- Service "+Aliases[i].requires+" required by alias "+Aliases[i].text+" is not on a u-lined server, possibly underhanded antics detected!"); - Srv->SendServ(user->fd,"401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible."); - raw = "PONG :"+Srv->GetServerName(); - return; - } - } - - dptr += Aliases[i].text.length(); - if (strlen(dptr)) - { - raw = Aliases[i].replace_with + std::string(dptr); - } - else - { - raw = Aliases[i].replace_with; - } - return; + 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 (!ServerInstance->ULine(u->server)) + { + 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); + std::string cmd = ""; + std::string target = ""; + stuff >> cmd; + stuff >> target; + const char* para[2]; + para[0] = target.c_str(); + para[1] = n.c_str(); + ServerInstance->CallCommandHandler(cmd,para,2,user); + return 1; } - } - - virtual void OnRehash() - { - 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() - { - return new ModuleAlias; - } + public: + ModuleAliasFactory() + { + } + + ~ModuleAliasFactory() + { + } + + virtual Module * CreateModule(InspIRCd* Me) + { + return new ModuleAlias(Me); + } };