Fix a bunch of weird indentation and spacing issues.

[user/henk/code/inspircd.git] / src / coremods / core_info / cmd_motd.cpp

diff --git a/src/coremods/core_info/cmd_motd.cpp b/src/coremods/core_info/cmd_motd.cpp
index 1422ffa0331efceb70284e0bb14cb4f137fa7b45..c9a542f14f80220e91cbfeb9d1c75f0b68738f2d 100644 (file)
--- a/src/coremods/core_info/cmd_motd.cpp
+++ b/src/coremods/core_info/cmd_motd.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2014, 2018-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2014, 2018-2020 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>
@@ -48,7 +48,8 @@ CmdResult CommandMotd::Handle(User* user, const Params& parameters)
        LocalUser* localuser = IS_LOCAL(user);
        if (localuser)
                tag = localuser->GetClass()->config;
-       std::string motd_name = tag->getString("motd", "motd");
+
+       const std::string motd_name = tag->getString("motd", "motd", 1);
        ConfigFileCache::iterator motd = motds.find(motd_name);
        if (motd == motds.end())
        {
@@ -56,7 +57,7 @@ CmdResult CommandMotd::Handle(User* user, const Params& parameters)
                return CMD_SUCCESS;
        }
 
-       user->WriteRemoteNumeric(RPL_MOTDSTART, InspIRCd::Format("%s message of the day", ServerInstance->Config->ServerName.c_str()));
+       user->WriteRemoteNumeric(RPL_MOTDSTART, InspIRCd::Format("%s message of the day", ServerInstance->Config->GetServerName().c_str()));
 
        for (file_cache::iterator i = motd->second.begin(); i != motd->second.end(); i++)
                user->WriteRemoteNumeric(RPL_MOTD, InspIRCd::Format(" %s", i->c_str()));