Fixed autoid

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

4 files changed, 4 insertions, 46 deletions

diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index 3a3b68777..5c3cde993 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -28,13 +28,8 @@ class CommandNSGroup : public Command
 	CommandReturn Execute(User *u, std::vector<ci::string> &params)
 	{
 		NickAlias *na, *target;
-		NickCore *nc;
 		const char *nick = params[0].c_str();
 		const char *pass = params[1].c_str();
-		int i;
-		char tsbuf[16];
-		char modes[512];
-		int len;
 		std::list<std::pair<std::string, std::string> >::iterator it;
 
 		if (NSEmailReg && findrequestnick(u->nick))
@@ -131,21 +126,12 @@ class CommandNSGroup : public Command
 				u->nc = na->nc;
 
 				FOREACH_MOD(I_OnNickGroup, OnNickGroup(u, target));
+				ircdproto->SetAutoIdentificationToken(u);
 
 				alog("%s: %s!%s@%s makes %s join group of %s (%s) (e-mail: %s)", s_NickServ, u->nick, u->GetIdent().c_str(), u->host, u->nick, target->nick, target->nc->display, (target->nc->email ? target->nc->email : "none"));
 				notice_lang(s_NickServ, u, NICK_GROUP_JOINED, target->nick);
 
 				u->lastnickreg = time(NULL);
-				snprintf(tsbuf, sizeof(tsbuf), "%lu", static_cast<unsigned long>(u->timestamp));
-				if (ircd->modeonreg)
-				{
-					len = strlen(ircd->modeonreg);
-					strncpy(modes, ircd->modeonreg, 512);
-					if (ircd->tsonmode)
-						common_svsmode(u, modes, tsbuf);
-					else
-						common_svsmode(u, modes, NULL);
-				}
 
 				check_memos(u);
 			}
diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c
index e2bacf321..eb47101d8 100644
--- a/src/core/ns_identify.c
+++ b/src/core/ns_identify.c
@@ -32,9 +32,6 @@ class CommandNSIdentify : public Command
 		NickAlias *na;
 		NickRequest *nr;
 		int res;
-		char tsbuf[16];
-		char modes[512];
-		int len;
 
 		if (!(na = findnick(u->nick)))
 		{
@@ -74,18 +71,8 @@ class CommandNSIdentify : public Command
 			na->last_seen = time(NULL);
 			u->nc = na->nc;
 
-			snprintf(tsbuf, sizeof(tsbuf), "%lu", static_cast<unsigned long>(u->timestamp));
-
-			if (ircd->modeonreg)
-			{
-				len = strlen(ircd->modeonreg);
-				strncpy(modes, ircd->modeonreg, 512);
-				if (ircd->tsonmode)
-					common_svsmode(u, modes, tsbuf);
-				else
-					common_svsmode(u, modes, "");
-			}
 			ircdproto->SendAccountLogin(u, u->nc);
+			ircdproto->SetAutoIdentificationToken(u);
 
 			FOREACH_MOD(I_OnNickIdentify, OnNickIdentify(u));
 
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c
index 6a7a6e337..ea306e387 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.c
@@ -58,7 +58,7 @@ class CommandNSLogout : public Command
 				na->status &= ~(NS_IDENTIFIED | NS_RECOGNIZED);
 			}
 
-			if (ircd->modeonreg)
+			if (ircd->modeonunreg)
 				common_svsmode(u2, ircd->modeonunreg, "1");
 
 			u2->isSuperAdmin = 0; /* Dont let people logout and remain a SuperAdmin */
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index 6c7f7af3c..9ed66529b 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -34,10 +34,7 @@ class CommandNSConfirm : public Command
 			return MOD_CONT;
 		}
 
-		int len;
-		char tsbuf[16];
 		char tmp_pass[PASSMAX];
-		char modes[512];
 
 		memcpy(na->nc->pass, nr->password, PASSMAX);
 		na->status = static_cast<int16>(NS_IDENTIFIED | NS_RECOGNIZED);
@@ -77,6 +74,7 @@ class CommandNSConfirm : public Command
 				notice_lang(s_NickServ, u, NICK_REGISTERED_NO_MASK, u->nick);
 
 			ircdproto->SendAccountLogin(u, u->nc);
+			ircdproto->SetAutoIdentificationToken(u);
 
 			FOREACH_MOD(I_OnNickRegister, OnNickRegister(u));
 
@@ -84,19 +82,6 @@ class CommandNSConfirm : public Command
 				notice_lang(s_NickServ, u, NICK_PASSWORD_IS, tmp_pass);
 
 			u->lastnickreg = time(NULL);
-			if (ircd->modeonreg)
-			{
-				len = strlen(ircd->modeonreg);
-				strncpy(modes, ircd->modeonreg, 512);
-
-				if (ircd->tsonmode)
-				{
-					snprintf(tsbuf, sizeof(tsbuf), "%lu", static_cast<unsigned long>(u->timestamp));
-					common_svsmode(u, modes, tsbuf);
-				}
-				else
-					common_svsmode(u, modes, NULL);
-			}
 		}
 		else
 			notice_lang(s_NickServ, u, NICK_FORCE_REG, nr->nick);