diff options
| author |  Elvio Basello | 2009-12-28 20:30:30 +0000 |
|---|---|---|
| committer | Elvio Basello | 2009-12-28 20:30:30 +0000 |
| commit | 78dd3adf6fa25d65751beb1fa0088b1ce67e0a4c (patch) | |
| tree | 1f5ed73fddf2c89e79dbe753899fd37551ca1822 /src | |
| parent | typos (diff) | |
| download | KVIrc-78dd3adf6fa25d65751beb1fa0088b1ce67e0a4c.tar.gz KVIrc-78dd3adf6fa25d65751beb1fa0088b1ce67e0a4c.tar.bz2 KVIrc-78dd3adf6fa25d65751beb1fa0088b1ce67e0a4c.zip | |
quick fix
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3760 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvilib/irc/kvi_nickserv.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/kvilib/irc/kvi_nickserv.cpp b/src/kvilib/irc/kvi_nickserv.cpp index 401ac555e..d0a51bf8f 100644 --- a/src/kvilib/irc/kvi_nickserv.cpp +++ b/src/kvilib/irc/kvi_nickserv.cpp @@ -194,20 +194,25 @@ KviNickServRuleSet * KviNickServRuleSet::createInstance() } -KviNickServRule * KviNickServRuleSet::matchRule(const QString &szNick,const KviIrcMask *nickServ,const QString &szMsg,const QString &szServer) +KviNickServRule * KviNickServRuleSet::matchRule(const QString & szNick, const KviIrcMask * pNickServ, const QString & szMsg, const QString & szServer) { - if(!m_pRules)return 0; + if(!m_pRules) return 0; + for(KviNickServRule *r = m_pRules->first();r;r = m_pRules->next()) { - if(!KviQString::matchString(r->registeredNick(),szNick,false,true)) continue; + if(!KviQString::matchString(r->registeredNick(),szNick,false,true)) + continue; + if(!szServer.isEmpty()) { QRegExp res(r->serverMask(),Qt::CaseInsensitive,QRegExp::Wildcard); - if(!res.exactMatch(szServer))continue; + if(!res.exactMatch(szServer)) + continue; } - if(!nickServ->matchedBy(KviIrcMask(r->nickServMask())))continue; - QRegExp re(r->messageRegexp(),Qt::CaseSensitive,QRegExp::Wildcard); - if(re.exactMatch(szMsg))return r; + if(!pNickServ->matchedBy(KviIrcMask(r->nickServMask()))) + continue; + QRegExp re(r->messageRegexp(),Qt::CaseInsensitive,QRegExp::Wildcard); + if(re.exactMatch(szMsg)) return r; } return 0; } |