some improvements
This commit is contained in:
parent
28d927e05e
commit
c38058b277
@ -10,6 +10,7 @@ use ManiaControl\Callbacks\CallbackListener;
|
|||||||
use ManiaControl\Callbacks\CallbackManager;
|
use ManiaControl\Callbacks\CallbackManager;
|
||||||
use ManiaControl\ManiaControl;
|
use ManiaControl\ManiaControl;
|
||||||
use ManiaControl\Players\Player;
|
use ManiaControl\Players\Player;
|
||||||
|
use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
|
||||||
|
|
||||||
require_once __DIR__ . '/StyleManager.php';
|
require_once __DIR__ . '/StyleManager.php';
|
||||||
require_once __DIR__ . '/IconManager.php';
|
require_once __DIR__ . '/IconManager.php';
|
||||||
@ -129,7 +130,9 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener
|
|||||||
*/
|
*/
|
||||||
public function sendManialink($manialinkText, $logins = null, $timeout = 0, $hideOnClick = false) { //TODO imrpvoe
|
public function sendManialink($manialinkText, $logins = null, $timeout = 0, $hideOnClick = false) { //TODO imrpvoe
|
||||||
$manialinkText = (string)$manialinkText;
|
$manialinkText = (string)$manialinkText;
|
||||||
if(!$logins) { //TODO check if null works?
|
|
||||||
|
try {
|
||||||
|
if(!$logins) {
|
||||||
return $this->maniaControl->client->sendDisplayManialinkPage(null, $manialinkText, $timeout, $hideOnClick);
|
return $this->maniaControl->client->sendDisplayManialinkPage(null, $manialinkText, $timeout, $hideOnClick);
|
||||||
}
|
}
|
||||||
if(is_string($logins)) {
|
if(is_string($logins)) {
|
||||||
@ -146,10 +149,13 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener
|
|||||||
|
|
||||||
return $success;
|
return $success;
|
||||||
}
|
}
|
||||||
|
} catch(Exception $e) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Enable the alt menu for the player
|
* Enable the alt menu for the player
|
||||||
*
|
*
|
||||||
|
@ -42,6 +42,8 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
|
|||||||
const ACTION_ERASE_MAP = 'MapList.EraseMap';
|
const ACTION_ERASE_MAP = 'MapList.EraseMap';
|
||||||
const ACTION_SWITCH_MAP = 'MapList.SwitchMap';
|
const ACTION_SWITCH_MAP = 'MapList.SwitchMap';
|
||||||
const ACTION_QUEUED_MAP = 'MapList.QueueMap';
|
const ACTION_QUEUED_MAP = 'MapList.QueueMap';
|
||||||
|
const ACTION_CHECK_UPDATE = 'MapList.CheckUpdate';
|
||||||
|
const ACTION_CLEAR_MAPQUEUE = 'MapList.ClearMapQueue';
|
||||||
const MAX_MAPS_PER_PAGE = 15;
|
const MAX_MAPS_PER_PAGE = 15;
|
||||||
const MAX_MX_MAPS_PER_PAGE = 14;
|
const MAX_MX_MAPS_PER_PAGE = 14;
|
||||||
const SHOW_MX_LIST = 1;
|
const SHOW_MX_LIST = 1;
|
||||||
@ -73,8 +75,33 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
|
|||||||
|
|
||||||
$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_SEARCH_MAPNAME, $this, 'showManiaExchangeList');
|
$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_SEARCH_MAPNAME, $this, 'showManiaExchangeList');
|
||||||
$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_SEARCH_AUTHOR, $this, 'showManiaExchangeList');
|
$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_SEARCH_AUTHOR, $this, 'showManiaExchangeList');
|
||||||
|
$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_CHECK_UPDATE, $this, 'checkUpdates');
|
||||||
|
$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_CLEAR_MAPQUEUE, $this, 'clearMapQueue');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clears the Map Queue
|
||||||
|
*
|
||||||
|
* @param array $chatCallback
|
||||||
|
* @param Player $player
|
||||||
|
*/
|
||||||
|
public function clearMapQueue(array $chatCallback, Player $player) {
|
||||||
|
//Clears the Map Queue
|
||||||
|
$this->maniaControl->mapManager->mapQueue->clearMapQueue($player);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check for Map Updates
|
||||||
|
*
|
||||||
|
* @param array $chatCallback
|
||||||
|
* @param Player $player
|
||||||
|
*/
|
||||||
|
public function checkUpdates(array $chatCallback, Player $player) {
|
||||||
|
//Update Mx Infos
|
||||||
|
$this->maniaControl->mapManager->mxManager->fetchManiaExchangeMapInformations();
|
||||||
|
//Reshow the Maplist
|
||||||
|
$this->showMapList($player);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Display the Mania Exchange List
|
* Display the Mania Exchange List
|
||||||
@ -228,6 +255,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
|
|||||||
$mxQuad->setZ(0.01);
|
$mxQuad->setZ(0.01);
|
||||||
$script->addTooltip($mxQuad, $descriptionLabel, array(Script::OPTION_TOOLTIP_TEXT => "View " . $map->name . " on Mania-Exchange"));
|
$script->addTooltip($mxQuad, $descriptionLabel, array(Script::OPTION_TOOLTIP_TEXT => "View " . $map->name . " on Mania-Exchange"));
|
||||||
|
|
||||||
|
//TODO permission Clear Jukebox
|
||||||
if($this->maniaControl->authenticationManager->checkPermission($player, MapManager::SETTING_PERMISSION_ADD_MAP)) {
|
if($this->maniaControl->authenticationManager->checkPermission($player, MapManager::SETTING_PERMISSION_ADD_MAP)) {
|
||||||
$addQuad = new Quad_Icons64x64_1();
|
$addQuad = new Quad_Icons64x64_1();
|
||||||
$mapFrame->add($addQuad);
|
$mapFrame->add($addQuad);
|
||||||
@ -400,6 +428,51 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
|
|||||||
$script->addPageLabel($pageCountLabel, $pagesId);
|
$script->addPageLabel($pageCountLabel, $pagesId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Admin Buttons
|
||||||
|
if($this->maniaControl->authenticationManager->checkPermission($player, MapManager::SETTING_PERMISSION_ADD_MAP)) {
|
||||||
|
//Clear Jukebox
|
||||||
|
$label = new Label_Button();
|
||||||
|
$frame->add($label);
|
||||||
|
$label->setText("Clear Map-Queue");
|
||||||
|
$label->setTextSize(1);
|
||||||
|
$label->setPosition($width / 2 - 8, -$height / 2 + 9);
|
||||||
|
$label->setHAlign(Control::RIGHT);
|
||||||
|
|
||||||
|
$quad = new Quad_BgsPlayerCard();
|
||||||
|
$frame->add($quad);
|
||||||
|
$quad->setPosition($width / 2 - 5, -$height / 2 + 9, 0.01);
|
||||||
|
$quad->setSubStyle($quad::SUBSTYLE_BgPlayerCardBig);
|
||||||
|
$quad->setHAlign(Control::RIGHT);
|
||||||
|
$quad->setSize(29, 4);
|
||||||
|
$quad->setAction(self::ACTION_CLEAR_MAPQUEUE);
|
||||||
|
|
||||||
|
//Check Update
|
||||||
|
$label = new Label_Button();
|
||||||
|
$frame->add($label);
|
||||||
|
$label->setText("Check MX Updates");
|
||||||
|
$label->setTextSize(1);
|
||||||
|
$label->setPosition($width / 2 - 41, -$height / 2 + 9, 0.01);
|
||||||
|
$label->setHAlign(Control::RIGHT);
|
||||||
|
|
||||||
|
$quad = new Quad_BgsPlayerCard();
|
||||||
|
$frame->add($quad);
|
||||||
|
$quad->setPosition($width / 2 - 37, -$height / 2 + 9, 0.01);
|
||||||
|
$quad->setSubStyle($quad::SUBSTYLE_BgPlayerCardBig);
|
||||||
|
$quad->setHAlign(Control::RIGHT);
|
||||||
|
$quad->setSize(35, 4);
|
||||||
|
$quad->setAction(self::ACTION_CHECK_UPDATE);
|
||||||
|
|
||||||
|
$mxQuad = new Quad();
|
||||||
|
$frame->add($mxQuad);
|
||||||
|
$mxQuad->setSize(3, 3);
|
||||||
|
$mxQuad->setImage($this->maniaControl->manialinkManager->iconManager->getIcon(IconManager::MX_ICON_GREEN));
|
||||||
|
$mxQuad->setImageFocus($this->maniaControl->manialinkManager->iconManager->getIcon(IconManager::MX_ICON_GREEN_MOVER));
|
||||||
|
$mxQuad->setPosition($width / 2 - 67, -$height / 2 + 9);
|
||||||
|
$mxQuad->setZ(0.01);
|
||||||
|
$mxQuad->setAction(self::ACTION_CHECK_UPDATE);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Headline
|
// Headline
|
||||||
$headFrame = new Frame();
|
$headFrame = new Frame();
|
||||||
$frame->add($headFrame);
|
$frame->add($headFrame);
|
||||||
|
@ -58,6 +58,15 @@ class MapQueue implements CallbackListener, CommandListener {
|
|||||||
* @param Player $player
|
* @param Player $player
|
||||||
*/
|
*/
|
||||||
public function command_ClearMapQueue(array $chat, Player $admin) {
|
public function command_ClearMapQueue(array $chat, Player $admin) {
|
||||||
|
$this->clearMapQueue($admin);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clears the Map Queue
|
||||||
|
*
|
||||||
|
* @param $admin
|
||||||
|
*/
|
||||||
|
public function clearMapQueue($admin) {
|
||||||
$title = $this->maniaControl->authenticationManager->getAuthLevelName($admin->authLevel);
|
$title = $this->maniaControl->authenticationManager->getAuthLevelName($admin->authLevel);
|
||||||
|
|
||||||
//Destroy map - queue list
|
//Destroy map - queue list
|
||||||
@ -70,6 +79,7 @@ class MapQueue implements CallbackListener, CommandListener {
|
|||||||
$this->maniaControl->callbackManager->triggerCallback(self::CB_MAPQUEUE_CHANGED, array('clear'));
|
$this->maniaControl->callbackManager->triggerCallback(self::CB_MAPQUEUE_CHANGED, array('clear'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds a Map to the map-queue
|
* Adds a Map to the map-queue
|
||||||
*
|
*
|
||||||
|
@ -107,6 +107,13 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
|
|||||||
$backgroundQuad->setSize($width, $height);
|
$backgroundQuad->setSize($width, $height);
|
||||||
$backgroundQuad->setStyles($quadStyle, $quadSubstyle);
|
$backgroundQuad->setStyles($quadStyle, $quadSubstyle);
|
||||||
|
|
||||||
|
/*$backgroundQuad = new Quad();
|
||||||
|
$frame->add($backgroundQuad);
|
||||||
|
$backgroundQuad->setSize($width* 1.3, $height* 1.3);
|
||||||
|
//$backgroundQuad->setStyles($quadStyle, $quadSubstyle);
|
||||||
|
$backgroundQuad->setImage("http://www.imgdumper.nl/uploads7/52d991addf7a1/52d991add72ef-border-playerstats.png");
|
||||||
|
$backgroundQuad->setZ(-0.5);*/
|
||||||
|
|
||||||
// Close Quad (X)
|
// Close Quad (X)
|
||||||
$closeQuad = new Quad_Icons64x64_1();
|
$closeQuad = new Quad_Icons64x64_1();
|
||||||
$frame->add($closeQuad);
|
$frame->add($closeQuad);
|
||||||
|
Loading…
Reference in New Issue
Block a user