X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=8b5e94c5fe0277c6b03d8a6901645459b639cd36;hb=27cef863f7286b626e01f1287f31005478a66fea;hp=4ee9bb208a7205ad1bd6e1319c56e3785a1607cf;hpb=4426a2fc448f332e42a7e6ff778e5047bb588c98;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 4ee9bb208..8b5e94c5f 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -20,18 +20,18 @@
 class CommandSamode : public Command
 {
  public:
-	CommandSamode (InspIRCd* Instance) : Command(Instance,"SAMODE", 'o', 2, false, 0)
+	CommandSamode (InspIRCd* Instance) : Command(Instance,"SAMODE", "o", 2, false, 0)
 	{
 		this->source = "m_samode.so";
 		syntax = "<target> <modes> {<mode-parameters>}";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
 		/*
 		 * Handles an SAMODE request. Notifies all +s users.
 	 	 */
-		ServerInstance->SendMode(parameters, pcnt, ServerInstance->FakeClient);
+		ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
 
 		if (ServerInstance->Modes->GetLastParse().length())
 		{
@@ -39,27 +39,23 @@ class CommandSamode : public Command
 
 			std::deque<std::string> n;
 			irc::spacesepstream spaced(ServerInstance->Modes->GetLastParse());
-			std::string one = "*";
+			std::string one;
 			while (spaced.GetToken(one))
 				n.push_back(one);
 
-			Event rmode((char *)&n, NULL, "send_mode");
-			rmode.Send(ServerInstance);
-
-			n.clear();
-			n.push_back(std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse());
-			Event rmode2((char *)&n, NULL, "send_opers");
-			rmode2.Send(ServerInstance);
+			std::string channel = n[0];
+			n.pop_front();
+			ServerInstance->PI->SendMode(channel, n);
 
 			/* XXX: Yes, this is right. We dont want to propagate the
 			 * actual SAMODE command, just the MODE command generated
-			 * by the send_mode
+			 * by the Protocol Interface
 			 */
 			return CMD_LOCALONLY;
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick);
+			user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick.c_str());
 		}
 
 		return CMD_FAILURE;
@@ -73,19 +69,19 @@ class ModuleSaMode : public Module
 	ModuleSaMode(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		mycommand = new CommandSamode(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 
 	}
-	
+
 	virtual ~ModuleSaMode()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };