Be consistent. Use ServerInstance in all places instead of 'Instance' in half. This has bugged me forever :p. I think I got all of extra/ too..

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10579 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 22 insertions, 22 deletions

diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index 6d068c5e2..b97c582d0 100644
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -29,12 +29,12 @@
 void TreeSocket::DoBurst(TreeServer* s)
 {
 	std::string name = s->GetName();
-	std::string burst = ":" + this->Instance->Config->GetSID() + " BURST " +ConvToStr(Instance->Time());
-	std::string endburst = ":" + this->Instance->Config->GetSID() + " ENDBURST";
-	this->Instance->SNO->WriteToSnoMask('l',"Bursting to \2%s\2 (Authentication: %s).", name.c_str(), this->GetTheirChallenge().empty() ? "plaintext password" : "SHA256-HMAC challenge-response");
+	std::string burst = ":" + this->ServerInstance->Config->GetSID() + " BURST " +ConvToStr(ServerInstance->Time());
+	std::string endburst = ":" + this->ServerInstance->Config->GetSID() + " ENDBURST";
+	this->ServerInstance->SNO->WriteToSnoMask('l',"Bursting to \2%s\2 (Authentication: %s).", name.c_str(), this->GetTheirChallenge().empty() ? "plaintext password" : "SHA256-HMAC challenge-response");
 	this->WriteLine(burst);
 	/* send our version string */
-	this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" VERSION :"+this->Instance->GetVersionString());
+	this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" VERSION :"+this->ServerInstance->GetVersionString());
 	/* Send server tree */
 	this->SendServers(Utils->TreeRoot,s,1);
 	/* Send users and their oper status */
@@ -42,9 +42,9 @@ void TreeSocket::DoBurst(TreeServer* s)
 	/* Send everything else (channel modes, xlines etc) */
 	this->SendChannelModes(s);
 	this->SendXLines(s);
-	FOREACH_MOD_I(this->Instance,I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)Utils->Creator,(void*)this));
+	FOREACH_MOD_I(this->ServerInstance,I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)Utils->Creator,(void*)this));
 	this->WriteLine(endburst);
-	this->Instance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+name+"\2.");
+	this->ServerInstance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+name+"\2.");
 }
 
 /** Recursively send the server tree with distances as hops.
@@ -85,7 +85,7 @@ void TreeSocket::SendFJoins(TreeServer* Current, Channel* c)
 	char list[MAXBUF];
 
 	size_t dlen, curlen;
-	dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu +%s", this->Instance->Config->GetSID().c_str(), c->name.c_str(),(unsigned long)c->age, c->ChanModes(true));
+	dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu +%s", this->ServerInstance->Config->GetSID().c_str(), c->name.c_str(),(unsigned long)c->age, c->ChanModes(true));
 	int numusers = 0;
 	char* ptr = list + dlen;
 	bool looped_once = false;
@@ -97,12 +97,12 @@ void TreeSocket::SendFJoins(TreeServer* Current, Channel* c)
 	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 	{
 		size_t ptrlen = 0;
-		std::string modestr = this->Instance->Modes->ModeString(i->first, c, false);
+		std::string modestr = this->ServerInstance->Modes->ModeString(i->first, c, false);
 
 		if ((curlen + modestr.length() + i->first->uuid.length() + 4) > 480)
 		{
 			buffer.append(list).append("\r\n");
-			dlen = curlen = snprintf(list, MAXBUF, ":%s FJOIN %s %lu +%s", this->Instance->Config->GetSID().c_str(), c->name.c_str(), (unsigned long)c->age, c->ChanModes(true));
+			dlen = curlen = snprintf(list, MAXBUF, ":%s FJOIN %s %lu +%s", this->ServerInstance->Config->GetSID().c_str(), c->name.c_str(), (unsigned long)c->age, c->ChanModes(true));
 			ptr = list + dlen;
 			numusers = 0;
 		}
@@ -134,10 +134,10 @@ void TreeSocket::SendFJoins(TreeServer* Current, Channel* c)
 			params.append(" ").append(b->data);
 			linesize += size;
 		}
-		if ((params.length() >= Instance->Config->Limits.MaxModes) || (currsize > 350))
+		if ((params.length() >= ServerInstance->Config->Limits.MaxModes) || (currsize > 350))
 		{
 			/* Wrap at MAXMODES */
-			buffer.append(":").append(this->Instance->Config->GetSID()).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(modes).append(params).append("\r\n");
+			buffer.append(":").append(this->ServerInstance->Config->GetSID()).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(modes).append(params).append("\r\n");
 			modes.clear();
 			params.clear();
 			linesize = 1;
