[X2serv-cvs] [CVS] Module x3: Change committed
Brought to you by:
sirvulcan
From: Alex S. <ru...@us...> - 2005-05-28 04:57:54
|
Committer : Alex Schumann <ru...@us...> CVSROOT : /cvsroot/x2serv Module : x3 Commit time: 2005-05-28 04:57:48 UTC Modified files: ChangeLog.X3 src/chanserv.c Log message: Fix some stuff with adduser pending ---------------------- diff included ---------------------- Index: x3/ChangeLog.X3 diff -u x3/ChangeLog.X3:1.34 x3/ChangeLog.X3:1.35 --- x3/ChangeLog.X3:1.34 Tue May 24 15:16:12 2005 +++ x3/ChangeLog.X3 Fri May 27 21:57:38 2005 @@ -1,6 +1,13 @@ /*********************************************************************** X3 ChangeLog +2005-05-27 Alex Schumann <ru...@af...> + + * 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 <ru...@af...> * src/modcmd.c: reed pointed out that modcmd non-command help wasnt @@ -229,5 +236,5 @@ ***********************************************************************/ -#define CVS_VERSION "$Revision: 1.34 $" +#define CVS_VERSION "$Revision: 1.35 $" Index: x3/src/chanserv.c diff -u x3/src/chanserv.c:1.28 x3/src/chanserv.c:1.29 --- x3/src/chanserv.c:1.28 Wed May 18 11:37:34 2005 +++ x3/src/chanserv.c Fri May 27 21:57:38 2005 @@ -195,7 +195,7 @@ { "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? */ @@ -1311,8 +1311,15 @@ 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); } } ----------------------- End of diff ----------------------- |