* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 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.
#include "inspircd.h"
-/* $ModDesc: /helpop Command, Works like Unreal helpop */
static std::map<irc::string, std::string> 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, "helpop", 'h', PARAM_NONE, MODETYPE_USER)
+ {
+ oper = true;
+ }
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
if (adding)
{
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 = "<any-text>";
}
- CmdResult Handle (const char** parameters, int pcnt, User *user)
+ CmdResult Handle (const std::vector<std::string> ¶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<irc::string, std::string>::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<irc::string, std::string>::iterator iter = helpop_map.find(parameter);
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;
}
};
{
private:
std::string h_file;
- CommandHelpop* mycommand;
- Helpop* ho;
+ CommandHelpop cmd;
+ Helpop ho;
public:
- ModuleHelpop(InspIRCd* Me)
- : Module(Me)
+ ModuleHelpop()
+ : cmd(this), ho(this)
{
- ReadConfig();
- ho = new Helpop(ServerInstance);
- if (!ServerInstance->Modes->AddMode(ho))
- throw ModuleException("Could not add new modes!");
- mycommand = new CommandHelpop(ServerInstance);
- ServerInstance->AddCommand(mycommand);
- Implementation eventlist[] = { I_OnRehash, I_OnWhois };
- ServerInstance->Modules->Attach(eventlist, this, 2);
}
- virtual void ReadConfig()
+ void init()
{
- ConfigReader *MyConf = new ConfigReader(ServerInstance);
+ ReadConfig();
+ ServerInstance->Modules->AddService(ho);
+ ServerInstance->Modules->AddService(cmd);
+ Implementation eventlist[] = { I_OnRehash, I_OnWhois };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
+ }
+ void ReadConfig()
+ {
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")
{
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.");
}
}
-
- virtual void OnRehash(User* user, const std::string ¶meter)
+ void OnRehash(User* user)
{
ReadConfig();
}
- virtual void OnWhois(User* src, User* dst)
+ void OnWhois(User* src, User* dst)
{
if (dst->IsModeSet('h'))
{
}
}
- virtual ~ModuleHelpop()
- {
- ServerInstance->Modes->DelMode(ho);
- delete ho;
- }
-
- virtual Version GetVersion()
+ Version GetVersion()
{
- return Version(1,1,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
+ return Version("/help command, works like Unreal helpop", VF_VENDOR);
}
};