Automated merge with ssh://taros@hg.atheme.org//hg/unofficial/shadowircd

[irc/rqf/shadowircd.git] / modules / core / m_message.c

diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index 29c4b441bc89fb9c727a82c3a313bca4ef3ac879..46ba4e9ffb547a67d24eb2e8b8324b027832e9d0 100644 (file)
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_message.c 3173 2007-01-31 23:57:18Z jilles $
  */
 
 #include "stdinc.h"
@@ -46,6 +45,7 @@
 #include "tgchange.h"
 #include "inline/stringops.h"
 #include "irc_dictionary.h"
+#include "channel.h"
 
 static int m_message(int, const char *, struct Client *, struct Client *, int, const char **);
 static int m_privmsg(struct Client *, struct Client *, int, const char **);
@@ -54,6 +54,8 @@ static int m_notice(struct Client *, struct Client *, int, const char **);
 static void expire_tgchange(void *unused);
 static struct ev_entry *expire_tgchange_event;
 
+struct module_modes ModuleModes;
+
 static int
 modinit(void)
 {
@@ -498,7 +500,7 @@ msg_channel(int p_or_n, const char *command,
                        source_p->localClient->last = rb_current_time();
        }
 
-       if(chptr->mode.mode & MODE_NOREPEAT)
+       if(chptr->mode.mode & ModuleModes.MODE_NOREPEAT)
        {
                rb_strlcpy(text2, text, BUFSIZE);
                strip_unprintable(text2);
@@ -516,7 +518,7 @@ msg_channel(int p_or_n, const char *command,
                channel_metadata_add(chptr, "NOREPEAT", text2, 0);
        }
 
-       if(chptr->mode.mode & MODE_NOCOLOR && (!ConfigChannel.exempt_cmode_c || !is_any_op(msptr)))
+       if(chptr->mode.mode & ModuleModes.MODE_NOCOLOR && (!ConfigChannel.exempt_cmode_c || !is_any_op(msptr)))
        {
                rb_strlcpy(text2, text, BUFSIZE);
                strip_colour(text2);
@@ -534,10 +536,18 @@ msg_channel(int p_or_n, const char *command,
        /* chanops and voiced can flood their own channel with impunity */
        if((result = can_send(chptr, source_p, NULL)))
        {
+               if(result != CAN_SEND_OPV && MyClient(source_p) &&
+                  !IsOper(source_p) &&
+                  !add_channel_target(source_p, chptr))
+               {
+                       sendto_one(source_p, form_str(ERR_TARGCHANGE),
+                                  me.name, source_p->name, chptr->chname);
+                       return;
+               }
                if(result == CAN_SEND_OPV ||
                   !flood_attack_channel(p_or_n, source_p, chptr, chptr->chname))
                {
-                       if (strlen(text) > 10 && chptr->mode.mode & MODE_NOCAPS && (!ConfigChannel.exempt_cmode_G || !is_any_op(msptr)))
+                       if (strlen(text) > 10 && chptr->mode.mode & ModuleModes.MODE_NOCAPS && (!ConfigChannel.exempt_cmode_G || !is_any_op(msptr)))
                        {
                                rb_strlcpy(text2, text, BUFSIZE);
                                strip_unprintable(text2);
@@ -553,12 +563,12 @@ msg_channel(int p_or_n, const char *command,
                                        return;
                                }
                        }
-                       if (p_or_n != PRIVMSG && chptr->mode.mode & MODE_NONOTICE && (!ConfigChannel.exempt_cmode_T || !is_any_op(msptr)))
+                       if (p_or_n != PRIVMSG && chptr->mode.mode & ModuleModes.MODE_NONOTICE && (!ConfigChannel.exempt_cmode_T || !is_any_op(msptr)))
                        {
                                sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - Notices are disallowed (+T set)", chptr->chname);
                                return;
                        }
-                       if (p_or_n != NOTICE && chptr->mode.mode & MODE_NOACTION &&
+                       if (p_or_n != NOTICE && chptr->mode.mode & ModuleModes.MODE_NOACTION &&
                                        !strncasecmp(text + 1, "ACTION", 6) &&
                                        (!ConfigChannel.exempt_cmode_D || !is_any_op(msptr)))
                        {
@@ -568,7 +578,7 @@ msg_channel(int p_or_n, const char *command,
                        if (p_or_n != NOTICE && *text == '\001' &&
                                        strncasecmp(text + 1, "ACTION", 6))
                        {
-                               if (chptr->mode.mode & MODE_NOCTCP && (!ConfigChannel.exempt_cmode_C || !is_any_op(msptr)))
+                               if (chptr->mode.mode & ModuleModes.MODE_NOCTCP && (!ConfigChannel.exempt_cmode_C || !is_any_op(msptr)))
                                {
                                        sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - CTCPs to this channel are disallowed (+C set)", chptr->chname);
                                        return;
@@ -580,10 +590,17 @@ msg_channel(int p_or_n, const char *command,
                                             "%s %s :%s", command, chptr->chname, text);
                }
        }
-       else if(chptr->mode.mode & MODE_OPMODERATE &&
+       else if(chptr->mode.mode & ModuleModes.MODE_OPMODERATE &&
                        (!(chptr->mode.mode & MODE_NOPRIVMSGS) ||
                         IsMember(source_p, chptr)))
        {
+               if(MyClient(source_p) && !IsOper(source_p) &&
+                  !add_channel_target(source_p, chptr))
+               {
+                       sendto_one(source_p, form_str(ERR_TARGCHANGE),
+                                  me.name, source_p->name, chptr->chname);
+                       return;
+               }
                if(!flood_attack_channel(p_or_n, source_p, chptr, chptr->chname))
                {
                        sendto_channel_opmod(client_p, source_p, chptr,
@@ -617,7 +634,7 @@ msg_channel_opmod(int p_or_n, const char *command,
 {
        char text2[BUFSIZE];
 
-       if(chptr->mode.mode & MODE_NOCOLOR)
+       if(chptr->mode.mode & ModuleModes.MODE_NOCOLOR)
        {
                rb_strlcpy(text2, text, BUFSIZE);
                strip_colour(text2);
@@ -632,7 +649,7 @@ msg_channel_opmod(int p_or_n, const char *command,
                }
        }
 
-       if(chptr->mode.mode & MODE_OPMODERATE &&
+       if(chptr->mode.mode & ModuleModes.MODE_OPMODERATE &&
                        (!(chptr->mode.mode & MODE_NOPRIVMSGS) ||
                         IsMember(source_p, chptr)))
        {
@@ -733,10 +750,36 @@ msg_client(int p_or_n, const char *command,
        struct Metadata *md;
        struct DictionaryIter iter;
        int oaccept = 0;
-       char *text3 = rb_strdup("");
+       char text3[10];
 
        if(MyClient(source_p))
        {
+               /*
+                * XXX: Controversial? Allow target users to send replies
+                * through a +g.  Rationale is that people can presently use +g
+                * as a way to taunt users, e.g. harass them and hide behind +g
+                * as a way of griefing.  --nenolod
+                */
+               if(p_or_n != NOTICE && MyClient(source_p) &&
+                               IsSetCallerId(source_p) &&
+                               IsSetSCallerId(source_p) &&
+                               !accept_message(target_p, source_p))
+               {
+                       if(rb_dlink_list_length(&source_p->localClient->allow_list) <
+                                       ConfigFileEntry.max_accept)
+                       {
+                               rb_dlinkAddAlloc(target_p, &source_p->localClient->allow_list);
+                               rb_dlinkAddAlloc(source_p, &target_p->on_allow_list);
+                       }
+                       else
+                       {
+                               sendto_one_numeric(source_p, ERR_OWNMODE,
+                                               form_str(ERR_OWNMODE),
+                                               target_p->name, "+g");
+                               return;
+                       }
+               }
+
                /* reset idle time for message only if its not to self 
                 * and its not a notice */
                if(p_or_n != NOTICE)
@@ -796,7 +839,7 @@ msg_client(int p_or_n, const char *command,
                {
                        if (IsOper(source_p))
                        {
-                               rb_sprintf(text3, "O%s", source_p->id);
+                               rb_snprintf(text3, sizeof(text3), "O%s", source_p->id);
                                DICTIONARY_FOREACH(md, &iter, target_p->user->metadata)
                                {
                                        if(!strcmp(md->value, "OACCEPT") && !strcmp(md->name, text3))
@@ -887,7 +930,7 @@ flood_attack_client(int p_or_n, struct Client *source_p, struct Client *target_p
         * and msg user@server.
         * -- jilles
         */
-       if(GlobalSetOptions.floodcount && IsClient(source_p) && source_p != target_p && !IsService(target_p))
+       if(GlobalSetOptions.floodcount && IsClient(source_p) && source_p != target_p && !IsService(target_p) && (!IsOper(source_p) || !ConfigFileEntry.true_no_oper_flood))
        {
                if((target_p->first_received_message_time + 1) < rb_current_time())
                {
@@ -942,7 +985,7 @@ flood_attack_channel(int p_or_n, struct Client *source_p, struct Channel *chptr,
 {
        int delta;
 
-       if(GlobalSetOptions.floodcount && MyClient(source_p))
+       if(GlobalSetOptions.floodcount && MyClient(source_p) && (!IsOper(source_p) || !ConfigFileEntry.true_no_oper_flood))
        {
                if((chptr->first_received_message_time + 1) < rb_current_time())
                {