Merge pull request #1269 from Adam-/insp20+saslhost

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

diff --git a/src/commands/cmd_rules.cpp b/src/commands/cmd_rules.cpp
index 78b3235fb3b69f9dcf4f8cb82a4fee37601d5be9..7aacf8c31262be7cf17f1e204a6e7ceda6e2ea99 100644 (file)
--- a/src/commands/cmd_rules.cpp
+++ b/src/commands/cmd_rules.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 /RULES. These command handlers can be reloaded by the core,
@@ -42,9 +49,20 @@ class CommandRules : public Command
 CmdResult CommandRules::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 /RULES of a remote server
+               LocalUser* localuser = IS_LOCAL(user);
+               if ((localuser) && (!IS_OPER(user)))
+                       localuser->CommandFloodPenalty += 2000;
                return CMD_SUCCESS;
+       }
 
-       if (!ServerInstance->Config->RULES.size())
+       ConfigTag* tag = ServerInstance->Config->EmptyTag;
+       if (IS_LOCAL(user))
+               tag = user->GetClass()->config;
+       std::string rules_name = tag->getString("rules", "rules");
+       ConfigFileCache::iterator rules = ServerInstance->Config->Files.find(rules_name);
+       if (rules == ServerInstance->Config->Files.end())
        {
                user->SendText(":%s %03d %s :RULES file is missing.",
                        ServerInstance->Config->ServerName.c_str(), ERR_NORULES, user->nick.c_str());
@@ -53,7 +71,7 @@ CmdResult CommandRules::Handle (const std::vector<std::string>& parameters, User
        user->SendText(":%s %03d %s :%s server rules:", ServerInstance->Config->ServerName.c_str(),
                RPL_RULESTART, user->nick.c_str(), ServerInstance->Config->ServerName.c_str());
 
-       for (file_cache::iterator i = ServerInstance->Config->RULES.begin(); i != ServerInstance->Config->RULES.end(); i++)
+       for (file_cache::iterator i = rules->second.begin(); i != rules->second.end(); i++)
                user->SendText(":%s %03d %s :- %s", ServerInstance->Config->ServerName.c_str(), RPL_RULES, user->nick.c_str(),i->c_str());
 
        user->SendText(":%s %03d %s :End of RULES command.", ServerInstance->Config->ServerName.c_str(), RPL_RULESEND, user->nick.c_str());