]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_check.cpp
Remove some pointless code:
[user/henk/code/inspircd.git] / src / modules / m_check.cpp
index 6f89f8cf4687ba72f08fc7d60d057a05d7c9eede..84e147f7b88979ddf630edbd332d75245c31806f 100644 (file)
@@ -1,26 +1,70 @@
-/*       +------------------------------------+
- *       | 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 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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"
 
-/* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */
+#include "inspircd.h"
+#include "listmode.h"
 
 /** Handle /CHECK
  */
 class CommandCheck : public Command
 {
+       UserModeReference snomaskmode;
+
+       std::string GetSnomasks(User* user)
+       {
+               std::string ret;
+               if (snomaskmode)
+                       ret = snomaskmode->GetUserParameter(user);
+
+               if (ret.empty())
+                       ret = "+";
+               return ret;
+       }
+
+       static void dumpListMode(User* user, const std::string& checkstr, const ListModeBase::ModeList* list)
+       {
+               if (!list)
+                       return;
+
+               std::string buf = checkstr + " modelist";
+               const std::string::size_type headlen = buf.length();
+               const size_t maxline = ServerInstance->Config->Limits.MaxLine;
+               for (ListModeBase::ModeList::const_iterator i = list->begin(); i != list->end(); ++i)
+               {
+                       if (buf.size() + i->mask.size() + 1 > maxline)
+                       {
+                               user->SendText(buf);
+                               buf.erase(headlen);
+                       }
+                       buf.append(" ").append(i->mask);
+               }
+               if (buf.length() > headlen)
+                       user->SendText(buf);
+       }
+
  public:
-       CommandCheck(Module* parent) : Command(parent,"CHECK", 1)
+       CommandCheck(Module* parent)
+               : Command(parent,"CHECK", 1)
+               , snomaskmode(parent, "snomask")
        {
                flags_needed = 'o'; syntax = "<nickname>|<ip>|<hostmask>|<channel> <server>";
        }
@@ -33,7 +77,7 @@ class CommandCheck : public Command
                return std::string(timebuf);
        }
 
