X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=869bc6a1f9c1f7a0cbe8d11ce7623f7644284574;hb=3a7023f2c595d14778b3f1f7e53d3914698dd500;hp=ddfede7f2533b036347b921e6f2d7d56bfd8db92;hpb=740b09e2aee345c6fde199986d8eab6e0db224e3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index ddfede7f2..869bc6a1f 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -1,161 +1,178 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. + * E-mail: + * + * + * * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + *the file COPYING for details. * * --------------------------------------------------- */ +using namespace std; + #include "users.h" #include "channels.h" #include "modules.h" +#include "helperfuncs.h" #include -/* $ModDesc: Changes the ident of connecting bottler clients to 'bottler' */ +/* $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: - - virtual void ReadAliases() - { - Aliases.clear(); - - for (int i = 0; i < MyConf->Enumerate("alias"); i++) + private: + Server *Srv; + ConfigReader *MyConf; + std::vector Aliases; + + virtual void ReadAliases() { - Alias a; - a.text = MyConf->ReadValue("alias", "text", i); - a.replace_with = MyConf->ReadValue("alias", "replace", i); - a.requires = MyConf->ReadValue("alias", "requires", i); + Aliases.clear(); + + 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() - { - Srv = new Server; - MyConf = new ConfigReader; + ModuleAlias(Server* Me) + : Module::Module(Me) + { + Srv = Me; + MyConf = new ConfigReader; + ReadAliases(); + } - ReadAliases(); - } + void Implements(char* List) + { + List[I_OnPreCommand] = List[I_OnRehash] = 1; + } - virtual ~ModuleAlias() - { - delete Srv; - delete MyConf; - } + virtual ~ModuleAlias() + { + DELETE(MyConf); + } - virtual Version GetVersion() - { - return Version(1,0,0,0); - } - + virtual Version GetVersion() + { + return Version(1,0,0,1,VF_VENDOR); + } - virtual void OnServerRaw(std::string &raw, bool inbound, userrec* user) - { - if (inbound) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated) { - char data[MAXBUF]; - strncpy(data,raw.c_str(),MAXBUF); - char* dptr = data; + 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 != 7)) + return 0; - for (int i = 0; i < Aliases.size(); i++) + for (unsigned int i = 0; i < Aliases.size(); i++) { - if (!strncasecmp(Aliases[i].text.c_str(),data,Aliases[i].text.length())) + if (Aliases[i].text == c) { - userrec* u = NULL; - if (Aliases[i].requires != "") { u = Srv->FindNick(Aliases[i].requires); + if (!u) + { + Srv->SendServ(user->fd,"401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later."); + return 1; + } } - - 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 ((u != NULL) && (Aliases[i].requires != "") && (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->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!"); 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; + return 1; } } - - dptr += Aliases[i].text.length(); - if (strlen(dptr)) - { - raw = Aliases[i].replace_with + std::string(dptr); - } - else + + std::string n = ""; + for (int j = 0; j < pcnt; j++) { - raw = Aliases[i].replace_with; + if (j) + n = n + " "; + n = n + parameters[j]; } - return; + /* 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(); + + Srv->CallCommandHandler(cmd,para,2,user); + return 1; } } - } - } + return 0; + } - virtual void OnRehash() - { - delete MyConf; - MyConf = new ConfigReader; + virtual void OnRehash(const std::string ¶meter) + { + DELETE(MyConf); + MyConf = new ConfigReader; - ReadAliases(); - } + ReadAliases(); + } }; class ModuleAliasFactory : public ModuleFactory { - public: - ModuleAliasFactory() - { - } - - ~ModuleAliasFactory() - { - } + public: + ModuleAliasFactory() + { + } - virtual Module * CreateModule() - { - return new ModuleAlias; - } + ~ModuleAliasFactory() + { + } + virtual Module * CreateModule(Server* Me) + { + return new ModuleAlias(Me); + } };