Grammar/spelling fixes, resync fixes, and incorrectly named message fix.

diff --git a/ChangeLog.X3 b/ChangeLog.X3
index 64018fb14eb30ab63f8b807659ad3599c5c540dd..dc2c7bafcad25ca186c6a8f5f704cc2f870a29a4 100644 (file)
--- a/ChangeLog.X3
+++ b/ChangeLog.X3
@@ -1,13 +1,18 @@
 /***********************************************************************
  X3 ChangeLog
 
 /***********************************************************************
  X3 ChangeLog
 

+2005-05-27  Reed Loden  <reed@reedloden.com>
+
+       * 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  <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-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
 2005-05-18  Alex Schumann  <rubin@afternet.org>
 
        * src/modcmd.c: reed pointed out that modcmd non-command help wasnt

diff --git a/src/chanserv.c b/src/chanserv.c
index f7f7b03a70aaa90182dff9cf66478b20b51bcf46..daf8687bf2cfdc2a930ce151454cde57f26c5d67 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -199,9 +199,9 @@ static const struct message_entry msgtab[] = {
     { "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_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_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." },
     { "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 @@ static CHANSERV_FUNC(cmd_resync)
         }
         else if(uData && uData->access >= UL_HALFOP /*cData->lvlOpts[lvlGiveHalfOps]*/)
         {
         }
         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;
             }
                 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)
                 changes->args[used++].u.member = mn;
             }
             if(mn->modes & MODE_VOICE)


@@ -4496,12 +4496,12 @@ static CHANSERV_FUNC(cmd_resync)
         {
             if(mn->modes & MODE_CHANOP)
             {
         {
             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++].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))
                 changes->args[used++].u.member = mn;
             }
             if(!(mn->modes & MODE_VOICE))