X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=ef5c5c35f14c9c6bddd1ddacabd774dc1e049118;hb=dd36852a52e8541306b76c5b88bce8ab9b36654c;hp=ff7c9d783d43c131f2922d0bb361daa0bf495938;hpb=cadc11999ee28545e9beb92de116c151832af5c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index ff7c9d783..ef5c5c35f 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -21,14 +21,14 @@ 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]);
 		
@@ -38,12 +38,6 @@ class CommandSwhois : public Command
 			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++)
 		{
@@ -59,18 +53,17 @@ class CommandSwhois : public Command
 		if (text)
 		{
 			// We already had it set...
-			
 			if (!ServerInstance->ULine(user->server))
 				// Ulines set SWHOISes silently
-				ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
+				ServerInstance->SNO->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
 			
 			dest->Shrink("swhois");
-			DELETE(text);
+			delete text;
 		}
 		else if (!ServerInstance->ULine(user->server))
 		{
 			// Ulines set SWHOISes silently
-			ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
+			ServerInstance->SNO->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
 		}
 		
 		text = new std::string(line);
@@ -89,6 +82,13 @@ class CommandSwhois : public Command
 		Event event((char*)metadata,(Module*)this,"send_metadata");
 		event.Send(ServerInstance);
 		delete metadata;
+		
+		// If it's an empty swhois, unset it (not ideal, but ok)
+		if (text->empty())
+		{
+			dest->Shrink("swhois");
+			delete text;
+		}
 
 		return CMD_LOCALONLY;
 	}
@@ -114,14 +114,10 @@ class ModuleSWhois : public Module
 
 	void OnRehash(User* user, const std::string &parameter)
 	{
-		DELETE(Conf);
+		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnDecodeMetaData] = List[I_OnWhoisLine] = List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnRehash] = List[I_OnPostCommand] = 1;
-	}
 
 	// :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
 	int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
@@ -171,7 +167,7 @@ class ModuleSWhois : public Module
 		if (swhois)
 		{
 			user->Shrink("swhois");
-			DELETE(swhois);
+			delete swhois;
 		}
 	}
 
@@ -186,7 +182,7 @@ class ModuleSWhois : public Module
 			if (swhois)
 			{
 				user->Shrink("swhois");
-				DELETE(swhois);
+				delete swhois;
 			}
 		}
 	}
@@ -208,13 +204,13 @@ class ModuleSWhois : public Module
 			std::string* text;
 			if (!dest->GetExt("swhois", text))
 			{
-				std::string* text = new std::string(extdata);
-				dest->Extend("swhois",text);
+				std::string* text2 = new std::string(extdata);
+				dest->Extend("swhois",text2);
 			}
 		}
 	}
 	
-	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;
@@ -250,7 +246,7 @@ class ModuleSWhois : public Module
 		if (user->GetExt("swhois", old))
 		{
 			user->Shrink("swhois");
-			DELETE(old);
+			delete old;
 		}
 		
 		if (!swhois.length())
@@ -269,7 +265,7 @@ class ModuleSWhois : public Module
 
 	virtual ~ModuleSWhois()
 	{
-		DELETE(Conf);
+		delete Conf;
 	}
 	
 	virtual Version GetVersion()