Switch from the Ubuntu 16.04 image to the 18.04 Ubuntu image.

[user/henk/code/inspircd.git] / src / modules / m_permchannels.cpp

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 86c2f83d5ce3b58f3562787ae71f841f0b0482b1..0651f5cdc73634e6199ca646f022d06a0c54246a 100644 (file)
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2014 Justin Crawford <Justasic@Gmail.com>
- *   Copyright (C) 2013-2014, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014, 2017-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012, 2014 Adam <Adam@anope.org>
@@ -54,7 +54,7 @@ class PermChannel : public ModeHandler
        }
 };
 
-// Not in a class due to circular dependancy hell.
+// Not in a class due to circular dependency hell.
 static std::string permchannelsconf;
 static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_listmodes)
 {
@@ -77,7 +77,10 @@ static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_list
                return false;
        }
 
-       stream << "# This file is automatically generated by m_permchannels. Any changes will be overwritten." << std::endl
+       stream
+               << "# This file was automatically generated by the " << INSPIRCD_VERSION << " permchannels module on " << InspIRCd::TimeString(ServerInstance->Time()) << "." << std::endl
+               << "# Any changes to this file will be automatically overwritten." << std::endl
+               << std::endl
                << "<config format=\"xml\">" << std::endl;
 
        const chan_hash& chans = ServerInstance->GetChans();
@@ -152,7 +155,7 @@ static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_list
 #ifdef _WIN32
        remove(permchannelsconf.c_str());
 #endif
-       // Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash.
+       // Use rename to move temporary to new db - this is guaranteed not to fuck up, even in case of a crash.
        if (rename(permchannelsnewconf.c_str(), permchannelsconf.c_str()) < 0)
        {
                ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Cannot replace old database \"%s\" with new database \"%s\"! %s (%d)", permchannelsconf.c_str(), permchannelsnewconf.c_str(), strerror(errno), errno);
@@ -186,7 +189,7 @@ public:
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("permchanneldb");
                permchannelsconf = tag->getString("filename");
-               save_listmodes = tag->getBool("listmodes");
+               save_listmodes = tag->getBool("listmodes", true);
                SetInterval(tag->getDuration("saveperiod", 5));
 
                if (!permchannelsconf.empty())
@@ -228,7 +231,7 @@ public:
                                                topicset = ServerInstance->Time();
                                        std::string topicsetby = tag->getString("topicsetby");
                                        if (topicsetby.empty())
-                                               topicsetby = ServerInstance->Config->ServerName;
+                                               topicsetby = ServerInstance->Config->GetServerName();
                                        c->SetTopic(ServerInstance->FakeClient, topic, topicset, &topicsetby);
                                }