Remove more classbase

[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 e3de633254728e10f3a43a75b5ae8913e77e786a..4b960e18b6b6e8dddd94fefa7f0b88274997ec4c 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -36,16 +36,14 @@ class CommandCheck : public Command
        void dumpExt(User* user, std::string checkstr, Extensible* ext)
        {
                std::stringstream dumpkeys;
-               for(ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++)
+               for(Extensible::ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++)
                {
-                       ExtensionItem* item = Extensible::GetItem(i->first);
-                       std::string value;
-                       if (item)
-                               value = item->serialize(FORMAT_USER, ext, i->second);
-                       if (value.empty())
-                               dumpkeys << " " << i->first;
-                       else
-                               ServerInstance->DumpText(user, checkstr + " meta:" + i->first + " " + value);
+                       ExtensionItem* item = i->first;
+                       std::string value = item->serialize(FORMAT_USER, ext, i->second);
+                       if (!value.empty())
+                               ServerInstance->DumpText(user, checkstr + " meta:" + item->key + " " + value);
+                       else if (!item->key.empty())
+                               dumpkeys << " " << item->key;
                }
                if (!dumpkeys.str().empty())
                        ServerInstance->DumpText(user,checkstr + " metadata", dumpkeys);
@@ -53,7 +51,7 @@ class CommandCheck : public Command
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName)
+               if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName.c_str())
                        return CMD_SUCCESS;
 
                User *targuser;