Fixed some stuff spotted by Cronus, made db_old convert ACCESS_INVALID levels to ACCESS_FOUNDER, fix cs_enforce +R from an earlier commit, fixed ChangeModeInternal TS checking when IRCds don't send TS on mode

8 files changed, 14 insertions, 14 deletions

diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index 4a5362bcc..e39226dd8 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -334,7 +334,7 @@ struct IRCDMessageMode : IRCDMessage
 		if (params.size() > 2 && ircdproto->IsChannelValid(params[0]))
 		{
 			Channel *c = findchan(params[0]);
-			time_t ts = Anope::CurTime;
+			time_t ts = 0;
 			try
 			{
 				ts = convertTo<time_t>(params[1]);
diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index 52f58f254..d3d67d84e 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -316,7 +316,7 @@ struct IRCDMessageMode : IRCDMessage
 		if (params.size() > 2 && ircdproto->IsChannelValid(params[0]))
 		{
 			Channel *c = findchan(params[0]);
-			time_t ts = Anope::CurTime;
+			time_t ts = 0;
 
 			try
 			{
@@ -546,7 +546,7 @@ struct IRCDMessageTMode : IRCDMessage
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override
 	{
-		time_t ts = Anope::CurTime;
+		time_t ts = 0;
 
 		try
 		{
diff --git a/modules/protocol/inspircd-ts6.h b/modules/protocol/inspircd-ts6.h
index 38ad32e26..7e0fe971d 100644
--- a/modules/protocol/inspircd-ts6.h
+++ b/modules/protocol/inspircd-ts6.h
@@ -516,7 +516,7 @@ struct IRCDMessageFMode : IRCDMessage
 		}
 		catch (const ConvertException &)
 		{
-			ts = Anope::CurTime;
+			ts = 0;
 		}
 
 		if (c)
@@ -680,7 +680,7 @@ struct IRCDMessageMode : IRCDMessage
 				modes += " " + params[n];
 
 			if (c)
-				c->SetModesInternal(source, modes, Anope::CurTime);
+				c->SetModesInternal(source, modes);
 		}
 		else
 		{
diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp
index 10a47ae3e..1ac97ddcc 100644
--- a/modules/protocol/inspircd11.cpp
+++ b/modules/protocol/inspircd11.cpp
@@ -783,7 +783,7 @@ struct IRCDMessageMode : IRCDMessage
 			}
 			catch (const ConvertException &)
 			{
-				ts = Anope::CurTime;
+				ts = 0;
 			}
 
 			if (c)
diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp
index 0caf23381..006ddc7a1 100644
--- a/modules/protocol/ngircd.cpp
+++ b/modules/protocol/ngircd.cpp
@@ -255,7 +255,7 @@ struct IRCDMessageChaninfo : IRCDMessage
 			c->ChangeTopicInternal(source.GetName(), params[4], Anope::CurTime);
 		}
 
-		c->SetModesInternal(source, modes, c->creation_time, true);
+		c->SetModesInternal(source, modes);
 		return true;
 	}
 };
@@ -302,7 +302,7 @@ struct IRCDMessageJoin : IRCDMessage
 		chan->JoinUser(user);
 
 		if (!modes.empty())
-			chan->SetModesInternal(source, modes, chan->creation_time);
+			chan->SetModesInternal(source, modes);
 
 		/* Set the proper modes on the user */
 		chan_set_correct_modes(user, chan, 1, true);
@@ -353,7 +353,7 @@ struct IRCDMessageMode : IRCDMessage
 			Channel *c = findchan(params[0]);
 
 			if (c)
-				c->SetModesInternal(source, modes, c->creation_time);
+				c->SetModesInternal(source, modes);
 		}
 		else
 		{
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index 948a715ac..432cc3c02 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -358,7 +358,7 @@ struct IRCDMessageMode : IRCDMessage
 		{
 			// 0 = channel, 1 = ts, 2 = modes
 			Channel *c = findchan(params[0]);
-			time_t ts = Anope::CurTime;
+			time_t ts = 0;
 			try
 			{
 				ts = convertTo<time_t>(params[1]);
@@ -567,7 +567,7 @@ struct IRCDMessageTMode : IRCDMessage
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override
 	{
-		time_t ts = Anope::CurTime;
+		time_t ts = 0;
 		try
 		{
 			ts = convertTo<time_t>(params[0]);
diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp
index 317ced1ff..3ae4b6e17 100644
--- a/modules/protocol/ratbox.cpp
+++ b/modules/protocol/ratbox.cpp
@@ -303,7 +303,7 @@ struct IRCDMessageMode : IRCDMessage
 		{
 			Channel *c = findchan(params[0]);
 			if (c)
-				c->SetModesInternal(source, params[1], Anope::CurTime);
+				c->SetModesInternal(source, params[1]);
 		}
 		else
 		{
@@ -507,7 +507,7 @@ struct IRCDMessageTMode : IRCDMessage
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override
 	{
-		time_t ts = Anope::CurTime;
+		time_t ts = 0;
 		try
 		{
 			ts = convertTo<time_t>(params[0]);
diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp
index 62157b8b4..5d3604a34 100644
--- a/modules/protocol/unreal.cpp
+++ b/modules/protocol/unreal.cpp
@@ -702,7 +702,7 @@ struct IRCDMessageMode : IRCDMessage
 		if (ircdproto->IsChannelValid(params[0]))
 		{
 			Channel *c = findchan(params[0]);
-			time_t ts = Anope::CurTime;
+			time_t ts = 0;
 			try
 			{
 				if (server_source)