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

improved manialink sending code

Browse Source
This commit is contained in:
Steffen Schröder
2014-03-02 13:00:23 +01:00
parent 2f9cab62fa
commit 795366e542
11 changed files with 30 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/core/Manialinks/CustomUIManager.php
View File

@ -55,12 +55,11 @@ class CustomUIManager implements CallbackListener, TimerListener {
* @param Player $player
*/
private function updateManialink(Player $player = null) {
$manialinkText = $this->customUI->render()->saveXML();
if ($player) {
$this->maniaControl->manialinkManager->sendManialink($manialinkText, $player->login);
$this->maniaControl->manialinkManager->sendManialink($this->customUI, $player->login);
return;
}
$this->maniaControl->manialinkManager->sendManialink($manialinkText);
$this->maniaControl->manialinkManager->sendManialink($this->customUI);
}
/**

3
application/core/Manialinks/IconManager.php
View File

@ -121,7 +121,6 @@ class IconManager implements CallbackListener {
}
// Send manialink
$manialinkText = $maniaLink->render()->saveXML();
$this->maniaControl->manialinkManager->sendManialink($manialinkText, $player);
$this->maniaControl->manialinkManager->sendManialink($maniaLink, $player);
}
}

10
application/core/Manialinks/ManialinkManager.php
View File

@ -129,7 +129,7 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener
* @return bool
*/
public function sendManialink($manialinkText, $logins = null, $timeout = 0, $hideOnClick = false) {
$manialinkText = (string)$manialinkText;
$manialinkText = (string) $manialinkText;
try {
if (!$logins) {
@ -211,7 +211,7 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener
*/
public function displayWidget($maniaLink, Player $player, $widgetName = '') {
// render and display xml
$this->maniaControl->manialinkManager->sendManialink($maniaLink, $player->login);
$this->sendManialink($maniaLink, $player->login);
if ($widgetName != '') { //TODO make check by manialinkId, getter is needed to avoid uses on non main widgets
$this->disableAltMenu($player);
@ -239,16 +239,14 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener
public function closeWidget(Player $player, $widgetId = false) {
if (!$widgetId) {
$emptyManialink = new ManiaLink(self::MAIN_MLID);
$manialinkText = $emptyManialink->render()->saveXML();
$this->maniaControl->manialinkManager->sendManialink($manialinkText, $player->login);
$this->sendManialink($emptyManialink, $player->login);
$this->enableAltMenu($player);
// Trigger callback
$this->maniaControl->callbackManager->triggerCallback(self::CB_MAIN_WINDOW_CLOSED, $player);
} else {
$emptyManialink = new ManiaLink($widgetId);
$manialinkText = $emptyManialink->render()->saveXML();
$this->maniaControl->manialinkManager->sendManialink($manialinkText, $player->login);
$this->sendManialink($emptyManialink, $player->login);
}
}