From: Matthew Wiggins <lithium@rubiks.net>
Date: Mon, 7 Mar 2005 19:14:49 +0000 (+0000)
Subject: Unapplied COLORED_NICK patch
X-Git-Tag: rubiks-ircd-1-0-6~22
X-Git-Url: http://git.pulsar-zone.net/?a=commitdiff_plain;h=a8bfc63d7eebf777e8b04712fa23cc0352cf2c6b;p=rubiks-ircd.git

Unapplied COLORED_NICK patch
---

diff --git a/RUBIKS-CHANGES b/RUBIKS-CHANGES
index 96d263d..7d14868 100644
--- a/RUBIKS-CHANGES
+++ b/RUBIKS-CHANGES
@@ -5,7 +5,6 @@ rubiks-ircd-1-0-0	Based on bahamut 1.8.3 release (BAHAMUT-1-8-3)
   - Fake hosts for opers (FAKEHOST in include/config.h)
   - DCC Allow patch (DCCALLOW in include/config.h)
   - OpenSSL (--enable-openssl in configure script)
-  - Colored Nicknames (COLORED_NICKS in include/config.h)
   - Added NO_TILDE in include/config.h to prevent ~ from being prefixed
     to usernames for which ident could not be retreived, can only be used
     if DO_IDENT is unset (default for rubiks-ircd)
diff --git a/include/config.h b/include/config.h
index 011e067..8e7c88c 100644
--- a/include/config.h
+++ b/include/config.h
@@ -18,7 +18,7 @@
  *
  */
 
-/* $Id: config.h,v 1.12 2005/01/15 23:35:02 mwiggins Exp $ */
+/* $Id: config.h,v 1.13 2005/03/07 19:14:48 mwiggins Exp $ */
 
 #ifndef	__config_include__
 #define	__config_include__
@@ -560,11 +560,6 @@
  */
 #undef DCCALLOW
 
-/* COLORED_NICKS
- * Allow ^C character in nicks to facilitate IRC colors
- */
-#define COLORED_NICKS
-
 /* FAKEHOST
  * Allow opers to use fake hostnames
  */
diff --git a/include/struct.h b/include/struct.h
index dd38edc..c52dd3b 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -20,7 +20,7 @@
  *
  */
 
-/* $Id: struct.h,v 1.6 2005/01/14 07:50:01 mwiggins Exp $ */
+/* $Id: struct.h,v 1.7 2005/03/07 19:14:49 mwiggins Exp $ */
 
 #ifndef	__struct_include__
 #define __struct_include__
@@ -1316,11 +1316,7 @@ struct Channel
 
 #define	BadPtr(x) (!(x) || (*(x) == '\0'))
 
-#ifdef COLORED_NICKS
-#define	isvalid(c) (((c) >= 'A' && (c) < '~') || (c) == '\003' ||  IsDigit(c) || (c) == '-')
-#else
 #define	isvalid(c) (((c) >= 'A' && (c) < '~') || IsDigit(c) || (c) == '-')
-#endif
 
 #define	MyConnect(x)			((x)->fd >= 0)
 #define	MyClient(x)			(MyConnect(x) && IsClient(x))
diff --git a/src/m_nick.c b/src/m_nick.c
index cb99830..88753c4 100644
--- a/src/m_nick.c
+++ b/src/m_nick.c
@@ -20,7 +20,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-/* $Id: m_nick.c,v 1.3 2005/01/13 08:06:45 mmondor Exp $ */
+/* $Id: m_nick.c,v 1.4 2005/03/07 19:14:49 mwiggins Exp $ */
 
 #include "struct.h"
 #include "common.h"
@@ -106,20 +106,6 @@ int m_nick(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	return 0;
     }
 
-#ifdef COLORED_NICKS
-    {
-	char *p;
-
-	if ( (p = strrchr(parv[1], '\003')) &&
-		((p[1] >= '0') && (p[1] <= '9')) ) 
-	{
-	    int n = strlen(parv[1]);
-
-	    parv[1][ (n < NICKLEN) ? n : NICKLEN ] = '\003';
-	}
-    }
-#endif
-  
     if (!IsServer(sptr) && IsServer(cptr) && parc > 2)
 	newts = atol(parv[2]);
     else if (IsServer(sptr) && parc > 3)