Merge branch 'insp4' into master.

102 files changed, 77 insertions, 136 deletions

diff --git a/modules/alltime.cpp b/modules/alltime.cpp
index ae1e41c1c..410d2ec95 100644
--- a/modules/alltime.cpp
+++ b/modules/alltime.cpp
@@ -5,7 +5,6 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2007 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -37,7 +36,7 @@ public:
 
 	CmdResult Handle(User* user, const Params& parameters) override
 	{
-		auto timestr = Time::ToString(ServerInstance->Time(), "%A, %d %B %Y @ %H:%M:%S %Z", true);
+		auto timestr = Time::ToString(ServerInstance->Time(), Time::DEFAULT_LONG, true);
 		timestr += FMT::format(" ({})", ServerInstance->Time());
 
 		user->WriteRemoteNumeric(RPL_TIME, ServerInstance->Config->ServerName, timestr);
diff --git a/modules/banexception.cpp b/modules/banexception.cpp
index 9e90e7f31..3c743b5d9 100644
--- a/modules/banexception.cpp
+++ b/modules/banexception.cpp
@@ -6,7 +6,7 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2008 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2007 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2006 Oliver Lupton <om@inspircd.org>
  *
diff --git a/modules/blockamsg.cpp b/modules/blockamsg.cpp
index 70f360ba2..bb502267d 100644
--- a/modules/blockamsg.cpp
+++ b/modules/blockamsg.cpp
@@ -6,7 +6,7 @@
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012, 2014-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2008 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Oliver Lupton <om@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
diff --git a/modules/blockcolor.cpp b/modules/blockcolor.cpp
index c978cca3a..032fdc7d5 100644
--- a/modules/blockcolor.cpp
+++ b/modules/blockcolor.cpp
@@ -7,8 +7,6 @@
  *   Copyright (C) 2012 DjSlash <djslash@djslash.org>
  *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@gmail.com>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/botmode.cpp b/modules/botmode.cpp
index c9cb2202e..c56907603 100644
--- a/modules/botmode.cpp
+++ b/modules/botmode.cpp
@@ -1,11 +1,10 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2017-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012, 2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2004 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -62,7 +61,7 @@ private:
 
 public:
 	ModuleBotMode()
-		: Module(VF_VENDOR, "Adds user mode B (bot) which marks users with it set as bots in their /WHOIS response.")
+		: Module(VF_VENDOR, "Adds user mode B (bot) which marks users with it set as bots.")
 		, ISupport::EventListener(this)
 		, Who::EventListener(this)
 		, Whois::EventListener(this)
diff --git a/modules/cban.cpp b/modules/cban.cpp
index 5ab261249..76ca13189 100644
--- a/modules/cban.cpp
+++ b/modules/cban.cpp
@@ -8,7 +8,7 @@
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012, 2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2008 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2005, 2008 Robin Burchell <robin+git@viroteck.net>
  *
diff --git a/modules/chanhistory.cpp b/modules/chanhistory.cpp
index c04f9e2cb..86058c365 100644
--- a/modules/chanhistory.cpp
+++ b/modules/chanhistory.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2021 Dominic Hamon
- *   Copyright (C) 2017-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
  *   Copyright (C) 2012, 2014, 2018 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
diff --git a/modules/check.cpp b/modules/check.cpp
index eed6b1791..e7c73b8a4 100644
--- a/modules/check.cpp
+++ b/modules/check.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
- *   Copyright (C) 2018-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018-2023, 2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013, 2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
@@ -42,9 +42,8 @@ private:
 
 	static std::string FormatTime(time_t ts)
 	{
-		std::string timestr(Time::ToString(ts, "%Y-%m-%d %H:%M:%S UTC (", true));
-		timestr.append(ConvToStr(ts));
-		timestr.push_back(')');
+		auto timestr = Time::ToString(ts, Time::DEFAULT_LONG, true);
+		timestr += FMT::format(" ({})", ServerInstance->Time());
 		return timestr;
 	}
 
diff --git a/modules/chghost.cpp b/modules/chghost.cpp
index cba9fccbe..20f8b45a4 100644
--- a/modules/chghost.cpp
+++ b/modules/chghost.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013-2014, 2017, 2019-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014, 2017, 2019-2023, 2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2013, 2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009, 2012 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/modules/chgident.cpp b/modules/chgident.cpp
index 593ceaae1..7e98f8b10 100644
--- a/modules/chgident.cpp
+++ b/modules/chgident.cpp
@@ -5,9 +5,8 @@
  *   Copyright (C) 2012, 2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2007 John Brooks <john@jbrooks.io>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/chgname.cpp b/modules/chgname.cpp
index 2a76c9566..807d4b6b7 100644
--- a/modules/chgname.cpp
+++ b/modules/chgname.cpp
@@ -7,7 +7,6 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/cloak_sha256.cpp b/modules/cloak_sha256.cpp
index c9ebb5483..4b5277789 100644
--- a/modules/cloak_sha256.cpp
+++ b/modules/cloak_sha256.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2023-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2023-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2017 Adam <Adam@anope.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/cloak_static.cpp b/modules/cloak_static.cpp
index 82d8fd8f8..606842932 100644
--- a/modules/cloak_static.cpp
+++ b/modules/cloak_static.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2023, 2025 Sadie Powell <sadie@witchery.services>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/cloak_user.cpp b/modules/cloak_user.cpp
index 9caf4875b..45e6a0c25 100644
--- a/modules/cloak_user.cpp
+++ b/modules/cloak_user.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2023-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2023-2025 Sadie Powell <sadie@witchery.services>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/codepage.cpp b/modules/codepage.cpp
index 7a8c27e47..812cd77e8 100644
--- a/modules/codepage.cpp
+++ b/modules/codepage.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2020-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2020-2023, 2025 Sadie Powell <sadie@witchery.services>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/conn_join.cpp b/modules/conn_join.cpp
index d10836a93..a5cc5d29a 100644
--- a/modules/conn_join.cpp
+++ b/modules/conn_join.cpp
@@ -8,7 +8,6 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2009 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2007 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/conn_waitpong.cpp b/modules/conn_waitpong.cpp
index f11ec4285..9367b5f7b 100644
--- a/modules/conn_waitpong.cpp
+++ b/modules/conn_waitpong.cpp
@@ -5,7 +5,6 @@
  *   Copyright (C) 2012, 2018 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/connectban.cpp b/modules/connectban.cpp
index 9c5636ec3..1347466aa 100644
--- a/modules/connectban.cpp
+++ b/modules/connectban.cpp
@@ -4,7 +4,7 @@
  *   Copyright (C) 2021 Dominic Hamon
  *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2014 Googolplexed <googol@googolplexed.net>
- *   Copyright (C) 2013, 2019-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2019-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/modules/core/core_channel/cmd_join.cpp b/modules/core/core_channel/cmd_join.cpp
index 21ccf6794..0ba9adb29 100644
--- a/modules/core/core_channel/cmd_join.cpp
+++ b/modules/core/core_channel/cmd_join.cpp
@@ -6,7 +6,6 @@
  *   Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006, 2008 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_channel/cmode_k.cpp b/modules/core/core_channel/cmode_k.cpp
index c8791db35..a23e56127 100644
--- a/modules/core/core_channel/cmode_k.cpp
+++ b/modules/core/core_channel/cmode_k.cpp
@@ -2,12 +2,11 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2017, 2019-2023 Sadie Powell <sadie@witchery.services>
- *   Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
  *   Copyright (C) 2009 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_info/cmd_admin.cpp b/modules/core/core_info/cmd_admin.cpp
index 144b77154..8f95df91d 100644
--- a/modules/core/core_info/cmd_admin.cpp
+++ b/modules/core/core_info/cmd_admin.cpp
@@ -6,7 +6,6 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_info/cmd_commands.cpp b/modules/core/core_info/cmd_commands.cpp
index eda428be5..371d83690 100644
--- a/modules/core/core_info/cmd_commands.cpp
+++ b/modules/core/core_info/cmd_commands.cpp
@@ -2,12 +2,11 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2017, 2020-2024 Sadie Powell <sadie@witchery.services>
- *   Copyright (C) 2012, 2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2014, 2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2007-2008 Craig Edwards <brain@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/core/core_info/cmd_info.cpp b/modules/core/core_info/cmd_info.cpp
index b77f7cf49..6ef6cdfe1 100644
--- a/modules/core/core_info/cmd_info.cpp
+++ b/modules/core/core_info/cmd_info.cpp
@@ -6,7 +6,6 @@
  *   Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2007 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_info/cmd_motd.cpp b/modules/core/core_info/cmd_motd.cpp
index 1d0482780..17b47de7f 100644
--- a/modules/core/core_info/cmd_motd.cpp
+++ b/modules/core/core_info/cmd_motd.cpp
@@ -5,7 +5,6 @@
  *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_info/cmd_time.cpp b/modules/core/core_info/cmd_time.cpp
index d83fb93a6..11d0e546a 100644
--- a/modules/core/core_info/cmd_time.cpp
+++ b/modules/core/core_info/cmd_time.cpp
@@ -39,7 +39,7 @@ CmdResult CommandTime::Handle(User* user, const Params& parameters)
 	if (!parameters.empty() && !irc::equals(parameters[0], ServerInstance->Config->ServerName))
 		return CmdResult::SUCCESS;
 
-	auto timestr = Time::ToString(ServerInstance->Time(), "%A, %d %B %Y @ %H:%M:%S %Z");
+	auto timestr = Time::ToString(ServerInstance->Time(), Time::DEFAULT_LONG);
 	timestr += FMT::format(" ({})", ServerInstance->Time());
 
 	user->WriteRemoteNumeric(RPL_TIME, ServerInstance->Config->GetServerName(), timestr);
diff --git a/modules/core/core_info/cmd_version.cpp b/modules/core/core_info/cmd_version.cpp
index 191124508..04e0800cf 100644
--- a/modules/core/core_info/cmd_version.cpp
+++ b/modules/core/core_info/cmd_version.cpp
@@ -1,12 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2018-2020, 2022-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018, 2020, 2022-2023 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_lusers.cpp b/modules/core/core_lusers.cpp
index a88f59e98..33354f673 100644
--- a/modules/core/core_lusers.cpp
+++ b/modules/core/core_lusers.cpp
@@ -5,7 +5,6 @@
  *   Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_message.cpp b/modules/core/core_message.cpp
index 6cd1ea8c8..fc5686a63 100644
--- a/modules/core/core_message.cpp
+++ b/modules/core/core_message.cpp
@@ -2,10 +2,9 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2017-2024 Sadie Powell <sadie@witchery.services>
- *   Copyright (C) 2013-2014, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2018 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006-2008 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_oper/cmd_oper.cpp b/modules/core/core_oper/cmd_oper.cpp
index 8eda63ec8..98693980c 100644
--- a/modules/core/core_oper/cmd_oper.cpp
+++ b/modules/core/core_oper/cmd_oper.cpp
@@ -5,8 +5,6 @@
  *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006, 2008 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_oper/cmd_rehash.cpp b/modules/core/core_oper/cmd_rehash.cpp
index 0f033df5b..48676362c 100644
--- a/modules/core/core_oper/cmd_rehash.cpp
+++ b/modules/core/core_oper/cmd_rehash.cpp
@@ -9,7 +9,6 @@
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007-2008 Craig Edwards <brain@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/core/core_oper/cmd_restart.cpp b/modules/core/core_oper/cmd_restart.cpp
index 8f988fa4e..1045977c0 100644
--- a/modules/core/core_oper/cmd_restart.cpp
+++ b/modules/core/core_oper/cmd_restart.cpp
@@ -7,7 +7,6 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_oper/core_oper.cpp b/modules/core/core_oper/core_oper.cpp
index dc8747265..3f8b8ba68 100644
--- a/modules/core/core_oper/core_oper.cpp
+++ b/modules/core/core_oper/core_oper.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2018-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
  *
@@ -133,13 +133,16 @@ public:
 	void OnPostOperLogout(User* user, const std::shared_ptr<OperAccount>& oper) override
 	{
 		LocalUser* luser = IS_LOCAL(user);
-		if (!luser)
+		if (!luser || luser->quitting)
 			return;
 
 		if (hasoperclass.Get(luser))
 		{
 			if (!luser->FindConnectClass(true))
-				ServerInstance->Logs.Normal("CONNECTCLASS", "Unable to find a non-operator connect class for {} ({}); keeping their existing one.");
+			{
+				ServerInstance->Logs.Normal("CONNECTCLASS", "Unable to find a non-operator connect class for {} ({}); keeping their existing one.",
+					user->nick, user->GetRealUserHost());
+			}
 			hasoperclass.Unset(luser);
 		}
 	}
diff --git a/modules/core/core_oper/umode_o.cpp b/modules/core/core_oper/umode_o.cpp
index 8c57e0dc1..54d45d7dc 100644
--- a/modules/core/core_oper/umode_o.cpp
+++ b/modules/core/core_oper/umode_o.cpp
@@ -4,7 +4,6 @@
  *   Copyright (C) 2017, 2020-2021, 2023 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_oper/umode_s.cpp b/modules/core/core_oper/umode_s.cpp
index 4d1cdc63f..9f30f7838 100644
--- a/modules/core/core_oper/umode_s.cpp
+++ b/modules/core/core_oper/umode_s.cpp
@@ -7,7 +7,6 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Craig Edwards <brain@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_reloadmodule.cpp b/modules/core/core_reloadmodule.cpp
index f8f787ea8..ae4e2760e 100644
--- a/modules/core/core_reloadmodule.cpp
+++ b/modules/core/core_reloadmodule.cpp
@@ -5,7 +5,6 @@
  *   Copyright (C) 2014-2016, 2018 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2007 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_user/cmd_away.cpp b/modules/core/core_user/cmd_away.cpp
index b4ac98db5..fcb9daec8 100644
--- a/modules/core/core_user/cmd_away.cpp
+++ b/modules/core/core_user/cmd_away.cpp
@@ -6,8 +6,6 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_user/cmd_nick.cpp b/modules/core/core_user/cmd_nick.cpp
index 028a02f86..995595420 100644
--- a/modules/core/core_user/cmd_nick.cpp
+++ b/modules/core/core_user/cmd_nick.cpp
@@ -5,8 +5,7 @@
  *   Copyright (C) 2013, 2016, 2018, 2020-2024 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_user/cmd_quit.cpp b/modules/core/core_user/cmd_quit.cpp
index a1630fc4d..2b83a1dc7 100644
--- a/modules/core/core_user/cmd_quit.cpp
+++ b/modules/core/core_user/cmd_quit.cpp
@@ -6,7 +6,6 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_user/cmd_user.cpp b/modules/core/core_user/cmd_user.cpp
index 2cd87b9b5..367792ec7 100644
--- a/modules/core/core_user/cmd_user.cpp
+++ b/modules/core/core_user/cmd_user.cpp
@@ -6,7 +6,6 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2007 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_who.cpp b/modules/core/core_who.cpp
index a6fcb387e..5fbc12817 100644
--- a/modules/core/core_who.cpp
+++ b/modules/core/core_who.cpp
@@ -11,7 +11,6 @@
  *   Copyright (C) 2009 John Brooks <john@jbrooks.io>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007-2008 Craig Edwards <brain@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/core/core_whowas.cpp b/modules/core/core_whowas.cpp
index df29d1494..8502ea875 100644
--- a/modules/core/core_whowas.cpp
+++ b/modules/core/core_whowas.cpp
@@ -7,7 +7,7 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2006-2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_xline/cmd_eline.cpp b/modules/core/core_xline/cmd_eline.cpp
index 885801141..6ac3bb92e 100644
--- a/modules/core/core_xline/cmd_eline.cpp
+++ b/modules/core/core_xline/cmd_eline.cpp
@@ -8,7 +8,6 @@
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006-2008 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_xline/cmd_gline.cpp b/modules/core/core_xline/cmd_gline.cpp
index 4201c0dad..b101b51dd 100644
--- a/modules/core/core_xline/cmd_gline.cpp
+++ b/modules/core/core_xline/cmd_gline.cpp
@@ -9,7 +9,6 @@
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006-2008 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_xline/cmd_kline.cpp b/modules/core/core_xline/cmd_kline.cpp
index 49609a9d0..46ace7646 100644
--- a/modules/core/core_xline/cmd_kline.cpp
+++ b/modules/core/core_xline/cmd_kline.cpp
@@ -9,7 +9,6 @@
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006-2008 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_xline/cmd_qline.cpp b/modules/core/core_xline/cmd_qline.cpp
index 94a711c97..de3a14712 100644
--- a/modules/core/core_xline/cmd_qline.cpp
+++ b/modules/core/core_xline/cmd_qline.cpp
@@ -9,7 +9,6 @@
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Thomas Stagner <aquanight@gmail.com>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006-2008 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/cycle.cpp b/modules/cycle.cpp
index 1ed78b9b5..12c4dfe9c 100644
--- a/modules/cycle.cpp
+++ b/modules/cycle.cpp
@@ -8,7 +8,7 @@
  *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2008 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 John Brooks <john@jbrooks.io>
  *
diff --git a/modules/dccallow.cpp b/modules/dccallow.cpp
index 2b71d89ec..4092c325c 100644
--- a/modules/dccallow.cpp
+++ b/modules/dccallow.cpp
@@ -4,7 +4,7 @@
  *   Copyright (C) 2021 Dominic Hamon
  *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2016 Adam <Adam@anope.org>
- *   Copyright (C) 2013, 2017-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2017-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Matt Smith <dz@inspircd.org>
diff --git a/modules/deaf.cpp b/modules/deaf.cpp
index 87eb180ce..193e5e7bd 100644
--- a/modules/deaf.cpp
+++ b/modules/deaf.cpp
@@ -9,7 +9,7 @@
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006-2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/delaymsg.cpp b/modules/delaymsg.cpp
index aea668eb5..b43025cae 100644
--- a/modules/delaymsg.cpp
+++ b/modules/delaymsg.cpp
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2022 iwalkalone <iwalkalone69@gmail.com>
  *   Copyright (C) 2021 Dominic Hamon
- *   Copyright (C) 2017-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/modules/disable.cpp b/modules/disable.cpp
index b23b677ba..ff52c94ed 100644
--- a/modules/disable.cpp
+++ b/modules/disable.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2019-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2019-2023, 2025 Sadie Powell <sadie@witchery.services>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/extra/geo_maxmind.cpp b/modules/extra/geo_maxmind.cpp
index da5f5bc9a..aec8b11e3 100644
--- a/modules/extra/geo_maxmind.cpp
+++ b/modules/extra/geo_maxmind.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2019-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2019-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/extra/ldap.cpp b/modules/extra/ldap.cpp
index a160cb3a8..15cfcbf60 100644
--- a/modules/extra/ldap.cpp
+++ b/modules/extra/ldap.cpp
@@ -6,7 +6,7 @@
  *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2016-2017, 2019-2024 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2013-2016 Adam <Adam@anope.org>
+ *   Copyright (C) 2013-2015 Adam <Adam@anope.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/extra/pgsql.cpp b/modules/extra/pgsql.cpp
index ac6ff7cb8..e605f0144 100644
--- a/modules/extra/pgsql.cpp
+++ b/modules/extra/pgsql.cpp
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2024 Larry Williamson <l422y@l422y.com>
  *   Copyright (C) 2015 Daniel Vassdal <shutter@canternet.org>
- *   Copyright (C) 2013, 2016-2017, 2019-2025 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2017, 2019-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/modules/extra/regex_re2.cpp b/modules/extra/regex_re2.cpp
index 52ab9a28f..caae80efd 100644
--- a/modules/extra/regex_re2.cpp
+++ b/modules/extra/regex_re2.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013-2014, 2016, 2019-2022, 2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2016, 2019-2022, 2024 Sadie Powell <sadie@witchery.services>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/gateway.cpp b/modules/gateway.cpp
index 4daee3816..14e880ca5 100644
--- a/modules/gateway.cpp
+++ b/modules/gateway.cpp
@@ -9,8 +9,7 @@
  *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
- *   Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2006-2007, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/help.cpp b/modules/help.cpp
index 1dead0235..19bb16c66 100644
--- a/modules/help.cpp
+++ b/modules/help.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2017-2021, 2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017-2021, 2023, 2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013, 2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/modules/helpmode.cpp b/modules/helpmode.cpp
index 5b47b1387..41d5a1ac5 100644
--- a/modules/helpmode.cpp
+++ b/modules/helpmode.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2023-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2023-2025 Sadie Powell <sadie@witchery.services>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/hidechans.cpp b/modules/hidechans.cpp
index 9afaa872b..461e1dd6b 100644
--- a/modules/hidechans.cpp
+++ b/modules/hidechans.cpp
@@ -5,7 +5,6 @@
  *   Copyright (C) 2012, 2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006, 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/hideoper.cpp b/modules/hideoper.cpp
index 51a09d772..fc2e26113 100644
--- a/modules/hideoper.cpp
+++ b/modules/hideoper.cpp
@@ -2,14 +2,12 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
- *   Copyright (C) 2015, 2017-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2015, 2017-2023, 2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2014 Adam <Adam@anope.org>
  *   Copyright (C) 2012-2013, 2015-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2008 Geoff Bricker <geoff.bricker@gmail.com>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/httpd.cpp b/modules/httpd.cpp
index 156be2fe3..af9ef5f26 100644
--- a/modules/httpd.cpp
+++ b/modules/httpd.cpp
@@ -4,7 +4,7 @@
  *   Copyright (C) 2021 Dominic Hamon
  *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2018 edef <edef@edef.eu>
- *   Copyright (C) 2013-2014, 2017, 2019-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014, 2017, 2019-2023, 2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
@@ -271,7 +271,7 @@ public:
 	{
 		WriteData(FMT::format("HTTP/{}.{} {} {}\r\n", parser.http_major ? parser.http_major : 1, parser.http_major ? parser.http_minor : 1, response, http_status_str((http_status)response)));
 
-		rheaders.CreateHeader("Date", Time::ToString(ServerInstance->Time(), "%a, %d %b %Y %H:%M:%S GMT", true));
+		rheaders.CreateHeader("Date", Time::ToString(ServerInstance->Time(), Time::RFC_1123, true));
 		rheaders.CreateHeader("Server", INSPIRCD_BRANCH);
 		rheaders.SetHeader("Content-Length", ConvToStr(size));
 
diff --git a/modules/inviteexception.cpp b/modules/inviteexception.cpp
index 9ce0d4a64..6e66f4f10 100644
--- a/modules/inviteexception.cpp
+++ b/modules/inviteexception.cpp
@@ -5,7 +5,6 @@
  *   Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/joinflood.cpp b/modules/joinflood.cpp
index 898d9ba96..ce61b1f82 100644
--- a/modules/joinflood.cpp
+++ b/modules/joinflood.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2021 Dominic Hamon
- *   Copyright (C) 2016, 2018-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2016, 2018-2023, 2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/modules/kicknorejoin.cpp b/modules/kicknorejoin.cpp
index e55778086..a2356db1b 100644
--- a/modules/kicknorejoin.cpp
+++ b/modules/kicknorejoin.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2018-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018-2023, 2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2018 A_D
  *   Copyright (C) 2012-2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
diff --git a/modules/knock.cpp b/modules/knock.cpp
index c350011d3..03058fe32 100644
--- a/modules/knock.cpp
+++ b/modules/knock.cpp
@@ -7,7 +7,6 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006, 2008 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/log_json.cpp b/modules/log_json.cpp
index 5ab03ed75..74ea65d67 100644
--- a/modules/log_json.cpp
+++ b/modules/log_json.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2022-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2022-2025 Sadie Powell <sadie@witchery.services>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -66,7 +66,7 @@ public:
 		if (prevtime != time)
 		{
 			prevtime = time;
-			timestr = Time::ToString(prevtime, "%Y-%m-%dT%H:%M:%S%z");
+			timestr = Time::ToString(prevtime, Time::ISO_8601);
 		}
 
 		const auto* levelstr = Log::LevelToString(level);
diff --git a/modules/messageflood.cpp b/modules/messageflood.cpp
index c644c2c70..a7cac8d43 100644
--- a/modules/messageflood.cpp
+++ b/modules/messageflood.cpp
@@ -6,8 +6,6 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 John Brooks <john@jbrooks.io>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006, 2008 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/multiprefix.cpp b/modules/multiprefix.cpp
index 16a01b450..b5c6a2dfa 100644
--- a/modules/multiprefix.cpp
+++ b/modules/multiprefix.cpp
@@ -3,11 +3,10 @@
  *
  *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2013, 2018-2023 Sadie Powell <sadie@witchery.services>
- *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012-2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006, 2008 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/nickflood.cpp b/modules/nickflood.cpp
index 4ad7442aa..9e8904d3a 100644
--- a/modules/nickflood.cpp
+++ b/modules/nickflood.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2021 Dominic Hamon
- *   Copyright (C) 2016-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2016-2023, 2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012, 2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/modules/nicklock.cpp b/modules/nicklock.cpp
index ba4c6d9c7..29ff8a956 100644
--- a/modules/nicklock.cpp
+++ b/modules/nicklock.cpp
@@ -6,7 +6,7 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2009 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2009 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006, 2008 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/noctcp.cpp b/modules/noctcp.cpp
index 995f3ef77..c80b49db8 100644
--- a/modules/noctcp.cpp
+++ b/modules/noctcp.cpp
@@ -7,8 +7,6 @@
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/nokicks.cpp b/modules/nokicks.cpp
index 9d1406fbb..86d002298 100644
--- a/modules/nokicks.cpp
+++ b/modules/nokicks.cpp
@@ -7,7 +7,6 @@
  *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/nonicks.cpp b/modules/nonicks.cpp
index 78033ad42..fca3f7f1b 100644
--- a/modules/nonicks.cpp
+++ b/modules/nonicks.cpp
@@ -1,12 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2017-2021, 2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017-2021, 2023, 2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2004 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/nonotice.cpp b/modules/nonotice.cpp
index f4eeb655a..9fb875eaf 100644
--- a/modules/nonotice.cpp
+++ b/modules/nonotice.cpp
@@ -1,12 +1,10 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2017, 2020-2024 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/operchans.cpp b/modules/operchans.cpp
index 4a440c033..f5c046d68 100644
--- a/modules/operchans.cpp
+++ b/modules/operchans.cpp
@@ -6,7 +6,6 @@
  *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/operlog.cpp b/modules/operlog.cpp
index dc67210fc..d0be5cb52 100644
--- a/modules/operlog.cpp
+++ b/modules/operlog.cpp
@@ -5,7 +5,6 @@
  *   Copyright (C) 2012, 2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/override.cpp b/modules/override.cpp
index eb7e38776..f3888aa75 100644
--- a/modules/override.cpp
+++ b/modules/override.cpp
@@ -9,7 +9,7 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2008 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006, 2008 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/pbkdf2.cpp b/modules/pbkdf2.cpp
index 7bf246be2..db63cea2d 100644
--- a/modules/pbkdf2.cpp
+++ b/modules/pbkdf2.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2021 Dominic Hamon
- *   Copyright (C) 2018-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2014, 2020 Daniel Vassdal <shutter@canternet.org>
  *   Copyright (C) 2014, 2016 Attila Molnar <attilamolnar@hush.com>
diff --git a/modules/permchannels.cpp b/modules/permchannels.cpp
index 917ff0a9d..eb4590152 100644
--- a/modules/permchannels.cpp
+++ b/modules/permchannels.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013-2014, 2017, 2019-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014, 2017, 2019-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013, 2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2014 Adam <Adam@anope.org>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
diff --git a/modules/redirect.cpp b/modules/redirect.cpp
index 63420b9bc..826c1be37 100644
--- a/modules/redirect.cpp
+++ b/modules/redirect.cpp
@@ -8,7 +8,6 @@
  *   Copyright (C) 2012, 2014 Shawn Smith <ShawnSmith0828@gmail.com>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/regex_stdlib.cpp b/modules/regex_stdlib.cpp
index 336e15a06..8e6642952 100644
--- a/modules/regex_stdlib.cpp
+++ b/modules/regex_stdlib.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013, 2016, 2019-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2019-2023 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
  *
diff --git a/modules/restrictmsg.cpp b/modules/restrictmsg.cpp
index 624417e5e..c1003ed56 100644
--- a/modules/restrictmsg.cpp
+++ b/modules/restrictmsg.cpp
@@ -5,7 +5,6 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2005-2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/samode.cpp b/modules/samode.cpp
index 5ebe8319c..8fb2b6710 100644
--- a/modules/samode.cpp
+++ b/modules/samode.cpp
@@ -6,7 +6,6 @@
  *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/securelist.cpp b/modules/securelist.cpp
index 958ac995f..c70cb3fc4 100644
--- a/modules/securelist.cpp
+++ b/modules/securelist.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2021 Dominic Hamon
- *   Copyright (C) 2018-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2013, 2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
diff --git a/modules/sethost.cpp b/modules/sethost.cpp
index b9a22fb49..e5804cad8 100644
--- a/modules/sethost.cpp
+++ b/modules/sethost.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013, 2017, 2019-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2017, 2019-2023, 2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/modules/setidle.cpp b/modules/setidle.cpp
index 2aa6f6608..4bc297f20 100644
--- a/modules/setidle.cpp
+++ b/modules/setidle.cpp
@@ -1,8 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019-2023, 2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
- *   Copyright (C) 2017, 2019-2023 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
  *   Copyright (C) 2009 Robin Burchell <robin+git@viroteck.net>
diff --git a/modules/setname.cpp b/modules/setname.cpp
index 39215ac48..442bd0315 100644
--- a/modules/setname.cpp
+++ b/modules/setname.cpp
@@ -7,7 +7,6 @@
  *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2007 John Brooks <john@jbrooks.io>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/shun.cpp b/modules/shun.cpp
index 59b2b8b3a..e95484784 100644
--- a/modules/shun.cpp
+++ b/modules/shun.cpp
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
- *   Copyright (C) 2017-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
  *   Copyright (C) 2012-2013, 2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
diff --git a/modules/spanningtree/addline.cpp b/modules/spanningtree/addline.cpp
index eff11b12b..8386259df 100644
--- a/modules/spanningtree/addline.cpp
+++ b/modules/spanningtree/addline.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2018, 2020-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018, 2020-2023, 2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
diff --git a/modules/spanningtree/capab.cpp b/modules/spanningtree/capab.cpp
index 5931a0be0..43744e0bc 100644
--- a/modules/spanningtree/capab.cpp
+++ b/modules/spanningtree/capab.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2017-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/modules/spanningtree/main.cpp b/modules/spanningtree/main.cpp
index aafe8d5c7..04f5ac1be 100644
--- a/modules/spanningtree/main.cpp
+++ b/modules/spanningtree/main.cpp
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
- *   Copyright (C) 2013, 2017-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2017-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013, 2016 Adam <Adam@anope.org>
  *   Copyright (C) 2012-2016, 2018 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
diff --git a/modules/spanningtree/netburst.cpp b/modules/spanningtree/netburst.cpp
index 396628211..cf6b87f22 100644
--- a/modules/spanningtree/netburst.cpp
+++ b/modules/spanningtree/netburst.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013, 2019-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2019-2024 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/modules/spanningtree/override_map.cpp b/modules/spanningtree/override_map.cpp
index c1418d600..2983030ce 100644
--- a/modules/spanningtree/override_map.cpp
+++ b/modules/spanningtree/override_map.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2021 Dominic Hamon
- *   Copyright (C) 2018-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
  *   Copyright (C) 2014 Adam <Adam@anope.org>
  *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
diff --git a/modules/spanningtree/override_squit.cpp b/modules/spanningtree/override_squit.cpp
index 331cfdadf..ba9cb2a7b 100644
--- a/modules/spanningtree/override_squit.cpp
+++ b/modules/spanningtree/override_squit.cpp
@@ -6,7 +6,6 @@
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Thomas Stagner <aquanight@gmail.com>
- *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/spanningtree/pingtimer.cpp b/modules/spanningtree/pingtimer.cpp
index 8d7ee6866..cc6adb5d4 100644
--- a/modules/spanningtree/pingtimer.cpp
+++ b/modules/spanningtree/pingtimer.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2019, 2021-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2019, 2021-2022, 2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2015 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/spanningtree/server.cpp b/modules/spanningtree/server.cpp
index e9d8ebd19..eb73f97b9 100644
--- a/modules/spanningtree/server.cpp
+++ b/modules/spanningtree/server.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2017-2020, 2022-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017-2020, 2022-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/modules/spanningtree/treesocket2.cpp b/modules/spanningtree/treesocket2.cpp
index d8c0e9544..c9a5ccb28 100644
--- a/modules/spanningtree/treesocket2.cpp
+++ b/modules/spanningtree/treesocket2.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
- *   Copyright (C) 2018-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2016, 2018 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/modules/spanningtree/utils.cpp b/modules/spanningtree/utils.cpp
index cdf8fc7dc..9477f9d72 100644
--- a/modules/spanningtree/utils.cpp
+++ b/modules/spanningtree/utils.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013-2014, 2018-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014, 2018-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013 Adam <Adam@anope.org>
  *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
diff --git a/modules/sslinfo.cpp b/modules/sslinfo.cpp
index 385740491..c21cbfbae 100644
--- a/modules/sslinfo.cpp
+++ b/modules/sslinfo.cpp
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
- *   Copyright (C) 2013, 2017-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2017-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013, 2015-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2010 Adam <Adam@anope.org>
diff --git a/modules/stripcolor.cpp b/modules/stripcolor.cpp
index 48a8b7c61..04c7b2c96 100644
--- a/modules/stripcolor.cpp
+++ b/modules/stripcolor.cpp
@@ -7,8 +7,6 @@
  *   Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@gmail.com>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/timedbans.cpp b/modules/timedbans.cpp
index d19e98262..3ee089030 100644
--- a/modules/timedbans.cpp
+++ b/modules/timedbans.cpp
@@ -2,18 +2,16 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2020 iwalkalone <iwalkalone69@gmail.com>
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
- *   Copyright (C) 2016, 2019 Matt Schatz <genius3000@g3k.solutions>
- *   Copyright (C) 2013, 2017, 2019-2023 Sadie Powell <sadie@witchery.services>
- *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ *   Copyright (C) 2013, 2017, 2019-2023, 2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2009 John Brooks <john@jbrooks.io>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2005, 2007-2008 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2005, 2007 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/modules/uhnames.cpp b/modules/uhnames.cpp
index 52e60cc7a..756e0db46 100644
--- a/modules/uhnames.cpp
+++ b/modules/uhnames.cpp
@@ -2,11 +2,10 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2013, 2019-2021, 2023 Sadie Powell <sadie@witchery.services>
- *   Copyright (C) 2012, 2014-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2007 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/xline_db.cpp b/modules/xline_db.cpp
index 1c0d27fe7..ea804b199 100644
--- a/modules/xline_db.cpp
+++ b/modules/xline_db.cpp
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2021 Herman <GermanAizek@yandex.ru>
  *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
- *   Copyright (C) 2013, 2015, 2018-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2015, 2018-2025 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2014 Adam <Adam@anope.org>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>