diff --git a/modules/autoattach.cpp b/modules/autoattach.cpp index 5cf8f160..e3e31124 100644 --- a/modules/autoattach.cpp +++ b/modules/autoattach.cpp @@ -38,11 +38,11 @@ public: } bool IsMatch(const CString& sChan, const CString& sHost, const CString& sMessage) const { - if (!sHost.WildCmp(m_sHostmaskWildcard)) + if (!sHost.WildCmp(m_sHostmaskWildcard, CString::CaseInsensitive)) return false; - if (!sChan.WildCmp(m_sChannelWildcard)) + if (!sChan.WildCmp(m_sChannelWildcard, CString::CaseInsensitive)) return false; - if (!sMessage.WildCmp(m_pModule->ExpandString(m_sSearchWildcard))) + if (!sMessage.WildCmp(m_pModule->ExpandString(m_sSearchWildcard), CString::CaseInsensitive)) return false; return true; } diff --git a/modules/autocycle.cpp b/modules/autocycle.cpp index 71f65b12..18dff944 100644 --- a/modules/autocycle.cpp +++ b/modules/autocycle.cpp @@ -206,13 +206,13 @@ protected: bool IsAutoCycle(const CString& sChan) { for (unsigned int a = 0; a < m_vsNegChans.size(); a++) { - if (sChan.WildCmp(m_vsNegChans[a])) { + if (sChan.WildCmp(m_vsNegChans[a], CString::CaseInsensitive)) { return false; } } for (unsigned int b = 0; b < m_vsChans.size(); b++) { - if (sChan.WildCmp(m_vsChans[b])) { + if (sChan.WildCmp(m_vsChans[b], CString::CaseInsensitive)) { return true; } } diff --git a/modules/autoop.cpp b/modules/autoop.cpp index df144c78..ef866968 100644 --- a/modules/autoop.cpp +++ b/modules/autoop.cpp @@ -64,7 +64,7 @@ public: bool ChannelMatches(const CString& sChan) const { for (set::const_iterator it = m_ssChans.begin(); it != m_ssChans.end(); ++it) { - if (sChan.AsLower().WildCmp(*it)) { + if (sChan.AsLower().WildCmp(*it, CString::CaseInsensitive)) { return true; } } @@ -74,7 +74,7 @@ public: bool HostMatches(const CString& sHostmask) { for (set::const_iterator it = m_ssHostmasks.begin(); it != m_ssHostmasks.end(); ++it) { - if (sHostmask.WildCmp(*it)) { + if (sHostmask.WildCmp(*it, CString::CaseInsensitive)) { return true; } } diff --git a/modules/autovoice.cpp b/modules/autovoice.cpp index ec21d1fb..e1eb2733 100644 --- a/modules/autovoice.cpp +++ b/modules/autovoice.cpp @@ -41,7 +41,7 @@ public: bool ChannelMatches(const CString& sChan) const { for (set::const_iterator it = m_ssChans.begin(); it != m_ssChans.end(); ++it) { - if (sChan.AsLower().WildCmp(*it)) { + if (sChan.AsLower().WildCmp(*it, CString::CaseInsensitive)) { return true; } } @@ -50,7 +50,7 @@ public: } bool HostMatches(const CString& sHostmask) { - return sHostmask.WildCmp(m_sHostmask); + return sHostmask.WildCmp(m_sHostmask, CString::CaseInsensitive); } CString GetChannels() const { diff --git a/modules/log.cpp b/modules/log.cpp index 6cf0ceaa..4a328cd0 100644 --- a/modules/log.cpp +++ b/modules/log.cpp @@ -33,7 +33,7 @@ public: void SetEnabled(bool bEnabled) { m_bEnabled = bEnabled; } bool Compare(const CString& sTarget) const { - return sTarget.WildCmp(m_sRule); + return sTarget.WildCmp(m_sRule, CString::CaseInsensitive); } bool operator==(const CLogRule& sOther) const { diff --git a/modules/watch.cpp b/modules/watch.cpp index fe3ab3f3..be2d80f4 100644 --- a/modules/watch.cpp +++ b/modules/watch.cpp @@ -81,7 +81,7 @@ public: for (unsigned int a = 0; a < m_vsSources.size(); a++) { const CWatchSource& WatchSource = m_vsSources[a]; - if (sSource.AsLower().WildCmp(WatchSource.GetSource().AsLower())) { + if (sSource.WildCmp(WatchSource.GetSource(), CString::CaseInsensitive)) { if (WatchSource.IsNegated()) { return false; } else { @@ -93,9 +93,9 @@ public: if (!bGoodSource) return false; - if (!Nick.GetHostMask().AsLower().WildCmp(m_sHostMask.AsLower())) + if (!Nick.GetHostMask().WildCmp(m_sHostMask, CString::CaseInsensitive)) return false; - return (sText.AsLower().WildCmp(pNetwork->ExpandString(m_sPattern).AsLower())); + return (sText.WildCmp(pNetwork->ExpandString(m_sPattern), CString::CaseInsensitive)); } bool operator ==(const CWatchEntry& WatchEntry) {