Merge pull request #1094 from SISheogorath/insp20+fixed-Override

[user/henk/code/inspircd.git] / src / modules / m_alltime.cpp

diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp
index 63e8067e3cc3d48b409f58a53fc4928c92156fd5..38ae4b254f7c7853ab30d99d7c0d5975e8ffa02b 100644 (file)
--- a/src/modules/m_alltime.cpp
+++ b/src/modules/m_alltime.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 John Brooks <john.brooks@dereferenced.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Display timestamps from all servers connected to the network */
@@ -20,7 +28,7 @@ class CommandAlltime : public Command
  public:
        CommandAlltime(Module* Creator) : Command(Creator, "ALLTIME", 0)
        {
-               flags_needed = 'o'; syntax.clear();
+               flags_needed = 'o';
                translation.push_back(TR_END);
        }
 
@@ -30,9 +38,9 @@ class CommandAlltime : public Command
                time_t now = ServerInstance->Time();
                strftime(fmtdate, sizeof(fmtdate), "%Y-%m-%d %H:%M:%S", gmtime(&now));
 
-               std::string msg = ":" + std::string(ServerInstance->Config->ServerName.c_str()) + " NOTICE " + user->nick + " :System time is " + fmtdate + "(" + ConvToStr(ServerInstance->Time()) + ") on " + ServerInstance->Config->ServerName;
+               std::string msg = ":" + ServerInstance->Config->ServerName + " NOTICE " + user->nick + " :System time is " + fmtdate + " (" + ConvToStr(ServerInstance->Time()) + ") on " + ServerInstance->Config->ServerName;
 
-               ServerInstance->DumpText(user, msg);
+               user->SendText(msg);
 
                /* we want this routed out! */
                return CMD_SUCCESS;
@@ -40,7 +48,7 @@ class CommandAlltime : public Command
 
        RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
        {
-               return ROUTE_BROADCAST;
+               return ROUTE_OPT_BCAST;
        }
 };
 
@@ -52,7 +60,11 @@ class Modulealltime : public Module
        Modulealltime()
                : mycommand(this)
        {
-               ServerInstance->AddCommand(&mycommand);
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(mycommand);
        }
 
        virtual ~Modulealltime()
@@ -61,7 +73,7 @@ class Modulealltime : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Display timestamps from all servers connected to the network", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Display timestamps from all servers connected to the network", VF_OPTCOMMON | VF_VENDOR);
        }
 
 };