beu/TrackManiaControl
1
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
kremsy
2014-02-24 20:20:17 +01:00
committed by Steffen Schröder
parent ae53958b37
commit b403ceef31
8 changed files with 59 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/core/Maps/Map.php
View File

@ -16,6 +16,7 @@ class Map {
*/
public $index = -1;
public $name = 'undefined';
public $rawName = '';
public $uid = '';
public $fileName = '';
public $environment = '';
@ -49,6 +50,7 @@ class Map {
return;
}
$this->name = FORMATTER::stripDirtyCodes($mpMap->name);
$this->rawName = $mpMap->name;
$this->uid = $mpMap->uId;
$this->fileName = $mpMap->fileName;
$this->authorLogin = $mpMap->author;

2
application/core/Maps/MapManager.php
View File

@ -140,7 +140,7 @@ class MapManager implements CallbackListener {
trigger_error($mysqli->error);
return false;
}
$mapStatement->bind_param('ssssss', $map->uid, $map->name, $map->authorLogin, $map->fileName, $map->environment, $map->mapType);
$mapStatement->bind_param('ssssss', $map->uid, $map->rawName, $map->authorLogin, $map->fileName, $map->environment, $map->mapType);
$mapStatement->execute();
if ($mapStatement->error) {
trigger_error($mapStatement->error);

2
application/core/Players/Player.php
View File

@ -17,6 +17,7 @@ class Player {
public $pid = -1;
public $login = '';
public $nickname = '';
public $rawNickname = '';
public $path = '';
public $authLevel = 0;
public $language = '';
@ -70,6 +71,7 @@ class Player {
$this->pid = $mpPlayer->playerId;
$this->login = $mpPlayer->login;
$this->nickname = Formatter::stripDirtyCodes($mpPlayer->nickName);
$this->rawNickname = $mpPlayer->nickName;
$this->path = $mpPlayer->path;
$this->language = $mpPlayer->language;
$this->avatar = $mpPlayer->avatar['FileName'];

28
application/core/Players/PlayerManager.php
View File

@ -360,12 +360,13 @@ class PlayerManager implements CallbackListener {
return null;
}
$player = new Player(false);
$player->index = $playerIndex;
$player->login = $row->login;
$player->nickname = $row->nickname;
$player->path = $row->path;
$player->authLevel = $row->authLevel;
$player = new Player(false);
$player->index = $playerIndex;
$player->login = $row->login;
$player->rawNickname = $row->nickname;
$player->nickname = Formatter::stripDirtyCodes($player->rawNickname);
$player->path = $row->path;
$player->authLevel = $row->authLevel;
return $player;
}
@ -394,12 +395,13 @@ class PlayerManager implements CallbackListener {
return null;
}
$player = new Player(false);
$player->index = $row->index;
$player->login = $row->login;
$player->nickname = $row->nickname;
$player->path = $row->path;
$player->authLevel = $row->authLevel;
$player = new Player(false);
$player->index = $row->index;
$player->login = $row->login;
$player->rawNickname = $row->nickname;
$player->nickname = Formatter::stripDirtyCodes($player->rawNickname);
$player->path = $row->path;
$player->authLevel = $row->authLevel;
return $player;
}
@ -429,7 +431,7 @@ class PlayerManager implements CallbackListener {
trigger_error($mysqli->error);
return false;
}
$playerStatement->bind_param('sss', $player->login, $player->nickname, $player->path);
$playerStatement->bind_param('sss', $player->login, $player->rawNickname, $player->path);
$playerStatement->execute();
if ($playerStatement->error) {
trigger_error($playerStatement->error);