Replace IS_AWAY() and IS_OPER() macros with User::IsAway() and User::IsOper()

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

diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp
index 15487bd8e984d73356c77a19df183db20cd4c5b1..6fd94d1b82e24a08a6209311e00963bc604cef39 100644 (file)
--- a/src/commands/cmd_eline.cpp
+++ b/src/commands/cmd_eline.cpp
@@ -50,15 +50,15 @@ CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User
        if (parameters.size() >= 3)
        {
                IdentHostPair ih;
-               User* find = ServerInstance->FindNick(target.c_str());
-               if (find)
+               User* find = ServerInstance->FindNick(target);
+               if ((find) && (find->registered == REG_ALL))
                {
                        ih.first = "*";
                        ih.second = find->GetIPString();
                        target = std::string("*@") + find->GetIPString();
                }
                else
-                       ih = ServerInstance->XLines->IdentSplit(target.c_str());
+                       ih = ServerInstance->XLines->IdentSplit(target);
 
         if (ih.first.empty())
         {
@@ -69,8 +69,7 @@ CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User
                if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
                        return CMD_FAILURE;
 
-               long duration = ServerInstance->Duration(parameters[1].c_str());
-
+               unsigned long duration = InspIRCd::Duration(parameters[1]);
                ELine* el = new ELine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
                if (ServerInstance->XLines->AddLine(el, user))
                {
@@ -81,8 +80,9 @@ CmdResult CommandEline::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);
                                ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires on %s: %s",user->nick.c_str(),target.c_str(),
-                                               ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
+                                               timestr.c_str(), parameters[2].c_str());
                        }
                }
                else