Extra Dry! Shame it's not in Hereford right now :p

[user/henk/code/inspircd.git] / src / cmd_admin.cpp

diff --git a/src/cmd_admin.cpp b/src/cmd_admin.cpp
index 4754387ecead6dc3c82fd1bade03ee040c196f90..698468d0ccbf7c8f34a2c2f266db6b2444171b19 100644 (file)
--- a/src/cmd_admin.cpp
+++ b/src/cmd_admin.cpp
@@ -2,23 +2,22 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "commands/cmd_admin.h"
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_admin(Instance);
 }
@@ -27,12 +26,10 @@ extern "C" command_t* init_command(InspIRCd* Instance)
  */
 CmdResult cmd_admin::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       if (!pcnt)
-       {
-               user->WriteServ("256 %s :Administrative info for %s",user->nick,ServerInstance->Config->ServerName);
+       user->WriteServ("256 %s :Administrative info for %s",user->nick,ServerInstance->Config->ServerName);
+       if (*ServerInstance->Config->AdminName)
                user->WriteServ("257 %s :Name     - %s",user->nick,ServerInstance->Config->AdminName);
-               user->WriteServ("258 %s :Nickname - %s",user->nick,ServerInstance->Config->AdminNick);
-               user->WriteServ("258 %s :E-Mail   - %s",user->nick,ServerInstance->Config->AdminEmail);
-       }
+       user->WriteServ("258 %s :Nickname - %s",user->nick,ServerInstance->Config->AdminNick);
+       user->WriteServ("258 %s :E-Mail   - %s",user->nick,ServerInstance->Config->AdminEmail);
        return CMD_SUCCESS;
 }