mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-08 12:48:32 +00:00
Code Issues Projects Releases Wiki Activity

Lowercase enforcement (fixes #144)

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2013-03-19 16:06:23 +01:00
parent 8842d8d772
commit acc0311386
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/API/BanAPI.php
View File

@ -90,17 +90,17 @@ class BanAPI{
$output = ""; $output = "";
switch($cmd){ switch($cmd){
case "sudo": case "sudo":
$target = array_shift($params); $target = strtolower($params[0]);
$player = $this->server->api->player->get($target); $player = $this->server->api->player->get($target);
if(!($player instanceof Player)){ if(!($player instanceof Player)){
$output .= "Player not connected.\n"; $output .= "Player not connected.\n";
break; break;
} }
$this->server->api->console->run(implode(" ", $params), $player); $this->server->api->console->run(implode(" ", $params), $player);
$output .= "Command ran.\n"; $output .= "Command ran as ".$player->username.".\n";
break; break;
case "op": case "op":
$user = array_shift($params); $user = strtolower($params[0]);
if($user == ""){ if($user == ""){
break; break;
} }
@ -110,7 +110,7 @@ class BanAPI{
$this->server->api->chat->sendTo(false, "You are now op.", $user); $this->server->api->chat->sendTo(false, "You are now op.", $user);
break; break;
case "deop": case "deop":
$user = array_shift($params); $user = strtolower($params[0]);
if($user == ""){ if($user == ""){
break; break;
} }
@ -123,7 +123,7 @@ class BanAPI{
if(!isset($params[0])){ if(!isset($params[0])){
$output .= "Usage: /kick <playername> [reason]\n"; $output .= "Usage: /kick <playername> [reason]\n";
}else{ }else{
$name = array_shift($params); $name = strtolower(array_shift($params));
$player = $this->server->api->player->get($name); $player = $this->server->api->player->get($name);
if($player === false){ if($player === false){
$output .= "Player \"".$name."\" does not exist\n"; $output .= "Player \"".$name."\" does not exist\n";
@ -143,13 +143,13 @@ class BanAPI{
$p = strtolower(array_shift($params)); $p = strtolower(array_shift($params));
switch($p){ switch($p){
case "remove": case "remove":
$user = trim(implode(" ", $params)); $user = strtolower($params[0]);
$this->whitelist->remove($user); $this->whitelist->remove($user);
$this->whitelist->save(); $this->whitelist->save();
$output .= "Player \"$user\" removed from white-list\n"; $output .= "Player \"$user\" removed from white-list\n";
break; break;
case "add": case "add":
$user = trim(implode(" ", $params)); $user = strtolower($params[0]);
$this->whitelist->set($user); $this->whitelist->set($user);
$this->whitelist->save(); $this->whitelist->save();
$output .= "Player \"$user\" added to white-list\n"; $output .= "Player \"$user\" added to white-list\n";
@ -182,14 +182,14 @@ class BanAPI{
switch($p){ switch($p){
case "pardon": case "pardon":
case "remove": case "remove":
$ip = trim(implode($params)); $ip = strtolower($params[0]);
$this->bannedIPs->remove($ip); $this->bannedIPs->remove($ip);
$this->bannedIPs->save(); $this->bannedIPs->save();
$output .= "IP \"$ip\" removed from ban list\n"; $output .= "IP \"$ip\" removed from ban list\n";
break; break;
case "add": case "add":
case "ban": case "ban":
$ip = trim(implode($params)); $ip = strtolower($params[0]);
$this->bannedIPs->set($ip); $this->bannedIPs->set($ip);
$this->bannedIPs->save(); $this->bannedIPs->save();
$output .= "IP \"$ip\" added to ban list\n"; $output .= "IP \"$ip\" added to ban list\n";
@ -210,21 +210,20 @@ class BanAPI{
switch($p){ switch($p){
case "pardon": case "pardon":
case "remove": case "remove":
$user = trim(implode($params)); $user = strtolower($params[0]);
$this->banned->remove($user); $this->banned->remove($user);
$this->banned->save(); $this->banned->save();
$output .= "Player \"$user\" removed from ban list\n"; $output .= "Player \"$user\" removed from ban list\n";
break; break;
case "add": case "add":
case "ban": case "ban":
$user = array_shift($params); $user = strtolower($params[0]);
$this->banned->set($user); $this->banned->set($user);
$this->banned->save(); $this->banned->save();
$player = $this->server->api->player->get($user); $player = $this->server->api->player->get($user);
if($player !== false){ if($player !== false){
$player->close("You have been banned"); $player->close("You have been banned");
} }
$this->server->api->chat->broadcast("$user has been banned");
if($issuer instanceof Player){ if($issuer instanceof Player){
$this->server->api->chat->broadcast($user." has been banned by ".$issuer->username."\n"); $this->server->api->chat->broadcast($user." has been banned by ".$issuer->username."\n");
}else{ }else{
@ -284,6 +283,7 @@ class BanAPI{
} }
public function isBanned($username){ public function isBanned($username){
$username = strtolower($username);
if($this->server->api->dhandle("api.ban.check", $username) === false){ if($this->server->api->dhandle("api.ban.check", $username) === false){
return true; return true;
}elseif($this->banned->exists($username)){ }elseif($this->banned->exists($username)){
@ -293,6 +293,7 @@ class BanAPI{
} }
public function inWhitelist($username){ public function inWhitelist($username){
$username = strtolower($username);
if($this->server->api->dhandle("api.ban.whitelist.check", $ip) === false){ if($this->server->api->dhandle("api.ban.whitelist.check", $ip) === false){
return true; return true;
}elseif($this->whitelist->exists($username)){ }elseif($this->whitelist->exists($username)){