← Back to branch summary

~vanhoof/+junk/znc

« back to all changes in this revision

Viewing changes to modules/partyline.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Patrick Matthäi
  • Date: 2011-02-06 17:41:38 UTC
  • mfrom: (21.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20110206174138-ush4l5mkr4wg738n
Tags: 0.096-2
* Merge 0.092-3~bpo50+1 changelog.
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/partyline.cpp
184
184
        }
185
185
 
186
186
        virtual void OnClientLogin() {
187
 
                if (m_spInjectedPrefixes.find(m_pUser) == m_spInjectedPrefixes.end()) {
 
187
                if (m_spInjectedPrefixes.find(m_pUser) == m_spInjectedPrefixes.end() && !m_pUser->GetChanPrefixes().empty()) {
188
188
                        m_pClient->PutClient(":" + GetIRCServer(m_pUser) + " 005 " + m_pUser->GetIRCNick().GetNick() + " CHANTYPES=" + m_pUser->GetChanPrefixes() + CHAN_PREFIX_1 " :are supported by this server.");
189
189
                }
190
190
 
196
196
                        if (pChannel->IsInChannel(sNick))
197
197
                                continue;
198
198
 
199
 
                        CString sHost = m_pUser->GetVHost();
 
199
                        CString sHost = m_pUser->GetBindHost();
200
200
                        const set<CString>& ssNicks = pChannel->GetNicks();
201
201
 
202
202
                        if (sHost.empty()) {
319
319
                        pChannel->DelFixedNick(pUser->GetUserName());
320
320
 
321
321
                        const set<CString>& ssNicks = pChannel->GetNicks();
322
 
                        CString sHost = pUser->GetVHost();
 
322
                        CString sHost = pUser->GetBindHost();
323
323
 
324
324
                        if (sHost.empty()) {
325
325
                                sHost = pUser->GetIRCNick().GetHost();
377
377
                        const CString& sNick = pUser->GetUserName();
378
378
                        pChannel->AddNick(sNick);
379
379
 
380
 
                        CString sHost = pUser->GetVHost();
 
380
                        CString sHost = pUser->GetBindHost();
381
381
 
382
382
                        if (sHost.empty()) {
383
383
                                sHost = pUser->GetIRCNick().GetHost();
408
408
                        return CONTINUE;
409
409
                }
410
410
 
411
 
                CString sHost = m_pUser->GetVHost();
 
411
                CString sHost = m_pUser->GetBindHost();
412
412
 
413
413
                if (sHost.empty()) {
414
414
                        sHost = m_pUser->GetIRCNick().GetHost();