Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix temporary ban flags, add lang keys (#440)

Browse Source
This commit is contained in:
KliPPy 2017-05-27 21:47:24 +02:00 committed by Vincent Herbet
parent ac7de68ac7
commit c0011891e6
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/admincmd.sma
View File

@ -242,12 +242,12 @@ public cmdUnban(id, level, cid)
get_user_authid(id, authid, charsmax(authid)) get_user_authid(id, authid, charsmax(authid))
if( ~get_user_flags(id) & ( ADMIN_BAN | ADMIN_RCON ) ) if( !(get_user_flags(id) & ( ADMIN_BAN | ADMIN_RCON )) )
{ {
new storedAdminAuth[32] new storedAdminAuth[32]
if( !TrieGetString(g_tempBans, arg, storedAdminAuth, charsmax(storedAdminAuth)) || !equal(storedAdminAuth, authid) ) if( !TrieGetString(g_tempBans, arg, storedAdminAuth, charsmax(storedAdminAuth)) || !equal(storedAdminAuth, authid) )
{ {
console_print(id, "%L", id, "NO_ACC_COM"); // may be someone wants to create a new sentence and to translate it in all languages ? console_print(id, "%L", id, "ADMIN_MUST_TEMPUNBAN");
return PLUGIN_HANDLED; return PLUGIN_HANDLED;
} }
} }
@ -430,14 +430,15 @@ public cmdBan(id, level, cid)
return PLUGIN_HANDLED return PLUGIN_HANDLED
new nNum = str_to_num(minutes) new nNum = str_to_num(minutes)
new const tempBanMaxTime = get_pcvar_num(p_amx_tempban_maxtime);
if( nNum < 0 ) // since negative values result in permanent bans if( nNum < 0 ) // since negative values result in permanent bans
{ {
nNum = 0; nNum = 0;
minutes = "0"; minutes = "0";
} }
if( ~get_user_flags(id) & ( ADMIN_BAN | ADMIN_RCON ) && (nNum <= 0 || nNum > get_pcvar_num(p_amx_tempban_maxtime)) ) if( !(get_user_flags(id) & ( ADMIN_BAN | ADMIN_RCON )) && (nNum <= 0 || nNum > tempBanMaxTime) )
{ {
console_print(id, "%L", id, "NO_ACC_COM"); // may be someone wants to create a new sentence and to translate it in all languages ? console_print(id, "%L", id, "ADMIN_MUST_TEMPBAN", tempBanMaxTime);
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
@ -516,14 +517,15 @@ public cmdBanIP(id, level, cid)
return PLUGIN_HANDLED return PLUGIN_HANDLED
new nNum = str_to_num(minutes) new nNum = str_to_num(minutes)
new const tempBanMaxTime = get_pcvar_num(p_amx_tempban_maxtime);
if( nNum < 0 ) // since negative values result in permanent bans if( nNum < 0 ) // since negative values result in permanent bans
{ {
nNum = 0; nNum = 0;
minutes = "0"; minutes = "0";
} }
if( ~get_user_flags(id) & ( ADMIN_BAN | ADMIN_RCON ) && (nNum <= 0 || nNum > get_pcvar_num(p_amx_tempban_maxtime)) ) if( !(get_user_flags(id) & ( ADMIN_BAN | ADMIN_RCON )) && (nNum <= 0 || nNum > tempBanMaxTime) )
{ {
console_print(id, "%L", id, "NO_ACC_COM"); // may be someone wants to create a new sentence and to translate it in all languages ? console_print(id, "%L", id, "ADMIN_MUST_TEMPBAN", tempBanMaxTime);
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }

4
plugins/lang/admincmd.txt
View File

@ -1,4 +1,4 @@
[en] [en]
ADMIN_KICK_1 = ADMIN: kick %s ADMIN_KICK_1 = ADMIN: kick %s
ADMIN_KICK_2 = ADMIN %s: kick %s ADMIN_KICK_2 = ADMIN %s: kick %s
IP_REMOVED = Ip "%s" removed from ban list IP_REMOVED = Ip "%s" removed from ban list
@ -72,6 +72,8 @@ CHANGED_NICK = Changed nick of %s to "%s"
ADMIN_EXTEND_1 = ADMIN: extend map for %d minutes ADMIN_EXTEND_1 = ADMIN: extend map for %d minutes
ADMIN_EXTEND_2 = ADMIN %s: extend map for %d minutes ADMIN_EXTEND_2 = ADMIN %s: extend map for %d minutes
MAP_EXTENDED = Map "%s" has been extended for %d minutes MAP_EXTENDED = Map "%s" has been extended for %d minutes
ADMIN_MUST_TEMPBAN = You can only temporarily ban players, for up to %d minutes
ADMIN_MUST_TEMPUNBAN = You can only unban players that you have recently banned
[de] [de]
ADMIN_KICK_1 = ADMIN: kickt %s ADMIN_KICK_1 = ADMIN: kickt %s