Modes the wrong way around

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3590 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index a02d19702272f97fe09fa4cd8c1e4bc2c879d5ec..7e9f72913ecfe4940f3407d379e30bc39639d0d7 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -1324,8 +1324,8 @@ void userlist(userrec *user,chanrec *c)
 
        char list[MAXBUF];
        size_t dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
-       int n = 0;
-       char* ptr = list + dlen;
+       int numusers = 0;
+       char* ptr = list + dlen - 1;
 
        CUList *ulist= c->GetUsers();
 
@@ -1351,7 +1351,7 @@ void userlist(userrec *user,chanrec *c)
                for (char* t = i->second->nick; *t; t++)
                        *ptr++ = *t;
                *ptr++ = ' ';
-               n++;
+               numusers++;
 
                if ((ptr - list) > (480-NICKMAX))
                {
@@ -1359,14 +1359,14 @@ void userlist(userrec *user,chanrec *c)
                        *--ptr = 0;
                        WriteServ_NoFormat(user->fd,list);
                        dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
-                       ptr = list + dlen;
-                       n = 0;
+                       ptr = list + dlen - 1;
+                       numusers = 0;
                }
        }
        *--ptr = 0;
 
        /* if whats left in the list isnt empty, send it */
-       if (n)
+       if (numusers)
        {
                WriteServ_NoFormat(user->fd,list);
        }

diff --git a/src/mode.cpp b/src/mode.cpp
index 418ad4eac31cd49d07dd74ae0fd1120cf6193e94..73315227ab573da0a4d1bd77adf49bc602c3996a 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -1272,13 +1272,13 @@ void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
                                                                                        DeleteOper(dest);
                                                                                break;
                                                                                case 'i':
-                                                                                       dest->modebits ^= UM_INVISIBLE;
+                                                                                       dest->modebits &= ~UM_INVISIBLE;
                                                                                break;
                                                                                case 's':
-                                                                                       dest->modebits ^= UM_SERVERNOTICE;
+                                                                                       dest->modebits &= ~UM_SERVERNOTICE;
                                                                                break;
                                                                                case 'w':
-                                                                                       dest->modebits ^= UM_WALLOPS;
+                                                                                       dest->modebits &= ~UM_WALLOPS;
                                                                                break;
                                                                        }
                                                                }

diff --git a/src/svn-rev.sh b/src/svn-rev.sh
index 380078739edfbbb1179f003e3add18bc7175c6dd..61c8deda6b5426ab0e7ad3dea1a1bbd10ba940dd 100755 (executable)
--- a/src/svn-rev.sh
+++ b/src/svn-rev.sh
@@ -1 +1 @@
-echo 3586
+echo 3589