Fix infinite loop on alias expansion, found by Adam

[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 063e18798ee69c8fac94a18633fef22419b3272d..b8174c7a629e627376a8b52ea8a92d747209b503 100644 (file)
--- a/src/modules/m_alltime.cpp
+++ b/src/modules/m_alltime.cpp
@@ -18,9 +18,9 @@
 class CommandAlltime : public Command
 {
  public:
-       CommandAlltime(InspIRCd *Instance, Module* Creator) : Command(Instance, Creator, "ALLTIME", "o", 0)
+       CommandAlltime(Module* Creator) : Command(Creator, "ALLTIME", 0)
        {
-               syntax.clear();
+               flags_needed = 'o'; syntax.clear();
                translation.push_back(TR_END);
        }
 
@@ -30,7 +30,7 @@ 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) + " NOTICE " + user->nick + " :System time is " + fmtdate + "(" + ConvToStr(ServerInstance->Time()) + ") on " + ServerInstance->Config->ServerName;
+               std::string msg = ":" + std::string(ServerInstance->Config->ServerName.c_str()) + " NOTICE " + user->nick + " :System time is " + fmtdate + "(" + ConvToStr(ServerInstance->Time()) + ") on " + ServerInstance->Config->ServerName;
 
                ServerInstance->DumpText(user, msg);
 
@@ -49,8 +49,8 @@ class Modulealltime : public Module
 {
        CommandAlltime mycommand;
  public:
-       Modulealltime(InspIRCd *Me)
-               : Module(Me), mycommand(Me, this)
+       Modulealltime()
+               : mycommand(this)
        {
                ServerInstance->AddCommand(&mycommand);
        }
@@ -61,7 +61,7 @@ class Modulealltime : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Display timestamps from all servers connected to the network", VF_COMMON | VF_VENDOR);
        }
 
 };