diff options
| author | peavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-06-02 01:50:27 +0000 |
|---|---|---|
| committer | peavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-06-02 01:50:27 +0000 |
| commit | 73bd4d4240ee4ed88776ee9db0597a2f219e9070 (patch) | |
| tree | 39011e589ee104e059860532b3184eb3a6b36755 | |
| parent | e6ce64246b2cff2adcb66366727e095afe6ff197 (diff) | |
same for admin, and fix some returns.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7207 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | src/cmd_admin.cpp | 13 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/main.cpp | 7 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/cmd_admin.cpp b/src/cmd_admin.cpp index 5f36d767c..698468d0c 100644 --- a/src/cmd_admin.cpp +++ b/src/cmd_admin.cpp @@ -26,13 +26,10 @@ extern "C" DllExport 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); - 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("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); return CMD_SUCCESS; } diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 7aa09ba7a..7cba58811 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -249,7 +249,7 @@ int ModuleSpanningTree::HandleAdmin(const char** parameters, int pcnt, userrec* if (pcnt > 0) { if (match(ServerInstance->Config->ServerName, parameters[0])) - return 1; + return 0; /* Remote ADMIN, the server is within the 1st parameter */ std::deque<std::string> params; @@ -257,7 +257,10 @@ int ModuleSpanningTree::HandleAdmin(const char** parameters, int pcnt, userrec* /* Send it out remotely, generate no reply yet */ TreeServer* s = Utils->FindServerMask(parameters[0]); if (s) + { + params[0] = s->GetName(); Utils->DoOneToOne(user->nick, "ADMIN", params, s->GetName()); + } else user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]); return 1; @@ -270,7 +273,7 @@ int ModuleSpanningTree::HandleModules(const char** parameters, int pcnt, userrec if (pcnt > 0) { if (match(ServerInstance->Config->ServerName, parameters[0])) - return 1; + return 0; std::deque<std::string> params; params.push_back(parameters[0]); |