m_hideoper Fix wrong /WHO output for hidden opers if the channel name contains '*'

[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 72290436094700cf6fedaa3e60962003d2e8ba32..88b0c4cdffbf544f5ed12a1a5746162cdf152a6d 100644 (file)
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -1,84 +1,119 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for hiding oper status with user mode +H */
 
 /** Handles user mode +H
  */
-class HideOper : public ModeHandler
+class HideOper : public SimpleUserModeHandler
 {
  public:
-       HideOper(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)
+       HideOper(Module* Creator) : SimpleUserModeHandler(Creator, "hideoper", 'H')
        {
-               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;
+               oper = true;
        }
 };
 
 class ModuleHideOper : public Module
 {
-       
-       HideOper* hm;
+       HideOper hm;
  public:
-       ModuleHideOper(InspIRCd* Me)
-               : Module(Me)
+       ModuleHideOper()
+               : hm(this)
+       {
+       }
+
+       void init()
        {
-               
-               hm = new HideOper(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(hm))
-                       throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnWhoisLine };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               ServerInstance->Modules->AddService(hm);
+               Implementation eventlist[] = { I_OnWhoisLine, I_OnSendWhoLine, I_OnStats };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       
+
        virtual ~ModuleHideOper()
        {
-               ServerInstance->Modes->DelMode(hm);
-               delete hm;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR);
        }
 
-       int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+       ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
        {
                /* Dont display numeric 313 (RPL_WHOISOPER) if they have +H set and the
                 * person doing the WHOIS is not an oper
                 */
-               return ((!IS_OPER(user)) && (numeric == 313) && dest->IsModeSet('H'));
+               if (numeric != 313)
+                       return MOD_RES_PASSTHRU;
+
+               if (!dest->IsModeSet('H'))
+                       return MOD_RES_PASSTHRU;
+
+               if (!user->HasPrivPermission("users/auspex"))
+                       return MOD_RES_DENY;
+
+               return MOD_RES_PASSTHRU;
+       }
+
+       void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line)
+       {
+               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 spcolon = line.find(" :");
+                       if (spcolon == std::string::npos)
+                               return; // Another module hid the user completely
+                       std::string::size_type sp = line.rfind(' ', spcolon-1);
+                       std::string::size_type pos = line.find('*', sp);
+                       if (pos != std::string::npos)
+                               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();
+               }
+       }
+
+       ModResult OnStats(char symbol, User* user, string_list &results)
+       {
+               if (symbol != 'P')
+                       return MOD_RES_PASSTHRU;
+
+               unsigned int count = 0;
+               for (std::list<User*>::const_iterator i = ServerInstance->Users->all_opers.begin(); i != ServerInstance->Users->all_opers.end(); ++i)
+               {
+                       User* oper = *i;
+                       if (!ServerInstance->ULine(oper->server) && (IS_OPER(user) || !oper->IsModeSet('H')))
+                       {
+                               results.push_back(ServerInstance->Config->ServerName+" 249 " + user->nick + " :" + oper->nick + " (" + oper->ident + "@" + oper->dhost + ") Idle: " +
+                                               (IS_LOCAL(oper) ? ConvToStr(ServerInstance->Time() - oper->idle_lastmsg) + " secs" : "unavailable"));
+                               count++;
+                       }
+               }
+               results.push_back(ServerInstance->Config->ServerName+" 249 "+user->nick+" :"+ConvToStr(count)+" OPER(s)");
+
+               return MOD_RES_DENY;
        }
 };