Merge pull request #984 from Renegade334/modules-exempt-uline

[user/henk/code/inspircd.git] / src / coremods / core_whois.cpp

diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp
index 934dd21025ae88b650df9aa4aa8012ecc32472f5..7464e052753cad86ab0235389e32ad137d212d64 100644 (file)
--- a/src/coremods/core_whois.cpp
+++ b/src/coremods/core_whois.cpp
@@ -59,7 +59,7 @@ std::string CommandWhois::ChannelList(User* source, User* dest, bool spy)
 {
        std::string list;
 
-       for (UCListIter i = dest->chans.begin(); i != dest->chans.end(); i++)
+       for (User::ChanList::iterator i = dest->chans.begin(); i != dest->chans.end(); i++)
        {
                Membership* memb = *i;
                Channel* c = memb->chan;
@@ -96,7 +96,7 @@ void CommandWhois::SplitChanList(User* source, User* dest, const std::string& cl
                        line = prefix.str();
                }
 
-               line.append(cl.substr(start, pos - start + 1));
+               line.append(cl, start, pos - start + 1);
        }
 
        if (line.length() != prefix.str().length())
@@ -224,7 +224,7 @@ CmdResult CommandWhois::HandleLocal(const std::vector<std::string>& parameters,
                LocalUser* localuser = IS_LOCAL(dest);
                if (localuser && (ServerInstance->Config->HideWhoisServer.empty() || parameters.size() > 1))
                {
-                       idle = abs((long)((localuser->idle_lastmsg)-ServerInstance->Time()));
+                       idle = labs((long)((localuser->idle_lastmsg)-ServerInstance->Time()));
                        signon = dest->signon;
                }