diff --git a/application/core/ManiaExchange/ManiaExchangeManager.php b/application/core/ManiaExchange/ManiaExchangeManager.php index 79b4b7de..f8867020 100644 --- a/application/core/ManiaExchange/ManiaExchangeManager.php +++ b/application/core/ManiaExchange/ManiaExchangeManager.php @@ -34,8 +34,8 @@ class ManiaExchangeManager { const SEARCH_ORDER_COMMENTS_LEAST = 11; const SEARCH_ORDER_DIFFICULTY_EASIEST = 12; const SEARCH_ORDER_DIFFICULTY_HARDEST = 13; - const SEARCH_ORDER_LENGHT_SHORTEST = 14; - const SEARCH_ORDER_LENGHT_LONGEST = 15; + const SEARCH_ORDER_LENGTH_SHORTEST = 14; + const SEARCH_ORDER_LENGTH_LONGEST = 15; //Maximum Maps per request const MAPS_PER_MX_FETCH = 50; @@ -73,7 +73,7 @@ class ManiaExchangeManager { * * @param null $map */ - public function fetchManiaExchangeMapInformations($map = null) { + public function fetchManiaExchangeMapInformation($map = null) { if (!$map) { //Fetch Information for whole MapList $maps = $this->maniaControl->mapManager->getMaps(); diff --git a/application/core/Maps/MapCommands.php b/application/core/Maps/MapCommands.php index 48654728..7723436f 100644 --- a/application/core/Maps/MapCommands.php +++ b/application/core/Maps/MapCommands.php @@ -22,6 +22,7 @@ use Maniaplanet\DedicatedServer\Xmlrpc\FaultException; * @copyright 2014 ManiaControl Team * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ +// TODO: dedicated commands for remove map and erase map class MapCommands implements CommandListener, ManialinkPageAnswerListener, CallbackListener { /* * Constants diff --git a/application/core/Maps/MapManager.php b/application/core/Maps/MapManager.php index 714b3829..e7331f5d 100644 --- a/application/core/Maps/MapManager.php +++ b/application/core/Maps/MapManager.php @@ -621,7 +621,7 @@ class MapManager implements CallbackListener { */ public function handleAfterInit() { // Fetch MX infos - $this->mxManager->fetchManiaExchangeMapInformations(); + $this->mxManager->fetchManiaExchangeMapInformation(); } /** @@ -678,7 +678,7 @@ class MapManager implements CallbackListener { $this->restructureMapList(); // Update the mx of the map (for update checks, etc.) - $this->mxManager->fetchManiaExchangeMapInformations($this->currentMap); + $this->mxManager->fetchManiaExchangeMapInformation($this->currentMap); // Trigger own BeginMap callback ( //TODO remove deprecated callback later diff --git a/application/core/Maps/MapQueue.php b/application/core/Maps/MapQueue.php index 73038e3c..450e98ec 100644 --- a/application/core/Maps/MapQueue.php +++ b/application/core/Maps/MapQueue.php @@ -30,7 +30,7 @@ class MapQueue implements CallbackListener, CommandListener { const SETTING_MAPLIMIT_PLAYER = 'Maximum maps per player in the Map-Queue (-1 = unlimited)'; const SETTING_MAPLIMIT_ADMIN = 'Maximum maps per admin (Admin+) in the Map-Queue (-1 = unlimited)'; const SETTING_BUFFERSIZE = 'Size of the Map-Queue buffer (recently played maps)'; - const SETTING_PERMISSION_CLEAR_MAPQUEUE = 'Clear Mapqueue'; + const SETTING_PERMISSION_CLEAR_MAPQUEUE = 'Clear MapQueue'; const SETTING_PERMISSION_QUEUE_BUFFER = 'Queue maps in buffer'; const ADMIN_COMMAND_CLEAR_MAPQUEUE = 'clearmapqueue'; diff --git a/application/core/Players/PlayerCommands.php b/application/core/Players/PlayerCommands.php index 83418ffe..e1a6d5f6 100644 --- a/application/core/Players/PlayerCommands.php +++ b/application/core/Players/PlayerCommands.php @@ -46,7 +46,7 @@ class PlayerCommands implements CommandListener, ManialinkPageAnswerListener, Ca $this->maniaControl->commandManager->registerCommandListener('kick', $this, 'command_Kick', true, 'Kicks player from the server.'); $this->maniaControl->commandManager->registerCommandListener('ban', $this, 'command_Ban', true, 'Bans player from the server.'); $this->maniaControl->commandManager->registerCommandListener(array('forcespec', 'forcespectator'), $this, 'command_ForceSpectator', true, 'Forces player into spectator.'); - $this->maniaControl->commandManager->registerCommandListener('forceplay', $this, 'command_ForcePlay', true, 'Forces player into playmode.'); + $this->maniaControl->commandManager->registerCommandListener('forceplay', $this, 'command_ForcePlay', true, 'Forces player into Play mode.'); $this->maniaControl->commandManager->registerCommandListener('forceblue', $this, 'command_ForceBlue', true, 'Forces player into blue team.'); $this->maniaControl->commandManager->registerCommandListener('forcered', $this, 'command_ForceRed', true, 'Forces player into red team.'); $this->maniaControl->commandManager->registerCommandListener(array('addbots', 'addbot'), $this, 'command_AddFakePlayers', true, 'Adds bots to the game.'); @@ -69,7 +69,7 @@ class PlayerCommands implements CommandListener, ManialinkPageAnswerListener, Ca $itemQuad = new Quad_UIConstruction_Buttons(); $itemQuad->setSubStyle($itemQuad::SUBSTYLE_Author); $itemQuad->setAction(self::ACTION_OPEN_PLAYERLIST); - $this->maniaControl->actionsMenu->addMenuItem($itemQuad, true, 15, 'Open Playerlist'); + $this->maniaControl->actionsMenu->addMenuItem($itemQuad, true, 15, 'Open PlayerList'); } /** diff --git a/application/core/Plugins/PluginInstallMenu.php b/application/core/Plugins/PluginInstallMenu.php index 2e1df7a0..ad426a9a 100644 --- a/application/core/Plugins/PluginInstallMenu.php +++ b/application/core/Plugins/PluginInstallMenu.php @@ -30,7 +30,7 @@ class PluginInstallMenu implements CallbackListener, ConfiguratorMenu, Manialink * Constants */ const SETTING_PERMISSION_INSTALL_PLUGINS = 'Install Plugins'; - const ACTION_PREFIX_INSTALLPLUGIN = 'PluginInstallMenu.Install.'; + const ACTION_PREFIX_INSTALL_PLUGIN = 'PluginInstallMenu.Install.'; /* * Private Properties @@ -150,7 +150,7 @@ class PluginInstallMenu implements CallbackListener, ConfiguratorMenu, Manialink $installButton->setStyle($installButton::STYLE_CardButtonSmall); $installButton->setTextPrefix('$f00'); $installButton->setText('Install'); - $installButton->setAction(self::ACTION_PREFIX_INSTALLPLUGIN . $plugin->id); + $installButton->setAction(self::ACTION_PREFIX_INSTALL_PLUGIN . $plugin->id); $y -= $entryHeight; $index++; diff --git a/application/core/Update/PluginUpdateManager.php b/application/core/Update/PluginUpdateManager.php index 0b77f976..bc1717df 100644 --- a/application/core/Update/PluginUpdateManager.php +++ b/application/core/Update/PluginUpdateManager.php @@ -327,7 +327,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis public function handleManialinkPageAnswer(array $callback) { $actionId = $callback[1][2]; $update = (strpos($actionId, PluginMenu::ACTION_PREFIX_UPDATEPLUGIN) === 0); - $install = (strpos($actionId, PluginInstallMenu::ACTION_PREFIX_INSTALLPLUGIN) === 0); + $install = (strpos($actionId, PluginInstallMenu::ACTION_PREFIX_INSTALL_PLUGIN) === 0); if (!$update && !$install) { return; } @@ -349,7 +349,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis } } } else { - $pluginId = substr($actionId, strlen(PluginInstallMenu::ACTION_PREFIX_INSTALLPLUGIN)); + $pluginId = substr($actionId, strlen(PluginInstallMenu::ACTION_PREFIX_INSTALL_PLUGIN)); $url = ManiaControl::URL_WEBSERVICE . 'plugins?id=' . $pluginId; $self = $this;