Send numeric 735 on MLOCK policy-restricted mode changes that are ignored.

[irc/rqf/shadowircd.git] / extensions / m_ojoin.c

diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index 3a769c2bf7934b34200515620bfbbc6dbd4838f4..a58c08309e3a6495797ebc89b23f235db43fa1ac 100644 (file)
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -16,29 +16,25 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: m_ojoin.c 3161 2007-01-25 07:23:01Z nenolod $
  */
 
 #include "stdinc.h"
-#include "tools.h"
-#include "patricia.h"
 #include "channel.h"
-#include "client.h"
+#include "client.h" 
 #include "ircd.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "s_conf.h"
-#include "s_newconf.h"
+#include "s_newconf.h" 
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
-#include "hash.h"
+#include "match.h"
+#include "hash.h" 
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
 
-
 static int mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 
@@ -49,11 +45,10 @@ struct Message ojoin_msgtab = {
 
 mapi_clist_av1 ojoin_clist[] = { &ojoin_msgtab, NULL };
 
-DECLARE_MODULE_AV1(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, "$Revision: 3161 $");
+DECLARE_MODULE_AV1(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, "$Revision: 3554 $");
 
 /*
 ** mo_ojoin
-**      parv[0] = sender prefix
 **      parv[1] = channel
 */
 static int
@@ -65,11 +60,11 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
        /* admins only */
        if(!IsOperAdmin(source_p))
        {
-               sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "ojoin");
+               sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "admin");
                return 0;
        }
 
-       if(*parv[1] == '@' || *parv[1] == '%' || *parv[1] == '+')
+       if(*parv[1] == '@' || *parv[1] == '%' || *parv[1] == '+' || *parv[1] == '!')
        {
                parv[1]++;
                move_me = 1;
@@ -102,12 +97,25 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
                        me.name, parv[1],
                        source_p->name, source_p->username, source_p->host);
 
-       if(*parv[1] == '@')
+       if(*parv[1] == '!' && ConfigChannel.use_admin)
+       {
+               add_user_to_channel(chptr, source_p, CHFL_ADMIN);
+               sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
+                             ":%s SJOIN %ld %s + :!%s",
+                             me.id, (long) chptr->channelts, chptr->chname, source_p->id);
+               sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s",
+                                    source_p->name,
+                                    source_p->username, source_p->host, chptr->chname);
+               sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +a %s",
+                                    me.name, chptr->chname, source_p->name);
+
+       }
+       else if(*parv[1] == '@')
        {
                add_user_to_channel(chptr, source_p, CHFL_CHANOP);
-               sendto_server(client_p, chptr, NOCAPS, NOCAPS,
+               sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
                              ":%s SJOIN %ld %s + :@%s",
-                             me.name, (long) chptr->channelts, chptr->chname, source_p->name);
+                             me.id, (long) chptr->channelts, chptr->chname, source_p->id);
                sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s",
                                     source_p->name,
                                     source_p->username, source_p->host, chptr->chname);
@@ -115,12 +123,24 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
                                     me.name, chptr->chname, source_p->name);
 
        }
+       else if(*parv[1] == '%' && ConfigChannel.use_halfop)
+       {
+               add_user_to_channel(chptr, source_p, CHFL_HALFOP);
+               sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
+                             ":%s SJOIN %ld %s + :%s%s",
+                             me.id, (long) chptr->channelts, chptr->chname, "%", source_p->id);
+               sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s",
+                                    source_p->name,
+                                    source_p->username, source_p->host, chptr->chname);
+               sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s +h %s",
+                                    me.name, chptr->chname, source_p->name);
+       }
        else if(*parv[1] == '+')
        {
                add_user_to_channel(chptr, source_p, CHFL_VOICE);
-               sendto_server(client_p, chptr, NOCAPS, NOCAPS,
+               sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
                              ":%s SJOIN %ld %s + :+%s",
-                             me.name, (long) chptr->channelts, chptr->chname, source_p->name);
+                             me.id, (long) chptr->channelts, chptr->chname, source_p->id);
                sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s",
                                     source_p->name,
                                     source_p->username, source_p->host, chptr->chname);
@@ -130,9 +150,9 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
        else
        {
                add_user_to_channel(chptr, source_p, CHFL_PEON);
-               sendto_server(client_p, chptr, NOCAPS, NOCAPS,
-                             ":%s SJOIN %ld %s + :%s",
-                             me.name, (long) chptr->channelts, chptr->chname, source_p->name);
+               sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
+                             ":%s JOIN %ld %s +",
+                             source_p->id, (long) chptr->channelts, chptr->chname);
                sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN %s",
                                     source_p->name,
                                     source_p->username, source_p->host, chptr->chname);
@@ -147,7 +167,7 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
                           source_p->name, chptr->chname, chptr->topic_info, chptr->topic_time);
        }
 
-       source_p->localClient->last_join_time = CurrentTime;
+       source_p->localClient->last_join_time = rb_current_time();
        channel_member_names(chptr, source_p, 1);
 
        return 0;