X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_invite.cpp;h=9c2c2644212818ddefe7406de7c4c70e056707d6;hb=2e28b264afa667923b6c17d88ffcb12315309936;hp=0c1b01ebacdf6be307a4c54be3b8cc5bf0ce1d54;hpb=293df6a8b55e89c127e60e92711ef0ef1027bff8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp index 0c1b01eba..9c2c26442 100644 --- a/src/cmd_invite.cpp +++ b/src/cmd_invite.cpp @@ -2,120 +2,98 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2005 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include -#include -#include -#include "users.h" -#include "ctables.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" -#include "commands.h" -#include "mode.h" -#include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" -#include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" -#include "command_parse.h" -#include "cmd_invite.h" +#include "commands/cmd_invite.h" -extern ServerConfig* Config; -extern InspIRCd* ServerInstance; -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern time_t TIME; -extern user_hash clientlist; -extern chan_hash chanlist; -extern whowas_hash whowas; -extern std::vector all_opers; -extern std::vector local_users; -extern userrec* fd_ref_table[65536]; +extern "C" DllExport command_t* init_command(InspIRCd* Instance) +{ + return new cmd_invite(Instance); +} -void cmd_invite::Handle (char **parameters, int pcnt, userrec *user) +/** Handle /INVITE + */ +CmdResult cmd_invite::Handle (const char** parameters, int pcnt, userrec *user) { + int MOD_RESULT = 0; + if (pcnt == 2) { - userrec* u = Find(parameters[0]); - chanrec* c = FindChan(parameters[1]); + userrec* u = ServerInstance->FindNick(parameters[0]); + chanrec* c = ServerInstance->FindChan(parameters[1]); if ((!c) || (!u)) { if (!c) { - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[1]); + user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[1]); } else { - if (c->binarymodes & CM_INVITEONLY) - { - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]); - } + user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]); } - return; + return CMD_FAILURE; } - if (c->binarymodes & CM_INVITEONLY) + if ((c->IsModeSet('i')) && (IS_LOCAL(user))) { - if (cstatus(user,c) < STATUS_HOP) + if (c->GetStatus(user) < STATUS_HOP) { - WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, c->name); - return; + user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, c->name); + return CMD_FAILURE; } } - if (has_channel(u,c)) + + if (c->HasUser(u)) { - WriteServ(user->fd,"443 %s %s %s :Is already on channel %s",user->nick,u->nick,c->name,c->name); - return; + user->WriteServ("443 %s %s %s :is already on channel",user->nick,u->nick,c->name); + return CMD_FAILURE; } - if (!has_channel(user,c)) + + if ((IS_LOCAL(user)) && (!c->HasUser(user))) { - WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, c->name); - return; + user->WriteServ("442 %s %s :You're not on that channel!",user->nick, c->name); + return CMD_FAILURE; } - int MOD_RESULT = 0; - FOREACH_RESULT(OnUserPreInvite(user,u,c)); - if (MOD_RESULT == 1) { - return; + FOREACH_RESULT(I_OnUserPreInvite,OnUserPreInvite(user,u,c)); + + if (MOD_RESULT == 1) + { + return CMD_FAILURE; } - irc::string xname(c->name); - u->InviteTo(xname); - WriteFrom(u->fd,user,"INVITE %s :%s",u->nick,c->name); - WriteServ(user->fd,"341 %s %s %s",user->nick,u->nick,c->name); - FOREACH_MOD OnUserInvite(user,u,c); + u->InviteTo(c->name); + u->WriteFrom(user,"INVITE %s :%s",u->nick,c->name); + user->WriteServ("341 %s %s %s",user->nick,u->nick,c->name); + switch (ServerInstance->Config->AnnounceInvites) + { + case ServerConfig::INVITE_ANNOUNCE_ALL: + c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick); + break; + case ServerConfig::INVITE_ANNOUNCE_OPS: + c->WriteAllExceptSender(user, true, '@', "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick); + break; + case ServerConfig::INVITE_ANNOUNCE_DYNAMIC: + if (c->IsModeSet('i')) + c->WriteAllExceptSender(user, true, '@', "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick); + else + c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick); + break; + default: + /* Nobody */ + break; + } + FOREACH_MOD(I_OnUserInvite,OnUserInvite(user,u,c)); } else { @@ -124,10 +102,10 @@ void cmd_invite::Handle (char **parameters, int pcnt, userrec *user) InvitedList* il = user->GetInviteList(); for (InvitedList::iterator i = il->begin(); i != il->end(); i++) { - WriteServ(user->fd,"346 %s :%s",user->nick,i->channel.c_str()); + user->WriteServ("346 %s :%s",user->nick,i->c_str()); } - WriteServ(user->fd,"347 %s :End of INVITE list",user->nick); + user->WriteServ("347 %s :End of INVITE list",user->nick); } + return CMD_SUCCESS; } -