- The big forward port. I probably broke lots of stuff, so please look over any

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

diff --git a/ircd/m_mode.c b/ircd/m_mode.c
index 474f39b3f3f9fd1b8ae5840b49cb3c1d72263fbc..362bc76aed4a6e5b75e79a4561992fd21d6e516b 100644 (file)
--- a/ircd/m_mode.c
+++ b/ircd/m_mode.c
@@ -112,11 +112,10 @@ m_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
 
   clean_channelname(parv[1]);
 
-  if (('#' != *parv[1] && '&' != *parv[1] && '+' != *parv[1]) || 
-      !(chptr = FindChannel(parv[1])))
+  if (!IsChannelName(parv[1]) || !(chptr = FindChannel(parv[1])))
     return set_user_mode(cptr, sptr, parc, parv);
 
-  cli_flags(sptr) &= ~FLAGS_TS8;
+  ClrFlag(sptr, FLAG_TS8);
 
   member = find_member_link(chptr, sptr);
 
@@ -168,10 +167,11 @@ ms_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
   if (IsLocalChannel(parv[1]))
     return 0;
 
-  if (('#' != *parv[1] && '+' != *parv[1])|| !(chptr = FindChannel(parv[1])))
+  if (IsChannelName(parv[1]) || !(chptr = FindChannel(parv[1])) ||
+      IsLocalChannel(parv[1]))
     return set_user_mode(cptr, sptr, parc, parv);
 
-  cli_flags(sptr) &= ~FLAGS_TS8;
+  ClrFlag(sptr, FLAG_TS8);
 
   if (IsServer(sptr)) {
     if (find_conf_byhost(cli_confs(cptr), cli_name(sptr), CONF_UWORLD))