Replace most usages of "GECOS" with "real" or "real name".

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

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 91c9f3ca88fd27475e605ebecaf48a1a3ed338c4..86933dc729d871621028de8f692b99b9b24a6fee 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -26,11 +26,11 @@
 #include "treeserver.h"
 #include "remoteuser.h"
 
-CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::string>& params)
+CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params& params)
 {
        /**
         *      0    1    2    3    4    5        6        7     8        9       (n-1)
-        * UID uuid age nick host dhost ident ip.string signon +modes (modepara) :gecos
+        * UID uuid age nick host dhost ident ip.string signon +modes (modepara) :real
         */
        time_t age_t = ServerCommand::ExtractTS(params[1]);
        time_t signon = ServerCommand::ExtractTS(params[7]);
@@ -73,8 +73,8 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
        RemoteUser* _new = new SpanningTree::RemoteUser(params[0], remoteserver);
        ServerInstance->Users->clientlist[params[2]] = _new;
        _new->nick = params[2];
-       _new->host = params[3];
-       _new->dhost = params[4];
+       _new->ChangeRealHost(params[3], false);
+       _new->ChangeDisplayedHost(params[4]);
        _new->ident = params[5];
        _new->fullname = params.back();
        _new->registered = REG_ALL;
@@ -115,7 +115,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
                _new->SetMode(mh, true);
        }
 
-       _new->SetClientIP(params[6].c_str());
+       _new->SetClientIP(params[6]);
 
        ServerInstance->Users->AddClone(_new);
        remoteserver->UserCount++;
@@ -133,19 +133,19 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
        return CMD_SUCCESS;
 }
 
-CmdResult CommandFHost::HandleRemote(RemoteUser* src, std::vector<std::string>& params)
-{
+CmdResult CommandFHost::HandleRemote(RemoteUser* src, Params& params)
+{              
        src->ChangeDisplayedHost(params[0]);
        return CMD_SUCCESS;
 }
 
-CmdResult CommandFIdent::HandleRemote(RemoteUser* src, std::vector<std::string>& params)
+CmdResult CommandFIdent::HandleRemote(RemoteUser* src, Params& params)
 {
        src->ChangeIdent(params[0]);
        return CMD_SUCCESS;
 }
 
-CmdResult CommandFName::HandleRemote(RemoteUser* src, std::vector<std::string>& params)
+CmdResult CommandFName::HandleRemote(RemoteUser* src, Params& params)
 {
        src->ChangeName(params[0]);
        return CMD_SUCCESS;
@@ -157,8 +157,8 @@ CommandUID::Builder::Builder(User* user)
        push(user->uuid);
        push_int(user->age);
        push(user->nick);
-       push(user->host);
-       push(user->dhost);
+       push(user->GetRealHost());
+       push(user->GetDisplayedHost());
        push(user->ident);
        push(user->GetIPString());
        push_int(user->signon);