Read uline state in spanningtree; remove ConfigReader::ulines

[user/henk/code/inspircd.git] / src / commands / cmd_gline.cpp

diff --git a/src/commands/cmd_gline.cpp b/src/commands/cmd_gline.cpp
index 25330ffe2b059005181dbeb63596e2c18716082d..bc81172d3087532186556a4ac2e24f974c86e915 100644 (file)
--- a/src/commands/cmd_gline.cpp
+++ b/src/commands/cmd_gline.cpp
@@ -63,7 +63,7 @@ CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User
 
                if (ih.first.empty())
                {
-                       user->WriteServ("NOTICE %s :*** Target not found", user->nick.c_str());
+                       user->WriteNotice("*** Target not found");
                        return CMD_FAILURE;
                }
 
@@ -72,7 +72,7 @@ CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User
 
                else if (target.find('!') != std::string::npos)
                {
-                       user->WriteServ("NOTICE %s :*** G-Line cannot operate on nick!user@host masks",user->nick.c_str());
+                       user->WriteNotice("*** G-Line cannot operate on nick!user@host masks");
                        return CMD_FAILURE;
                }
 
@@ -87,7 +87,7 @@ CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User
                        else
                        {
                                time_t c_requires_crap = duration + ServerInstance->Time();
-                               std::string timestr = ServerInstance->TimeString(c_requires_crap);
+                               std::string timestr = InspIRCd::TimeString(c_requires_crap);
                                ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires on %s: %s",user->nick.c_str(),target.c_str(),
                                                timestr.c_str(), parameters[2].c_str());
                        }
@@ -97,7 +97,7 @@ CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User
                else
                {
                        delete gl;
-                       user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick.c_str(),target.c_str());
+                       user->WriteNotice("** G-Line for " + target + " already exists");
                }
 
        }
@@ -109,7 +109,7 @@ CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** G-line %s not found in list, try /stats g.",user->nick.c_str(),target.c_str());
+                       user->WriteNotice("*** G-Line " + target + " not found in list, try /stats g.");
                }
        }