X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=f211b01d88a75af838c527b283ef68c81517750d;hb=9d72ec55ae98960bf996dd3d92c29598a5e3c825;hp=6f954df645c6711fe102b2e2269b8385744a2f72;hpb=7d93921aabd9c608821baec8a871aff844dfae49;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 6f954df64..f211b01d8 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -1,55 +1,54 @@
-/*       +------------------------------------+
- *       | 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) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * 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"
-#include "m_cap.h"
 
-/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
+#include "inspircd.h"
+#include "modules/cap.h"
 
 class ModuleNamesX : public Module
 {
- public:
 	GenericCap cap;
-	ModuleNamesX(InspIRCd* Me) : Module(Me), cap(this, "multi-prefix")
-	{
-		Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
-	}
-
-
-	~ModuleNamesX()
+ public:
+	ModuleNamesX() : cap(this, "multi-prefix")
 	{
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR);
 	}
 
-	void On005Numeric(std::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		output.append(" NAMESX");
+		tokens["NAMESX"];
 	}
 
-	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
 	{
-		irc::string c = command.c_str();
 		/* We don't actually create a proper command handler class for PROTOCTL,
 		 * because other modules might want to have PROTOCTL hooks too.
 		 * Therefore, we just hook its as an unvalidated command therefore we
 		 * can capture it even if it doesnt exist! :-)
 		 */
-		if (c == "PROTOCTL")
+		if (command == "PROTOCTL")
 		{
 			if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
 			{
@@ -60,19 +59,43 @@ class ModuleNamesX : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
+	ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
 	{
-		if (!cap.ext.get(issuer))
+		if (cap.ext.get(issuer))
+			prefixes = memb->GetAllPrefixChars();
+
+		return MOD_RES_PASSTHRU;
+	}
+
+	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
+	{
+		if ((!memb) || (!cap.ext.get(source)))
 			return;
 
-		/* Some module hid this from being displayed, dont bother */
-		if (nick.empty())
+		// Channel names can contain ":", and ":" as a 'start-of-token' delimiter is
+		// only ever valid after whitespace, so... find the actual delimiter first!
+		// Thanks to FxChiP for pointing this out.
+		std::string::size_type pos = line.find(" :");
+		if (pos == std::string::npos || pos == 0)
+			return;
+		pos--;
+		// Don't do anything if the user has no prefixes
+		if ((line[pos] == 'H') || (line[pos] == 'G') || (line[pos] == '*'))
+			return;
+
+		// 352 21DAAAAAB #chan ident localhost insp21.test 21DAAAAAB H@ :0 a
+		//                                                            pos
+
+		// Don't do anything if the user has only one prefix
+		std::string prefixes = memb->GetAllPrefixChars();
+		if (prefixes.length() <= 1)
 			return;
 
-		prefixes = memb->chan->GetAllPrefixChars(memb->user);
+		line.erase(pos, 1);
+		line.insert(pos, prefixes);
 	}
 
-	void OnEvent(Event *ev)
+	void OnEvent(Event& ev) CXX11_OVERRIDE
 	{
 		cap.HandleEvent(ev);
 	}