X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=cb01c774186e23a104c3266f558e1e74b4199ea9;hb=92796ffe6430162a9cb70f1361aaa9ca64645c90;hp=df959147ae4bd670cca8b951b3169e5cdeb8ab77;hpb=d185decae97752368d5cf62311cbc0d1a52aa22c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index df959147a..cb01c7741 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-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -21,7 +21,7 @@ class CommandSwhois : public Command
 {
 
  public:
-	CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS","o",2)
+	CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS","o",2, 2)
 	{
 		this->source = "m_swhois.so";
 		syntax = "<nick> :<swhois>";
@@ -34,19 +34,17 @@ class CommandSwhois : public Command
 
 		if (!dest)
 		{
-			user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
 			return CMD_FAILURE;
 		}
 
 		std::string* text;
-		dest->GetExt("swhois", text);
-
-		if (text)
+		if (dest->GetExt("swhois", text))
 		{
 			// We already had it set...
 			if (!ServerInstance->ULine(user->server))
 				// Ulines set SWHOISes silently
-				ServerInstance->SNO->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick.c_str(), dest->nick.c_str(), text->c_str(), parameters[0].c_str());
+				ServerInstance->SNO->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick.c_str(), dest->nick.c_str(), text->c_str(), parameters[1].c_str());
 
 			dest->Shrink("swhois");
 			delete text;
@@ -54,10 +52,10 @@ class CommandSwhois : public Command
 		else if (!ServerInstance->ULine(user->server))
 		{
 			// Ulines set SWHOISes silently
-			ServerInstance->SNO->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois to '%s'", user->nick.c_str(), dest->nick.c_str(), parameters[0].c_str());
+			ServerInstance->SNO->WriteToSnoMask('A', "%s used SWHOIS to set %s's extra whois to '%s'", user->nick.c_str(), dest->nick.c_str(), parameters[1].c_str());
 		}
 
-		text = new std::string(parameters[0]);
+		text = new std::string(parameters[1]);
 		dest->Extend("swhois", text);
 
 		/* Bug #376 - feature request -
@@ -112,8 +110,7 @@ class ModuleSWhois : public Module
 		{
 			/* Insert our numeric before 312 */
 			std::string* swhois;
-			dest->GetExt("swhois", swhois);
-			if (swhois)
+			if (dest->GetExt("swhois", swhois))
 			{
 				ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), swhois->c_str());
 			}
@@ -135,8 +132,7 @@ class ModuleSWhois : public Module
 		{
 			// check if this user has an swhois field to send
 			std::string* swhois;
-			user->GetExt("swhois", swhois);
-			if (swhois)
+			if (user->GetExt("swhois", swhois))
 			{
 				// call this function in the linking module, let it format the data how it
 				// sees fit, and send it on its way. We dont need or want to know how.
@@ -149,8 +145,7 @@ class ModuleSWhois : public Module
 	virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
 	{
 		std::string* swhois;
-		user->GetExt("swhois", swhois);
-		if (swhois)
+		if (user->GetExt("swhois", swhois))
 		{
 			user->Shrink("swhois");
 			delete swhois;
@@ -164,8 +159,7 @@ class ModuleSWhois : public Module
 		{
 			User* user = (User*)item;
 			std::string* swhois;
-			user->GetExt("swhois", swhois);
-			if (swhois)
+			if (user->GetExt("swhois", swhois))
 			{
 				user->Shrink("swhois");
 				delete swhois;
@@ -257,7 +251,7 @@ class ModuleSWhois : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };