ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.2.x/modules/core/m_message.c
(Generate patch)

Comparing ircd-hybrid/branches/8.2.x/modules/core/m_message.c (file contents):
Revision 6648 by michael, Wed Sep 16 19:54:01 2015 UTC vs.
Revision 6649 by michael, Sun Oct 25 14:36:49 2015 UTC

# Line 260 | Line 260 | msg_channel(int p_or_n, const char *comm
260        sendto_channel_butone(source_p, source_p, chptr, type, "%s %s%s :%s",
261                              command, prefix, chptr->name, text);
262    }
263 <  else
263 >  else if (p_or_n != NOTICE)
264    {
265 <    if (p_or_n != NOTICE)
266 <    {
267 <      if (result == ERR_NOCTRLSONCHAN)
268 <        sendto_one_numeric(source_p, &me, ERR_NOCTRLSONCHAN,
269 <                           chptr->name, text);
270 <      else if (result == ERR_NOCTCP)
271 <        sendto_one_numeric(source_p, &me, ERR_NOCTCP,
272 <                           chptr->name, text);
273 <      else if (result == ERR_NEEDREGGEDNICK)
274 <        sendto_one_numeric(source_p, &me, ERR_NEEDREGGEDNICK,
275 <                           chptr->name);
276 <      else
277 <        sendto_one_numeric(source_p, &me, ERR_CANNOTSENDTOCHAN,
278 <                           chptr->name);
279 <    }
265 >    if (result == ERR_NOCTRLSONCHAN)
266 >      sendto_one_numeric(source_p, &me, ERR_NOCTRLSONCHAN,
267 >                         chptr->name, text);
268 >    else if (result == ERR_NOCTCP)
269 >      sendto_one_numeric(source_p, &me, ERR_NOCTCP,
270 >                         chptr->name, text);
271 >    else if (result == ERR_NEEDREGGEDNICK)
272 >      sendto_one_numeric(source_p, &me, ERR_NEEDREGGEDNICK,
273 >                         chptr->name);
274 >    else
275 >      sendto_one_numeric(source_p, &me, ERR_CANNOTSENDTOCHAN,
276 >                         chptr->name);
277    }
278   }
279  
# Line 591 | Line 588 | build_target_list(int p_or_n, const char
588  
589      if (*name == '$' || strchr(name, '@'))
590        handle_special(p_or_n, command, source_p, name, text);
591 <    else
591 >    else if (p_or_n != NOTICE)
592      {
593 <      if (p_or_n != NOTICE)
594 <      {
598 <        if (!IsDigit(*name) || MyClient(source_p))
599 <          sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
600 <      }
593 >      if (!IsDigit(*name) || MyClient(source_p))
594 >        sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
595      }
596    }
597  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines