X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_notice.cpp;h=a797fefabc509c1cdcf136666dc377416ae434e7;hb=f48750e54a87cd95d7673059146177c2d888b050;hp=0f968e0db30b0c78dfff599bd17fde6317e09ed1;hpb=a9b90ecb4329498aba52da6aaa9812e3a70b8e11;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp index 0f968e0db..a797fefab 100644 --- a/src/cmd_notice.cpp +++ b/src/cmd_notice.cpp @@ -2,154 +2,157 @@ * | 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 "configreader.h" #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_notice.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]; - -void cmd_notice::Handle (char **parameters, int pcnt, userrec *user) +#include "commands/cmd_notice.h" + +extern "C" DllExport command_t* init_command(InspIRCd* Instance) +{ + return new cmd_notice(Instance); +} + +CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user) { userrec *dest; chanrec *chan; - user->idle_lastmsg = TIME; + CUList exempt_list; + + user->idle_lastmsg = ServerInstance->Time(); - if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-2,0)) - return; - if (parameters[0][0] == '$') + if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0)) + return CMD_SUCCESS; + if ((parameters[0][0] == '$') && (IS_OPER(user) || ServerInstance->ULine(user->server))) { + int MOD_RESULT = 0; + std::string temp = parameters[1]; + FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0,exempt_list)); + if (MOD_RESULT) + return CMD_FAILURE; + parameters[1] = temp.c_str(); // notice to server mask - char* servermask = parameters[0]; - servermask++; - if (match(Config->ServerName,servermask)) + const char* servermask = parameters[0] + 1; + if (match(ServerInstance->Config->ServerName,servermask)) { - NoticeAll(user, true, "%s",parameters[1]); + user->SendAll("NOTICE", "%s", parameters[1]); } - return; + FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,exempt_list)); + return CMD_SUCCESS; + } + char status = 0; + if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+')) + { + status = *parameters[0]; + parameters[0]++; } - else if (parameters[0][0] == '#') + if (*parameters[0] == '#') { - chan = FindChan(parameters[0]); + chan = ServerInstance->FindChan(parameters[0]); + + exempt_list[user] = user->nick; + if (chan) { - if ((chan->binarymodes & CM_NOEXTERNAL) && (!has_channel(user,chan))) - { - WriteServ(user->fd,"404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name); - return; - } - if ((chan->binarymodes & CM_MODERATED) && (cstatus(user,chan)fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name); - return; + if ((chan->modes[CM_NOEXTERNAL]) && (!chan->HasUser(user))) + { + user->WriteServ("404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name); + return CMD_FAILURE; + } + if ((chan->modes[CM_MODERATED]) && (chan->GetStatus(user) < STATUS_VOICE)) + { + user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name); + return CMD_FAILURE; + } } - int MOD_RESULT = 0; std::string temp = parameters[1]; - FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,chan,TYPE_CHANNEL,temp)); + FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,chan,TYPE_CHANNEL,temp,status, exempt_list)); if (MOD_RESULT) { - return; + return CMD_FAILURE; } - parameters[1] = (char*)temp.c_str(); + parameters[1] = temp.c_str(); - if (temp == "") - { - WriteServ(user->fd,"412 %s No text to send", user->nick); - return; - } + if (temp.empty()) + { + user->WriteServ("412 %s :No text to send", user->nick); + return CMD_FAILURE; + } - ChanExceptSender(chan, user, "NOTICE %s :%s", chan->name, parameters[1]); + if (status) + { + if (ServerInstance->Config->UndernetMsgPrefix) + { + chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%c %s", status, chan->name, status, parameters[1]); + } + else + { + chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%s", status, chan->name, parameters[1]); + } + } + else + { + chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %s :%s", chan->name, parameters[1]); + } - FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1])); + FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1],status,exempt_list)); } else { /* no such nick/channel */ - 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 CMD_FAILURE; } - return; + return CMD_SUCCESS; } - dest = Find(parameters[0]); + dest = ServerInstance->FindNick(parameters[0]); if (dest) { + if (!*parameters[1]) + { + user->WriteServ("412 %s :No text to send", user->nick); + return CMD_FAILURE; + } + int MOD_RESULT = 0; - std::string temp = parameters[1]; - FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,dest,TYPE_USER,temp)); + FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,dest,TYPE_USER,temp,0,exempt_list)); if (MOD_RESULT) { - return; + return CMD_FAILURE; } parameters[1] = (char*)temp.c_str(); - if (dest->fd > -1) + if (IS_LOCAL(dest)) { // direct write, same server - WriteTo(user, dest, "NOTICE %s :%s", dest->nick, parameters[1]); + user->WriteTo(dest, "NOTICE %s :%s", dest->nick, parameters[1]); } - FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,parameters[1])); + FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,parameters[1],0,exempt_list)); } else { /* no such nick/channel */ - 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 CMD_FAILURE; } -} + return CMD_SUCCESS; + +}