Improved strhashcomp with no allocations

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

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index c8a632b7e3c7508db641c2b2ad9826e05abcb8c5..dbd3af52f7e27624160d230ab99c0b618c3e9c3f 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -25,7 +25,7 @@ using namespace std;
 #include "helperfuncs.h"
 #include "message.h"
 
-Server *Srv;
+static Server *Srv;
         
 class cmd_uninvite : public command_t
 {
@@ -70,14 +70,15 @@ class cmd_uninvite : public command_t
                         WriteServ(user->fd,"491 %s %s %s :Is not invited to channel %s",user->nick,u->nick,c->name,c->name);
                         return;
                 }
-                if (has_channel(user,c))
+                if (!c->HasUser(user))
                 {
                         WriteServ(user->fd,"492 %s %s :You're not on that channel!",user->nick, c->name);
                         return;
                 }
 
                 u->RemoveInvite(xname);
-                WriteServ(user->fd,"NOTICE %s :*** Uninvited %s from %s",user->nick,u->nick,c->name);
+                WriteServ(user->fd,"494 %s %s %s :Uninvited",user->nick,c->name,u->nick);
+               WriteServ(u->fd,"493 %s :You were uninvited from %s by %s",u->nick,c->name,user->nick);
                 WriteChannel(c,user,"NOTICE %s :*** %s uninvited %s.",c->name,user->nick,u->nick);
         }
 };