X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=510e4e899f793a55a5a8f994226f2441b7ad9c3b;hb=67878d628c15f2adec41b6d3b266830a636c2ed0;hp=8a69c422e030e22c9d1f3b14ef9e9f71af9ffb40;hpb=034f74a23b3d6aff177682c916e18382621f495a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp index 8a69c422e..510e4e899 100644 --- a/src/modules/m_helpop.cpp +++ b/src/modules/m_helpop.cpp @@ -1,33 +1,24 @@ -/* +------------------------------------+ - * | 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 * - * 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 "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 */ @@ -67,137 +58,56 @@ class cmd_helpop : public command_t cmd_helpop (InspIRCd* Instance) : command_t(Instance, "HELPOP", 0, 1) { this->source = "m_helpop.so"; - syntax = "[?|!]"; + syntax = ""; } CmdResult Handle (const char** parameters, int pcnt, userrec *user) - { - char a[MAXBUF]; - std::string output = " "; + { + irc::string parameter = parameters[0]; - if (!helpop) - return CMD_FAILURE; - - if (pcnt < 1) - { - do_helpop(NULL,pcnt,user); - return CMD_SUCCESS; - } - - 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("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("nohelp", std::string(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("nohelpo", std::string(a), 0); - if (output != "") - { - user->WriteServ("290 "+std::string(user->nick)+" :"+output); - } - } - // Forward. - sendtohelpop(user, pcnt, parameters); - } - } - - return CMD_SUCCESS; - } - + user->WriteServ("NOTICE %s :*** HELPOP for %s", user->nick, parameters[0]); - 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 ((token = stream.GetToken()) != "") { - src->WriteServ("290 "+std::string(src->nick)+" :"+output); - nlines++; + user->WriteServ("NOTICE %s :%s", user->nick, 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("NOTICE %s :*** End of HELPOP", user->nick); } - 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; } }; -/** Thrown by m_helpop - */ -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; @@ -208,31 +118,42 @@ class ModuleHelpop : public Module { 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() { - conf = new ConfigReader(ServerInstance); - 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++) { - 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(ServerInstance, 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()) + { + // 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) @@ -242,10 +163,6 @@ class ModuleHelpop : public Module virtual void OnRehash(const std::string ¶meter) { - DELETE(conf); - if (helpop) - DELETE(helpop); - ReadConfig(); } @@ -253,15 +170,13 @@ class ModuleHelpop : public Module { if (dst->IsModeSet('h')) { - ServerInstance->SendWhoisLine(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() { ServerInstance->Modes->DelMode(ho); - DELETE(conf); - DELETE(helpop); DELETE(ho); }