Merge pull request #1269 from Adam-/insp20+saslhost

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

diff --git a/src/commands/cmd_ping.cpp b/src/commands/cmd_ping.cpp
index feea84f59dae19cc7f7a3ac630ae9d1902200ae3..dd14b52c82681f665c1086cf9b2121dd4d0dc873 100644 (file)
--- a/src/commands/cmd_ping.cpp
+++ b/src/commands/cmd_ping.cpp
@@ -1,25 +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) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.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"
-
-#ifndef __CMD_PING_H__
-#define __CMD_PING_H__
-
-// include the common header files
 
-#include "users.h"
-#include "channels.h"
+#include "inspircd.h"
 
 /** Handle /PING. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
@@ -31,7 +30,7 @@ class CommandPing : public Command
  public:
        /** Constructor for ping.
         */
-       CommandPing (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"PING", 0, 1, false, 0) { syntax = "<servername> [:<servername>]"; }
+       CommandPing ( Module* parent) : Command(parent,"PING", 1, 2) { syntax = "<servername> [:<servername>]"; }
        /** Handle command.
         * @param parameters The parameters to the comamnd
         * @param pcnt The number of parameters passed to teh command
@@ -41,12 +40,9 @@ class CommandPing : public Command
        CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
 CmdResult CommandPing::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       user->WriteServ("PONG %s :%s", ServerInstance->Config->ServerName, parameters[0].c_str());
+       user->WriteServ("PONG %s :%s", ServerInstance->Config->ServerName.c_str(), parameters[0].c_str());
        return CMD_SUCCESS;
 }