Remove VF_COMMON from mode-provider modules (no longer needed due to better CAPAB...

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

diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index 82b6c2b685e1268f83ce68af8c09ee8f727a882c..0e2ae2bf899405d74233510c38f967aa0c2289c6 100644 (file)
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -34,8 +34,8 @@ void TreeSocket::DoBurst(TreeServer* s)
        std::string endburst = ":" + ServerInstance->Config->GetSID() + " ENDBURST";
        ServerInstance->SNO->WriteToSnoMask('l',"Bursting to \2%s\2 (Authentication: %s%s).",
                name.c_str(),
-               this->auth_fingerprint ? "SSL Fingerprint and " : "",
-               this->auth_challenge ? "challenge-response" : "plaintext password");
+               capab->auth_fingerprint ? "SSL Fingerprint and " : "",
+               capab->auth_challenge ? "challenge-response" : "plaintext password");
        this->CleanNegotiationInfo();
        this->WriteLine(burst);
        /* send our version string */
@@ -103,7 +103,7 @@ void TreeSocket::SendFJoins(TreeServer* Current, Channel* c)
        for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
        {
                size_t ptrlen = 0;
-               std::string modestr = ServerInstance->Modes->ModeString(i->first, c, false);
+               std::string modestr = i->second->modes;
 
                if ((curlen + modestr.length() + i->first->uuid.length() + 4) > 480)
                {
@@ -220,12 +220,12 @@ void TreeSocket::SendChannelModes(TreeServer* Current)
                        this->WriteLine(data);
                }
 
-               for(ExtensibleStore::const_iterator i = c->second->GetExtList().begin(); i != c->second->GetExtList().end(); i++)
+               for(Extensible::ExtensibleStore::const_iterator i = c->second->GetExtList().begin(); i != c->second->GetExtList().end(); i++)
                {
                        ExtensionItem* item = i->first;
                        std::string value = item->serialize(FORMAT_NETWORK, c->second, i->second);
                        if (!value.empty())
-                               Utils->Creator->ProtoSendMetaData(this, c->second, item->key, value);
+                               Utils->Creator->ProtoSendMetaData(this, c->second, item->name, value);
                }
 
                FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(c->second,Utils->Creator,this));
@@ -269,12 +269,12 @@ void TreeSocket::SendUsers(TreeServer* Current)
                                }
                        }
 
-                       for(ExtensibleStore::const_iterator i = u->second->GetExtList().begin(); i != u->second->GetExtList().end(); i++)
+                       for(Extensible::ExtensibleStore::const_iterator i = u->second->GetExtList().begin(); i != u->second->GetExtList().end(); i++)
                        {
                                ExtensionItem* item = i->first;
                                std::string value = item->serialize(FORMAT_NETWORK, u->second, i->second);
                                if (!value.empty())
-                                       Utils->Creator->ProtoSendMetaData(this, u->second, item->key, value);
+                                       Utils->Creator->ProtoSendMetaData(this, u->second, item->name, value);
                        }
 
                        FOREACH_MOD(I_OnSyncUser,OnSyncUser(u->second,Utils->Creator,this));