X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=f82004f162f09fb022e1dc62825ca6aab9aa9dbf;hb=7c197db72eab03321e4f3e847054e13126520504;hp=9fd3052b7ceb76692f09a55651031603852a0f07;hpb=2cfd118f5463ddcf55ebc9bdd0a80a29021c447c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp index 9fd3052b7..f82004f16 100644 --- a/src/modules/m_helpop.cpp +++ b/src/modules/m_helpop.cpp @@ -1,231 +1,190 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * Inspire is copyright (C) 2002-2004 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" - -// Global Vars -/* XXX - should all this be marked static? clear the global namespace, etc. */ -ConfigReader *helpop; -Server *Srv; - -void handle_helpop(char**, int, userrec*); -bool do_helpop(char**, int, userrec*); -void sendtohelpop(userrec*, int, char**); - +#include "inspircd.h" /* $ModDesc: /helpop Command, Works like Unreal helpop */ +static std::map helpop_map; -void handle_helpop(char **parameters, int pcnt, userrec *user) -{ - char a[MAXBUF]; - std::string output = " "; - if (pcnt < 1) - { - do_helpop(NULL,pcnt,user); - return; - } +/** Handles user mode +h + */ +class Helpop : public ModeHandler +{ + public: + Helpop(InspIRCd* Instance) : ModeHandler(Instance, 'h', 0, 0, false, MODETYPE_USER, true) { } - if (parameters[0][0] == '!') - { - // Force send to all +h users - sendtohelpop(user, pcnt, parameters); - } - else if (parameters[0][0] == '?') + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - // Force to the helpop system with no forward if not found. - if (do_helpop(parameters, pcnt, user) == false) + if (adding) { - // Not handled by the Database, Tell the user, and bail. - for (int i = 1; output != ""; i++) + if (!dest->IsModeSet('h')) { - snprintf(a,MAXBUF,"line%d",i); - output = helpop->ReadValue("nohelp", std::string(a), 0); - - if(output != "") - { - Srv->SendTo(NULL,user,"290 "+std::string(user->nick)+" :"+output); - } + dest->SetMode('h',true); + return MODEACTION_ALLOW; } } - } - else - { - // Check with the helpop database, if not found send to +h - if (do_helpop(parameters, pcnt, user) == false) + else { - // Not handled by the Database, Tell the user, and forward. - for (int i = 1; output != ""; i++) - { - snprintf(a,MAXBUF,"line%d",i); - /* XXX - "nohelpo" ? or "nohelp", as above */ - output = helpop->ReadValue("nohelpo", std::string(a), 0); - if (output != "") - { - Srv->SendTo(NULL,user,"290 "+std::string(user->nick)+" :"+output); - } - } - // Forward. - sendtohelpop(user, pcnt, parameters); + if (dest->IsModeSet('h')) + { + dest->SetMode('h',false); + return MODEACTION_ALLOW; + } } + + return MODEACTION_DENY; } -} +}; -bool do_helpop(char **parameters, int pcnt, userrec *src) +/** Handles /HELPOP + */ +class cmd_helpop : public command_t { - char *search; - std::string output = " "; // a fix bought to you by brain :p - char a[MAXBUF]; - char lower[MAXBUF]; - int nlines = 0; - - if (!parameters) - { - search = "start"; - } - else + public: + cmd_helpop (InspIRCd* Instance) : command_t(Instance, "HELPOP", 0, 0) { - search = parameters[0]; - } + this->source = "m_helpop.so"; + syntax = ""; + } - if (search[0] == '?') + CmdResult Handle (const char** parameters, int pcnt, userrec *user) { - search++; - } - - /* XXX - don't we have an strtolower()? if not, might pay to add one.. that works on char *, preferably.. */ - strlcpy(lower, search, MAXBUF); - for (unsigned int t = 0; t < strlen(lower); t++) - lower[t] = tolower(lower[t]); + irc::string parameter; + if (pcnt > 0) + parameter = parameters[0]; - - for (int i = 1; output != ""; i++) - { - snprintf(a,MAXBUF,"line%d",i); - output = helpop->ReadValue(lower, a, 0); - if (output != "") + if (pcnt == 0 || parameter == "index") { - Srv->SendTo(NULL,src,"290 "+std::string(src->nick)+" :"+output); - nlines++; + /* iterate over all helpop items */ + user->WriteServ("NOTICE %s :HELPOP topic index", user->nick); + for (std::map::iterator iter = helpop_map.begin(); iter != helpop_map.end(); iter++) + { + user->WriteServ("NOTICE %s : %s", user->nick, iter->first.c_str()); + } + user->WriteServ("NOTICE %s :*** End of HELPOP topic index", user->nick); } - } - return (nlines>0); -} + else + { + user->WriteServ("NOTICE %s :*** HELPOP for %s", user->nick, parameters[0]); + std::map::iterator iter = helpop_map.find(parameter); + if (iter == helpop_map.end()) + { + iter = helpop_map.find("nohelp"); + } -void sendtohelpop(userrec *src, int pcnt, char **params) -{ - char* first = params[0]; - if (*first == '!') - { - first++; - } + std::string value = iter->second; + irc::sepstream stream(value, '\n'); + std::string token = "*"; - 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]) + " "; + while ((token = stream.GetToken()) != "") + { + user->WriteServ("NOTICE %s :%s", user->nick, token.c_str()); + } + + user->WriteServ("NOTICE %s :*** End of HELPOP", user->nick); + } + + /* 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; } - Srv->SendToModeMask("oh",WM_AND,line); -} +}; class ModuleHelpop : public Module { private: - ConfigReader *conf; std::string h_file; + cmd_helpop* mycommand; + Helpop* ho; public: - ModuleHelpop() + ModuleHelpop(InspIRCd* Me) + : Module::Module(Me) { - Srv = new Server; - ReadConfig(); - if (!Srv->AddExtendedMode('h',MT_CLIENT,true,0,0)) - { - Srv->Log(DEFAULT,"Unable to claim the +h usermode."); - return; - } - - Srv->AddCommand("HELPOP",handle_helpop,0,0,"m_helpop.so"); + ho = new Helpop(ServerInstance); + if (!ServerInstance->AddMode(ho, 'h')) + throw ModuleException("Could not add new modes!"); + mycommand = new cmd_helpop(ServerInstance); + ServerInstance->AddCommand(mycommand); } virtual void ReadConfig() { - conf = new ConfigReader; - h_file = conf->ReadValue("helpop", "file", 0); + ConfigReader *MyConf = new ConfigReader(ServerInstance); + + helpop_map.clear(); - if (h_file == "") + for (int i = 0; i < MyConf->Enumerate("helpop"); i++) { - log(DEFAULT,"m_helpop: Helpop file not Specified."); - return; + 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()) { - log(DEFAULT,"m_helpop: Helpop file is missing important entries. Please check the example conf."); - return; + // 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."); } - } + } - virtual void OnRehash() + void Implements(char* List) { - delete conf; - delete helpop; - - ReadConfig(); + List[I_OnRehash] = List[I_OnWhois] = 1; } - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) + virtual void OnRehash(userrec* user, const std::string ¶meter) { - if ((modechar == 'h') && (type == MT_CLIENT)) - { - return 1; - } - return 0; + ReadConfig(); } virtual void OnWhois(userrec* src, userrec* dst) { - if (strchr(dst->modes,'h')) + if (dst->IsModeSet('h')) { - Srv->SendTo(NULL,src,"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 Srv; - delete conf; - delete helpop; + ServerInstance->Modes->DelMode(ho); + DELETE(ho); } virtual Version GetVersion() { - return Version(1,0,0,1,VF_STATIC|VF_VENDOR); + return Version(1,1,0,1,VF_COMMON|VF_VENDOR,API_VERSION); } }; @@ -240,9 +199,9 @@ class ModuleHelpopFactory : public ModuleFactory { } - virtual Module * CreateModule() + virtual Module * CreateModule(InspIRCd* Me) { - return new ModuleHelpop; + return new ModuleHelpop(Me); } };