X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namedmodes.cpp;h=8647cebb454daa4cd9aacfa8a78a78a2de78e39b;hb=b14ebbccf08ec34a73e1ba271e67da80d9fe805c;hp=1ba39b54a36cd83c77d310cce5a79f758dc99971;hpb=8170cabf0f43622c86220ddbe527bc84637cc3c7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp
index 1ba39b54a..8647cebb4 100644
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -1,16 +1,22 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *
- * 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"
 
 static void DisplayList(User* user, Channel* channel)
@@ -21,16 +27,14 @@ static void DisplayList(User* user, Channel* channel)
 		ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_CHANNEL);
 		if (!mh || mh->IsListMode())
 			continue;
-		if (!channel->IsModeSet(letter))
+		if (!channel->IsModeSet(mh))
 			continue;
-		std::string item = mh->name;
+		items << " +" << mh->name;
 		if (mh->GetNumParams(true))
-			item += "=" + channel->GetModeParameter(letter);
-		items << item << " ";
+			items << " " << channel->GetModeParameter(mh);
 	}
-	char pfx[MAXBUF];
-	snprintf(pfx, MAXBUF, ":%s 961 %s %s", ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), channel->name.c_str());
-	user->SendText(std::string(pfx), items);
+	const std::string line = ":" + ServerInstance->Config->ServerName + " 961 " + user->nick + " " + channel->name;
+	user->SendText(line, items);
 	user->WriteNumeric(960, "%s %s :End of mode list", user->nick.c_str(), channel->name.c_str());
 }
 
@@ -70,34 +74,42 @@ class CommandProp : public Command
 					modes[1].append((plus ? "+" : "-") + std::string(1, letter));
 					if (mh->GetNumParams(plus))
 					{
-						if (i == parameters.size())
-							return CMD_FAILURE;
-						modes.push_back(parameters[i++]);
+						if (i != parameters.size())
+							modes.push_back(parameters[i++]);
 					}
 				}
 			}
 		}
-		ServerInstance->SendGlobalMode(modes, src);
+		ServerInstance->Modes->Process(modes, src);
 		return CMD_SUCCESS;
 	}
 };
 
+class DummyZ : public ModeHandler
+{
+ public:
+	DummyZ(Module* parent) : ModeHandler(parent, "namebase", 'Z', PARAM_ALWAYS, MODETYPE_CHANNEL)
+	{
+		list = true;
+	}
+};
+
 class ModuleNamedModes : public Module
 {
 	CommandProp cmd;
+	DummyZ dummyZ;
  public:
-	ModuleNamedModes() : cmd(this)
+	ModuleNamedModes() : cmd(this), dummyZ(this)
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules->AddService(cmd);
-		Implementation eventlist[] = { I_OnPreMode, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->AddService(dummyZ);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides the ability to manipulate modes via long names.",VF_VENDOR);
 	}
@@ -107,19 +119,7 @@ class ModuleNamedModes : public Module
 		ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST);
 	}
 
-	void On005Numeric(std::string& line)
-	{
-		std::string::size_type pos = line.find(" CHANMODES=");
-		if (pos != std::string::npos)
-		{
-			pos += 11;
-			while (line[pos] > 'A' && line[pos] < 'Z')
-				pos++;
-			line.insert(pos, 1, 'Z');
-		}
-	}
-
-	ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector<std::string>& parameters)
+	ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector<std::string>& parameters) CXX11_OVERRIDE
 	{
 		if (!channel)
 			return MOD_RES_PASSTHRU;
@@ -191,7 +191,7 @@ class ModuleNamedModes : public Module
 			}
 		}
 		newparms[1] = modelist;
-		ServerInstance->Modes->Process(newparms, source, false);
+		ServerInstance->Modes->Process(newparms, source);
 		return MOD_RES_DENY;
 	}
 };