implement configurable channel modes (closes #31)

[solanum.git] / modules / core / m_join.c

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 929074a925b01d10a95705cc1f133515fcfdea10..b45728e3b97565bdfa349e39cd55519325460f2f 100644 (file)
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -341,8 +341,7 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
                if(flags & CHFL_CHANOP)
                {
                        chptr->channelts = rb_current_time();
-                       chptr->mode.mode |= MODE_TOPICLIMIT;
-                       chptr->mode.mode |= MODE_NOPRIVMSGS;
+                       chptr->mode.mode |= ConfigChannel.autochanmodes;
                        modes = channel_modes(chptr, &me);
 
                        sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s %s",
@@ -529,7 +528,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
        int fl;
        int isnew;
        int mlen_uid;
-       int len_nick;
        int len_uid;
        int len;
        int joins = 0;
@@ -778,7 +776,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
        mbuf = modebuf;
        para[0] = para[1] = para[2] = para[3] = empty;
        pargs = 0;
-       len_nick = len_uid = 0;
+       len_uid = 0;
 
        /* if theres a space, theres going to be more than one nick, change the
         * first space to \0, so s is just the first nick, and point p to the
@@ -830,13 +828,11 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
                        if(fl & CHFL_CHANOP)
                        {
                                *ptr_uid++ = '@';
-                               len_nick++;
                                len_uid++;
                        }
                        if(fl & CHFL_VOICE)
                        {
                                *ptr_uid++ = '+';
-                               len_nick++;
                                len_uid++;
                        }
                }