Change /CHECK <#channel> to correctly report timestamp since it might have been TS...

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

diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index 0a9790450cf7128bbf195ce84f5626cec8e0f76f..5f2e38aa0920ed3d18d4e79c8c5146db52c034bb 100644 (file)
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -70,7 +70,7 @@ bool TreeSocket::RemoteServer(const std::string &prefix, std::deque<std::string>
 
        if (Node->DuplicateID())
        {
-               this->SendError("Server ID "+servername+" already exists on the network!");
+               this->SendError("Server ID "+servername+" already exists on the network! You may want to specify the server ID for the server manually with <server:id> so they do not conflict.");
                this->ServerInstance->SNO->WriteToSnoMask('L', "Server \2"+servername+"\2 being introduced from \2" + ParentOfThis->GetName() + "\2 denied, server ID already exists on the network. Closing link with " + ParentOfThis->GetName());
                return false;
        }
@@ -158,7 +158,7 @@ bool TreeSocket::Outbound_Reply_Server(std::deque<std::string> &params)
 
                if (Node->DuplicateID())
                {
-                       this->SendError("Server ID "+sid+" already exists on the network!");
+                       this->SendError("Server ID "+sid+" already exists on the network! You may want to specify the server ID for the server manually with <server:id> so they do not conflict.");
                        this->ServerInstance->SNO->WriteToSnoMask('l',"Server \2"+assign(servername)+"\2 being introduced denied, server ID already exists on the network. Closing link.");
                        return false;
                }
@@ -238,7 +238,7 @@ bool TreeSocket::Inbound_Server(std::deque<std::string> &params)
 
                if (CheckDupeSID)
                {
-                       this->SendError("Server ID "+CheckDupeSID->GetID()+" already exists on server "+CheckDupeSID->GetName()+"!");
+                       this->SendError("Server ID "+CheckDupeSID->GetID()+" already exists on server "+CheckDupeSID->GetName()+"! You may want to specify the server ID for the server manually with <server:id> so they do not conflict.");
                        this->ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, server ID '"+CheckDupeSID->GetID()+
                                        "' already exists on server "+CheckDupeSID->GetName());
                        return false;