From 59643d29385fd4fbfed7a5720e90e2c9ffd1fd21 Mon Sep 17 00:00:00 2001 From: w00t Date: Sun, 10 Feb 2008 14:28:01 +0000 Subject: Correctly rewrite bans in 1.2 also, and make zline on nicks actually work. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8873 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/commands/cmd_eline.cpp | 2 ++ src/commands/cmd_gline.cpp | 2 ++ src/commands/cmd_kline.cpp | 2 ++ src/commands/cmd_zline.cpp | 7 +++++++ 4 files changed, 13 insertions(+) diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp index 2fdb29679..ca95955b7 100644 --- a/src/commands/cmd_eline.cpp +++ b/src/commands/cmd_eline.cpp @@ -32,6 +32,8 @@ CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user) { ih.first = "*"; ih.second = find->GetIPString(); + std::string c = std::string("*@") + find->GetIPString(); + parameters[0] = c.c_str(); } else ih = ServerInstance->XLines->IdentSplit(parameters[0]); diff --git a/src/commands/cmd_gline.cpp b/src/commands/cmd_gline.cpp index 37a15c210..30112b74a 100644 --- a/src/commands/cmd_gline.cpp +++ b/src/commands/cmd_gline.cpp @@ -32,6 +32,8 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user) { ih.first = "*"; ih.second = find->GetIPString(); + std::string c = std::string("*@") + find->GetIPString(); + parameters[0] = c.c_str(); } else ih = ServerInstance->XLines->IdentSplit(parameters[0]); diff --git a/src/commands/cmd_kline.cpp b/src/commands/cmd_kline.cpp index 50f9ebf08..1b5764bdc 100644 --- a/src/commands/cmd_kline.cpp +++ b/src/commands/cmd_kline.cpp @@ -32,6 +32,8 @@ CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user) { ih.first = "*"; ih.second = find->GetIPString(); + std::string c = std::string("*@") + find->GetIPString(); + parameters[0] = c.c_str(); } else ih = ServerInstance->XLines->IdentSplit(parameters[0]); diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp index bc71b9e1e..a9f76a932 100644 --- a/src/commands/cmd_zline.cpp +++ b/src/commands/cmd_zline.cpp @@ -32,6 +32,13 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user) return CMD_FAILURE; } + User *u = ServerInstance->FindNick(parameters[0]); + + if (u) + { + parameters[0] = u->GetIPString(); + } + if (ServerInstance->IPMatchesEveryone(parameters[0],user)) return CMD_FAILURE; -- cgit v1.2.3