X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..c1c91f9438713b71a0b8b7cc9104458c7a6a3b47:/extensions/m_opme.c

diff --git a/extensions/m_opme.c b/extensions/m_opme.c
index 9798b77..1435cf8 100644
--- a/extensions/m_opme.c
+++ b/extensions/m_opme.c
@@ -16,20 +16,18 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *   $Id: m_opme.c 3121 2007-01-02 13:23:04Z jilles $
+ *   $Id: m_opme.c 3554 2007-08-10 22:31:14Z jilles $
  */
 #include "stdinc.h"
-#include "tools.h"
-#include "patricia.h"
 #include "channel.h"
 #include "client.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "msg.h"
 #include "parse.h"
@@ -46,12 +44,11 @@ struct Message opme_msgtab = {
 
 mapi_clist_av1 opme_clist[] = { &opme_msgtab, NULL };
 
-DECLARE_MODULE_AV1(opme, NULL, NULL, opme_clist, NULL, NULL, "$Revision: 3121 $");
+DECLARE_MODULE_AV1(opme, NULL, NULL, opme_clist, NULL, NULL, "$Revision: 3554 $");
 
 
 /*
 ** mo_opme
-**      parv[0] = sender prefix
 **      parv[1] = channel
 */
 static int
@@ -59,12 +56,12 @@ mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *
 {
 	struct Channel *chptr;
 	struct membership *msptr;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 
 	/* admins only */
 	if(!IsOperAdmin(source_p))
 	{
-		sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "opme");
+		sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "admin");
 		return 0;
 	}
 
@@ -75,14 +72,13 @@ mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *
 		return 0;
 	}
 
-	DLINK_FOREACH(ptr, chptr->members.head)
+	RB_DLINK_FOREACH(ptr, chptr->members.head)
 	{
 		msptr = ptr->data;
 
-		if(is_chanop(msptr))
+		if(is_chanop(msptr) || is_admin(msptr))
 		{
-			sendto_one(source_p, ":%s NOTICE %s :%s Channel is not opless",
-				   me.name, parv[0], parv[1]);
+			sendto_one_notice(source_p, ":%s Channel is not opless", parv[1]);
 			return 0;
 		}
 	}
@@ -106,10 +102,10 @@ mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *
 		sendto_server(NULL, NULL, NOCAPS, NOCAPS,
 			      ":%s WALLOPS :OPME called for [%s] by %s!%s@%s",
 			      me.name, parv[1], source_p->name, source_p->username, source_p->host);
-		sendto_server(NULL, chptr, NOCAPS, NOCAPS, ":%s PART %s", source_p->name, parv[1]);
-		sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+		sendto_server(NULL, chptr, CAP_TS6, NOCAPS, ":%s PART %s", source_p->id, parv[1]);
+		sendto_server(NULL, chptr, CAP_TS6, NOCAPS,
 			      ":%s SJOIN %ld %s + :@%s",
-			      me.name, (long) chptr->channelts, parv[1], source_p->name);
+			      me.id, (long) chptr->channelts, parv[1], source_p->id);
 	}
 
 	sendto_channel_local(ALL_MEMBERS, chptr,