X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=bcf1f1e20fd58f398acbf062176e7811896e8b33;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=452a7114bf2642a26b4268fba7736fe661d1ba91;hpb=fd6ee21f2f55875984884a8413d61012e066029f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp index 452a7114b..bcf1f1e20 100644 --- a/src/modules/m_helpop.cpp +++ b/src/modules/m_helpop.cpp @@ -1,43 +1,33 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * - * 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 "inspircd.h" -// Global Vars -static ConfigReader *helpop; - - - -bool do_helpop(const char**, int, userrec*); -void sendtohelpop(userrec*, int, const char**); - /* $ModDesc: /helpop Command, Works like Unreal helpop */ +static std::map helpop_map; + +/** Handles user mode +h + */ class Helpop : public ModeHandler { public: - Helpop(InspIRCd* Instance) : ModeHandler(Instance, 'h', 0, 0, false, MODETYPE_USER, true) { } + Helpop(Module* Creator) : ModeHandler(Creator, 'h', PARAM_NONE, MODETYPE_USER) + { + oper = true; + } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (adding) { @@ -60,230 +50,142 @@ class Helpop : public ModeHandler } }; -class cmd_helpop : public command_t +/** Handles /HELPOP + */ +class CommandHelpop : public Command { public: - cmd_helpop (InspIRCd* Instance) : command_t(Instance, "HELPOP", 0, 1) - { - this->source = "m_helpop.so"; - syntax = "[?|!]"; - } - - void Handle (const char** parameters, int pcnt, userrec *user) + CommandHelpop(Module* Creator) : Command(Creator, "HELPOP", 0) { - char a[MAXBUF]; - std::string output = " "; - - if (!helpop) - return; + syntax = ""; + } - if (pcnt < 1) - { - do_helpop(NULL,pcnt,user); - return; - } + CmdResult Handle (const std::vector ¶meters, User *user) + { + irc::string parameter("start"); + if (parameters.size() > 0) + parameter = parameters[0].c_str(); - if (*parameters[0] == '!') + if (parameter == "index") { - // Force send to all +h users - sendtohelpop(user, pcnt, parameters); - } - else if (*parameters[0] == '?') - { - // Force to the helpop system with no forward if not found. - if (do_helpop(parameters, pcnt, user) == false) + /* iterate over all helpop items */ + user->WriteServ("290 %s :HELPOP topic index", user->nick.c_str()); + for (std::map::iterator iter = helpop_map.begin(); iter != helpop_map.end(); iter++) { - // Not handled by the Database, Tell the user, and bail. - for (int i = 1; output != ""; i++) - { - snprintf(a,MAXBUF,"line%d",i); - output = helpop->ReadValue("nohelp", std::string(a), 0); - - if(output != "") - { - user->WriteServ("290 "+std::string(user->nick)+" :"+output); - } - } + user->WriteServ("292 %s : %s", user->nick.c_str(), iter->first.c_str()); } + user->WriteServ("292 %s :*** End of HELPOP topic index", user->nick.c_str()); } else { - // Check with the helpop database, if not found send to +h - if (do_helpop(parameters, pcnt, user) == false) - { - // Not handled by the Database, Tell the user, and forward. - for (int i = 1; output != ""; i++) - { - snprintf(a,MAXBUF,"line%d",i); - /* "nohelpo" for opers "nohelp" for users */ - output = helpop->ReadValue("nohelpo", std::string(a), 0); - if (output != "") - { - user->WriteServ("290 "+std::string(user->nick)+" :"+output); - } - } - // Forward. - sendtohelpop(user, pcnt, parameters); - } - } - } - + user->WriteServ("290 %s :*** HELPOP for %s", user->nick.c_str(), parameter.c_str()); + user->WriteServ("292 %s : -", user->nick.c_str()); - bool do_helpop(const char** parameters, int pcnt, userrec *src) - { - char search[MAXBUF]; - std::string output = " "; // a fix bought to you by brain :p - char a[MAXBUF]; - int nlines = 0; + std::map::iterator iter = helpop_map.find(parameter); - if (!pcnt) - { - strcpy(search,"start"); - } - else - { - if (*parameters[0] == '?') - parameters[0]++; - strlcpy(search,parameters[0],MAXBUF); - } + if (iter == helpop_map.end()) + { + iter = helpop_map.find("nohelp"); + } - for (char* n = search; *n; n++) - *n = tolower(*n); + std::string value = iter->second; + irc::sepstream stream(value, '\n'); + std::string token = "*"; - for (int i = 1; output != ""; i++) - { - snprintf(a,MAXBUF,"line%d",i); - output = helpop->ReadValue(search, a, 0); - if (output != "") + while (stream.GetToken(token)) { - src->WriteServ("290 "+std::string(src->nick)+" :"+output); - nlines++; + // Writing a blank line will not work with some clients + if (token.empty()) + user->WriteServ("292 %s : ", user->nick.c_str()); + else + user->WriteServ("292 %s :%s", user->nick.c_str(), token.c_str()); } - } - return (nlines>0); - } - void sendtohelpop(userrec *src, int pcnt, const char **params) - { - const char* first = params[0]; - if (*first == '!') - { - first++; + user->WriteServ("292 %s : -", user->nick.c_str()); + user->WriteServ("292 %s :*** End of HELPOP", user->nick.c_str()); } - std::string line = "*** HELPOPS - From "+std::string(src->nick)+": "+std::string(first)+" "; - for (int i = 1; i < pcnt; i++) - { - line = line + std::string(params[i]) + " "; - } - ServerInstance->WriteMode("oh",WM_AND,line.c_str()); + /* We dont want these going out over the network, return CMD_FAILURE + * to make sure the protocol module thinks theyre not worth sending. + */ + return CMD_FAILURE; } }; -class HelpopException : public ModuleException -{ - private: - std::string err; - public: - HelpopException(std::string message) : err(message) { } - virtual const char* GetReason() { return err.c_str(); } -}; - class ModuleHelpop : public Module { private: - ConfigReader *conf; std::string h_file; - cmd_helpop* mycommand; - Helpop* ho; + CommandHelpop cmd; + Helpop ho; public: - ModuleHelpop(InspIRCd* Me) - : Module::Module(Me) + ModuleHelpop() + : cmd(this), ho(this) { ReadConfig(); - ho = new Helpop(ServerInstance); - ServerInstance->AddMode(ho, 'h'); - mycommand = new cmd_helpop(ServerInstance); - ServerInstance->AddCommand(mycommand); + if (!ServerInstance->Modes->AddMode(&ho)) + throw ModuleException("Could not add new modes!"); + ServerInstance->AddCommand(&cmd); + Implementation eventlist[] = { I_OnRehash, I_OnWhois }; + ServerInstance->Modules->Attach(eventlist, this, 2); } virtual void ReadConfig() { - conf = new ConfigReader; - h_file = conf->ReadValue("helpop", "file", 0); + ConfigReader MyConf; + + helpop_map.clear(); - if (h_file == "") + for (int i = 0; i < MyConf.Enumerate("helpop"); i++) { - helpop = NULL; - HelpopException e("Missing helpop file"); - throw(e); + irc::string key = assign(MyConf.ReadValue("helpop", "key", i)); + std::string value = MyConf.ReadValue("helpop", "value", i, true); /* Linefeeds allowed! */ + + if (key == "index") + { + throw ModuleException("m_helpop: The key 'index' is reserved for internal purposes. Please remove it."); + } + + helpop_map[key] = value; } - helpop = new ConfigReader(h_file); - if ((helpop->ReadValue("nohelp", "line1", 0) == "") || - (helpop->ReadValue("nohelpo", "line1", 0) == "") || - (helpop->ReadValue("start", "line1", 0) == "")) + if (helpop_map.find("start") == helpop_map.end()) { - HelpopException e("m_helpop: Helpop file is missing important entries. Please check the example conf."); - throw(e); + // error! + throw ModuleException("m_helpop: Helpop file is missing important entries. Please check the example conf."); + } + else if (helpop_map.find("nohelp") == helpop_map.end()) + { + // error! + throw ModuleException("m_helpop: Helpop file is missing important entries. Please check the example conf."); } - } - void Implements(char* List) - { - List[I_OnRehash] = List[I_OnWhois] = 1; } - virtual void OnRehash(const std::string ¶meter) - { - DELETE(conf); - if (helpop) - DELETE(helpop); + virtual void OnRehash(User* user) + { ReadConfig(); } - virtual void OnWhois(userrec* src, userrec* dst) + virtual void OnWhois(User* src, User* dst) { if (dst->IsModeSet('h')) { - src->WriteServ("310 "+std::string(src->nick)+" "+std::string(dst->nick)+" :is available for help."); + ServerInstance->SendWhoisLine(src, dst, 310, std::string(src->nick)+" "+std::string(dst->nick)+" :is available for help."); } } virtual ~ModuleHelpop() { - DELETE(conf); - DELETE(helpop); - DELETE(ho); + ServerInstance->Modes->DelMode(&ho); } - + virtual Version GetVersion() { - return Version(1,0,0,1,VF_STATIC|VF_VENDOR); + return Version("/helpop Command, Works like Unreal helpop", VF_COMMON | VF_VENDOR, API_VERSION); } }; -class ModuleHelpopFactory : public ModuleFactory -{ - public: - ModuleHelpopFactory() - { - } - - ~ModuleHelpopFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleHelpop(Me); - } - -}; - -extern "C" void * init_module( void ) -{ - return new ModuleHelpopFactory; -} +MODULE_INIT(ModuleHelpop)