Automatically register ServiceProviders created by modules

[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 b0f61a835737c94ca8efba1b89c54408d7d3c1a9..b28e57b2f018d2641f15bdc7070aaed264b50c3a 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
+ *
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * 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 free but copyrighted software; see
- *            the file COPYING for details.
+ * 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,
@@ -23,7 +30,7 @@ class CommandMotd : public Command
  public:
        /** Constructor for motd.
         */
-       CommandMotd ( Module* parent) : Command(parent,"MOTD",0,1) { ServerInstance->ProcessedMotdEscapes = false; syntax = "[<servername>]"; }
+       CommandMotd ( Module* parent) : Command(parent,"MOTD",0,1) { syntax = "[<servername>]"; }
        /** Handle command.
         * @param parameters The parameters to the comamnd
         * @param pcnt The number of parameters passed to teh command
@@ -39,61 +46,6 @@ class CommandMotd : public Command
        }
 };
 
-/*
- * Replace all color codes from the special[] array to actual
- * color code chars using C++ style escape sequences. You
- * can append other chars to replace if you like (such as %U
- * being underline). -- Justasic
- */
-void ProcessColors(ConfigFileCache::iterator &file)
-{
-  static struct special_chars
-  {
-    std::string character;
-    std::string replace;
-    special_chars(const std::string &c, const std::string &r) : character(c), replace(r) { }
-  }
-  
-  special[] = {
-    special_chars("\\002", "\002"),  // Bold
-    special_chars("\\037", "\037"),  // underline
-    special_chars("\\003", "\003"),  // Color
-    special_chars("\\0017", "\017"), // Stop colors
-    special_chars("\\u", "\037"),    // Alias for underline
-    special_chars("\\b", "\002"),    // Alias for Bold
-    special_chars("\\x", "\017"),    // Alias for stop
-    special_chars("\\c", "\003"),    // Alias for color
-    special_chars("", "")
-  };
-  
-  for(file_cache::iterator it = file->second.begin(); it != file->second.end(); it++)
-  {
-    std::string ret = *it;
-    for(int i = 0; special[i].character.empty() == false; ++i)
-    {
-      std::string::size_type pos = ret.find(special[i].character);
-      if(pos != std::string::npos && ret[pos-1] == '\\' && ret[pos] == '\\')
-       continue; // Skip double slashes.
-       
-       // Replace all our characters in the array
-       while(pos != std::string::npos)
-       {
-         ret = ret.substr(0, pos) + special[i].replace + ret.substr(pos + special[i].character.size());
-         pos = ret.find(special[i].character, pos + special[i].replace.size());
-       }
-    }
-    
-    // Replace double slashes with a single slash before we return
-    std::string::size_type pos = ret.find("\\\\");
-    while(pos != std::string::npos)
-    {
-      ret = ret.substr(0, pos) + "\\" + ret.substr(pos + 2);
-      pos = ret.find("\\\\", pos + 1);
-    }
-    *it = ret;
-  }
-}
-
 /** Handle /MOTD
  */
 CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User *user)
@@ -102,8 +54,9 @@ CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User
                return CMD_SUCCESS;
 
        ConfigTag* tag = NULL;
-       if (IS_LOCAL(user))
-               tag = user->GetClass()->config;
+       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())
@@ -113,12 +66,6 @@ CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User
                return CMD_SUCCESS;
        }
 
-       if(!ServerInstance->ProcessedMotdEscapes)
-       {
-               ProcessColors(motd);
-               ServerInstance->ProcessedMotdEscapes = true;
-       }
-
        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());