Author: Kev <klmitch@mit.edu>

[ircu2.10.12-pk.git] / ircd / m_clearmode.c

diff --git a/ircd/m_clearmode.c b/ircd/m_clearmode.c
index 4ae5f2603396165a05069cf9202051189d1ff72d..cbd961f88ce6629e0b81b649d0e71776c12e6055 100644 (file)
--- a/ircd/m_clearmode.c
+++ b/ircd/m_clearmode.c
@@ -80,19 +80,15 @@
  *            note:   it is guaranteed that parv[0]..parv[parc-1] are all
  *                    non-NULL pointers.
  */
-#if 0
-/*
- * No need to include handlers.h here the signatures must match
- * and we don't need to force a rebuild of all the handlers everytime
- * we add a new one to the list. --Bleep
- */
-#include "handlers.h"
-#endif /* 0 */
+#include "config.h"
+
 #include "client.h"
 #include "channel.h"
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_alloc.h"
+#include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "list.h"
@@ -224,12 +220,6 @@ do_clearmode(struct Client *cptr, struct Client *sptr, struct Channel *chptr,
   if (del_mode & MODE_KEY)
     chptr->mode.key[0] = '\0';
 
-#ifndef OPATH
-  /* Don't propagate CLEARMODE if it's a local channel */
-  if (IsLocalChannel(chptr->chname))
-    return 0;
-#endif
-
   /* Ok, build control string again */
   for (flag_p = flags; flag_p[0]; flag_p += 2)
     if (del_mode & flag_p[0])
@@ -237,25 +227,14 @@ do_clearmode(struct Client *cptr, struct Client *sptr, struct Channel *chptr,
 
   control_buf[control_buf_i] = '\0';
 
-#ifdef OPATH
-  if (IsServer(sptr))
-    write_log(OPATH, TIME_T_FMT " %s CLEARMODE %s %s\n", TStime(), sptr->name,
-             chptr->chname, control_buf);
-  else
-    write_log(OPATH, TIME_T_FMT " %s!%s@%s CLEARMODE %s %s\n", TStime(),
-             sptr->name, sptr->user->username, sptr->user->host,
-             chptr->chname, control_buf);
-#endif
+  /* Log it... */
+  log_write(LS_OPERMODE, L_INFO, LOG_NOSNOTICE, "%#C CLEARMODE %H %s", sptr,
+           chptr, control_buf);
 
   /* Then send it */
-  if (!IsLocalChannel(chptr->chname)) {
-    if (IsServer(sptr))
-      sendto_serv_butone(cptr, "%s " TOK_CLEARMODE " %s %s", NumServ(sptr),
-                        chptr->chname, control_buf);
-    else
-      sendto_serv_butone(cptr, "%s%s " TOK_CLEARMODE " %s %s", NumNick(sptr),
-                        chptr->chname, control_buf);
-  }
+  if (!IsLocalChannel(chptr->chname))
+    sendcmdto_serv_butone(sptr, CMD_CLEARMODE, cptr, "%H %s", chptr,
+                         control_buf);
 
   return 0;
 }
@@ -275,12 +254,14 @@ ms_clearmode(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   if (parc < 3)
     return need_more_params(sptr, "CLEARMODE");
 
-  if (!IsPrivileged(sptr))
-    return send_error_to_client(sptr, ERR_NOPRIVILEGES);
+  if (!IsPrivileged(sptr)) {
+    protocol_violation(sptr,"No priviledges on source for CLEARMODE, desync?");
+    return send_reply(sptr, ERR_NOPRIVILEGES);
+  }
 
   if (!IsChannelName(parv[1]) || IsLocalChannel(parv[1]) ||
       !(chptr = FindChannel(parv[1])))
-    return send_error_to_client(sptr, ERR_NOSUCHCHANNEL, parv[1]);
+    return send_reply(sptr, ERR_NOSUCHCHANNEL, parv[1]);
 
   return do_clearmode(cptr, sptr, chptr, parv[2]);
 }
@@ -298,6 +279,9 @@ mo_clearmode(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   struct Channel *chptr;
   char *control = "ovpsmikbl"; /* default control string */
 
+  if (!feature_bool(FEAT_CONFIG_OPERCMDS))
+    return send_reply(sptr, ERR_DISABLED, "CLEARMODE");
+
   if (parc < 2)
     return need_more_params(sptr, "CLEARMODE");
 
@@ -306,11 +290,12 @@ mo_clearmode(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 
   clean_channelname(parv[1]);
 
-  if (!IsOper(sptr) && !IsLocalChannel(parv[1]))
-    return send_error_to_client(sptr, ERR_NOPRIVILEGES);
+  if (!HasPriv(sptr,
+              IsLocalChannel(parv[1]) ? PRIV_LOCAL_OPMODE : PRIV_OPMODE))
+    return send_reply(sptr, ERR_NOPRIVILEGES);
 
-  if (!IsChannelName(parv[1]) || !(chptr = FindChannel(parv[1])))
-    return send_error_to_client(sptr, ERR_NOSUCHCHANNEL, parv[1]);
+  if (('#' != *parv[1] && '&' != *parv[1]) || !(chptr = FindChannel(parv[1])))
+    return send_reply(sptr, ERR_NOSUCHCHANNEL, parv[1]);
 
   return do_clearmode(cptr, sptr, chptr, control);
 }