Remove User::na, use User::nc everywhere. Will probably break everything, but opens the door to decoupling NC from NA, and means commands can now be run without bothering about changinc nick :)

More tweaking for na/nc usage.

It compiles, but it's still a work in progress.

Again, this compiles, but I *bet* there's no chance in hell it'll work. :)

Slightly better.

Set User::nc correctly.

Fix crash with unregistered nicks in core and ns_access.

Fix glist to work when you're not on that particular nick.

Fix ns_set to not crash and burn horribly.

Fix ns_set and ns_logout to not do bad things.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2076 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 6 insertions, 32 deletions

diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 1bbc5c2dc..82dbc900b 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -562,7 +562,7 @@ class UnrealIRCdProto : public IRCDProto
 						break;
 					if (isdigit(*av[1]))
 					{
-						user->svid = strtoul(av[1], NULL, 0);
+						//user->svid = strtoul(av[1], NULL, 0);
 						user->mode = backup;  /* Ugly fix, but should do the job ~ Viper */
 						continue; // +d was setting a service stamp, ignore the usermode +-d.
 					}
@@ -818,29 +818,6 @@ class UnrealIRCdProto : public IRCDProto
 		else send_cmd(ServerName, "n %s %s", name, mode);
 	}
 
-
-	/* SVSMODE +d */
-	/* sent if svid is something weird */
-	void SendSVID(const char *nick, time_t ts)
-	{
-		send_cmd(ServerName, "v %s +d 1", nick);
-	}
-
-	/* SVSMODE +d */
-	/* nc_change was = 1, and there is no na->status */
-	void SendUnregisteredNick(User *u)
-	{
-		common_svsmode(u, "-r+d", "1");
-	}
-
-	/* SVSMODE +r */
-	void SendSVID2(User *u, const char *ts)
-	{
-		if (u->svid != u->timestamp) common_svsmode(u, "+rd", ts);
-		else common_svsmode(u, "+r", NULL);
-	}
-
-
 	/* svsjoin
 		parv[0] - sender
 		parv[1] - nick to make join
@@ -1223,7 +1200,7 @@ int anope_event_sethost(const char *source, int ac, const char **av)
 */
 /*
  do_nick(const char *source, char *nick, char *username, char *host,
-			  char *server, char *realname, time_t ts, uint32 svid,
+			  char *server, char *realname, time_t ts, 
 			  uint32 ip, char *vhost, char *uid)
 */
 int anope_event_nick(const char *source, int ac, const char **av)
@@ -1239,28 +1216,25 @@ int anope_event_nick(const char *source, int ac, const char **av)
 			   - so we have to leave it around for now -TSL
 			 */
 			do_nick(source, av[0], av[3], av[4], av[5], av[6],
-					strtoul(av[2], NULL, 10), 0, 0, "*", NULL);
+					strtoul(av[2], NULL, 10), 0, "*", NULL);
 
 		} else if (ac == 11) {
 			user = do_nick(source, av[0], av[3], av[4], av[5], av[10],
-						   strtoul(av[2], NULL, 10), strtoul(av[6], NULL,
-															 0),
-						   ntohl(decode_ip(av[9])), av[8], NULL);
+						   strtoul(av[2], NULL, 10), ntohl(decode_ip(av[9])), av[8], NULL);
 			if (user)
 				ircdproto->ProcessUsermodes(user, 1, &av[7]);
 
 		} else {
 			/* NON NICKIP */
 			user = do_nick(source, av[0], av[3], av[4], av[5], av[9],
-						   strtoul(av[2], NULL, 10), strtoul(av[6], NULL,
-															 0), 0, av[8],
+						   strtoul(av[2], NULL, 10), 0, av[8],
 						   NULL);
 			if (user)
 				ircdproto->ProcessUsermodes(user, 1, &av[7]);
 		}
 	} else {
 		do_nick(source, av[0], NULL, NULL, NULL, NULL,
-				strtoul(av[1], NULL, 10), 0, 0, NULL, NULL);
+				strtoul(av[1], NULL, 10), 0, NULL, NULL);
 	}
 	return MOD_CONT;
 }