Modified chlist() and whois to allow output of multi line channel membership list (!)

[user/henk/code/inspircd.git] / src / message.cpp

diff --git a/src/message.cpp b/src/message.cpp
index d188f57f7602e16662f9b88c12536e1d961fa177..f55df0ee39910231de4e0ace300a12be42a42618 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -16,10 +16,10 @@
 
 using namespace std;
 
+#include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
-#include "inspircd_config.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>
@@ -35,14 +35,13 @@ using namespace std;
 #include <sstream>
 #include <vector>
 #include <deque>
-#include "connection.h"
 #include "users.h"
-#include "servers.h"
 #include "ctables.h"
 #include "globals.h"
 #include "modules.h"
 #include "dynamic.h"
 #include "wildcard.h"
+#include "commands.h"
 #include "message.h"
 #include "inspstring.h"
 #include "dns.h"
@@ -69,9 +68,9 @@ int common_channels(userrec *u, userrec *u2)
                log(DEFAULT,"*** BUG *** common_channels was given an invalid parameter");
                return 0;
        }
-       for (int i = 0; i != MAXCHANS; i++)
+       for (unsigned int i = 0; i < u->chans.size(); i++)
        {
-               for (int z = 0; z != MAXCHANS; z++)
+               for (unsigned int z = 0; z != u2->chans.size(); z++)
                {
                        if ((u->chans[i].channel != NULL) && (u2->chans[z].channel != NULL))
                        {
@@ -109,7 +108,7 @@ void tidystring(char* str)
        while (go_again)
        {
                bool noparse = false;
-               int t = 0, a = 0;
+               unsigned int t = 0, a = 0;
                go_again = false;
                while (a < strlen(str))
                {
@@ -194,7 +193,7 @@ int CleanAndResolve (char *resolvedHost, const char *unresolvedHost)
 int c_count(userrec* u)
 {
        int z = 0;
-       for (int i =0; i != MAXCHANS; i++)
+       for (unsigned int i =0; i < u->chans.size(); i++)
                if (u->chans[i].channel != NULL)
                        z++;
        return z;
@@ -219,11 +218,9 @@ void ChangeName(userrec* user, const char* gecos)
                FOREACH_RESULT(OnChangeLocalUserGECOS(user,gecos));
                if (MOD_RESULT)
                        return;
+               FOREACH_MOD OnChangeName(user,gecos);
        }
        strlcpy(user->fullname,gecos,MAXBUF);
-       char buffer[MAXBUF];
-       snprintf(buffer,MAXBUF,"a %s :%s",user->nick,gecos);
-       NetSendToAll(buffer);
 }
 
 void ChangeDisplayedHost(userrec* user, const char* host)
@@ -234,11 +231,9 @@ void ChangeDisplayedHost(userrec* user, const char* host)
                 FOREACH_RESULT(OnChangeLocalUserHost(user,host));
                 if (MOD_RESULT)
                         return;
+               FOREACH_MOD OnChangeHost(user,host);
         }
        strlcpy(user->dhost,host,160);
-       char buffer[MAXBUF];
-       snprintf(buffer,MAXBUF,"b %s %s",user->nick,host);
-       NetSendToAll(buffer);
 }
 
 /* verify that a user's ident and nickname is valid */
@@ -254,14 +249,14 @@ int isident(const char* n)
         {
                 return 0;
         }
-        for (int i = 0; i != strlen(n); i++)
+        for (unsigned int i = 0; i < strlen(n); i++)
         {
                 if ((n[i] < 33) || (n[i] > 125))
                 {
                         return 0;
                 }
                 /* can't occur ANYWHERE in an Ident! */
-                if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i]))
+                if (strchr("<>,/?:;@'~#=+()*&%$£ \"!",n[i]))
                 {
                         return 0;
                 }
@@ -284,7 +279,7 @@ int isnick(const char* n)
        {
                return 0;
        }
-       for (int i = 0; i != strlen(n); i++)
+       for (unsigned int i = 0; i != strlen(n); i++)
        {
                if ((n[i] < 33) || (n[i] > 125))
                {
@@ -315,7 +310,8 @@ char* cmode(userrec *user, chanrec *chan)
                log(DEFAULT,"*** BUG *** cmode was given an invalid parameter");
                return "";
        }
-       for (int i = 0; i != MAXCHANS; i++)
+
+       for (unsigned int i = 0; i < user->chans.size(); i++)
        {
                if (user->chans[i].channel)
                {
@@ -352,7 +348,10 @@ int cstatus(userrec *user, chanrec *chan)
                return 0;
        }
 
-       for (int i = 0; i != MAXCHANS; i++)
+       if (is_uline(user->server))
+               return STATUS_OP;
+
+       for (unsigned int i = 0; i < user->chans.size(); i++)
        {
                if (user->chans[i].channel)
                {
@@ -386,7 +385,7 @@ int has_channel(userrec *u, chanrec *c)
                log(DEFAULT,"*** BUG *** has_channel was given an invalid parameter");
                return 0;
        }
-       for (int i =0; i != MAXCHANS; i++)
+       for (unsigned int i =0; i < u->chans.size(); i++)
        {
                if (u->chans[i].channel)
                {
@@ -428,49 +427,33 @@ void TidyBan(char *ban)
 
 char lst[MAXBUF];
 
-char* chlist(userrec *user,userrec* source)
+std::string chlist(userrec *user,userrec* source)
 {
-       char cmp[MAXBUF];
+       std::string cmp = "";
+       std::string lst = "";
         log(DEBUG,"chlist: %s",user->nick);
-       strcpy(lst,"");
        if (!user)
        {
                return lst;
        }
-       for (int i = 0; i != MAXCHANS; i++)
+       for (unsigned int i = 0; i < user->chans.size(); i++)
        {
                if (user->chans[i].channel != NULL)
                {
                        if (user->chans[i].channel->name)
                        {
-                               strlcpy(cmp,user->chans[i].channel->name,MAXBUF);
-                               strlcat(cmp," ",MAXBUF);
-                               if (!strstr(lst,cmp))
+                               cmp = std::string(user->chans[i].channel->name) + " ";
+                               if (!strstr(lst.c_str(),cmp.c_str()))
                                {
                                        // if the channel is NOT private/secret, OR the source user is on the channel
                                        if (((!(user->chans[i].channel->binarymodes & CM_PRIVATE)) && (!(user->chans[i].channel->binarymodes & CM_SECRET))) || (has_channel(source,user->chans[i].channel)))
                                        {
-                                               strlcat(lst,cmode(user,user->chans[i].channel),MAXBUF);
-                                               strlcat(lst,user->chans[i].channel->name,MAXBUF);
-                                               strlcat(lst," ",MAXBUF);
+                                               lst = lst + std::string(cmode(user,user->chans[i].channel)) + std::string(user->chans[i].channel->name) + " ";
                                        }
                                }
                        }
                }
        }
-       if (strlen(lst))
-       {
-               lst[strlen(lst)-1] = '\0'; // chop trailing space
-       }
        return lst;
 }
 
-
-void send_network_quit(const char* nick, const char* reason)
-{
-       char buffer[MAXBUF];
-       snprintf(buffer,MAXBUF,"Q %s :%s",nick,reason);
-       NetSendToAll(buffer);
-}
-
-