Add a Flash Policy Daemon module

[user/henk/code/inspircd.git] / src / modules / m_helpop.cpp

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 6259636ce3b03a326f4a95f1154243933566298c..d07898c90801c0a199c9e6bfd24f8d9ebe0ee8a9 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -55,17 +55,15 @@ class CommandHelpop : public Command
                if (parameter == "index")
                {
                        /* iterate over all helpop items */
-                       user->WriteServ("290 %s :HELPOP topic index", user->nick.c_str());
+                       user->WriteNumeric(290, ":HELPOP topic index");
                        for (std::map<irc::string, std::string>::iterator iter = helpop_map.begin(); iter != helpop_map.end(); iter++)
-                       {
-                               user->WriteServ("292 %s :  %s", user->nick.c_str(), iter->first.c_str());
-                       }
-                       user->WriteServ("292 %s :*** End of HELPOP topic index", user->nick.c_str());
+                               user->WriteNumeric(292, ":  %s", iter->first.c_str());
+                       user->WriteNumeric(292, ":*** End of HELPOP topic index");
                }
                else
                {
-                       user->WriteServ("290 %s :*** HELPOP for %s", user->nick.c_str(), parameter.c_str());
-                       user->WriteServ("292 %s : -", user->nick.c_str());
+                       user->WriteNumeric(290, ":*** HELPOP for %s", parameter.c_str());
+                       user->WriteNumeric(292, ": -");
 
                        std::map<irc::string, std::string>::iterator iter = helpop_map.find(parameter);
 
@@ -82,13 +80,13 @@ class CommandHelpop : public Command
                        {
                                // Writing a blank line will not work with some clients
                                if (token.empty())
-                                       user->WriteServ("292 %s : ", user->nick.c_str());
+                                       user->WriteNumeric(292, ": ");
                                else
-                                       user->WriteServ("292 %s :%s", user->nick.c_str(), token.c_str());
+                                       user->WriteNumeric(292, ":%s", token.c_str());
                        }
 
-                       user->WriteServ("292 %s : -", user->nick.c_str());
-                       user->WriteServ("292 %s :*** End of HELPOP", user->nick.c_str());
+                       user->WriteNumeric(292, ": -");
+                       user->WriteNumeric(292, ":*** End of HELPOP");
                }
                return CMD_SUCCESS;
        }
@@ -106,12 +104,6 @@ class ModuleHelpop : public Module
                {
                }
 
-               void init() CXX11_OVERRIDE
-               {
-                       ServerInstance->Modules->AddService(ho);
-                       ServerInstance->Modules->AddService(cmd);
-               }
-
                void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
                {
                        helpop_map.clear();
@@ -149,7 +141,7 @@ class ModuleHelpop : public Module
                {
                        if (dst->IsModeSet(ho))
                        {
-                               ServerInstance->SendWhoisLine(src, dst, 310, src->nick+" "+dst->nick+" :is available for help.");
+                               ServerInstance->SendWhoisLine(src, dst, 310, dst->nick+" :is available for help.");
                        }
                }