From c38058b27748c37f0e00af3725fb426d9c23ff2b Mon Sep 17 00:00:00 2001 From: kremsy Date: Fri, 17 Jan 2014 22:35:14 +0100 Subject: [PATCH] some improvements --- .../core/Manialinks/ManialinkManager.php | 36 +++++---- application/core/Maps/MapList.php | 73 +++++++++++++++++++ application/core/Maps/MapQueue.php | 10 +++ application/core/Players/PlayerList.php | 7 ++ 4 files changed, 111 insertions(+), 15 deletions(-) diff --git a/application/core/Manialinks/ManialinkManager.php b/application/core/Manialinks/ManialinkManager.php index 8e34220b..3142b990 100644 --- a/application/core/Manialinks/ManialinkManager.php +++ b/application/core/Manialinks/ManialinkManager.php @@ -10,6 +10,7 @@ use ManiaControl\Callbacks\CallbackListener; use ManiaControl\Callbacks\CallbackManager; use ManiaControl\ManiaControl; use ManiaControl\Players\Player; +use Maniaplanet\DedicatedServer\Xmlrpc\Exception; require_once __DIR__ . '/StyleManager.php'; require_once __DIR__ . '/IconManager.php'; @@ -129,25 +130,30 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener */ public function sendManialink($manialinkText, $logins = null, $timeout = 0, $hideOnClick = false) { //TODO imrpvoe $manialinkText = (string)$manialinkText; - if(!$logins) { //TODO check if null works? - return $this->maniaControl->client->sendDisplayManialinkPage(null, $manialinkText, $timeout, $hideOnClick); - } - if(is_string($logins)) { - return $this->maniaControl->client->sendDisplayManialinkPage($logins, $manialinkText, $timeout, $hideOnClick); - } - if(is_array($logins)) { - $success = true; - foreach($logins as $login) { - $subSuccess = $this->maniaControl->client->sendDisplayManialinkPage($login, $manialinkText, $timeout, $hideOnClick); - if(!$subSuccess) { - $success = false; - } + + try { + if(!$logins) { + return $this->maniaControl->client->sendDisplayManialinkPage(null, $manialinkText, $timeout, $hideOnClick); } + if(is_string($logins)) { + return $this->maniaControl->client->sendDisplayManialinkPage($logins, $manialinkText, $timeout, $hideOnClick); + } + if(is_array($logins)) { + $success = true; + foreach($logins as $login) { + $subSuccess = $this->maniaControl->client->sendDisplayManialinkPage($login, $manialinkText, $timeout, $hideOnClick); + if(!$subSuccess) { + $success = false; + } + } - return $success; + return $success; + } + } catch(Exception $e) { + return false; } - return false; + return true; } /** diff --git a/application/core/Maps/MapList.php b/application/core/Maps/MapList.php index 74732b8f..ca62731f 100644 --- a/application/core/Maps/MapList.php +++ b/application/core/Maps/MapList.php @@ -42,6 +42,8 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener { const ACTION_ERASE_MAP = 'MapList.EraseMap'; const ACTION_SWITCH_MAP = 'MapList.SwitchMap'; 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_MX_MAPS_PER_PAGE = 14; 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_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 @@ -228,6 +255,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener { $mxQuad->setZ(0.01); $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)) { $addQuad = new Quad_Icons64x64_1(); $mapFrame->add($addQuad); @@ -400,6 +428,51 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener { $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 $headFrame = new Frame(); $frame->add($headFrame); diff --git a/application/core/Maps/MapQueue.php b/application/core/Maps/MapQueue.php index 2fac1d76..d2c2e3ce 100644 --- a/application/core/Maps/MapQueue.php +++ b/application/core/Maps/MapQueue.php @@ -58,6 +58,15 @@ class MapQueue implements CallbackListener, CommandListener { * @param Player $player */ 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); //Destroy map - queue list @@ -70,6 +79,7 @@ class MapQueue implements CallbackListener, CommandListener { $this->maniaControl->callbackManager->triggerCallback(self::CB_MAPQUEUE_CHANGED, array('clear')); } + /** * Adds a Map to the map-queue * diff --git a/application/core/Players/PlayerList.php b/application/core/Players/PlayerList.php index 84a89205..399ba4a0 100644 --- a/application/core/Players/PlayerList.php +++ b/application/core/Players/PlayerList.php @@ -107,6 +107,13 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener { $backgroundQuad->setSize($width, $height); $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) $closeQuad = new Quad_Icons64x64_1(); $frame->add($closeQuad);