m_services_account Fix possible recursion when checking 'U' extbans

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

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 691887429fd316b167f45ea5c0673908789b4922..d81dd553d2743f641c9c2281a05e4e15fc6dfba1 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -27,35 +27,13 @@
 
 /** Handle user mode +W
  */
-class SeeWhois : public ModeHandler
+class SeeWhois : public SimpleUserModeHandler
 {
  public:
-       SeeWhois(Module* Creator, bool IsOpersOnly) : ModeHandler(Creator, "showwhois", 'W', PARAM_NONE, MODETYPE_USER)
+       SeeWhois(Module* Creator, bool IsOpersOnly) : SimpleUserModeHandler(Creator, "showwhois", 'W')
        {
                oper = IsOpersOnly;
        }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!dest->IsModeSet('W'))
-                       {
-                               dest->SetMode('W',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (dest->IsModeSet('W'))
-                       {
-                               dest->SetMode('W',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
 };
 
 class WhoisNoticeCmd : public Command
@@ -76,6 +54,9 @@ class WhoisNoticeCmd : public Command
        CmdResult Handle(const std::vector<std::string> &parameters, User *user)
        {
                User* dest = ServerInstance->FindNick(parameters[0]);
+               if (!dest)
+                       return CMD_FAILURE;
+
                User* source = ServerInstance->FindNick(parameters[1]);
 
                if (IS_LOCAL(dest) && source)