-       void dumpExt(User* user, std::string checkstr, Extensible* ext)
+       void dumpExt(User* user, const std::string& checkstr, Extensible* ext)
        {
                std::stringstream dumpkeys;
                for(Extensible::ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++)
@@ -59,7 +103,7 @@ class CommandCheck : public Command
                std::string checkstr;
                std::string chliststr;
 
-               checkstr = std::string(":") + ServerInstance->Config->ServerName + " 304 " + std::string(user->nick) + " :CHECK";
+               checkstr = ":" + ServerInstance->Config->ServerName + " 304 " + user->nick + " :CHECK";
 
                targuser = ServerInstance->FindNick(parameters[0]);
                targchan = ServerInstance->FindChan(parameters[0]);
@@ -75,42 +119,43 @@ class CommandCheck : public Command
 
                if (targuser)
                {
+                       LocalUser* loctarg = IS_LOCAL(targuser);
                        /* /check on a user */
                        user->SendText(checkstr + " nuh " + targuser->GetFullHost());
                        user->SendText(checkstr + " realnuh " + targuser->GetFullRealHost());
                        user->SendText(checkstr + " realname " + targuser->fullname);
                        user->SendText(checkstr + " modes +" + targuser->FormatModes());
-                       user->SendText(checkstr + " snomasks +" + targuser->FormatNoticeMasks());
+                       user->SendText(checkstr + " snomasks " + GetSnomasks(targuser));
                        user->SendText(checkstr + " server " + targuser->server);
                        user->SendText(checkstr + " uid " + targuser->uuid);
                        user->SendText(checkstr + " signon " + timestring(targuser->signon));
                        user->SendText(checkstr + " nickts " + timestring(targuser->age));
-                       if (IS_LOCAL(targuser))
-                               user->SendText(checkstr + " lastmsg " + timestring(targuser->idle_lastmsg));
+                       if (loctarg)
+                               user->SendText(checkstr + " lastmsg " + timestring(loctarg->idle_lastmsg));
 
-                       if (IS_AWAY(targuser))
+                       if (targuser->IsAway())
                        {
                                /* user is away */
                                user->SendText(checkstr + " awaytime " + timestring(targuser->awaytime));
                                user->SendText(checkstr + " awaymsg " + targuser->awaymsg);
                        }
 
-                       if (IS_OPER(targuser))
+                       if (targuser->IsOper())
                        {
                                OperInfo* oper = targuser->oper;
                                /* user is an oper of type ____ */
-                               user->SendText(checkstr + " opertype " + oper->NameStr());
-                               if (IS_LOCAL(targuser))
+                               user->SendText(checkstr + " opertype " + oper->name);
+                               if (loctarg)
                                {
                                        std::string umodes;
                                        std::string cmodes;
                                        for(char c='A'; c < 'z'; c++)
                                        {
                                                ModeHandler* mh = ServerInstance->Modes->FindMode(c, MODETYPE_USER);
-                                               if (mh && mh->NeedsOper() && oper->AllowedUserModes[c])
+                                               if (mh && mh->NeedsOper() && loctarg->HasModePermission(c, MODETYPE_USER))
                                                        umodes.push_back(c);
                                                mh = ServerInstance->Modes->FindMode(c, MODETYPE_CHANNEL);
-                                               if (mh && mh->NeedsOper() && oper->AllowedChanModes[c])
+                                               if (mh && mh->NeedsOper() && loctarg->HasModePermission(c, MODETYPE_CHANNEL))
                                                        cmodes.push_back(c);
                                        }
                                        user->SendText(checkstr + " modeperms user=" + umodes + " channel=" + cmodes);
@@ -133,11 +178,10 @@ class CommandCheck : public Command
                                }
                        }
 
-                       LocalUser* loctarg = IS_LOCAL(targuser);
                        if (loctarg)
                        {
-                               user->SendText(checkstr + " clientaddr " + irc::sockets::satouser(loctarg->client_sa));
-                               user->SendText(checkstr + " serveraddr " + irc::sockets::satouser(loctarg->server_sa));
+                               user->SendText(checkstr + " clientaddr " + loctarg->client_sa.str());
+                               user->SendText(checkstr + " serveraddr " + loctarg->server_sa.str());
 
                                std::string classname = loctarg->GetClass()->name;
                                if (!classname.empty())
@@ -181,28 +225,19 @@ class CommandCheck : public Command
                        /* note that unlike /names, we do NOT check +i vs in the channel */
                        for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
                        {
-                               char tmpbuf[MAXBUF];
                                /*
-                                * Unlike Asuka, I define a clone as coming from the same host. --w00t
-                                */
-                               snprintf(tmpbuf, MAXBUF, "%-3lu %s%s (%s@%s) %s ", ServerInstance->Users->GlobalCloneCount(i->first), targchan->GetAllPrefixChars(i->first), i->first->nick.c_str(), i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str());
-                               user->SendText(checkstr + " member " + tmpbuf);
+                                * Unlike Asuka, I define a clone as coming from the same host. --w00t
+                                */
+                               user->SendText("%s member %-3lu %s%s (%s@%s) %s ",
+                                       checkstr.c_str(), ServerInstance->Users->GlobalCloneCount(i->first),
+                                       targchan->GetAllPrefixChars(i->first), i->first->nick.c_str(),
+                                       i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str());
                        }
 
-                       irc::modestacker modestack(true);
-                       std::string letter_b("b");
-                       for(BanList::iterator b = targchan->bans.begin(); b != targchan->bans.end(); ++b)
-                       {
-                               modestack.Push('b', b->data);
-                       }
-                       std::vector<std::string> stackresult;
-                       std::vector<TranslateType> dummy;
-                       while (modestack.GetStackedLine(stackresult))
-                       {
-                               creator->ProtoSendMode(user, TYPE_CHANNEL, targchan, stackresult, dummy);
-                               stackresult.clear();
-                       }
-                       FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(targchan,creator,user));
+                       const ModeParser::ListModeList& listmodes = ServerInstance->Modes->GetListModes();
+                       for (ModeParser::ListModeList::const_iterator i = listmodes.begin(); i != listmodes.end(); ++i)
+                               dumpListMode(user, checkstr, (*i)->GetList(targchan));
+
                        dumpExt(user, checkstr, targchan);
                }
                else
@@ -216,13 +251,13 @@ class CommandCheck : public Command
                                if (InspIRCd::Match(a->second->host, parameters[0], ascii_case_insensitive_map) || InspIRCd::Match(a->second->dhost, parameters[0], ascii_case_insensitive_map))
                                {
                                        /* host or vhost matches mask */
-                                       user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
+                                       user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->fullname);
                                }
                                /* IP address */
                                else if (InspIRCd::MatchCIDR(a->second->GetIPString(), parameters[0]))
                                {
                                        /* same IP. */
-                                       user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
+                                       user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->fullname);
                                }
                        }
 
@@ -242,44 +277,17 @@ class CommandCheck : public Command
        }
 };
 
-
 class ModuleCheck : public Module
 {
- private:
        CommandCheck mycommand;
  public:
        ModuleCheck() : mycommand(this)
        {
        }
 
-       void init()
-       {
-               ServerInstance->Modules->AddService(mycommand);
-       }
-
-       ~ModuleCheck()
-       {
-       }
-
-       void ProtoSendMode(void* uv, TargetTypeFlags, void*, const std::vector<std::string>& result, const std::vector<TranslateType>&)
-       {
-               User* user = (User*)uv;
-               std::string checkstr(":");
-               checkstr.append(ServerInstance->Config->ServerName);
-               checkstr.append(" 304 ");
-               checkstr.append(user->nick);
-               checkstr.append(" :CHECK modelist");
-               for(unsigned int i=0; i < result.size(); i++)
-               {
-                       checkstr.append(" ");
-                       checkstr.append(result[i]);
-               }
-               user->SendText(checkstr);
-       }
-
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("CHECK command, view user/channel details", VF_VENDOR|VF_OPTCOMMON);
+               return Version("CHECK command, view user, channel, IP address or hostname information", VF_VENDOR|VF_OPTCOMMON);
        }
 };