fixed some indentation and spacing in modules

[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 34bc9c62ba8182a35003ef2e1348113cb5eab0b8..1a1867e073d9e6db61479eebf59469ead4d7e0d3 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -19,32 +19,10 @@ static std::map<irc::string, std::string> helpop_map;
 
 /** Handles user mode +h
  */
-class Helpop : public ModeHandler
+class Helpop : public SimpleUserModeHandler
 {
  public:
-       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;
-       }
+       Helpop(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'h') { }
 };
 
 /** Handles /HELPOP
@@ -58,25 +36,25 @@ class CommandHelpop : public Command
                syntax = "<any-text>";
        }
 
-       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, 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("NOTICE %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("NOTICE %s :    %s", user->nick.c_str(), iter->first.c_str());
                        }
-                       user->WriteServ("NOTICE %s :*** End of HELPOP topic index", user->nick);
+                       user->WriteServ("NOTICE %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("NOTICE %s :*** HELPOP for %s", user->nick.c_str(), parameter.c_str());
 
                        std::map<irc::string, std::string>::iterator iter = helpop_map.find(parameter);
 
@@ -90,9 +68,9 @@ class CommandHelpop : public Command
                        std::string token = "*";
 
                        while (stream.GetToken(token))
-                               user->WriteServ("NOTICE %s :%s", user->nick, token.c_str());
+                               user->WriteServ("NOTICE %s :%s", user->nick.c_str(), token.c_str());
 
-                       user->WriteServ("NOTICE %s :*** End of HELPOP", user->nick);
+                       user->WriteServ("NOTICE %s :*** End of HELPOP", user->nick.c_str());
                }
 
                /* We dont want these going out over the network, return CMD_FAILURE
@@ -174,10 +152,10 @@ class ModuleHelpop : public Module
                        ServerInstance->Modes->DelMode(ho);
                        delete ho;
                }
-       
+
                virtual Version GetVersion()
                {
-                       return Version(1,1,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
+                       return Version(1,2,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
                }
 };