[X2serv-cvs] [CVS] Module x3: Change committed
Brought to you by:
sirvulcan
From: Reed L. <r3...@us...> - 2005-05-28 05:28:49
|
Committer : Reed Loden <r3...@us...> CVSROOT : /cvsroot/x2serv Module : x3 Commit time: 2005-05-28 05:28:42 UTC Modified files: ChangeLog.X3 src/chanserv.c Log message: Grammar/spelling fixes, resync fixes, and incorrectly named message fix. ---------------------- diff included ---------------------- Index: x3/ChangeLog.X3 diff -u x3/ChangeLog.X3:1.35 x3/ChangeLog.X3:1.36 --- x3/ChangeLog.X3:1.35 Fri May 27 21:57:38 2005 +++ x3/ChangeLog.X3 Fri May 27 22:28:31 2005 @@ -1,13 +1,18 @@ /*********************************************************************** X3 ChangeLog +2005-05-27 Reed Loden <re...@re...> + + * src/chanserv.c: Fixed an incorrectly named message. Fixed some + grammar issues in the message send to pending users. Fixed a + problem with some of the resync code. + 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 @@ -236,5 +241,5 @@ ***********************************************************************/ -#define CVS_VERSION "$Revision: 1.35 $" +#define CVS_VERSION "$Revision: 1.36 $" Index: x3/src/chanserv.c diff -u x3/src/chanserv.c:1.29 x3/src/chanserv.c:1.30 --- x3/src/chanserv.c:1.29 Fri May 27 21:57:38 2005 +++ x3/src/chanserv.c Fri May 27 22:28:32 2005 @@ -199,9 +199,9 @@ { "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? */ - { "CSMSG_ADDUSER_PENDING_HEADER", "--------- End of pending list ----------" }, /* Remove after testing? */ + { "CSMSG_ADDUSER_PENDING_FOOTER", "--------- End of pending list ----------" }, /* Remove after testing? */ /*{ "CSMSG_ADDUSER_PENDING_NOTINCHAN", "That user is not in %s, and is not auth'd." }, */ - { "CSMSG_ADDUSER_PENDING_TARGET", "Channel Services bot here, %s would like to add you to my userlist in channel %s, but you are not auth'd to $b$N$b. Please auth now, and you will be added. If you do not have an accont, type /msg $N help register" }, + { "CSMSG_ADDUSER_PENDING_TARGET", "Channel Services bot here: %s would like to add you to my userlist in channel %s, but you are not authenticated to $b$N$b. Please authenticate now and you will be added. If you do not have an account, type /msg $N help register" }, { "CSMSG_CANNOT_TRIM", "You must include a minimum inactivity duration of at least 60 seconds to trim." }, { "CSMSG_NO_SELF_CLVL", "You cannot change your own access." }, @@ -4476,14 +4476,14 @@ } else if(uData && uData->access >= UL_HALFOP /*cData->lvlOpts[lvlGiveHalfOps]*/) { - if(!(mn->modes & MODE_HALFOP)) + if(mn->modes & MODE_CHANOP) { - changes->args[used].mode = MODE_HALFOP; + changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_CHANOP); changes->args[used++].u.member = mn; } - if(mn->modes & MODE_CHANOP) + if(!(mn->modes & MODE_HALFOP)) { - changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_CHANOP); + changes->args[used].mode = MODE_HALFOP; changes->args[used++].u.member = mn; } if(mn->modes & MODE_VOICE) @@ -4496,12 +4496,12 @@ { if(mn->modes & MODE_CHANOP) { - changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_VOICE); + changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_CHANOP); changes->args[used++].u.member = mn; } if(mn->modes & MODE_HALFOP) { - changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_VOICE); + changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_HALFOP); changes->args[used++].u.member = mn; } if(!(mn->modes & MODE_VOICE)) ----------------------- End of diff ----------------------- |