X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=8276f610f1ae1e3a787c85534e9a138bf811de81;hb=d85e091d508de8749d624e755c45b4d302b79db0;hp=3a0b2b0a7e3ba950955ebbea06f9145095c38b9c;hpb=bfff1d9d93dccb9f0080b84d3933d47f2a6a1f6c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 3a0b2b0a7..8276f610f 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -21,29 +21,23 @@ class CommandSwhois : public Command
 {
 	
  public:
-	CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS",'o',2)
+	CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS","o",2)
 	{
 		this->source = "m_swhois.so";
 		syntax = "<nick> <swhois>";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle(const char** parameters, int pcnt, User* user)
+	CmdResult Handle(const char* const* parameters, int pcnt, User* user)
 	{
 		User* dest = ServerInstance->FindNick(parameters[0]);
 		
 		if (!dest)
 		{
-			user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+			user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick, parameters[0]);
 			return CMD_FAILURE;
 		}
 
-		if (!*parameters[1])
-		{
-			user->WriteServ("NOTICE %s :*** SWHOIS: Whois line must be specified", user->nick);
-			return CMD_FAILURE;
-		}
-		
 		std::string line;
 		for (int i = 1; i < pcnt; i++)
 		{
@@ -139,6 +133,7 @@ class ModuleSWhois : public Module
 				ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick,dest->nick,swhois->c_str());
 			}
 		}
+
 		/* Dont block anything */
 		return 0;
 	}
@@ -206,17 +201,24 @@ class ModuleSWhois : public Module
 		if ((target_type == TYPE_USER) && (extname == "swhois"))
 		{
 			User* dest = (User*)target;
-			// if they dont already have an swhois field, accept the remote server's
+
+			// if they already have an swhois field, trash it and replace it with the remote one.
 			std::string* text;
-			if (!dest->GetExt("swhois", text))
+			if (dest->GetExt("swhois", text))
 			{
-				std::string* text = new std::string(extdata);
-				dest->Extend("swhois",text);
+				user->Shrink("swhois");
+				delete text;
 			}
+
+			if (extdata.empty())
+				return; // XXX does the command parser even allow sending blank mdata? it needs to here! -- w00t
+
+			text2 = new std::string(extdata);
+			dest->Extend("swhois", text);
 		}
 	}
 	
-	virtual void OnPostCommand(const std::string &command, const char **params, int pcnt, User *user, CmdResult result, const std::string &original_line)
+	virtual void OnPostCommand(const std::string &command, const char* const* params, int pcnt, User *user, CmdResult result, const std::string &original_line)
 	{
 		if ((command != "OPER") || (result != CMD_SUCCESS))
 			return;
@@ -276,7 +278,7 @@ class ModuleSWhois : public Module
 	
 	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);
 	}
 };