Commented out debug statements again

[oweals/minetest.git] / src / servercommand.cpp

diff --git a/src/servercommand.cpp b/src/servercommand.cpp
index 87d7cd363c540ffa822554b2a88d2062dffaa8a7..89ba0771fe93f8ed91be720ab408b1398c9da34d 100644 (file)
--- a/src/servercommand.cpp
+++ b/src/servercommand.cpp
@@ -25,6 +25,14 @@ void cmd_status(std::wostringstream &os,
        os<<ctx->server->getStatusString();
 }
 
+void cmd_me(std::wostringstream &os,
+       ServerCommandContext *ctx)
+{
+       std::wstring name = narrow_to_wide(ctx->player->getName());
+       os << L"* " << name << L" " << ctx->paramstring;
+       ctx->flags |= SEND_TO_OTHERS | SEND_NO_PREFIX;
+}
+
 void cmd_privs(std::wostringstream &os,
        ServerCommandContext *ctx)
 {
@@ -130,7 +138,7 @@ void cmd_shutdown(std::wostringstream &os,
        ctx->server->requestShutdown();
                                        
        os<<L"*** Server shutting down (operator request)";
-       ctx->flags |= 2;
+       ctx->flags |= SEND_TO_OTHERS;
 }
 
 void cmd_setting(std::wostringstream &os,
@@ -183,41 +191,47 @@ void cmd_teleport(std::wostringstream &os,
        os<< L"-!- Teleported.";
 }
 
-void cmd_ipbanunban(std::wostringstream &os, ServerCommandContext *ctx)
+void cmd_banunban(std::wostringstream &os, ServerCommandContext *ctx)
 {
-       if((ctx->privs && PRIV_BAN) == 0)
+       if((ctx->privs & PRIV_BAN) == 0)
        {
                os<<L"-!- You don't have permission to do that";
                return;
        }
 
-       if(ctx->parms.size() != 2)
+       if(ctx->parms.size() < 2)
        {
-               os<<L"-!- Missing parameter";
+               std::string desc = ctx->server->getBanDescription("");
+               os<<L"-!- Ban list: "<<narrow_to_wide(desc);
                return;
        }
-       if(ctx->parms[0] == L"ipban")
+       if(ctx->parms[0] == L"ban")
        {
                Player *player = ctx->env->getPlayer(wide_to_narrow(ctx->parms[1]).c_str());
 
                if(player == NULL)
                {
-                       os<<L"-!- No such Player!";
+                       os<<L"-!- No such player";
                        return;
                }
 
                con::Peer *peer = ctx->server->getPeerNoEx(player->peer_id);
                if(peer == NULL)
                {
-                       dstream<<"peer was not found!"<<std::endl;
+                       dstream<<__FUNCTION_NAME<<": peer was not found"<<std::endl;
+                       return;
                }
-               ctx->server->setIpBanned(peer->address.serializeString());
-               os<<L"-!- IP: "<<narrow_to_wide(peer->address.serializeString())<<L" was banned!";
+               std::string ip_string = peer->address.serializeString();
+               ctx->server->setIpBanned(ip_string, player->getName());
+               os<<L"-!- Banned "<<narrow_to_wide(ip_string)<<L"|"
+                               <<narrow_to_wide(player->getName());
        }
        else
        {
-               ctx->server->unsetIpBanned(wide_to_narrow(ctx->parms[1]));
-               os<<L"-!- IP: "<<ctx->parms[1]<<L" was unbanned!";
+               std::string ip_or_name = wide_to_narrow(ctx->parms[1]);
+               std::string desc = ctx->server->getBanDescription(ip_or_name);
+               ctx->server->unsetIpBanned(ip_or_name);
+               os<<L"-!- Unbanned "<<narrow_to_wide(desc);
        }
 }
 
@@ -226,7 +240,7 @@ std::wstring processServerCommand(ServerCommandContext *ctx)
 {
 
        std::wostringstream os(std::ios_base::binary);
-       ctx->flags = 1; // Default, unless we change it.
+       ctx->flags = SEND_TO_SENDER;    // Default, unless we change it.
 
        u64 privs = ctx->privs;
 
@@ -243,7 +257,7 @@ std::wstring processServerCommand(ServerCommandContext *ctx)
                if(privs & PRIV_PRIVS)
                        os<<L" grant revoke";
                if(privs & PRIV_BAN)
-                       os<<L" ipban ipunban";
+                       os<<L" ban unban";
        }
        else if(ctx->parms[0] == L"status")
        {
@@ -273,9 +287,13 @@ std::wstring processServerCommand(ServerCommandContext *ctx)
        {
                cmd_teleport(os, ctx);
        }
-       else if(ctx->parms[0] == L"ipban" || ctx->parms[0] == L"ipunban")
+       else if(ctx->parms[0] == L"ban" || ctx->parms[0] == L"unban")
+       {
+               cmd_banunban(os, ctx);
+       }
+       else if(ctx->parms[0] == L"me")
        {
-               cmd_ipbanunban(os, ctx);
+               cmd_me(os, ctx);
        }
        else
        {