@@ -146,7 +146,7 @@ void TreeSocket::SendFJoins(TreeServer* Current, Channel* c)
 
 	/* Only send these if there are any */
 	if (!modes.empty())
-		buffer.append(":").append(this->Instance->Config->GetSID()).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(modes).append(params);
+		buffer.append(":").append(this->ServerInstance->Config->GetSID()).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(modes).append(params);
 
 	this->WriteLine(buffer);
 }
@@ -155,14 +155,14 @@ void TreeSocket::SendFJoins(TreeServer* Current, Channel* c)
 void TreeSocket::SendXLines(TreeServer* Current)
 {
 	char data[MAXBUF];
-	std::string n = this->Instance->Config->GetSID();
+	std::string n = this->ServerInstance->Config->GetSID();
 	const char* sn = n.c_str();
 
-	std::vector<std::string> types = Instance->XLines->GetAllTypes();
+	std::vector<std::string> types = ServerInstance->XLines->GetAllTypes();
 
 	for (std::vector<std::string>::iterator it = types.begin(); it != types.end(); ++it)
 	{
-		XLineLookup* lookup = Instance->XLines->GetAll(*it);
+		XLineLookup* lookup = ServerInstance->XLines->GetAll(*it);
 
 		if (lookup)
 		{
@@ -190,9 +190,9 @@ void TreeSocket::SendChannelModes(TreeServer* Current)
 {
 	char data[MAXBUF];
 	std::deque<std::string> list;
-	std::string n = this->Instance->Config->GetSID();
+	std::string n = this->ServerInstance->Config->GetSID();
 	const char* sn = n.c_str();
-	for (chan_hash::iterator c = this->Instance->chanlist->begin(); c != this->Instance->chanlist->end(); c++)
+	for (chan_hash::iterator c = this->ServerInstance->chanlist->begin(); c != this->ServerInstance->chanlist->end(); c++)
 	{
 		SendFJoins(Current, c->second);
 		if (!c->second->topic.empty())
@@ -200,12 +200,12 @@ void TreeSocket::SendChannelModes(TreeServer* Current)
 			snprintf(data,MAXBUF,":%s FTOPIC %s %lu %s :%s", sn, c->second->name.c_str(), (unsigned long)c->second->topicset, c->second->setby.c_str(), c->second->topic.c_str());
 			this->WriteLine(data);
 		}
-		FOREACH_MOD_I(this->Instance,I_OnSyncChannel,OnSyncChannel(c->second,(Module*)Utils->Creator,(void*)this));
+		FOREACH_MOD_I(this->ServerInstance,I_OnSyncChannel,OnSyncChannel(c->second,(Module*)Utils->Creator,(void*)this));
 		list.clear();
 		c->second->GetExtList(list);
 		for (unsigned int j = 0; j < list.size(); j++)
 		{
-			FOREACH_MOD_I(this->Instance,I_OnSyncChannelMetaData,OnSyncChannelMetaData(c->second,(Module*)Utils->Creator,(void*)this,list[j]));
+			FOREACH_MOD_I(this->ServerInstance,I_OnSyncChannelMetaData,OnSyncChannelMetaData(c->second,(Module*)Utils->Creator,(void*)this,list[j]));
 		}
 	}
 }
@@ -216,7 +216,7 @@ void TreeSocket::SendUsers(TreeServer* Current)
 	char data[MAXBUF];
 	std::deque<std::string> list;
 	std::string dataline;
-	for (user_hash::iterator u = this->Instance->Users->clientlist->begin(); u != this->Instance->Users->clientlist->end(); u++)
+	for (user_hash::iterator u = this->ServerInstance->Users->clientlist->begin(); u != this->ServerInstance->Users->clientlist->end(); u++)
 	{
 		if (u->second->registered == REG_ALL)
 		{
@@ -248,12 +248,12 @@ void TreeSocket::SendUsers(TreeServer* Current)
 				}
 			}
 
-			FOREACH_MOD_I(this->Instance,I_OnSyncUser,OnSyncUser(u->second,(Module*)Utils->Creator,(void*)this));
+			FOREACH_MOD_I(this->ServerInstance,I_OnSyncUser,OnSyncUser(u->second,(Module*)Utils->Creator,(void*)this));
 			list.clear();
 			u->second->GetExtList(list);
 			for (unsigned int j = 0; j < list.size(); j++)
 			{
-				FOREACH_MOD_I(this->Instance,I_OnSyncUserMetaData,OnSyncUserMetaData(u->second,(Module*)Utils->Creator,(void*)this,list[j]));
+				FOREACH_MOD_I(this->ServerInstance,I_OnSyncUserMetaData,OnSyncUserMetaData(u->second,(Module*)Utils->Creator,(void*)this,list[j]));
 			}
 		}
 	}