|
@@ -470,13 +470,13 @@ DEF_CONSOLE_CMD(ConClearBuffer)
|
|
|
|
|
|
|
|
|
/**********************************
|
|
|
* Network Core Console Commands
|
|
|
**********************************/
|
|
|
|
|
|
static bool ConKickOrBan(const char *argv, bool ban, const char *reason)
|
|
|
static bool ConKickOrBan(const char *argv, bool ban, const std::string &reason)
|
|
|
{
|
|
|
uint n;
|
|
|
|
|
|
if (strchr(argv, '.') == nullptr && strchr(argv, ':') == nullptr) { // banning with ID
|
|
|
ClientID client_id = (ClientID)atoi(argv);
|
|
|
|
|
@@ -524,13 +524,13 @@ DEF_CONSOLE_CMD(ConKick)
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
if (argc != 2 && argc != 3) return false;
|
|
|
|
|
|
/* No reason supplied for kicking */
|
|
|
if (argc == 2) return ConKickOrBan(argv[1], false, nullptr);
|
|
|
if (argc == 2) return ConKickOrBan(argv[1], false, {});
|
|
|
|
|
|
/* Reason for kicking supplied */
|
|
|
size_t kick_message_length = strlen(argv[2]);
|
|
|
if (kick_message_length >= 255) {
|
|
|
IConsolePrintF(CC_ERROR, "ERROR: Maximum kick message length is 254 characters. You entered " PRINTF_SIZE " characters.", kick_message_length);
|
|
|
return false;
|
|
@@ -548,13 +548,13 @@ DEF_CONSOLE_CMD(ConBan)
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
if (argc != 2 && argc != 3) return false;
|
|
|
|
|
|
/* No reason supplied for kicking */
|
|
|
if (argc == 2) return ConKickOrBan(argv[1], true, nullptr);
|
|
|
if (argc == 2) return ConKickOrBan(argv[1], true, {});
|
|
|
|
|
|
/* Reason for kicking supplied */
|
|
|
size_t kick_message_length = strlen(argv[2]);
|
|
|
if (kick_message_length >= 255) {
|
|
|
IConsolePrintF(CC_ERROR, "ERROR: Maximum kick message length is 254 characters. You entered " PRINTF_SIZE " characters.", kick_message_length);
|
|
|
return false;
|