X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=b25ed7089dd79331aa95b99a014d66b9d690a027;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=31692faf7a0a764428d8aa3e543d419436517e36;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp index 31692faf7..b25ed7089 100644 --- a/src/modules/m_helpop.cpp +++ b/src/modules/m_helpop.cpp @@ -11,18 +11,11 @@ * --------------------------------------------------- */ -#include "users.h" -#include "channels.h" -#include "modules.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 */ @@ -59,136 +52,54 @@ class Helpop : public ModeHandler class cmd_helpop : public command_t { public: - cmd_helpop (InspIRCd* Instance) : command_t(Instance, "HELPOP", 0, 1) - { - this->source = "m_helpop.so"; - syntax = "[?|!]"; - } + cmd_helpop (InspIRCd* Instance) : command_t(Instance, "HELPOP", 0, 0) + { + this->source = "m_helpop.so"; + syntax = ""; + } CmdResult Handle (const char** parameters, int pcnt, userrec *user) { - char a[MAXBUF]; - std::string output = " "; + irc::string parameter; + if (pcnt > 0) + parameter = parameters[0]; - if (!helpop) - return CMD_FAILURE; - - if (pcnt < 1) - { - do_helpop(NULL,pcnt,user); - return CMD_SUCCESS; - } - - if (*parameters[0] == '!') + if (pcnt == 0 || 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("NOTICE %s :HELPOP topic index", user->nick); + 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("helpop_nohelp", a, 0); - - if(output != "") - { - user->WriteServ("290 "+std::string(user->nick)+" :"+output); - } - } + user->WriteServ("NOTICE %s : %s", user->nick, iter->first.c_str()); } + user->WriteServ("NOTICE %s :*** End of HELPOP topic index", user->nick); } 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("helpop_nohelpo", a, 0); - if (output != "") - { - user->WriteServ("290 "+std::string(user->nick)+" :"+output); - } - } - // Forward. - sendtohelpop(user, pcnt, parameters); - } - } + user->WriteServ("NOTICE %s :*** HELPOP for %s", user->nick, parameters[0]); - return CMD_SUCCESS; - } + std::map::iterator iter = helpop_map.find(parameter); - - 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; - - if (!pcnt) - { - strcpy(search,"helpop_start"); - } - else - { - if (*parameters[0] == '?') - parameters[0]++; - strlcpy(search, "helpop_", MAXBUF); - strlcat(search, parameters[0], MAXBUF); - } - - for (char* n = search; *n; n++) - *n = tolower(*n); - - for (int i = 1; output != ""; i++) - { - snprintf(a,MAXBUF,"line%d",i); - output = helpop->ReadValue(search, a, 0); - if (output != "") + if (iter == helpop_map.end()) { - src->WriteServ("290 "+std::string(src->nick)+" :"+output); - nlines++; + iter = helpop_map.find("nohelp"); } - } - return (nlines>0); - } - void sendtohelpop(userrec *src, int pcnt, const char **params) - { - const 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 (stream.GetToken(token)) + user->WriteServ("NOTICE %s :%s", user->nick, token.c_str()); + + user->WriteServ("NOTICE %s :*** End of HELPOP", user->nick); } - ServerInstance->WriteMode("oh",WM_AND,line.c_str()); - } -}; -/** Thrown by m_helpop - */ -class HelpopException : public ModuleException -{ - private: - std::string err; - public: - HelpopException(std::string message) : err(message) { } - ~HelpopException() throw() { }; - virtual const char* GetReason() { return err.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 ModuleHelpop : public Module @@ -200,25 +111,46 @@ class ModuleHelpop : public Module public: ModuleHelpop(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { ReadConfig(); ho = new Helpop(ServerInstance); - ServerInstance->AddMode(ho, 'h'); + if (!ServerInstance->AddMode(ho, 'h')) + throw ModuleException("Could not add new modes!"); mycommand = new cmd_helpop(ServerInstance); ServerInstance->AddCommand(mycommand); } virtual void ReadConfig() { - helpop = new ConfigReader(ServerInstance); - if ((helpop->ReadValue("helpop_nohelp", "line1", 0) == "") || - (helpop->ReadValue("helpop_nohelpo", "line1", 0) == "") || - (helpop->ReadValue("helpop_start", "line1", 0) == "")) + ConfigReader *MyConf = new ConfigReader(ServerInstance); + + helpop_map.clear(); + + for (int i = 0; i < MyConf->Enumerate("helpop"); i++) + { + 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; + } + + if (helpop_map.find("start") == helpop_map.end()) + { + // 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()) { - 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."); } + } void Implements(char* List) @@ -226,10 +158,8 @@ class ModuleHelpop : public Module List[I_OnRehash] = List[I_OnWhois] = 1; } - virtual void OnRehash(const std::string ¶meter) + virtual void OnRehash(userrec* user, const std::string ¶meter) { - if (helpop) - DELETE(helpop); ReadConfig(); } @@ -244,7 +174,6 @@ class ModuleHelpop : public Module virtual ~ModuleHelpop() { ServerInstance->Modes->DelMode(ho); - DELETE(helpop); DELETE(ho); } @@ -254,25 +183,4 @@ class ModuleHelpop : public Module } }; -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)