summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgenius3000 <genius3000@g3k.solutions>2018-04-10 10:33:46 -0600
committerPeter Powell <petpow@saberuk.com>2018-04-11 18:59:17 +0100
commite6db1df5a657ea0603e1ec0b1ea9b056264d470f (patch)
tree4ba4300584a1068a52c91b90b10626c667ad8269
parent93fa544b2671b078cf81ac04fbb4b48d5e2d1677 (diff)
Change ServerInfo::gecos to description
-rw-r--r--include/protocol.h2
-rw-r--r--include/server.h2
-rw-r--r--src/modules/m_httpd_stats.cpp6
-rw-r--r--src/modules/m_spanningtree/compat.cpp2
-rw-r--r--src/modules/m_spanningtree/protocolinterface.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/include/protocol.h b/include/protocol.h
index 2e512f11a..7a2908a4c 100644
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -46,7 +46,7 @@ class CoreExport ProtocolInterface
public:
std::string servername;
std::string parentname;
- std::string gecos;
+ std::string description;
unsigned int usercount;
unsigned int opercount;
unsigned int latencyms;
diff --git a/include/server.h b/include/server.h
index e54a379bc..d73c9673a 100644
--- a/include/server.h
+++ b/include/server.h
@@ -53,7 +53,7 @@ class CoreExport Server : public classbase
*/
const std::string& GetName() const { return name; }
- /** Returns the description (GECOS) of this server
+ /** Returns the description of this server
* @return The description of this server
*/
const std::string& GetDesc() const { return description; }
diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 00cab3197..bc5d53c94 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -97,8 +97,8 @@ class ModuleHttpStats : public Module, public HTTPRequestEventListener
if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/"))
{
- data << "<inspircdstats><server><name>" << ServerInstance->Config->ServerName << "</name><gecos>"
- << Sanitize(ServerInstance->Config->ServerDesc) << "</gecos><version>"
+ data << "<inspircdstats><server><name>" << ServerInstance->Config->ServerName << "</name><description>"
+ << Sanitize(ServerInstance->Config->ServerDesc) << "</description><version>"
<< Sanitize(ServerInstance->GetVersionString()) << "</version></server>";
data << "<general>";
@@ -211,7 +211,7 @@ class ModuleHttpStats : public Module, public HTTPRequestEventListener
data << "<server>";
data << "<servername>" << b->servername << "</servername>";
data << "<parentname>" << b->parentname << "</parentname>";
- data << "<gecos>" << Sanitize(b->gecos) << "</gecos>";
+ data << "<description>" << Sanitize(b->description) << "</description>";
data << "<usercount>" << b->usercount << "</usercount>";
// This is currently not implemented, so, commented out.
// data << "<opercount>" << b->opercount << "</opercount>";
diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 2436e74f8..98b4be88d 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -267,7 +267,7 @@ void TreeSocket::WriteLine(const std::string& original_line)
}
else if (command == "SERVER")
{
- // :001 SERVER inspircd.test 002 [<anything> ...] :gecos
+ // :001 SERVER inspircd.test 002 [<anything> ...] :description
// A B C
std::string::size_type c = line.find(' ', b + 1);
if (c == std::string::npos)
diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index be95845a7..b3326581b 100644
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -38,7 +38,7 @@ void SpanningTreeProtocolInterface::GetServerList(ServerList& sl)
ps.parentname = s ? s->GetName() : "";
ps.usercount = i->second->UserCount;
ps.opercount = i->second->OperCount;
- ps.gecos = i->second->GetDesc();
+ ps.description = i->second->GetDesc();
ps.latencyms = i->second->rtt;
sl.push_back(ps);
}