X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_motd.cpp;h=b28e57b2f018d2641f15bdc7070aaed264b50c3a;hb=992674362c5f64bdb8e1942eeaa7612524529cd6;hp=9468eb2f3500282a7c1900470854157d447ee279;hpb=aeded4708c515bcc255b2947e67f076855fead14;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_motd.cpp b/src/commands/cmd_motd.cpp
index 9468eb2f3..b28e57b2f 100644
--- 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,
@@ -45,17 +52,25 @@ CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User
 {
 	if (parameters.size() > 0 && parameters[0] != ServerInstance->Config->ServerName)
 		return CMD_SUCCESS;
-	if (!ServerInstance->Config->MOTD.size())
+
+	ConfigTag* tag = NULL;
+	LocalUser* localuser = IS_LOCAL(user);
+	if (localuser)
+		tag = localuser->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.",
 			ServerInstance->Config->ServerName.c_str(), ERR_NOMOTD, user->nick.c_str());
 		return CMD_SUCCESS;
 	}
+
 	user->SendText(":%s %03d %s :%s message of the day", ServerInstance->Config->ServerName.c_str(),
 		RPL_MOTDSTART, user->nick.c_str(), ServerInstance->Config->ServerName.c_str());
 
-	for (file_cache::iterator i = ServerInstance->Config->MOTD.begin(); i != ServerInstance->Config->MOTD.end(); i++)
-		user->SendText(":%s %03d %s :- %s", ServerInstance->Config->ServerName.c_str(), RPL_MOTD, user->nick.c_str(),i->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 :End of message of the day.", ServerInstance->Config->ServerName.c_str(), RPL_ENDOFMOTD, user->nick.c_str());