EXPERIMENTAL new socket engine code

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

diff --git a/src/message.cpp b/src/message.cpp
index 6e76449fc17d97e794cea5d583b5c69682a40519..2f527c983e6ba9b0812af1ead2b8a91333e0b50d 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -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"
@@ -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))
                {
@@ -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,6 +310,7 @@ char* cmode(userrec *user, chanrec *chan)
                log(DEFAULT,"*** BUG *** cmode was given an invalid parameter");
                return "";
        }
+
        for (int i = 0; i != MAXCHANS; i++)
        {
                if (user->chans[i].channel)
@@ -352,6 +348,9 @@ int cstatus(userrec *user, chanrec *chan)
                return 0;
        }
 
+       if (is_uline(user->server))
+               return STATUS_OP;
+
        for (int i = 0; i != MAXCHANS; i++)
        {
                if (user->chans[i].channel)
@@ -466,11 +465,4 @@ char* chlist(userrec *user,userrec* source)
 }
 
 
-void send_network_quit(const char* nick, const char* reason)
-{
-       char buffer[MAXBUF];
-       snprintf(buffer,MAXBUF,"Q %s :%s",nick,reason);
-       NetSendToAll(buffer);
-}
-