Allow /ojoin !#channel/%#channel, if admin/halfop are enabled.

[irc/rqf/shadowircd.git] / modules / m_away.c

diff --git a/modules/m_away.c b/modules/m_away.c
index 6b3500874aab6feb8ceb843871f3c4bad9e6fe5e..02b510d8ed9caa1cbb6d396f7ff71d38c9081591 100644 (file)
--- a/modules/m_away.c
+++ b/modules/m_away.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
@@ -64,7 +64,6 @@ DECLARE_MODULE_AV1(away, NULL, NULL, away_clist, NULL, NULL, "$Revision: 3370 $"
 
 /*
 ** m_away
-**      parv[0] = sender prefix
 **      parv[1] = away message
 */
 static int
@@ -84,13 +83,10 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
                        /* we now send this only if they were away before --is */
                        sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
                                      ":%s AWAY", use_id(source_p));
-                       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, 
-                                     ":%s AWAY", source_p->name);
                        free_away(source_p);
                }
                if(MyConnect(source_p))
-                       sendto_one(source_p, form_str(RPL_UNAWAY),
-                                  me.name, source_p->name);
+                       sendto_one_numeric(source_p, RPL_UNAWAY, form_str(RPL_UNAWAY));
                return 0;
        }
 
@@ -101,15 +97,13 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
                rb_strlcpy(source_p->user->away, parv[1], AWAYLEN);
                sendto_server(client_p, NULL, CAP_TS6, NOCAPS, 
                              ":%s AWAY :%s", use_id(source_p), source_p->user->away);
-               sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
-                             ":%s AWAY :%s", source_p->name, source_p->user->away);
                        
        } else {
                rb_strlcpy(source_p->user->away, parv[1], AWAYLEN);
        }
        
        if(MyConnect(source_p))
-               sendto_one(source_p, form_str(RPL_NOWAWAY), me.name, source_p->name);
+               sendto_one_numeric(source_p, RPL_NOWAWAY, form_str(RPL_NOWAWAY));
 
        return 0;
 }