m_spanningtree Remove unneeded #includes

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

diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index e22eff10648dcb5748ef6b26f2a2ac761a54e00e..58887ba96e023f0ef41c345c8350c602e8a4922d 100644 (file)
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -25,35 +25,13 @@
 
 /** Handles user mode +H
  */
-class HideOper : public ModeHandler
+class HideOper : public SimpleUserModeHandler
 {
  public:
-       HideOper(Module* Creator) : ModeHandler(Creator, "hideoper", 'H', PARAM_NONE, MODETYPE_USER)
+       HideOper(Module* Creator) : SimpleUserModeHandler(Creator, "hideoper", 'H')
        {
                oper = true;
        }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               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;
-       }
 };
 
 class ModuleHideOper : public Module
@@ -63,15 +41,13 @@ class ModuleHideOper : public Module
        ModuleHideOper()
                : hm(this)
        {
-               if (!ServerInstance->Modes->AddMode(&hm))
-                       throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnWhoisLine, I_OnSendWhoLine };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-
-       virtual ~ModuleHideOper()
+       void init()
        {
+               ServerInstance->Modules->AddService(hm);
+               Implementation eventlist[] = { I_OnWhoisLine, I_OnSendWhoLine };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual Version GetVersion()
@@ -101,9 +77,9 @@ class ModuleHideOper : public Module
                if (user->IsModeSet('H') && !source->HasPrivPermission("users/auspex"))
                {
                        // hide the "*" that marks the user as an oper from the /WHO line
-                       std::string::size_type pos = line.find("* ");
+                       std::string::size_type pos = line.find("*");
                        if (pos != std::string::npos)
-                               line.erase(pos);
+                               line.erase(pos, 1);
                        // hide the line completely if doing a "/who * o" query
                        if (params.size() > 1 && params[1].find('o') != std::string::npos)
                                line.clear();
@@ -111,5 +87,4 @@ class ModuleHideOper : public Module
        }
 };
 
-
 MODULE_INIT(ModuleHideOper)