More tweaks

[user/henk/code/inspircd.git] / src / mode.cpp

diff --git a/src/mode.cpp b/src/mode.cpp
index 44117ac7764888ddd9db3ef0b4ceb9b82e4b15d2..f3cf54e6a4820eb805c8e10cc4999b835436fbb4 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -25,7 +25,7 @@ using namespace std;
 #include "users.h"
 #include "modules.h"
 #include "inspstring.h"
-#include "helperfuncs.h"
+
 #include "commands.h"
 #include "mode.h"
 
@@ -306,7 +306,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                                ServerInstance->Log(DEBUG,"The user is not a halfop or above, checking other reasons for being able to set the modes");
 
                                /* Are we a uline or is it a servermode? */
-                               if ((!is_uline(user->server)) && (!servermode))
+                               if ((!ServerInstance->ULine(user->server)) && (!servermode))
                                {
                                        /* Not enough permission:
                                         * NOT a uline and NOT a servermode,
@@ -395,6 +395,10 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                                                                if (parameter_counter < pcnt)
                                                                {
                                                                        parameter = parameters[parameter_counter++];
+
+                                                                       /* Yerk, invalid! */
+                                                                       if ((parameter.rfind(':') || (parameter.rfind(' '))))
+                                                                               parameter = "";
                                                                }
                                                                else
                                                                {
@@ -489,7 +493,7 @@ void cmd_mode::Handle (const char** parameters, int pcnt, userrec *user)
        if (!user)
                return;
 
-       ServerInstance->ModeGrok->Process(parameters, pcnt, user, false);
+       ServerInstance->Modes->Process(parameters, pcnt, user, false);
 
        return;
 }