diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-04-07 13:40:51 +0200 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-04-07 13:40:51 +0200 |
| commit | f71e6bf9cb41811f18864f5d4eecb26e29d03f25 (patch) | |
| tree | 88586e73f7ff864081b8831a88637680267b7201 /src/coremods | |
| parent | ce78080782c261aed2c0314bc8c66babc1369be2 (diff) | |
| parent | 493ff75f1f89a7ede2800eff0368740fbaf02aa4 (diff) | |
Merge insp20
Diffstat (limited to 'src/coremods')
| -rw-r--r-- | src/coremods/core_channel/cmd_kick.cpp | 4 | ||||
| -rw-r--r-- | src/coremods/core_channel/cmd_names.cpp | 5 | ||||
| -rw-r--r-- | src/coremods/core_ison.cpp | 4 | ||||
| -rw-r--r-- | src/coremods/core_who.cpp | 2 |
4 files changed, 5 insertions, 10 deletions
diff --git a/src/coremods/core_channel/cmd_kick.cpp b/src/coremods/core_channel/cmd_kick.cpp index 260264faf..715f35d54 100644 --- a/src/coremods/core_channel/cmd_kick.cpp +++ b/src/coremods/core_channel/cmd_kick.cpp @@ -43,9 +43,9 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User else u = ServerInstance->FindNick(parameters[1]); - if (!u || !c) + if ((!u) || (!c) || (u->registered != REG_ALL)) { - user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", u ? parameters[0].c_str() : parameters[1].c_str()); + user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", c ? parameters[1].c_str() : parameters[0].c_str()); return CMD_FAILURE; } diff --git a/src/coremods/core_channel/cmd_names.cpp b/src/coremods/core_channel/cmd_names.cpp index 81ada28bc..13d912376 100644 --- a/src/coremods/core_channel/cmd_names.cpp +++ b/src/coremods/core_channel/cmd_names.cpp @@ -46,11 +46,6 @@ CmdResult CommandNames::Handle (const std::vector<std::string>& parameters, User c = ServerInstance->FindChan(parameters[0]); if (c) { - if ((c->IsModeSet(secretmode)) && (!c->HasUser(user))) - { - user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", c->name.c_str()); - return CMD_FAILURE; - } c->UserList(user); } else diff --git a/src/coremods/core_ison.cpp b/src/coremods/core_ison.cpp index c7ead2a87..53d2e1c49 100644 --- a/src/coremods/core_ison.cpp +++ b/src/coremods/core_ison.cpp @@ -52,7 +52,7 @@ CmdResult CommandIson::Handle (const std::vector<std::string>& parameters, User if (ison_already.find(u) != ison_already.end()) continue; - if (u) + if ((u) && (u->registered == REG_ALL)) { reply.append(u->nick).append(" "); if (reply.length() > 450) @@ -77,7 +77,7 @@ CmdResult CommandIson::Handle (const std::vector<std::string>& parameters, User if (ison_already.find(u) != ison_already.end()) continue; - if (u) + if ((u) && (u->registered == REG_ALL)) { reply.append(u->nick).append(" "); if (reply.length() > 450) diff --git a/src/coremods/core_who.cpp b/src/coremods/core_who.cpp index 2c120e562..6f4bc088e 100644 --- a/src/coremods/core_who.cpp +++ b/src/coremods/core_who.cpp @@ -360,7 +360,7 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User * { if (!user->SharesChannelWith(oper)) { - if (usingwildcards && (!oper->IsModeSet(invisiblemode)) && (!user->HasPrivPermission("users/auspex"))) + if (usingwildcards && (oper->IsModeSet(invisiblemode)) && (!user->HasPrivPermission("users/auspex"))) continue; } |