From 22707ea9467545af9a5c150c087df2deb8ae60f2 Mon Sep 17 00:00:00 2001 From: kremsy Date: Thu, 13 Feb 2014 00:46:41 +0100 Subject: [PATCH] minor cleanup --- .../core/Admin/AuthenticationManager.php | 2 +- .../core/Configurators/Configurator.php | 12 +-- .../core/Configurators/ConfiguratorMenu.php | 8 +- .../core/Configurators/ServerSettings.php | 6 +- application/core/Formatter.php | 1 + application/core/ManiaExchange/MXMapInfo.php | 3 +- application/core/Plugins/PluginManager.php | 4 +- application/core/Plugins/PluginMenu.php | 82 +++++++++---------- application/core/Server/RankingManager.php | 2 +- 9 files changed, 61 insertions(+), 59 deletions(-) diff --git a/application/core/Admin/AuthenticationManager.php b/application/core/Admin/AuthenticationManager.php index 39e8d62f..5f071210 100644 --- a/application/core/Admin/AuthenticationManager.php +++ b/application/core/Admin/AuthenticationManager.php @@ -90,10 +90,10 @@ class AuthenticationManager implements CallbackListener { trigger_error($mysqli->error, E_USER_ERROR); return false; } - $adminStatement->bind_param('si', $login, $masterAdminLevel); $success = true; foreach($masterAdmins as $masterAdmin) { $login = (string)$masterAdmin; + $adminStatement->bind_param('si', $login, $masterAdminLevel); $adminStatement->execute(); if ($adminStatement->error) { trigger_error($adminStatement->error); diff --git a/application/core/Configurators/Configurator.php b/application/core/Configurators/Configurator.php index dbdc1de1..54e996fe 100644 --- a/application/core/Configurators/Configurator.php +++ b/application/core/Configurators/Configurator.php @@ -172,7 +172,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn $player = $callback[1]; $openedWidget = $callback[2]; //unset when another main widget got opened - if($openedWidget != 'Configurator') { + if ($openedWidget != 'Configurator') { unset($this->playersMenuShown[$player->login]); } } @@ -203,7 +203,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn * @param Player $player */ public function toggleMenu(Player $player) { - if(isset($this->playersMenuShown[$player->login])) { + if (isset($this->playersMenuShown[$player->login])) { $this->hideMenu($player); } else { $this->showMenu($player); @@ -220,7 +220,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn $i = 0; foreach($this->menus as $menu) { /** @var ConfiguratorMenu $menu */ - if($menu->getTitle() == $name) { + if ($menu->getTitle() == $name) { return $i; } $i++; @@ -279,7 +279,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn $menuItemY = $menuHeight * 0.42; $menuId = 0; - foreach($this->menus as $index => $menu) { + foreach($this->menus as $menu) { /** @var ConfiguratorMenu $menu */ // Add title @@ -292,7 +292,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn $menuItemLabel->setAction(self::ACTION_SELECTMENU . '.' . $menuId); //Show a Menu - if($menuId == $menuIdShown) { + if ($menuId == $menuIdShown) { $menuControl = $menu->getMenu($subMenuWidth, $subMenuHeight, $script); $menusFrame->add($menuControl); $script->addMenu($menuItemLabel, $menuControl); @@ -344,7 +344,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn public function handleManialinkPageAnswer(array $callback) { $actionId = $callback[1][2]; $boolSelectMenu = (strpos($actionId, self::ACTION_SELECTMENU) === 0); - if(!$boolSelectMenu) { + if (!$boolSelectMenu) { return; } diff --git a/application/core/Configurators/ConfiguratorMenu.php b/application/core/Configurators/ConfiguratorMenu.php index 555f16e8..4c889064 100644 --- a/application/core/Configurators/ConfiguratorMenu.php +++ b/application/core/Configurators/ConfiguratorMenu.php @@ -2,9 +2,7 @@ namespace ManiaControl\Configurators; -use FML\Script\Pages; use FML\Script\Script; -use FML\Script\Tooltips; use ManiaControl\Players\Player; /** @@ -24,8 +22,8 @@ interface ConfiguratorMenu { /** * Get the Configurator Menu Frame * - * @param float $width - * @param float $height + * @param float $width + * @param float $height * @param Script $script * @return \FML\Controls\Frame */ @@ -34,7 +32,7 @@ interface ConfiguratorMenu { /** * Save the Config Data * - * @param array $configData + * @param array $configData * @param Player $player */ public function saveConfigData(array $configData, Player $player); diff --git a/application/core/Configurators/ServerSettings.php b/application/core/Configurators/ServerSettings.php index 9f386430..6f4e621e 100644 --- a/application/core/Configurators/ServerSettings.php +++ b/application/core/Configurators/ServerSettings.php @@ -351,9 +351,9 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener { } // Notifications - $settingsCount = count($newSettings); - $settingIndex = 0; - $title = $this->maniaControl->authenticationManager->getAuthLevelName($player->authLevel); + //$settingsCount = count($newSettings); + $settingIndex = 0; + //$title = $this->maniaControl->authenticationManager->getAuthLevelName($player->authLevel); // $chatMessage = '$ff0' . $title . ' $<' . $player->nickname . '$> set ScriptSetting' . ($settingsCount > 1 ? 's' : '') . ' '; foreach($newSettings as $setting => $value) { diff --git a/application/core/Formatter.php b/application/core/Formatter.php index be1b21b6..125a0ad3 100644 --- a/application/core/Formatter.php +++ b/application/core/Formatter.php @@ -73,6 +73,7 @@ abstract class Formatter { return $r . ' ' . $str . ($r > 1 ? 's' : '') . ' ago'; } } + return ''; } /** diff --git a/application/core/ManiaExchange/MXMapInfo.php b/application/core/ManiaExchange/MXMapInfo.php index 706317ae..38cc80f2 100644 --- a/application/core/ManiaExchange/MXMapInfo.php +++ b/application/core/ManiaExchange/MXMapInfo.php @@ -21,7 +21,8 @@ class MXMapInfo { * Returns map object with all available data from MX map data * * @param String $prefix MX URL prefix - * @param Object $map The MX map data from MXInfoSearcher + * @param $mx + * @internal param Object $map The MX map data from MXInfoSearcher * @return MXMapInfo */ public function __construct($prefix, $mx) { diff --git a/application/core/Plugins/PluginManager.php b/application/core/Plugins/PluginManager.php index d0e31aec..c46984ef 100644 --- a/application/core/Plugins/PluginManager.php +++ b/application/core/Plugins/PluginManager.php @@ -133,7 +133,8 @@ class PluginManager { if ($this->isPluginActive($pluginClass)) { return false; } - $plugin = new $pluginClass(); + $plugin = new $pluginClass(); + /** @var Plugin $plugin */ $this->activePlugins[$pluginClass] = $plugin; $this->savePluginStatus($pluginClass, true); try { @@ -164,6 +165,7 @@ class PluginManager { return false; } $plugin = $this->activePlugins[$pluginClass]; + /** @var Plugin $plugin */ unset($this->activePlugins[$pluginClass]); $plugin->unload(); $interfaces = class_implements($pluginClass); diff --git a/application/core/Plugins/PluginMenu.php b/application/core/Plugins/PluginMenu.php index 98dd5a46..ffc44280 100644 --- a/application/core/Plugins/PluginMenu.php +++ b/application/core/Plugins/PluginMenu.php @@ -29,12 +29,12 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns /** * Constants */ - const ACTION_PREFIX_ENABLEPLUGIN = 'PluginMenu.Enable.'; - const ACTION_PREFIX_DISABLEPLUGIN = 'PluginMenu.Disable.'; - const ACTION_PREFIX_SETTINGS = 'PluginMenu.Settings.'; - const ACTION_PREFIX_SETTING = 'PluginMenuSetting'; - const ACTION_SETTING_BOOL = 'PluginMenuActionBoolSetting.'; - const ACTION_BACK_TO_PLUGINS = 'PluginMenu.BackToPlugins'; + const ACTION_PREFIX_ENABLEPLUGIN = 'PluginMenu.Enable.'; + const ACTION_PREFIX_DISABLEPLUGIN = 'PluginMenu.Disable.'; + const ACTION_PREFIX_SETTINGS = 'PluginMenu.Settings.'; + const ACTION_PREFIX_SETTING = 'PluginMenuSetting'; + const ACTION_SETTING_BOOL = 'PluginMenuActionBoolSetting.'; + const ACTION_BACK_TO_PLUGINS = 'PluginMenu.BackToPlugins'; const SETTING_PERMISSION_CHANGE_PLUGIN_SETTINGS = 'Change Plugin Settings'; /** @@ -57,7 +57,6 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns } /** - * * @see \ManiaControl\Configurators\ConfiguratorMenu::getTitle() */ public function getTitle() { @@ -74,7 +73,6 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns } /** - * * @see \ManiaControl\Configurators\ConfiguratorMenu::getMenu() */ public function getMenu($width, $height, Script $script) { @@ -116,7 +114,7 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns //Show Settings Menu - if($this->settingsClass != '') { //TODO improve + if ($this->settingsClass != '') { //TODO improve /** @var ManiaControl/SettingManager $this->maniaControl->settingManager */ $settings = $this->maniaControl->settingManager->getSettingsByClass($this->settingsClass); $pageFrames = array(); @@ -124,11 +122,11 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns $y = 0; $index = 1; $settingHeight = 5.; - foreach($settings as $id => $setting) { - if(!isset($pageFrame)) { + foreach($settings as $setting) { + if (!isset($pageFrame)) { $pageFrame = new Frame(); $frame->add($pageFrame); - if(!empty($pageFrames)) { + if (!empty($pageFrames)) { $pageFrame->setVisible(false); } array_push($pageFrames, $pageFrame); @@ -140,7 +138,7 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns $pageFrame->add($settingFrame); $settingFrame->setY($y); - if($index == 1) { + if ($index == 1) { //Headline Label $headLabel = new Label_Text(); $settingFrame->add($headLabel); @@ -154,10 +152,10 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns $y -= $settingHeight; - if($index % $pageMaxCount == $pageMaxCount - 1) { + if ($index % $pageMaxCount == $pageMaxCount - 1) { $pageFrame = new Frame(); $frame->add($pageFrame); - if(!empty($pageFrames)) { + if (!empty($pageFrames)) { $pageFrame->setVisible(false); } array_push($pageFrames, $pageFrame); @@ -196,10 +194,10 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns $entry->setDefault($setting->value); - if($setting->type == "bool") { - if($setting->value == "0") { + if ($setting->type == "bool") { + if ($setting->value == "0") { $substyle = Quad_Icons64x64_1::SUBSTYLE_LvlRed; - } else if($setting->value == "1") { + } else if ($setting->value == "1") { $substyle = Quad_Icons64x64_1::SUBSTYLE_LvlGreen; } @@ -216,7 +214,7 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns $y -= $settingHeight; - if($index % $pageSettingsMaxCount == $pageSettingsMaxCount - 1) { + if ($index % $pageSettingsMaxCount == $pageSettingsMaxCount - 1) { unset($pageFrame); } @@ -241,10 +239,11 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns $pageFrames = array(); $y = 0.; foreach($pluginClasses as $index => $pluginClass) { - if(!isset($pageFrame)) { + /** @var Plugin $pluginClass */ + if (!isset($pageFrame)) { $pageFrame = new Frame(); $frame->add($pageFrame); - if(!empty($pageFrames)) { + if (!empty($pageFrames)) { $pageFrame->setVisible(false); } @@ -263,7 +262,7 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns $pluginFrame->add($activeQuad); $activeQuad->setPosition($width * -0.45, -0.1, 1); $activeQuad->setSize($entryHeight * 0.9, $entryHeight * 0.9); - if($active) { + if ($active) { $activeQuad->setSubStyle($activeQuad::SUBSTYLE_LvlGreen); } else { $activeQuad->setSubStyle($activeQuad::SUBSTYLE_LvlRed); @@ -305,7 +304,7 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns $statusChangeButton->setHAlign(Control::RIGHT); $statusChangeButton->setX($width * 0.45); $statusChangeButton->setStyle($statusChangeButton::STYLE_CardButtonSmall); - if($active) { + if ($active) { $statusChangeButton->setTextPrefix('$f00'); $statusChangeButton->setText('Deactivate'); $statusChangeButton->setAction(self::ACTION_PREFIX_DISABLEPLUGIN . $pluginClass); @@ -316,7 +315,7 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns } $y -= $entryHeight; - if($index % $pageMaxCount == $pageMaxCount - 1) { + if ($index % $pageMaxCount == $pageMaxCount - 1) { unset($pageFrame); } } @@ -325,7 +324,6 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns } /** - * * @see \ManiaControl\Configurators\ConfiguratorMenu::saveConfigData() */ public function saveConfigData(array $configData, Player $player) { @@ -335,7 +333,7 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns } $prefix = explode(".", $configData[3][0]['Name']); - if($prefix[0] != self::ACTION_PREFIX_SETTING) { + if ($prefix[0] != self::ACTION_PREFIX_SETTING) { return; } @@ -347,11 +345,11 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns $settingName = substr($setting['Name'], $prefixLength + 1); $oldSetting = $maniaControlSettings[$settingName]; - if($setting['Value'] == $oldSetting->value || $oldSetting->type == 'bool') { + if ($setting['Value'] == $oldSetting->value || $oldSetting->type == 'bool') { continue; } - $this->maniaControl->settingManager->updateSetting($oldSetting->class, $oldSetting->setting, $setting['Value']); + $this->maniaControl->settingManager->setSetting($oldSetting->class, $oldSetting->setting, $setting['Value']); } //Reopen the Menu @@ -371,38 +369,40 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns $settings = (strpos($actionId, self::ACTION_PREFIX_SETTINGS) === 0); $boolSetting = (strpos($actionId, self::ACTION_SETTING_BOOL) === 0); - if(!$enable && !$disable && !$settings && !$boolSetting) { + if (!$enable && !$disable && !$settings && !$boolSetting) { return; } $login = $callback[1][1]; $player = $this->maniaControl->playerManager->getPlayer($login); - if(!$player) { + if (!$player) { return; } - if($enable) { + if ($enable) { $pluginClass = substr($actionId, strlen(self::ACTION_PREFIX_ENABLEPLUGIN)); - $activated = $this->maniaControl->pluginManager->activatePlugin($pluginClass, $player->login); - if($activated) { + /** @var Plugin $pluginClass */ + $activated = $this->maniaControl->pluginManager->activatePlugin($pluginClass, $player->login); + if ($activated) { $this->maniaControl->chat->sendSuccess($pluginClass::getName() . ' activated!', $player->login); $this->maniaControl->configurator->showMenu($player); $this->maniaControl->log(Formatter::stripCodes("{$player->login} activated '{$pluginClass}'!")); } else { $this->maniaControl->chat->sendError('Error activating ' . $pluginClass::getName() . '!', $player->login); } - } else if($disable) { + } else if ($disable) { $pluginClass = substr($actionId, strlen(self::ACTION_PREFIX_DISABLEPLUGIN)); + /** @var Plugin $pluginClass */ $deactivated = $this->maniaControl->pluginManager->deactivatePlugin($pluginClass); - if($deactivated) { + if ($deactivated) { $this->maniaControl->chat->sendSuccess($pluginClass::getName() . ' deactivated!', $player->login); $this->maniaControl->configurator->showMenu($player); $this->maniaControl->log(Formatter::stripCodes("{$player->login} deactivated '{$pluginClass}'!")); } else { $this->maniaControl->chat->sendError('Error deactivating ' . $pluginClass::getName() . '!', $player->login); } - } else if($settings) { //Open Settings Menu + } else if ($settings) { //Open Settings Menu $pluginClass = substr($actionId, strlen(self::ACTION_PREFIX_SETTINGS)); $this->settingsClass = $pluginClass; - } else if($boolSetting) { + } else if ($boolSetting) { $actionArray = explode(".", $actionId); $setting = $actionArray[1]; @@ -435,16 +435,16 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns $oldSetting = $this->maniaControl->settingManager->getSettingByIndex($setting); - if(!isset($oldSetting)) { + if (!isset($oldSetting)) { var_dump('no setting ' . $setting); return; } //Toggle value - if($oldSetting->value == "1") { - $this->maniaControl->settingManager->updateSetting($oldSetting->class, $oldSetting->setting, "0"); + if ($oldSetting->value == "1") { + $this->maniaControl->settingManager->setSetting($oldSetting->class, $oldSetting->setting, "0"); } else { - $this->maniaControl->settingManager->updateSetting($oldSetting->class, $oldSetting->setting, "1"); + $this->maniaControl->settingManager->setSetting($oldSetting->class, $oldSetting->setting, "1"); } } } diff --git a/application/core/Server/RankingManager.php b/application/core/Server/RankingManager.php index 0ef21851..2244c267 100644 --- a/application/core/Server/RankingManager.php +++ b/application/core/Server/RankingManager.php @@ -96,7 +96,7 @@ class RankingManager implements CallbackListener { public function getLeaders() { $leaders = array(); $prev = -1; - foreach($this->rankings as $player => $score) { + foreach($this->rankings as $score) { if ($prev != -1 && $prev < $score) { return $leaders; }