Send SVSNICKs during nick collision to prevent servers that do not fully implement...

[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 700656a53cc0034e3933d8f83c7302f1b04c277e..0cfca57d06065b9591081b172ce51b85cf1996cc 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -19,10 +19,32 @@ static std::map<irc::string, std::string> helpop_map;
 
 /** Handles user mode +h
  */
-class Helpop : public SimpleUserModeHandler
+class Helpop : public ModeHandler
 {
  public:
-       Helpop(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'h') { }
+       Helpop(InspIRCd* Instance) : ModeHandler(Instance, 'h', 0, 0, false, MODETYPE_USER, true) { }
+
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       {
+               if (adding)
+               {
+                       if (!dest->IsModeSet('h'))
+                       {
+                               dest->SetMode('h',true);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+               else
+               {
+                       if (dest->IsModeSet('h'))
+                       {
+                               dest->SetMode('h',false);
+                               return MODEACTION_ALLOW;
+                       }
+               }
+
+               return MODEACTION_DENY;
+       }
 };
 
 /** Handles /HELPOP
@@ -45,16 +67,17 @@ class CommandHelpop : public Command
                if (parameter == "index")
                {
                        /* iterate over all helpop items */
-                       user->WriteServ("NOTICE %s :HELPOP topic index", user->nick.c_str());
+                       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.c_str(), 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.c_str());
+                       user->WriteServ("292 %s :*** End of HELPOP topic index", user->nick.c_str());
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** HELPOP for %s", user->nick.c_str(), 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);
 
@@ -68,9 +91,16 @@ class CommandHelpop : public Command
                        std::string token = "*";
 
                        while (stream.GetToken(token))
-                               user->WriteServ("NOTICE %s :%s", user->nick.c_str(), 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.c_str());
+                       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
@@ -103,14 +133,14 @@ class ModuleHelpop : public Module
 
                virtual void ReadConfig()
                {
-                       ConfigReader *MyConf = new ConfigReader(ServerInstance);
+                       ConfigReader MyConf(ServerInstance);
 
                        helpop_map.clear();
 
-                       for (int i = 0; i < MyConf->Enumerate("helpop"); i++)
+                       for (int i = 0; i < MyConf.Enumerate("helpop"); i++)
                        {
-                               irc::string key = assign(MyConf->ReadValue("helpop", "key", i));
-                               std::string value = MyConf->ReadValue("helpop", "value", i, true); /* Linefeeds allowed! */
+                               irc::string key = assign(MyConf.ReadValue("helpop", "key", i));
+                               std::string value = MyConf.ReadValue("helpop", "value", i, true); /* Linefeeds allowed! */
 
                                if (key == "index")
                                {