Replace RPL_WHOISTEXT(337) with RPL_WHOISSPECIAL(320) (#419)

[solanum.git] / modules / m_away.c

diff --git a/modules/m_away.c b/modules/m_away.c
index 059e5b48bbd850d9e2210c3b155c25b5db8e5523..b216fb65af05bb8812d5423e949732b9bb5d4eb4 100644 (file)
--- a/modules/m_away.c
+++ b/modules/m_away.c
@@ -34,8 +34,11 @@
 #include "s_conf.h"
 #include "s_serv.h"
 #include "packet.h"
+#include "s_newconf.h"
 
-static int m_away(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char away_desc[] = "Provides the AWAY command to set yourself away";
+
+static void m_away(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message away_msgtab = {
        "AWAY", 0, 0, 0, 0,
@@ -44,8 +47,6 @@ struct Message away_msgtab = {
 
 mapi_clist_av1 away_clist[] = { &away_msgtab, NULL };
 
-static const char away_desc[] = "Provides the AWAY command to set yourself away";
-
 DECLARE_MODULE_AV2(away, NULL, NULL, away_clist, NULL, NULL, NULL, NULL, away_desc);
 
 /***********************************************************************
@@ -66,7 +67,7 @@ DECLARE_MODULE_AV2(away, NULL, NULL, away_clist, NULL, NULL, NULL, NULL, away_de
 ** m_away
 **      parv[1] = away message
 */
-static int
+static void
 m_away(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        if(MyClient(source_p) && source_p->localClient->next_away &&
@@ -74,7 +75,7 @@ m_away(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
                flood_endgrace(source_p);
 
        if(!IsClient(source_p))
-               return 0;
+               return;
 
        if(parc < 2 || EmptyString(parv[1]))
        {
@@ -91,18 +92,18 @@ m_away(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
                }
                if(MyConnect(source_p))
                        sendto_one_numeric(source_p, RPL_UNAWAY, form_str(RPL_UNAWAY));
-               return 0;
+               return;
        }
 
        /* Rate limit this because it is sent to common channels. */
        if (MyClient(source_p))
        {
-               if(!IsOper(source_p) &&
+               if(!IsOperGeneral(source_p) &&
                                source_p->localClient->next_away > rb_current_time())
                {
                        sendto_one(source_p, form_str(RPL_LOAD2HI),
                                        me.name, source_p->name, "AWAY");
-                       return 0;
+                       return;
                }
                if(source_p->localClient->next_away < rb_current_time() -
                                ConfigFileEntry.away_interval)
@@ -130,6 +131,4 @@ m_away(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
 
        if(MyConnect(source_p))
                sendto_one_numeric(source_p, RPL_NOWAWAY, form_str(RPL_NOWAWAY));
-
-       return 0;
 }