Fix a minor oversight in ERR_NONICKNAMEGIVEN.

[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 a45b84c7dca4dda7c4fa543dce314c552562db7e..17eb9d9c59d2194840645ceb75aab17dd354f46c 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -53,6 +53,34 @@ class CheckContext
 
        User* GetUser() const { return user; }
 
+       void DumpListMode(const ListModeBase::ModeList* list)
+       {
+               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();
+       }
+
+       void DumpExt(Extensible* ext)
+       {
+               CheckContext::List extlist(*this, "metadata");
+               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);
+                       if (!value.empty())
+                               Write("meta:" + item->name, value);
+                       else if (!item->name.empty())
+                               extlist.Add(item->name);
+               }
+
+               extlist.Flush();
+       }
+
        class List : public Numeric::GenericBuilder<' ', false, Numeric::WriteRemoteNumericSink>
        {
         public:
@@ -81,18 +109,6 @@ class CommandCheck : public Command
                return ret;
        }
 
-       static void dumpListMode(CheckContext& context, const ListModeBase::ModeList* list)
-       {
-               if (!list)
-                       return;
-
-               CheckContext::List modelist(context, "modelist");
-               for (ListModeBase::ModeList::const_iterator i = list->begin(); i != list->end(); ++i)
-                       modelist.Add(i->mask);
-
-               modelist.Flush();
-       }
-
  public:
        CommandCheck(Module* parent)
                : Command(parent,"CHECK", 1)
@@ -111,22 +127,6 @@ class CommandCheck : public Command
                return ret;
        }
 
-       void dumpExt(CheckContext& context, Extensible* ext)
-       {
-               CheckContext::List extlist(context, "metadata");
-               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);
-                       if (!value.empty())
-                               context.Write("meta:" + item->name, value);
-                       else if (!item->name.empty())
-                               extlist.Add(item->name);
-               }
-
-               extlist.Flush();
-       }
-
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName)
@@ -230,7 +230,7 @@ class CommandCheck : public Command
 
                        chanlist.Flush();
 
-                       dumpExt(context, targuser);
+                       context.DumpExt(targuser);
                }
                else if (targchan)
                {
@@ -266,9 +266,9 @@ class CommandCheck : public Command
 
                        const ModeParser::ListModeList& listmodes = ServerInstance->Modes->GetListModes();
                        for (ModeParser::ListModeList::const_iterator i = listmodes.begin(); i != listmodes.end(); ++i)
-                               dumpListMode(context, (*i)->GetList(targchan));
+                               context.DumpListMode((*i)->GetList(targchan));
 
-                       dumpExt(context, targchan);
+                       context.DumpExt(targchan);
                }
                else
                {
@@ -301,7 +301,7 @@ class CommandCheck : public Command
 
        RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
        {
-               if (parameters.size() > 1)
+               if ((parameters.size() > 1) && (parameters[1].find('.') != std::string::npos))
                        return ROUTE_OPT_UCAST(parameters[1]);
                return ROUTE_LOCALONLY;
        }