X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hideoper.cpp;h=88b0c4cdffbf544f5ed12a1a5746162cdf152a6d;hb=ae4017f4459de4945754dae658f731a19fe7fd64;hp=8294f53905790976fccbeb38ece6cef6e0552cd3;hpb=7d93921aabd9c608821baec8a871aff844dfae49;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index 8294f5390..88b0c4cdf 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -1,76 +1,63 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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, Module* Creator) : ModeHandler(Creator, '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
 {
 	HideOper hm;
  public:
-	ModuleHideOper(InspIRCd* Me)
-		: Module(Me), hm(Me, this)
+	ModuleHideOper()
+		: hm(this)
 	{
+	}
 
-		if (!ServerInstance->Modes->AddMode(&hm))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnWhoisLine };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+	void init()
+	{
+		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);
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for hiding oper status with user mode +H", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR);
 	}
 
 	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
@@ -90,16 +77,44 @@ class ModuleHideOper : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnSendWhoLine(User* source, User* user, Channel* channel, std::string& line)
+	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 pos = line.find("* ");
+			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);
+				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;
+	}
 };