X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sajoin.cpp;h=a2c710ec3d38f2ece7f598ade2a7201b4f3715a4;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=063f52e95744ab789243402c945a7b8e3950cf3f;hpb=4b0f6c610f755e0cb93843d5a2a6c70336eafe39;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 063f52e95..a2c710ec3 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -2,20 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *		       E-mail:
- *		<brain@chatspike.net>
- *	   	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include <stdio.h>
 #include <string>
 #include "users.h"
@@ -26,9 +21,8 @@ using namespace std;
 
 /* $ModDesc: Provides support for unreal-style SAJOIN command */
 
-
-
-
+/** Handle /SAJOIN
+ */
 class cmd_sajoin : public command_t
 {
  public:
@@ -55,8 +49,7 @@ class cmd_sajoin : public command_t
 				return CMD_FAILURE;
 			}
 
-			ServerInstance->WriteOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
-			chanrec::JoinUser(ServerInstance, dest, parameters[1], true);
+			chanrec::JoinUser(ServerInstance, dest, parameters[1], true, "");
 
 			/* Fix for dotslasher and w00t - if the join didnt succeed, return CMD_FAILURE so that it doesnt propogate */
 			chanrec* n = ServerInstance->FindChan(parameters[1]);
@@ -69,18 +62,21 @@ class cmd_sajoin : public command_t
 				}
 				else
 				{
-					user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(user->nick)+" to "+parameters[1]+" (User is probably banned, or blocking modes)");
+					user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]+" (User is probably banned, or blocking modes)");
 					return CMD_FAILURE;
 				}
 			}
 			else
 			{
-				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(user->nick)+" to "+parameters[1]);
+				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]);
 				return CMD_FAILURE;
 			}
 		}
-
-		return CMD_SUCCESS;
+		else
+		{
+			user->WriteServ("NOTICE "+std::string(user->nick)+" :*** No such nickname "+parameters[0]);
+			return CMD_FAILURE;
+		}
 	}
 };
 
@@ -102,7 +98,7 @@ class ModuleSajoin : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };