Change IS_FAKE and CheckTimeStamp to IS_SERVER and ResolveModeConflict to clarify their use

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

10 files changed, 12 insertions, 12 deletions

diff --git a/include/mode.h b/include/mode.h
index e118a161b..2c0e30be4 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -286,7 +286,7 @@ class CoreExport ModeHandler : public classbase
 	 * @param channel The channel we are checking against
 	 * @return True if the other side wins the merge, false if we win the merge for this mode.
 	 */
-	virtual bool CheckTimeStamp(std::string &their_param, const std::string &our_param, Channel* channel);
+	virtual bool ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel* channel);
 
 	/**
 	 * When a remote server needs to bounce a set of modes, it will call this method for every mode
diff --git a/include/modes/cmode_l.h b/include/modes/cmode_l.h
index 94313ec52..d83c4f1cf 100644
--- a/include/modes/cmode_l.h
+++ b/include/modes/cmode_l.h
@@ -23,5 +23,5 @@ class ModeChannelLimit : public ModeHandler
 	ModeChannelLimit();
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
-	bool CheckTimeStamp(std::string &their_param, const std::string &our_param, Channel* channel);
+	bool ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel* channel);
 };
diff --git a/include/modules.h b/include/modules.h
index d4c549730..63492b885 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -216,7 +216,7 @@ do { \
 /** Is a remote user */
 #define IS_REMOTE(x) (x->GetFd() < 0)
 /** Is a fake user */
-#define IS_FAKE(x) (x->GetFd() == FD_FAKEUSER_NUMBER)
+#define IS_SERVER(x) (x->GetFd() == FD_FAKEUSER_NUMBER)
 /** Is a module created user */
 #define IS_MODULE_CREATED(x) (x->GetFd() == FD_MAGIC_NUMBER)
 /** Is an oper */
diff --git a/src/mode.cpp b/src/mode.cpp
index 4478dce73..965619eea 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -138,7 +138,7 @@ void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel)
 {
 }
 
-bool ModeHandler::CheckTimeStamp(std::string& theirs, const std::string& ours, Channel*)
+bool ModeHandler::ResolveModeConflict(std::string& theirs, const std::string& ours, Channel*)
 {
 	return (theirs < ours);
 }
@@ -450,7 +450,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 			if (merge && targetchannel && targetchannel->IsModeSet(modechar) && !mh->IsListMode())
 			{
 				std::string ours = targetchannel->GetModeParameter(modechar);
-				if (!mh->CheckTimeStamp(parameter, ours, targetchannel))
+				if (!mh->ResolveModeConflict(parameter, ours, targetchannel))
 					/* we won the mode merge, don't apply this mode */
 					continue;
 			}
diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp
index aa713ec56..d177150b6 100644
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -34,7 +34,7 @@ ModePair ModeChannelLimit::ModeSet(User*, User*, Channel* channel, const std::st
 	}
 }
 
-bool ModeChannelLimit::CheckTimeStamp(std::string &their_param, const std::string &our_param, Channel*)
+bool ModeChannelLimit::ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel*)
 {
 	/* When TS is equal, the higher channel limit wins */
 	return (atoi(their_param.c_str()) < atoi(our_param.c_str()));
diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index 7931a5982..77ac5fc59 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -41,7 +41,7 @@ class DelayMsgMode : public ModeHandler
 		}
 	}
 
-	bool CheckTimeStamp(std::string &their_param, const std::string &our_param, Channel*)
+	bool ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel*)
 	{
 		return (atoi(their_param.c_str()) < atoi(our_param.c_str()));
 	}
diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 10dcdb37d..223768dac 100644
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -39,7 +39,7 @@ class OperPrefixMode : public ModeHandler
 
 		ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 		{
-			if (IS_FAKE(source) || (source && ServerInstance->ULine(source->server)))
+			if (IS_SERVER(source) || (source && ServerInstance->ULine(source->server)))
 				return MODEACTION_ALLOW;
 			else
 			{
@@ -110,7 +110,7 @@ class ModuleOperPrefixMode : public Module
 	ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt)
 	{
 		/* force event propagation to its ModeHandler */
-		if (!IS_FAKE(user) && chan && (mode == 'y'))
+		if (!IS_SERVER(user) && chan && (mode == 'y'))
 			return MOD_RES_ALLOW;
 		return MOD_RES_PASSTHRU;
 	}
diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 3e2e18a8e..a409078e4 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -135,7 +135,7 @@ class PermChannel : public ModeHandler
 		{
 			if (channel->IsModeSet('P'))
 			{
-				if (channel->GetUserCounter() == 0 && !IS_FAKE(source))
+				if (channel->GetUserCounter() == 0 && !IS_SERVER(source))
 				{
 					/*
 					 * ugh, ugh, UGH!
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 31d0ec449..e3ed9fca2 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -718,7 +718,7 @@ void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::s
 	{
 		Utils->DoOneToMany(source->uuid,"KICK",params);
 	}
-	else if (IS_FAKE(source) && source != Utils->ServerUser)
+	else if (IS_SERVER(source) && source != Utils->ServerUser)
 	{
 		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"KICK",params);
 	}
diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index db2d3b08e..b355bc890 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -171,7 +171,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 		return;
 	}
 
-	if (IS_FAKE(user))
+	if (IS_SERVER(user))
 	{
 		ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a fake user (%s)", user->nick.c_str());
 		return;