Removed some debug notices that were mistakenly in the DEFAULT loglevel

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

diff --git a/src/message.cpp b/src/message.cpp
index 6be101ee9bb24a200080474b400fa2dd1ce5d506..c53612b060d15b84b3cfd23af7838eceec7c2da2 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>
@@ -228,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 */
@@ -243,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;
 }
@@ -261,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;
        }
@@ -273,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))
+               /* can occur anywhere in a nickname */
+               if ((*i >= 'A') && (*i <= '}'))
                {
-                       return 0;
+                       continue;
                }
-               /* can't occur ANYWHERE in a nickname! */
-               if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i]))
+               /* can occur anywhere BUT the first char of a nickname */
+               if ((strchr("-0123456789",*i)) && (i > n))
                {
-                       return 0;
-               }
-               /* can't occur as the first char of a nickname... */
-               if ((strchr("0123456789",n[i])) && (!i))
-               {
-                       return 0;
+                       continue;
                }
+               /* invalid character! abort */
+               return 0;
        }
        return 1;
 }