Allow jmpsrv to handle SSL-connected clients correctly - also allow clients to use...

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

diff --git a/src/channels.cpp b/src/channels.cpp
index c7913606f44ecdbce5907d66d88897c9a8d40575..afc56990923434372947b37822f90c01d945cfad 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -40,15 +40,10 @@ namespace
 }
 
 Channel::Channel(const std::string &cname, time_t ts)
+       : name(cname), age(ts), topicset(0)
 {
        if (!ServerInstance->chanlist->insert(std::make_pair(cname, this)).second)
                throw CoreException("Cannot create duplicate channel " + cname);
-
-       this->name = cname;
-       this->age = ts ? ts : ServerInstance->Time();
-
-       topicset = 0;
-       modes.reset();
 }
 
 void Channel::SetMode(ModeHandler* mh, bool on)
@@ -342,7 +337,6 @@ void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, boo
        {
                // If the user was granted prefix modes (in the OnUserPreJoin hook, or he's a
                // remote user and his own server set the modes), then set them internally now
-               memb->modes = *privs;
                for (std::string::const_iterator i = privs->begin(); i != privs->end(); ++i)
                {
                        ModeHandler* mh = ServerInstance->Modes->FindMode(*i, MODETYPE_CHANNEL);