Decide that it wasn't quite appropriate :(

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

diff --git a/src/message.cpp b/src/message.cpp
index 41455a2ef6ae8f079c9f06276deef2630457ca98..4f8e25bee7e0dc7a3370aeff581162be8ecd922d 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -145,9 +145,6 @@ void chop(char* str)
                log(DEBUG,"ERROR! Null string passed to chop()!");
                return;
        }
-       string temp = str;
-       const char* str2 = temp.c_str();
-       strlcat(str,str2,MAXBUF);
        if (strlen(str) >= 511)
        {
                str[510] = '\r';
@@ -217,7 +214,7 @@ void ChangeName(userrec* user, const char* gecos)
                        return;
                FOREACH_MOD(I_OnChangeName,OnChangeName(user,gecos));
        }
-       strlcpy(user->fullname,gecos,MAXBUF);
+       strlcpy(user->fullname,gecos,MAXGECOS+1);
 }
 
 void ChangeDisplayedHost(userrec* user, const char* host)
@@ -231,6 +228,7 @@ void ChangeDisplayedHost(userrec* user, const char* host)
                FOREACH_MOD(I_OnChangeHost,OnChangeHost(user,host));
         }
        strlcpy(user->dhost,host,160);
+       WriteServ(user->fd,"396 %s %s :is now your hidden host",user->nick,user->dhost);
 }
 
 /* verify that a user's ident and nickname is valid */
@@ -246,17 +244,17 @@ int isident(const char* n)
         {
                 return 0;
         }
-        for (unsigned int i = 0; i < strlen(n); i++)
+        for (char* i = (char*)n; *i; i++)
         {
-                if ((n[i] < 33) || (n[i] > 125))
+                if ((*i >= 'A') && (*i <= '}'))
                 {
-                        return 0;
+                        continue;
                 }
-                /* can't occur ANYWHERE in an Ident! */
-                if (strchr("<>,/?:;@'~#=+()*&%$£ \"!",n[i]))
+                if (strchr(".-0123456789",*i))
                 {
-                        return 0;
+                        continue;
                 }
+               return 0;
         }
         return 1;
 }
@@ -264,11 +262,7 @@ int isident(const char* n)
 
 int isnick(const char* n)
 {
-       if (!n)
-       {
-               return 0;
-       }
-       if (!strcmp(n,""))
+       if (!n || !*n)
        {
                return 0;
        }
@@ -276,22 +270,20 @@ int isnick(const char* n)
        {
                return 0;
        }
-       for (unsigned int i = 0; i != strlen(n); i++)
+       for (char* i = (char*)n; *i; i++)
        {
-               if ((n[i] < 33) || (n[i] > 125))
-               {
-                       return 0;
-               }
-               /* can't occur ANYWHERE in a nickname! */
-               if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i]))
+               /* can occur anywhere in a nickname */
+               if ((*i >= 'A') && (*i <= '}'))
                {
-                       return 0;
+                       continue;
                }
-               /* can't occur as the first char of a nickname... */
-               if ((strchr("0123456789",n[i])) && (!i))
+               /* can occur anywhere BUT the first char of a nickname */
+               if ((strchr("-0123456789",*i)) && (i > n))
                {
-                       return 0;
+                       continue;
                }
+               /* invalid character! abort */
+               return 0;
        }
        return 1;
 }
@@ -333,6 +325,24 @@ char* cmode(userrec *user, chanrec *chan)
        return "";
 }
 
+int cflags(userrec *user, chanrec *chan)
+{
+       if ((!chan) || (!user))
+               return 0;
+
+       for (unsigned int i = 0; i < user->chans.size(); i++)
+       {
+               if (user->chans[i].channel)
+               {
+                       if ((!strcasecmp(user->chans[i].channel->name,chan->name)) && (chan != NULL))
+                       {
+                               return user->chans[i].uc_modes;
+                       }
+               }
+       }
+       return 0;
+}
+
 /* returns the status value for a given user on a channel, e.g. STATUS_OP for
  * op, STATUS_VOICE for voice etc. If the user has several modes set, the
  * highest mode the user has must be returned. */
@@ -415,7 +425,7 @@ void TidyBan(char *ban)
        pos_of_pling++;
        pos_of_at++;
 
-       strlcpy(NICK,temp,NICKMAX);
+       strlcpy(NICK,temp,NICKMAX-1);
        strlcpy(IDENT,pos_of_pling,IDENTMAX+1);
        strlcpy(HOST,pos_of_at,160);
 
@@ -433,6 +443,7 @@ std::string chlist(userrec *user,userrec* source)
        {
                return lst;
        }
+       bool userinvisible = (strchr(user->modes,'i'));
        for (unsigned int i = 0; i < user->chans.size(); i++)
        {
                if (user->chans[i].channel != NULL)
@@ -442,8 +453,9 @@ std::string chlist(userrec *user,userrec* source)
                                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)))
+                                       // if the channel is NOT private/secret, OR the source user is on the channel, AND the user is not invisible.
+                                       // if the user is the same as the source, shortcircuit the comparison.
+                                       if ((source == user) || ((((!(user->chans[i].channel->binarymodes & CM_PRIVATE)) && (!(user->chans[i].channel->binarymodes & CM_SECRET)) && (!userinvisible)) || (has_channel(source,user->chans[i].channel)))))
                                        {
                                                lst = lst + std::string(cmode(user,user->chans[i].channel)) + std::string(user->chans[i].channel->name) + " ";
                                        }