diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-05-19 21:16:42 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-05-19 21:16:42 +0000 |
| commit | 31f1e7ad092f8bf16ee653cc105eea4a769650ca (patch) | |
| tree | dced0411d5fbe803fe92ea54cb03d36c0a817563 /src/modules/m_safelist.cpp | |
| parent | 869bd02318d94a38369a125726b8edeb54ba0706 (diff) | |
Convert channel::name to std::string, this was a beastie!
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9770 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_safelist.cpp')
| -rw-r--r-- | src/modules/m_safelist.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp index 007e6f890..e6bb24442 100644 --- a/src/modules/m_safelist.cpp +++ b/src/modules/m_safelist.cpp @@ -185,7 +185,7 @@ class ModuleSafeList : public Module if ((chan) && (chan->modes[CM_PRIVATE]) && (!IS_OPER(user))) { - bool display = (match(chan->name, ld->glob) || (*chan->topic && match(chan->topic, ld->glob))); + bool display = (match(chan->name, ld->glob) || (!chan->topic.empty() && match(chan->topic, ld->glob))); if ((users) && (display)) { int counter = snprintf(buffer, MAXBUF, "322 %s * %ld :", user->nick.c_str(), users); @@ -193,12 +193,12 @@ class ModuleSafeList : public Module user->WriteServ(std::string(buffer)); } } - else if ((chan) && ((((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET])))) || (has_user) || IS_OPER(user))) + else if ((chan) && ((((!(chan->IsModeSet('p'))) && (!(chan->IsModeSet('s'))))) || (has_user) || IS_OPER(user))) { - bool display = (match(chan->name, ld->glob) || (*chan->topic && match(chan->topic, ld->glob))); + bool display = (match(chan->name, ld->glob) || (!chan->topic.empty() && match(chan->topic, ld->glob))); if ((users) && (display)) { - int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s",user->nick.c_str(), chan->name, users, chan->ChanModes(has_user || IS_OPER(user)), chan->topic); + int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s", user->nick.c_str(), chan->name.c_str(), users, chan->ChanModes(has_user || IS_OPER(user)), chan->topic.c_str()); amount_sent += counter + ServerNameSize; user->WriteServ(std::string(buffer)); } |