/***********************************************************************
X3 ChangeLog
+2005-05-27 Alex Schumann <rubin@afternet.org>
+
+ * src/chanserv.c: make pending add check if the person is already on
+ the userlist before re-adding them (thx exec & reed for noticing this)
+ Fix capitalisation of I in pending notice.
+
+
2005-05-18 Alex Schumann <rubin@afternet.org>
* src/modcmd.c: reed pointed out that modcmd non-command help wasnt
{ "CSMSG_TRIMMED_USERS", "Trimmed $b%d users$b with access from %d to %d from the %s user list who were inactive for at least %s." },
{ "CSMSG_INCORRECT_ACCESS", "%s has access $b%s$b, not %s." },
{ "CSMSG_USER_EXISTS", "%s is already on the $b%s$b user list (with %s access)." },
- { "CSMSG_ADDUSER_PENDING", "I have sent him/her a message letting them know, and if they auth or register soon, i will finish adding them automatically." },
+ { "CSMSG_ADDUSER_PENDING", "I have sent him/her a message letting them know, and if they auth or register soon, I will finish adding them automatically." },
{ "CSMSG_ADDUSER_PENDING_ALREADY", "He or she is already pending addition to %s once he/she auths with $b$N$b." },
{ "CSMSG_ADDUSER_PENDING_HEADER", "Users to add to channels pending logins:" }, /* Remove after testing? */
{ "CSMSG_ADDUSER_PENDING_LIST", "Channel %s user %s" }, /* Remove after testing? */
while((ap = find_adduser_pending(NULL, user)))
{
struct userData *actee;
- actee = add_channel_user(ap->channel->channel_info, ap->user->handle_info, ap->level, 0, NULL);
- scan_user_presence(actee, NULL);
+ if(GetTrueChannelAccess(ap->channel->channel_info, ap->user->handle_info))
+ {
+ /* Already on the userlist. do nothing*/
+ }
+ else
+ {
+ actee = add_channel_user(ap->channel->channel_info, ap->user->handle_info, ap->level, 0, NULL);
+ scan_user_presence(actee, NULL);
+ }
del_adduser_pending(ap);
}
}