userrec::UpdateNickHash(), userrec::ForceNickChange(), userrec::FullConnect()

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

diff --git a/src/modules.cpp b/src/modules.cpp
index bda6f765b232e2286f3df326391ac7c9453a108a..a0e15076465bc856c3ba694df7d06ada0007657d 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -400,16 +400,6 @@ void Server::SendToModeMask(const std::string &modes, int flags, const std::stri
        WriteMode(modes.c_str(),flags,"%s",text.c_str());
 }
 
-chanrec* Server::JoinUserToChannel(userrec* user, const std::string &cname, const std::string &key)
-{
-       return add_channel(user,cname.c_str(),key.c_str(),false);
-}
-
-chanrec* Server::PartUserFromChannel(userrec* user, const std::string &cname, const std::string &reason)
-{
-       return del_channel(user,cname.c_str(),reason.c_str(),false);
-}
-
 chanuserlist Server::GetUsers(chanrec* chan)
 {
        chanuserlist userl;
@@ -419,27 +409,6 @@ chanuserlist Server::GetUsers(chanrec* chan)
                userl.push_back(i->second);
        return userl;
 }
-void Server::ChangeUserNick(userrec* user, const std::string &nickname)
-{
-       force_nickchange(user,nickname.c_str());
-}
-
-void Server::KickUser(userrec* source, userrec* target, chanrec* chan, const std::string &reason)
-{
-       if (source)
-       {
-               chan->KickUser(source, target, reason.c_str());
-       }
-       else
-       {
-               chan->ServerKickUser(target, reason.c_str(), true);
-       }
-}
-
-void Server::QuitUser(userrec* user, const std::string &reason)
-{
-       kill_link(user,reason.c_str());
-}
 
 bool Server::IsUlined(const std::string &server)
 {
@@ -504,23 +473,6 @@ void Server::SendTo(userrec* Source, userrec* Dest, const std::string &s)
        }
 }
 
-void Server::SendChannelServerNotice(const std::string &ServName, chanrec* Channel, const std::string &text)
-{
-       WriteChannelWithServ_NoFormat((char*)ServName.c_str(), Channel, text.c_str());
-}
-
-void Server::SendChannel(userrec* User, chanrec* Channel, const std::string &s, bool IncludeSender)
-{
-       if (IncludeSender)
-       {
-               WriteChannel_NoFormat(Channel,User,s.c_str());
-       }
-       else
-       {
-               ChanExceptSender_NoFormat(Channel,User,0,s.c_str());
-       }
-}
-
 bool Server::CommonChannels(userrec* u1, userrec* u2)
 {
        return (common_channels(u1,u2) != 0);
@@ -672,7 +624,7 @@ bool Server::PseudoToUser(userrec* alive, userrec* zombie, const std::string &me
        std::string oldnick = alive->nick;
        std::string oldhost = alive->host;
        std::string oldident = alive->ident;
-       kill_link(alive,message.c_str());
+       userrec::QuitUser(alive,message.c_str());
        if (find(local_users.begin(),local_users.end(),alive) != local_users.end())
        {
                local_users.erase(find(local_users.begin(),local_users.end(),alive));