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

Comparing ircd-hybrid/trunk/modules/core/m_nick.c (file contents):
Revision 1795 by michael, Sun Mar 31 14:31:45 2013 UTC vs.
Revision 1832 by michael, Fri Apr 19 19:16:09 2013 UTC

# Line 171 | Line 171 | change_local_nick(struct Client *source_
171      fd_note(&source_p->localClient->fd, "Nick: %s", nick);
172    }
173    else
174 <    sendto_one(source_p, form_str(ERR_NICKTOOFAST),
174 >    sendto_one(source_p, ERR_NICKTOOFAST,
175                 me.name, source_p->name, source_p->name,
176                 nick, ConfigFileEntry.max_nick_time);
177   }
# Line 201 | Line 201 | mr_nick(struct Client *client_p, struct
201  
202    if (parc < 2 || EmptyString(parv[1]))
203    {
204 <    sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN), me.name,
204 >    sendto_one(source_p, ERR_NONICKNAMEGIVEN, me.name,
205                 source_p->name[0] ? source_p->name : "*");
206      return;
207    }
# Line 216 | Line 216 | mr_nick(struct Client *client_p, struct
216    /* check the nickname is ok */
217    if (!valid_nickname(nick, 1))
218    {
219 <    sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME), me.name,
219 >    sendto_one(source_p, ERR_ERRONEUSNICKNAME, me.name,
220                 source_p->name[0] ? source_p->name : "*", parv[1]);
221      return;
222    }
# Line 225 | Line 225 | mr_nick(struct Client *client_p, struct
225    if ((conf = find_matching_name_conf(CONF_NRESV, nick, NULL, NULL, 0)))
226    {
227      ++conf->count;
228 <    sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME), me.name,
228 >    sendto_one(source_p, ERR_ERRONEUSNICKNAME, me.name,
229                 source_p->name[0] ? source_p->name : "*", nick);
230      sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
231                           "Forbidding reserved nick [%s] from user %s",
# Line 238 | Line 238 | mr_nick(struct Client *client_p, struct
238    else if (source_p == target_p)
239      strlcpy(source_p->name, nick, sizeof(source_p->name));
240    else
241 <    sendto_one(source_p, form_str(ERR_NICKNAMEINUSE), me.name, "*", nick);
241 >    sendto_one(source_p, ERR_NICKNAMEINUSE, me.name, "*", nick);
242   }
243  
244  
# Line 268 | Line 268 | m_nick(struct Client *client_p, struct C
268  
269    if (parc < 2 || EmptyString(parv[1]))
270    {
271 <    sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN),
271 >    sendto_one(source_p, ERR_NONICKNAMEGIVEN,
272                 me.name, source_p->name);
273      return;
274    }
# Line 283 | Line 283 | m_nick(struct Client *client_p, struct C
283    /* check the nickname is ok */
284    if (!valid_nickname(nick, 1))
285    {
286 <    sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME),
286 >    sendto_one(source_p, ERR_ERRONEUSNICKNAME,
287                 me.name, source_p->name, nick);
288      return;
289    }
# Line 294 | Line 294 | m_nick(struct Client *client_p, struct C
294        (conf = find_matching_name_conf(CONF_NRESV, nick, NULL, NULL, 0)))
295    {
296      ++conf->count;
297 <    sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME),
297 >    sendto_one(source_p, ERR_ERRONEUSNICKNAME,
298                 me.name, source_p->name, nick);
299      sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
300                           "Forbidding reserved nick [%s] from user %s",
# Line 325 | Line 325 | m_nick(struct Client *client_p, struct C
325      change_local_nick(source_p, nick);
326    }
327    else
328 <    sendto_one(source_p, form_str(ERR_NICKNAMEINUSE), me.name,
328 >    sendto_one(source_p, ERR_NICKNAMEINUSE, me.name,
329                 source_p->name, nick);
330   }
331  
# Line 803 | Line 803 | perform_nick_collides(struct Client *sou
803                                   "%s (Nick collision (new))",
804                                   me.name);
805        ++ServerStats.is_kill;
806 <      sendto_one(target_p, form_str(ERR_NICKCOLLISION),
806 >      sendto_one(target_p, ERR_NICKCOLLISION,
807                   me.name, target_p->name, target_p->name);
808  
809        AddFlag(target_p, FLAGS_KILLED);
# Line 842 | Line 842 | perform_nick_collides(struct Client *sou
842                            client_p->name);
843  
844          ++ServerStats.is_kill;
845 <        sendto_one(target_p, form_str(ERR_NICKCOLLISION),
845 >        sendto_one(target_p, ERR_NICKCOLLISION,
846                     me.name, target_p->name, target_p->name);
847  
848          /* if it came from a LL server, itd have been source_p,
# Line 873 | Line 873 | perform_nick_collides(struct Client *sou
873                   source_p->name, target_p->name, target_p->from->name,
874                   client_p->name);
875      
876 <      sendto_one(target_p, form_str(ERR_NICKCOLLISION), me.name,
876 >      sendto_one(target_p, ERR_NICKCOLLISION, me.name,
877                   target_p->name, target_p->name);
878  
879        ++ServerStats.is_kill;
# Line 941 | Line 941 | perform_nick_collides(struct Client *sou
941                                   me.name);
942  
943         ++ServerStats.is_kill;
944 <       sendto_one(target_p, form_str(ERR_NICKCOLLISION),
944 >       sendto_one(target_p, ERR_NICKCOLLISION,
945                    me.name, target_p->name, target_p->name);
946  
947         AddFlag(target_p, FLAGS_KILLED);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines