X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_helpop.cpp;h=5cd8d8ea0701f1845a3ccdc4a4b100f2f75603dd;hb=76f9f4b47a16888d93bdb6122de0e1f6d7965f4b;hp=a5430d7da77cbd064aa5e02f6bf031d29fb8dab5;hpb=7240c926c8e9aeacf95c2bd4803c8879963cca3f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp index a5430d7da..5cd8d8ea0 100644 --- a/src/modules/m_helpop.cpp +++ b/src/modules/m_helpop.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -22,7 +22,10 @@ static std::map helpop_map; class Helpop : public ModeHandler { public: - Helpop(InspIRCd* Instance) : ModeHandler(Instance, 'h', 0, 0, false, MODETYPE_USER, true) { } + Helpop(Module* Creator) : ModeHandler(Creator, "helpop", 'h', PARAM_NONE, MODETYPE_USER) + { + oper = true; + } ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { @@ -52,31 +55,31 @@ class Helpop : public ModeHandler class CommandHelpop : public Command { public: - CommandHelpop (InspIRCd* Instance) : Command(Instance, "HELPOP", 0, 0) + CommandHelpop(Module* Creator) : Command(Creator, "HELP", 0) { - this->source = "m_helpop.so"; syntax = ""; } - CmdResult Handle (const char** parameters, int pcnt, User *user) + CmdResult Handle (const std::vector ¶meters, User *user) { irc::string parameter("start"); - if (pcnt > 0) - parameter = parameters[0]; + if (parameters.size() > 0) + parameter = parameters[0].c_str(); if (parameter == "index") { /* iterate over all helpop items */ - user->WriteServ("NOTICE %s :HELPOP topic index", user->nick); + user->WriteServ("290 %s :HELPOP topic index", user->nick.c_str()); 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("292 %s : %s", user->nick.c_str(), iter->first.c_str()); } - user->WriteServ("NOTICE %s :*** End of HELPOP topic index", user->nick); + user->WriteServ("292 %s :*** End of HELPOP topic index", user->nick.c_str()); } else { - user->WriteServ("NOTICE %s :*** HELPOP for %s", user->nick, parameter.c_str()); + user->WriteServ("290 %s :*** HELPOP for %s", user->nick.c_str(), parameter.c_str()); + user->WriteServ("292 %s : -", user->nick.c_str()); std::map::iterator iter = helpop_map.find(parameter); @@ -90,15 +93,18 @@ class CommandHelpop : public Command std::string token = "*"; while (stream.GetToken(token)) - user->WriteServ("NOTICE %s :%s", user->nick, token.c_str()); + { + // 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()); + } - user->WriteServ("NOTICE %s :*** End of HELPOP", user->nick); + user->WriteServ("292 %s : -", user->nick.c_str()); + user->WriteServ("292 %s :*** End of HELPOP", user->nick.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; + return CMD_SUCCESS; } }; @@ -106,31 +112,37 @@ class ModuleHelpop : public Module { private: std::string h_file; - CommandHelpop* mycommand; - Helpop* ho; + CommandHelpop cmd; + Helpop ho; public: - ModuleHelpop(InspIRCd* Me) - : Module(Me) + ModuleHelpop() + : cmd(this), ho(this) + { + } + + void init() { ReadConfig(); - ho = new Helpop(ServerInstance); - if (!ServerInstance->AddMode(ho)) - throw ModuleException("Could not add new modes!"); - mycommand = new CommandHelpop(ServerInstance); - ServerInstance->AddCommand(mycommand); + ServerInstance->Modules->AddService(ho); + ServerInstance->Modules->AddService(cmd); + Implementation eventlist[] = { I_OnRehash, I_OnWhois }; + ServerInstance->Modules->Attach(eventlist, this, 2); } - virtual void ReadConfig() + void ReadConfig() { - ConfigReader *MyConf = new ConfigReader(ServerInstance); + ConfigReader MyConf; helpop_map.clear(); - for (int i = 0; i < MyConf->Enumerate("helpop"); i++) + ConfigTagList tags = ServerInstance->Config->ConfTags("helpop"); + for(ConfigIter i = tags.first; i != tags.second; ++i) { - irc::string key = assign(MyConf->ReadValue("helpop", "key", i)); - std::string value = MyConf->ReadValue("helpop", "value", i, true); /* Linefeeds allowed! */ + ConfigTag* tag = i->second; + irc::string key = assign(tag->getString("key")); + std::string value; + tag->readString("value", value, true); /* Linefeeds allowed */ if (key == "index") { @@ -143,22 +155,18 @@ class ModuleHelpop : public Module if (helpop_map.find("start") == helpop_map.end()) { // error! - throw ModuleException("m_helpop: Helpop file is missing important entries. Please check the example conf."); + throw ModuleException("m_helpop: Helpop file is missing important entry 'start'. 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."); + throw ModuleException("m_helpop: Helpop file is missing important entry 'nohelp'. Please check the example conf."); } } - void Implements(char* List) - { - List[I_OnRehash] = List[I_OnWhois] = 1; - } - virtual void OnRehash(User* user, const std::string ¶meter) + virtual void OnRehash(User* user) { ReadConfig(); } @@ -173,13 +181,11 @@ class ModuleHelpop : public Module virtual ~ModuleHelpop() { - ServerInstance->Modes->DelMode(ho); - DELETE(ho); } - + virtual Version GetVersion() { - return Version(1,1,0,1,VF_COMMON|VF_VENDOR,API_VERSION); + return Version("/helpop Command, Works like Unreal helpop", VF_VENDOR); } };