Improved strhashcomp with no allocations

[user/henk/code/inspircd.git] / src / modules / m_sapart.cpp

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 918a8ca56e2750d636a2f4e72f1c7de514ba2578..33b323fea22c60144ec829aefb31a87c8d93d7e5 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -21,10 +21,11 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for unreal-style SAPART command */
 
-Server *Srv;
+static Server *Srv;
 
 class cmd_sapart : public command_t
 {
@@ -39,13 +40,10 @@ class cmd_sapart : public command_t
                userrec* dest = Srv->FindNick(std::string(parameters[0]));
                if (dest)
                {
-                       for (unsigned int x = 0; x < strlen(parameters[1]); x++)
+                       if (!IsValidChannelName(parameters[1]))
                        {
-                                       if ((parameters[1][0] != '#') || (parameters[1][x] == ' ') || (parameters[1][x] == ','))
-                                       {
-                                               Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
-                                               return;
-                                       }
+                               Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
+                               return;
                        }
 
                        Srv->SendOpers(std::string(user->nick)+" used SAPART to make "+std::string(dest->nick)+" part "+parameters[1]);