X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namedmodes.cpp;h=d3f9f94a47871a36ef4455151d664c62b83cf2a6;hb=357d190074ee58809b31ea0c08543566168bddf6;hp=3e27092a7fbb1ec1e329fe5eb9117cd3859b9baf;hpb=4b41feea830fc84e8c1b2fd0982f3e8d8840af96;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp
index 3e27092a7..d3f9f94a4 100644
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -17,8 +17,6 @@
  */
 
 
-/* $ModDesc: Provides the ability to manipulate modes via long names. */
-
 #include "inspircd.h"
 
 static void DisplayList(User* user, Channel* channel)
@@ -29,15 +27,15 @@ 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;
 		items << " +" << mh->name;
 		if (mh->GetNumParams(true))
-			items << " " << channel->GetModeParameter(letter);
+			items << " " << channel->GetModeParameter(mh);
 	}
 	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());
+	user->WriteNumeric(960, "%s :End of mode list", channel->name.c_str());
 }
 
 class CommandProp : public Command
@@ -82,7 +80,7 @@ class CommandProp : public Command
 				}
 			}
 		}
-		ServerInstance->SendGlobalMode(modes, src);
+		ServerInstance->Modes->Process(modes, src);
 		return CMD_SUCCESS;
 	}
 };
@@ -105,15 +103,6 @@ class ModuleNamedModes : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(cmd);
-		ServerInstance->Modules->AddService(dummyZ);
-
-		Implementation eventlist[] = { I_OnPreMode };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
 	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides the ability to manipulate modes via long names.",VF_VENDOR);
@@ -196,7 +185,7 @@ class ModuleNamedModes : public Module
 			}
 		}
 		newparms[1] = modelist;
-		ServerInstance->Modes->Process(newparms, source, false);
+		ServerInstance->Modes->Process(newparms, source);
 		return MOD_RES_DENY;
 	}
 };