Merge pull request #933 from SaberUK/insp20+fix-llvm34

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

diff --git a/src/commands/cmd_motd.cpp b/src/commands/cmd_motd.cpp
index b48c1c951a87c0ad5986cb545e74ebd8086e8314..869a9c3538652af4775da4791b742b4d325a26bf 100644 (file)
--- a/src/commands/cmd_motd.cpp
+++ b/src/commands/cmd_motd.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /** Handle /MOTD. These command handlers can be reloaded by the core,
@@ -46,7 +53,11 @@ CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User
        if (parameters.size() > 0 && parameters[0] != ServerInstance->Config->ServerName)
                return CMD_SUCCESS;
 
-       ConfigFileCache::iterator motd = ServerInstance->Config->Files.find("motd");
+       ConfigTag* tag = ServerInstance->Config->EmptyTag;
+       if (IS_LOCAL(user))
+               tag = user->GetClass()->config;
+       std::string motd_name = tag->getString("motd", "motd");
+       ConfigFileCache::iterator motd = ServerInstance->Config->Files.find(motd_name);
        if (motd == ServerInstance->Config->Files.end())
        {
                user->SendText(":%s %03d %s :Message of the day file is missing.",
@@ -58,7 +69,7 @@ CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User
                RPL_MOTDSTART, user->nick.c_str(), ServerInstance->Config->ServerName.c_str());
 
        for (file_cache::iterator i = motd->second.begin(); i != motd->second.end(); i++)
-               user->SendText(":%s %03d %s :- %s", ServerInstance->Config->ServerName.c_str(), RPL_MOTD, user->nick.c_str(),i->c_str());
+               user->SendText(":%s %03d %s :- %s", ServerInstance->Config->ServerName.c_str(), RPL_MOTD, user->nick.c_str(), i->c_str());
 
        user->SendText(":%s %03d %s :End of message of the day.", ServerInstance->Config->ServerName.c_str(), RPL_ENDOFMOTD, user->nick.c_str());