Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

[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 9a236137d7db0d098f1fc1857130ab969f0fa23c..9ed5ff188079fa1a86e3bc4737e128470c471425 100644 (file)
--- a/src/commands/cmd_motd.cpp
+++ b/src/commands/cmd_motd.cpp
@@ -30,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
@@ -46,69 +46,20 @@ 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)
 {
        if (parameters.size() > 0 && parameters[0] != ServerInstance->Config->ServerName)
+       {
+               // Give extra penalty if a non-oper queries the /MOTD of a remote server
+               LocalUser* localuser = IS_LOCAL(user);
+               if ((localuser) && (!IS_OPER(user)))
+                       localuser->CommandFloodPenalty += 2000;
                return CMD_SUCCESS;
+       }
 
-       ConfigTag* tag = NULL;
+       ConfigTag* tag = ServerInstance->Config->EmptyTag;
        if (IS_LOCAL(user))
                tag = user->GetClass()->config;
        std::string motd_name = tag->getString("motd", "motd");
@@ -120,12 +71,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());