Show an error when an unprivileged user tries to mass-message.

[user/henk/code/inspircd.git] / src / modules / m_check.cpp

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 5e1c01acb4ec085af2a0e013b0009a8818308ff8..cd336c865af2e6bfc9e5223273eb275433b909dd 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -1,10 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006-2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
  *
  * 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
@@ -67,16 +71,21 @@ class CheckContext
 
        User* GetUser() const { return user; }
 
-       void DumpListMode(const ListModeBase::ModeList* list)
+       void DumpListMode(ListModeBase* mode, Channel* chan)
        {
+               const ListModeBase::ModeList* list = mode->GetList(chan);
                if (!list)
                        return;
 
-               CheckContext::List modelist(*this, "modelist");
                for (ListModeBase::ModeList::const_iterator i = list->begin(); i != list->end(); ++i)
-                       modelist.Add(i->mask);
-
-               modelist.Flush();
+               {
+                       CheckContext::List listmode(*this, "listmode");
+                       listmode.Add(ConvToStr(mode->GetModeChar()));
+                       listmode.Add(i->mask);
+                       listmode.Add(i->setter);
+                       listmode.Add(FormatTime(i->time));
+                       listmode.Flush();
+               }
        }
 
        void DumpExt(Extensible* ext)
@@ -85,7 +94,7 @@ class CheckContext
                for(Extensible::ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); ++i)
                {
                        ExtensionItem* item = i->first;
-                       std::string value = item->serialize(FORMAT_USER, ext, i->second);
+                       std::string value = item->ToHuman(ext, i->second);
                        if (!value.empty())
                                Write("meta:" + item->name, value);
                        else if (!item->name.empty())
@@ -141,7 +150,8 @@ class CommandCheck : public Command
                : Command(parent,"CHECK", 1)
                , snomaskmode(parent, "snomask")
        {
-               flags_needed = 'o'; syntax = "<nickname>|<ip>|<hostmask>|<channel> <server>";
+               flags_needed = 'o';
+               syntax = "<nick>|<ipmask>|<hostmask>|<channel> [<servername>]";
        }
 
        CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
@@ -196,9 +206,8 @@ class CommandCheck : public Command
                                context.Write("opertype", oper->name);
                                if (loctarg)
                                {
-                                       std::string umodes = GetAllowedOperOnlyModes(loctarg, MODETYPE_USER);
-                                       std::string cmodes = GetAllowedOperOnlyModes(loctarg, MODETYPE_CHANNEL);
-                                       context.Write("modeperms", "user=" + umodes + " channel=" + cmodes);
+                                       context.Write("chanmodeperms", GetAllowedOperOnlyModes(loctarg, MODETYPE_CHANNEL));
+                                       context.Write("usermodeperms", GetAllowedOperOnlyModes(loctarg, MODETYPE_USER));
                                        context.Write("commandperms", oper->AllowedOperCommands.ToString());
                                        context.Write("permissions", oper->AllowedPrivs.ToString());
                                }
@@ -236,7 +245,7 @@ class CommandCheck : public Command
                else if (targchan)
                {
                        /* /check on a channel */
-                       context.Write("timestamp", targchan->age);
+                       context.Write("createdat", targchan->age);
 
                        if (!targchan->topic.empty())
                        {
@@ -257,17 +266,17 @@ class CommandCheck : public Command
                        for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i)
                        {
                                /*
-                                * Unlike Asuka, I define a clone as coming from the same host. --w00t
-                                */
+                                * Unlike Asuka, I define a clone as coming from the same host. --w00t
+                                */
                                const UserManager::CloneCounts& clonecount = ServerInstance->Users->GetCloneCounts(i->first);
-                               context.Write("member", InspIRCd::Format("%-3u %s%s (%s@%s) %s ", clonecount.global,
-                                       i->second->GetAllPrefixChars().c_str(), i->first->nick.c_str(),
-                                       i->first->ident.c_str(), i->first->GetDisplayedHost().c_str(), i->first->GetRealName().c_str()));
+                               context.Write("member", InspIRCd::Format("%u %s%s (%s)", clonecount.global,
+                                       i->second->GetAllPrefixChars().c_str(), i->first->GetFullHost().c_str(),
+                                       i->first->GetRealName().c_str()));
                        }
 
                        const ModeParser::ListModeList& listmodes = ServerInstance->Modes->GetListModes();
                        for (ModeParser::ListModeList::const_iterator i = listmodes.begin(); i != listmodes.end(); ++i)
-                               context.DumpListMode((*i)->GetList(targchan));
+                               context.DumpListMode(*i, targchan);
 
                        context.DumpExt(targchan);
                }
@@ -318,7 +327,7 @@ class ModuleCheck : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("CHECK command, view user, channel, IP address or hostname information", VF_VENDOR|VF_OPTCOMMON);
+               return Version("Adds the /CHECK command which allows server operators to look up details about a channel, user, IP address, or hostname.", VF_VENDOR|VF_OPTCOMMON);
        }
 };