diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-09-26 16:40:58 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-09-26 16:40:58 +0000 |
| commit | ee913368d7162dbe0dd119091f8b468eb7be0f1a (patch) | |
| tree | 16dadfee22e800beaa1d08668ed232700e2e9d2b /src/modules | |
| parent | 553b17b542831cfe8063209f46326057f50a6fbd (diff) | |
Change IS_FAKE and CheckTimeStamp to IS_SERVER and ResolveModeConflict to clarify their use
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11765 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_delaymsg.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_operprefix.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_permchannels.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/main.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp index 7931a5982..77ac5fc59 100644 --- a/src/modules/m_delaymsg.cpp +++ b/src/modules/m_delaymsg.cpp @@ -41,7 +41,7 @@ class DelayMsgMode : public ModeHandler } } - bool CheckTimeStamp(std::string &their_param, const std::string &our_param, Channel*) + bool ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel*) { return (atoi(their_param.c_str()) < atoi(our_param.c_str())); } diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp index 10dcdb37d..223768dac 100644 --- a/src/modules/m_operprefix.cpp +++ b/src/modules/m_operprefix.cpp @@ -39,7 +39,7 @@ class OperPrefixMode : public ModeHandler ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - if (IS_FAKE(source) || (source && ServerInstance->ULine(source->server))) + if (IS_SERVER(source) || (source && ServerInstance->ULine(source->server))) return MODEACTION_ALLOW; else { @@ -110,7 +110,7 @@ class ModuleOperPrefixMode : public Module ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string ¶m, bool adding, int pcnt) { /* force event propagation to its ModeHandler */ - if (!IS_FAKE(user) && chan && (mode == 'y')) + if (!IS_SERVER(user) && chan && (mode == 'y')) return MOD_RES_ALLOW; return MOD_RES_PASSTHRU; } diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp index 3e2e18a8e..a409078e4 100644 --- a/src/modules/m_permchannels.cpp +++ b/src/modules/m_permchannels.cpp @@ -135,7 +135,7 @@ class PermChannel : public ModeHandler { if (channel->IsModeSet('P')) { - if (channel->GetUserCounter() == 0 && !IS_FAKE(source)) + if (channel->GetUserCounter() == 0 && !IS_SERVER(source)) { /* * ugh, ugh, UGH! diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 31d0ec449..e3ed9fca2 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -718,7 +718,7 @@ void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::s { Utils->DoOneToMany(source->uuid,"KICK",params); } - else if (IS_FAKE(source) && source != Utils->ServerUser) + else if (IS_SERVER(source) && source != Utils->ServerUser) { Utils->DoOneToMany(ServerInstance->Config->GetSID(),"KICK",params); } |