Merge branch '2.0' into 2.1.

20 files changed, 21 insertions, 21 deletions

diff --git a/modules/extra/m_ldap.cpp b/modules/extra/m_ldap.cpp
index aef1c6d4d..34f1310c4 100644
--- a/modules/extra/m_ldap.cpp
+++ b/modules/extra/m_ldap.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2020 Anope Team
+ * (C) 2011-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/m_ldap_authentication.cpp b/modules/extra/m_ldap_authentication.cpp
index b3653528b..d3ee026d1 100644
--- a/modules/extra/m_ldap_authentication.cpp
+++ b/modules/extra/m_ldap_authentication.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2020 Anope Team
+ * (C) 2011-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/m_ldap_oper.cpp b/modules/extra/m_ldap_oper.cpp
index 861ce109f..ad369ca1d 100644
--- a/modules/extra/m_ldap_oper.cpp
+++ b/modules/extra/m_ldap_oper.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2020 Anope Team
+ * (C) 2011-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/m_mysql.cpp b/modules/extra/m_mysql.cpp
index b617018f1..fa6d924da 100644
--- a/modules/extra/m_mysql.cpp
+++ b/modules/extra/m_mysql.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2010-2020 Anope Team
+ * (C) 2010-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/m_regex_pcre.cpp b/modules/extra/m_regex_pcre.cpp
index 0794e80ff..7248888d4 100644
--- a/modules/extra/m_regex_pcre.cpp
+++ b/modules/extra/m_regex_pcre.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2012-2020 Anope Team
+ * (C) 2012-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/m_regex_posix.cpp b/modules/extra/m_regex_posix.cpp
index 41f7ca9b2..0f0e15c7c 100644
--- a/modules/extra/m_regex_posix.cpp
+++ b/modules/extra/m_regex_posix.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2012-2020 Anope Team
+ * (C) 2012-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/m_regex_tre.cpp b/modules/extra/m_regex_tre.cpp
index ef59da199..8e633b1ad 100644
--- a/modules/extra/m_regex_tre.cpp
+++ b/modules/extra/m_regex_tre.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2012-2020 Anope Team
+ * (C) 2012-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/m_sql_authentication.cpp b/modules/extra/m_sql_authentication.cpp
index 38de96f4d..7569219e7 100644
--- a/modules/extra/m_sql_authentication.cpp
+++ b/modules/extra/m_sql_authentication.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2012-2020 Anope Team
+ * (C) 2012-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/m_sql_log.cpp b/modules/extra/m_sql_log.cpp
index 28da360f0..b3003703b 100644
--- a/modules/extra/m_sql_log.cpp
+++ b/modules/extra/m_sql_log.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/m_sql_oper.cpp b/modules/extra/m_sql_oper.cpp
index 540be00fc..df14da8e4 100644
--- a/modules/extra/m_sql_oper.cpp
+++ b/modules/extra/m_sql_oper.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2012-2020 Anope Team
+ * (C) 2012-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/m_sqlite.cpp b/modules/extra/m_sqlite.cpp
index d8f1c43a4..c1cf2b9cb 100644
--- a/modules/extra/m_sqlite.cpp
+++ b/modules/extra/m_sqlite.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2020 Anope Team
+ * (C) 2011-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/m_ssl_gnutls.cpp b/modules/extra/m_ssl_gnutls.cpp
index de314cfa9..f01d92a3b 100644
--- a/modules/extra/m_ssl_gnutls.cpp
+++ b/modules/extra/m_ssl_gnutls.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2014 Attila Molnar <attilamolnar@hush.com>
- * (C) 2014-2020 Anope Team
+ * (C) 2014-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/m_ssl_openssl.cpp b/modules/extra/m_ssl_openssl.cpp
index 047943f4a..c457c82af 100644
--- a/modules/extra/m_ssl_openssl.cpp
+++ b/modules/extra/m_ssl_openssl.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2010-2020 Anope Team
+ * (C) 2010-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/stats/cs_fantasy_stats.cpp b/modules/extra/stats/cs_fantasy_stats.cpp
index 6ee0e383a..4c6ad95ff 100644
--- a/modules/extra/stats/cs_fantasy_stats.cpp
+++ b/modules/extra/stats/cs_fantasy_stats.cpp
@@ -1,6 +1,6 @@
 /* Chanstats core functions
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/stats/cs_fantasy_top.cpp b/modules/extra/stats/cs_fantasy_top.cpp
index 428fa133b..b629cb132 100644
--- a/modules/extra/stats/cs_fantasy_top.cpp
+++ b/modules/extra/stats/cs_fantasy_top.cpp
@@ -1,6 +1,6 @@
 /* Chanstats core functions
  *
- * (C) 2003-2020 Anope Team
+ * (C) 2003-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/stats/irc2sql/irc2sql.cpp b/modules/extra/stats/irc2sql/irc2sql.cpp
index 931e535bd..0d2d48d25 100644
--- a/modules/extra/stats/irc2sql/irc2sql.cpp
+++ b/modules/extra/stats/irc2sql/irc2sql.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2013-2020 Anope Team
+ * (C) 2013-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -71,7 +71,7 @@ void IRC2SQL::OnNewServer(Server *server)
 	query = "INSERT DELAYED INTO `" + prefix + "server` (name, hops, comment, link_time, online, ulined) "
 		"VALUES (@name@, @hops@, @comment@, now(), 'Y', @ulined@) "
 		"ON DUPLICATE KEY UPDATE name=VALUES(name), hops=VALUES(hops), comment=VALUES(comment), "
-			"link_time=VALUES(link_time), online=VALUES(online), ulined=(ulined)";
+			"link_time=VALUES(link_time), online=VALUES(online), ulined=VALUES(ulined)";
 	query.SetValue("name", server->GetName());
 	query.SetValue("hops", server->GetHops());
 	query.SetValue("comment", server->GetDescription());
diff --git a/modules/extra/stats/irc2sql/irc2sql.h b/modules/extra/stats/irc2sql/irc2sql.h
index a7b3413d8..3caec03ba 100644
--- a/modules/extra/stats/irc2sql/irc2sql.h
+++ b/modules/extra/stats/irc2sql/irc2sql.h
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2013-2020 Anope Team
+ * (C) 2013-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/stats/irc2sql/tables.cpp b/modules/extra/stats/irc2sql/tables.cpp
index 812f71339..1c286a191 100644
--- a/modules/extra/stats/irc2sql/tables.cpp
+++ b/modules/extra/stats/irc2sql/tables.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2013-2020 Anope Team
+ * (C) 2013-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/stats/irc2sql/utils.cpp b/modules/extra/stats/irc2sql/utils.cpp
index e4bb8b1ee..c04b55960 100644
--- a/modules/extra/stats/irc2sql/utils.cpp
+++ b/modules/extra/stats/irc2sql/utils.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2013-2020 Anope Team
+ * (C) 2013-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
diff --git a/modules/extra/stats/m_chanstats.cpp b/modules/extra/stats/m_chanstats.cpp
index eadc9fc22..716c24310 100644
--- a/modules/extra/stats/m_chanstats.cpp
+++ b/modules/extra/stats/m_chanstats.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2012-2020 Anope Team
+ * (C) 2012-2021 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.