ENCAPs cannot come from local clients, no need to check.

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

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 911439beb7bd6ff01950ed917369b593b57edb9d..f8598d7d10898429c9ef4f4fa98f32b53d7fdf35 100644 (file)
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -40,6 +40,7 @@
 #include "parse.h"
 #include "modules.h"
 #include "packet.h"
+#include "chmode.h"
 
 static int m_join(struct Client *, struct Client *, int, const char **);
 static int ms_join(struct Client *, struct Client *, int, const char **);
@@ -124,7 +125,6 @@ check_forward(struct Client *source_p, struct Channel *chptr,
 
 /*
  * m_join
- *      parv[0] = sender prefix
  *      parv[1] = channel
  *      parv[2] = channel password (key)
  */
@@ -136,6 +136,7 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
        struct ConfItem *aconf;
        char *name;
        char *key = NULL;
+       const char *modes;
        int i, flags = 0;
        char *p = NULL, *p2 = NULL;
        char *chanlist;
@@ -302,11 +303,18 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
                        if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) ||
                            (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL))
                        {
-                               sendto_one(source_p, form_str(i), me.name, source_p->name, name);
+                               /* might be wrong, but is there any other better location for such?
+                                * see extensions/chm_operonly.c for other comments on this
+                                * -- dwr
+                                */
+                               if(i != ERR_CUSTOM)
+                                       sendto_one(source_p, form_str(i), me.name, source_p->name, name);
+
                                if(successful_join_count > 0)
                                        successful_join_count--;
                                continue;
                        }
+
                        sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname);
                }
 
@@ -333,17 +341,15 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
                        chptr->channelts = rb_current_time();
                        chptr->mode.mode |= MODE_TOPICLIMIT;
                        chptr->mode.mode |= MODE_NOPRIVMSGS;
+                       modes = channel_modes(chptr, &me);
 
-                       sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s +nt",
-                                            me.name, chptr->chname);
+                       sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s %s",
+                                            me.name, chptr->chname, modes);
 
-                       if(*chptr->chname == '#')
-                       {
-                               sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
-                                             ":%s SJOIN %ld %s +nt :@%s",
-                                             me.id, (long) chptr->channelts,
-                                             chptr->chname, source_p->id);
-                       }
+                       sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
+                                     ":%s SJOIN %ld %s %s :@%s",
+                                     me.id, (long) chptr->channelts,
+                                     chptr->chname, modes, source_p->id);
                }
                else
                {
@@ -381,14 +387,10 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 /*
  * ms_join
- *
- * inputs      -
- * output      - none
- * side effects        - handles remote JOIN's sent by servers. In TSora
- *               remote clients are joined using SJOIN, hence a 
- *               JOIN sent by a server on behalf of a client is an error.
- *               here, the initial code is in to take an extra parameter
- *               and use it for the TimeStamp on a new channel.
+ *      parv[1] = channel TS
+ *      parv[2] = channel
+ *      parv[3] = "+", formerly channel modes but now unused
+ * alternatively, a single "0" parameter parts all channels
  */
 static int
 ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
@@ -762,9 +764,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
        else
                modes = empty_modes;
 
-       /* working on the presumption eventually itll be more efficient to
-        * build a TS6 buffer without checking its needed..
-        */
        mlen_uid = rb_sprintf(buf_uid, ":%s SJOIN %ld %s %s :",
                              use_id(source_p), (long) chptr->channelts, parv[2], modes);
        ptr_uid = buf_uid + mlen_uid;
@@ -991,27 +990,36 @@ do_join_0(struct Client *client_p, struct Client *source_p)
 static int
 check_channel_name_loc(struct Client *source_p, const char *name)
 {
+       const char *p;
+
        s_assert(name != NULL);
        if(EmptyString(name))
                return 0;
 
        if(ConfigFileEntry.disable_fake_channels && !IsOper(source_p))
        {
-               for(; *name; ++name)
+               for(p = name; *p; ++p)
                {
-                       if(!IsChanChar(*name) || IsFakeChanChar(*name))
+                       if(!IsChanChar(*p) || IsFakeChanChar(*p))
                                return 0;
                }
        }
        else
        {
-               for(; *name; ++name)
+               for(p = name; *p; ++p)
                {
-                       if(!IsChanChar(*name))
+                       if(!IsChanChar(*p))
                                return 0;
                }
        }
 
+       if(ConfigChannel.only_ascii_channels)
+       {
+               for(p = name; *p; ++p)
+                       if(*p < 33 || *p > 126)
+                               return 0;
+       }
+
        return 1;
 }
 
@@ -1177,7 +1185,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
                                        *mbuf = '\0';
                                        sendto_channel_local(ALL_MEMBERS, chptr,
                                                             ":%s MODE %s %s %s %s %s %s",
-                                                            me.name, chptr->chname,
+                                                            source_p->name, chptr->chname,
                                                             lmodebuf, lpara[0], lpara[1],
                                                             lpara[2], lpara[3]);
 
@@ -1209,7 +1217,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
                        *mbuf = '\0';
                        sendto_channel_local(ALL_MEMBERS, chptr,
                                             ":%s MODE %s %s %s %s %s %s",
-                                            me.name, chptr->chname, lmodebuf,
+                                            source_p->name, chptr->chname, lmodebuf,
                                             lpara[0], lpara[1], lpara[2], lpara[3]);
                        mbuf = lmodebuf;
                        *mbuf++ = '-';
@@ -1225,7 +1233,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
                *mbuf = '\0';
                sendto_channel_local(ALL_MEMBERS, chptr,
                                     ":%s MODE %s %s %s %s %s %s",
-                                    me.name, chptr->chname, lmodebuf,
+                                    source_p->name, chptr->chname, lmodebuf,
                                     EmptyString(lpara[0]) ? "" : lpara[0],
                                     EmptyString(lpara[1]) ? "" : lpara[1],
                                     EmptyString(lpara[2]) ? "" : lpara[2],