Mode +b stuff, probably wont work yet

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

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index fab61d07c0df403fc8f30717a200ca5d51f2552d..aa82464642ea288f00e511df3cac30c65383663e 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -76,6 +76,12 @@ class cmd_remove : public command_t
                        return;
                }
 
+               if (!channel->HasUser(target))
+               {
+                       Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** The user "+target->nick+" is not on channel "+channel->name);
+                       return;
+               }       
+
                /* And see if the person calling the command has access to use it on the channel */
                uprivs = Srv->ChanMode(user, channel);
                
@@ -115,7 +121,7 @@ class cmd_remove : public command_t
                if (ulevel > 1)
                {
                        /* For now, we'll let everyone remove their level and below, eg ops can remove ops, halfops, voices, and those with no mode (no moders actually are set to 1) */
-                       if(ulevel >= tlevel && tlevel != 5)
+                       if ((ulevel >= tlevel && tlevel != 5) && (!Srv->IsUlined(target->server)))
                        {
                                Srv->PartUserFromChannel(target, channel->name, reason);
                                WriteServ(user->fd, "NOTICE %s :%s removed %s from the channel", channel->name, user->nick, target->nick);
@@ -150,10 +156,10 @@ class ModuleRemove : public Module
                List[I_On005Numeric] = 1;
        }
 
-        virtual void On005Numeric(std::string &output)
-        {
-                output = output + std::string(" REMOVE");
-        }
+       virtual void On005Numeric(std::string &output)
+       {
+               output = output + std::string(" REMOVE");
+       }
        
        virtual ~ModuleRemove()
        {