From 7cd80a2131983db521dcf860e754ca00f5e6aec0 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 8 Aug 2013 03:03:57 +0000 Subject: [PATCH] Fix logging LOG_NORMAL logs in m_sqllog. Fix/add more compat extensible items to ChannelInfo::Unserialize --- modules/m_sql_log.cpp | 1 + src/regchannel.cpp | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/m_sql_log.cpp b/modules/m_sql_log.cpp index 4bc02d31a..ac9e91753 100644 --- a/modules/m_sql_log.cpp +++ b/modules/m_sql_log.cpp @@ -91,6 +91,7 @@ class SQLLog : public Module break; case LOG_NORMAL: insert.SetValue("type", "NORMAL"); + break; default: return; } diff --git a/src/regchannel.cpp b/src/regchannel.cpp index c4f3a39fb..a703acda8 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -294,8 +294,8 @@ Serializable* ChannelInfo::Unserialize(Serializable *obj, Serialize::Data &data) data["extensible:SECURE"] >> b; if (b) ci->Extend("CS_SECURE"); - data["extensible:PRIVATE"] >> b; b = false; + data["extensible:PRIVATE"] >> b; if (b) ci->Extend("CS_PRIVATE"); b = false; @@ -318,6 +318,22 @@ Serializable* ChannelInfo::Unserialize(Serializable *obj, Serialize::Data &data) data["extensible:SECUREFOUNDER"] >> b; if (b) ci->Extend("SECUREFOUNDER"); + b = false; + data["extensible:RESTRICTED"] >> b; + if (b) + ci->Extend("RESTRICTED"); + b = false; + data["extensible:KEEPTOPIC"] >> b; + if (b) + ci->Extend("KEEPTOPIC"); + b = false; + data["extensible:SIGNKICK"] >> b; + if (b) + ci->Extend("SIGNKICK"); + b = false; + data["extensible:SIGNKICK_LEVEL"] >> b; + if (b) + ci->Extend("SIGNKICK_LEVEL"); /* end compat */ return ci;