X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_modenotice.cpp;h=061933323f9cebb751021c57e48163bc06b38957;hb=4e3d655dff6f8a5aed626475fbf19c2a7119c20b;hp=8998ea8b1c8bc3792216319f452502a7bfc7b622;hpb=1f6ba902a6c45d84fcaf534d429ca1084ef35911;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_modenotice.cpp b/src/modules/m_modenotice.cpp
index 8998ea8b1..061933323 100644
--- a/src/modules/m_modenotice.cpp
+++ b/src/modules/m_modenotice.cpp
@@ -24,14 +24,16 @@ class CommandModeNotice : public Command
  public:
 	CommandModeNotice(Module* parent) : Command(parent,"MODENOTICE",2,2)
 	{
-		syntax = "<modes> <message>";
+		syntax = "<modeletters> :<message>";
 		flags_needed = 'o';
 	}
 
-	CmdResult Handle(const std::vector<std::string>& parameters, User *src)
+	CmdResult Handle(User* src, const Params& parameters) CXX11_OVERRIDE
 	{
+		std::string msg = "*** From " + src->nick + ": " + parameters[1];
 		int mlen = parameters[0].length();
-		for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
+		const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+		for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
 		{
 			User* user = *i;
 			for (int n = 0; n < mlen; n++)
@@ -39,14 +41,13 @@ class CommandModeNotice : public Command
 				if (!user->IsModeSet(parameters[0][n]))
 					goto next_user;
 			}
-			user->Write(":%s NOTICE %s :*** From %s: %s", ServerInstance->Config->ServerName.c_str(),
-				user->nick.c_str(), src->nick.c_str(), parameters[1].c_str());
+			user->WriteNotice(msg);
 next_user:	;
 		}
 		return CMD_SUCCESS;
 	}
 
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		return ROUTE_OPT_BCAST;
 	}
@@ -64,7 +65,7 @@ class ModuleModeNotice : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the /MODENOTICE command", VF_VENDOR);
+		return Version("Provides the MODENOTICE command", VF_VENDOR);
 	}
 };