Make /gline etc compile with new methods

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8431 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp
index a0b35bd64d5f35a7a8413e78ca7015339dc4fd93..176eef99d32184557c180c3e291c86111cfbfbfe 100644 (file)
--- a/src/commands/cmd_eline.cpp
+++ b/src/commands/cmd_eline.cpp
@@ -37,7 +37,9 @@ CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user)
                }
 
                long duration = ServerInstance->Duration(parameters[1]);
-               if (ServerInstance->XLines->AddELine(duration,user->nick,parameters[2],parameters[0]))
+
+               ELine* el = new ELine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ih.first.c_str(), ih.second.c_str());
+               if (!ServerInstance->XLines->AddLine(el))
                {
                        FOREACH_MOD(I_OnAddELine,OnAddELine(duration, user, parameters[2], parameters[0]));
 
@@ -54,6 +56,7 @@ CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user)
                }
                else
                {
+                       delete el;
                        user->WriteServ("NOTICE %s :*** E-Line for %s already exists",user->nick,parameters[0]);
                }
        }

diff --git a/src/commands/cmd_gline.cpp b/src/commands/cmd_gline.cpp
index 04b79a8cd7b80f76710fdfeb94a85b65a26f0ca4..6a8c8f807394aef74bdb4697a267d9553616603a 100644 (file)
--- a/src/commands/cmd_gline.cpp
+++ b/src/commands/cmd_gline.cpp
@@ -42,7 +42,8 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
                }
 
                long duration = ServerInstance->Duration(parameters[1]);
-               if (ServerInstance->XLines->AddGLine(duration,user->nick,parameters[2],parameters[0]))
+               GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ih.first.c_str(), ih.second.c_str());
+               if (!ServerInstance->XLines->AddLine(gl))
                {
                        FOREACH_MOD(I_OnAddGLine,OnAddGLine(duration, user, parameters[2], parameters[0]));
 
@@ -61,6 +62,7 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
                }
                else
                {
+                       delete gl;
                        user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick,parameters[0]);
                }
 

diff --git a/src/commands/cmd_kline.cpp b/src/commands/cmd_kline.cpp
index 5bdc9dc9644281e44183c658d911be2d85fa4a59..324c92c13f738288c13d943ccd69fbc410545f1d 100644 (file)
--- a/src/commands/cmd_kline.cpp
+++ b/src/commands/cmd_kline.cpp
@@ -42,7 +42,8 @@ CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user)
                }
 
                long duration = ServerInstance->Duration(parameters[1]);
-               if (ServerInstance->XLines->AddKLine(duration,user->nick,parameters[2],parameters[0]))
+               KLine* kl = new KLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ih.first.c_str(), ih.second.c_str());
+               if (!ServerInstance->XLines->AddLine(kl))
                {
                        FOREACH_MOD(I_OnAddKLine,OnAddKLine(duration, user, parameters[2], parameters[0]));
        
@@ -61,6 +62,7 @@ CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user)
                }
                else
                {
+                       delete kl;
                        user->WriteServ("NOTICE %s :*** K-Line for %s already exists",user->nick,parameters[0]);
                }
        }

diff --git a/src/commands/cmd_qline.cpp b/src/commands/cmd_qline.cpp
index 6b0b9d2c932bafdcdce732412d60c19c8a8cf231..8384c2ca014503b4bf2600237a65c8afe86c1cd2 100644 (file)
--- a/src/commands/cmd_qline.cpp
+++ b/src/commands/cmd_qline.cpp
@@ -36,7 +36,8 @@ CmdResult CommandQline::Handle (const char** parameters, int pcnt, User *user)
                }
 
                long duration = ServerInstance->Duration(parameters[1]);
-               if (ServerInstance->XLines->AddQLine(duration,user->nick,parameters[2],parameters[0]))
+               QLine* ql = new QLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]);
+               if (!ServerInstance->XLines->AddLine(ql))
                {
                        FOREACH_MOD(I_OnAddQLine,OnAddQLine(duration, user, parameters[2], parameters[0]));
                        if (!duration)
@@ -53,6 +54,7 @@ CmdResult CommandQline::Handle (const char** parameters, int pcnt, User *user)
                }
                else
                {
+                       delete ql;
                        user->WriteServ("NOTICE %s :*** Q-Line for %s already exists",user->nick,parameters[0]);
                }
        }

diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp
index 95063c8e288c7e529b7c720acd85b267b6bf5e61..971961c5706381972b041b825bd686488f1de89b 100644 (file)
--- a/src/commands/cmd_zline.cpp
+++ b/src/commands/cmd_zline.cpp
@@ -36,7 +36,16 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
                        return CMD_FAILURE;
 
                long duration = ServerInstance->Duration(parameters[1]);
-               if (ServerInstance->XLines->AddZLine(duration,user->nick,parameters[2],parameters[0]))
+
+               const char* ipaddr = parameters[0]; 
+               if (strchr(ipaddr,'@'))
+               {
+                       while (*ipaddr != '@')
+                               ipaddr++;
+                       ipaddr++;
+               }
+               ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ipaddr);
+               if (!ServerInstance->XLines->AddLine(zl))
                {
                        FOREACH_MOD(I_OnAddZLine,OnAddZLine(duration, user, parameters[2], parameters[0]));
                        if (!duration)
@@ -53,6 +62,7 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
                }
                else
                {
+                       delete zl;
                        user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,parameters[0]);
                }
        }