The SA* modules actually compile in this version

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@402 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 12 insertions, 9 deletions

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 5e7ae9786..94175a523 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -6,7 +6,7 @@
 #include "channels.h"
 #include "modules.h"
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+/* $ModDesc: Provides support for unreal-style SAJOIN command */
 
 Server *Srv;
 	 
@@ -15,8 +15,8 @@ void handle_sajoin(char **parameters, int pcnt, userrec *user)
 	userrec* dest = Srv->FindNick(std::string(parameters[0]));
 	if (dest)
 	{
-		Srv->SendOpers(std::string(user->nick)+" used SAJOIN to make "+std::String(dest->nick)+" join "+parameters[1]);
-		Srv->JoinUserToChannel(dest,std::String(parameters[1]),std::string(dest->nick));
+		Srv->SendOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+		Srv->JoinUserToChannel(dest,std::string(parameters[1]),std::string(dest->nick));
 	}
 }
 
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index d929efd4a..a95caa028 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -6,7 +6,7 @@
 #include "channels.h"
 #include "modules.h"
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+/* $ModDesc: Provides support for SANICK command */
 
 Server *Srv;
 	 
@@ -15,8 +15,11 @@ void handle_sanick(char **parameters, int pcnt, userrec *user)
 	userrec* source = Srv->FindNick(std::string(parameters[0]));
 	if (source)
 	{
-		Srv->SendOpers(std::string(user->nick)+" used SANICK to change "+std::String(dest->nick)+" to "+parameters[1]);
-		Srv->ChangeUserNick(source,std::String(parameters[1]));
+		if (Srv->IsNick(std::string(parameters[1])))
+		{
+			Srv->SendOpers(std::string(user->nick)+" used SANICK to change "+std::string(source->nick)+" to "+parameters[1]);
+			Srv->ChangeUserNick(source,std::string(parameters[1]));
+		}
 	}
 }
 
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 6b784c93b..266ed5a04 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -6,7 +6,7 @@
 #include "channels.h"
 #include "modules.h"
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+/* $ModDesc: Provides support for unreal-style SAPART command */
 
 Server *Srv;
 	 
@@ -15,8 +15,8 @@ void handle_sapart(char **parameters, int pcnt, userrec *user)
 	userrec* dest = Srv->FindNick(std::string(parameters[0]));
 	if (dest)
 	{
-		Srv->SendOpers(std::string(user->nick)+" used SAPART to make "+std::String(dest->nick)+" part "+parameters[1]);
-		Srv->PartUserFromChannel(dest,std::String(parameters[1]),std::string(dest->nick));
+		Srv->SendOpers(std::string(user->nick)+" used SAPART to make "+std::string(dest->nick)+" part "+parameters[1]);
+		Srv->PartUserFromChannel(dest,std::string(parameters[1]),std::string(dest->nick));
 	}
 }