m_auditorium Handle NULL return from Channel::GetUser() in OnSendWhoLine()

[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 60c23f45bd44820c39b5e01496a804551c535a1c..4bbe8785e4ef4f7b2f22d059b56f81682eb8d6fe 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -99,7 +99,6 @@ class CommandHelpop : public Command
 class ModuleHelpop : public Module
 {
        private:
-               std::string  h_file;
                CommandHelpop cmd;
                Helpop ho;
 
@@ -115,12 +114,12 @@ class ModuleHelpop : public Module
                        ServerInstance->Modules->AddService(ho);
                        ServerInstance->Modules->AddService(cmd);
                        Implementation eventlist[] = { I_OnRehash, I_OnWhois };
-                       ServerInstance->Modules->Attach(eventlist, this, 2);
+                       ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                }
 
                void ReadConfig()
                {
-                       helpop_map.clear();
+                       std::map<irc::string, std::string> help;
 
                        ConfigTagList tags = ServerInstance->Config->ConfTags("helpop");
                        for(ConfigIter i = tags.first; i != tags.second; ++i)
@@ -135,20 +134,21 @@ class ModuleHelpop : public Module
                                        throw ModuleException("m_helpop: The key 'index' is reserved for internal purposes. Please remove it.");
                                }
 
-                               helpop_map[key] = value;
+                               help[key] = value;
                        }
 
-                       if (helpop_map.find("start") == helpop_map.end())
+                       if (help.find("start") == help.end())
                        {
                                // error!
                                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())
+                       else if (help.find("nohelp") == help.end())
                        {
                                // error!
                                throw ModuleException("m_helpop: Helpop file is missing important entry 'nohelp'. Please check the example conf.");
                        }
 
+                       helpop_map.swap(help);
                }
 
                void OnRehash(User* user)
@@ -160,7 +160,7 @@ class ModuleHelpop : public Module
                {
                        if (dst->IsModeSet('h'))
                        {
-                               ServerInstance->SendWhoisLine(src, dst, 310, std::string(src->nick)+" "+std::string(dst->nick)+" :is available for help.");
+                               ServerInstance->SendWhoisLine(src, dst, 310, src->nick+" "+dst->nick+" :is available for help.");
                        }
                }