From ab375e636ee73ad3b1db2ffc750cac48787a823a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20Schro=CC=88der?= Date: Tue, 29 Apr 2014 23:53:55 +0200 Subject: [PATCH] fixed //checkupdate --- application/core/Update/UpdateManager.php | 410 ++++++++++++---------- 1 file changed, 215 insertions(+), 195 deletions(-) diff --git a/application/core/Update/UpdateManager.php b/application/core/Update/UpdateManager.php index 16bb43ca..52cd8e10 100644 --- a/application/core/Update/UpdateManager.php +++ b/application/core/Update/UpdateManager.php @@ -17,42 +17,45 @@ use ManiaControl\Plugins\PluginMenu; /** * Manager checking for ManiaControl Core and Plugin Updates - * - * @author steeffeen & kremsy + * + * @author steeffeen & kremsy * @copyright ManiaControl Copyright © 2014 ManiaControl Team - * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class UpdateManager implements CallbackListener, CommandListener, TimerListener { /* * Constants */ - const SETTING_ENABLEUPDATECHECK = 'Enable Automatic Core Update Check'; - const SETTING_UPDATECHECK_INTERVAL = 'Core Update Check Interval (Hours)'; - const SETTING_UPDATECHECK_CHANNEL = 'Core Update Channel (release, beta, nightly)'; - const SETTING_PERFORM_BACKUPS = 'Perform Backup before Updating'; - const SETTING_AUTO_UPDATE = 'Perform update automatically'; - const SETTING_PERMISSION_UPDATE = 'Update Core'; + const SETTING_ENABLEUPDATECHECK = 'Enable Automatic Core Update Check'; + const SETTING_UPDATECHECK_INTERVAL = 'Core Update Check Interval (Hours)'; + const SETTING_UPDATECHECK_CHANNEL = 'Core Update Channel (release, beta, nightly)'; + const SETTING_PERFORM_BACKUPS = 'Perform Backup before Updating'; + const SETTING_AUTO_UPDATE = 'Perform update automatically'; + const SETTING_PERMISSION_UPDATE = 'Update Core'; const SETTING_PERMISSION_UPDATECHECK = 'Check Core Update'; - const CHANNEL_RELEASE = 'release'; - const CHANNEL_BETA = 'beta'; - const CHANNEL_NIGHTLY = 'nightly'; - + const CHANNEL_RELEASE = 'release'; + const CHANNEL_BETA = 'beta'; + const CHANNEL_NIGHTLY = 'nightly'; + /* * Private Properties */ private $maniaControl = null; - /** @var UpdateData $coreUpdateData */ + /** + * + * @var UpdateData $coreUpdateData + */ private $coreUpdateData = null; private $currentBuildDate = ""; /** * Create a new Update Manager - * + * * @param ManiaControl $maniaControl */ public function __construct(ManiaControl $maniaControl) { $this->maniaControl = $maniaControl; - + // Init settings $this->maniaControl->settingManager->initSetting($this, self::SETTING_ENABLEUPDATECHECK, true); $this->maniaControl->settingManager->initSetting($this, self::SETTING_AUTO_UPDATE, true); @@ -60,29 +63,29 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener // TODO: 'nightly' only during dev $this->maniaControl->settingManager->initSetting($this, self::SETTING_UPDATECHECK_CHANNEL, self::CHANNEL_BETA); $this->maniaControl->settingManager->initSetting($this, self::SETTING_PERFORM_BACKUPS, true); - + // Register for callbacks $updateInterval = $this->maniaControl->settingManager->getSetting($this, self::SETTING_UPDATECHECK_INTERVAL); $this->maniaControl->timerManager->registerTimerListening($this, 'hourlyUpdateCheck', 1000 * 60 * 60 * $updateInterval); $this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERCONNECT, $this, 'handlePlayerJoined'); $this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERDISCONNECT, $this, 'autoUpdate'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 'handleManialinkPageAnswer'); - - //define Permissions + + // define Permissions $this->maniaControl->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_UPDATE, AuthenticationManager::AUTH_LEVEL_ADMIN); $this->maniaControl->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_UPDATECHECK, AuthenticationManager::AUTH_LEVEL_MODERATOR); - + // Register for chat commands $this->maniaControl->commandManager->registerCommandListener('checkupdate', $this, 'handle_CheckUpdate', true); $this->maniaControl->commandManager->registerCommandListener('coreupdate', $this, 'handle_CoreUpdate', true); $this->maniaControl->commandManager->registerCommandListener('pluginupdate', $this, 'handle_PluginUpdate', true); - + $this->currentBuildDate = $this->getNightlyBuildDate(); } /** * Perform Hourly Update Check - * + * * @param $time */ public function hourlyUpdateCheck($time) { @@ -94,18 +97,19 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener } return; } - - //Check if a new Core Update is Available - $self = $this; + + // Check if a new Core Update is Available + $self = $this; $maniaControl = $this->maniaControl; - $this->checkCoreUpdateAsync(function (UpdateData $updateData) use ($self, $maniaControl, $time) { - $buildDate = strtotime($self->getCurrentBuildDate()); + $this->checkCoreUpdateAsync(function (UpdateData $updateData) use($self, $maniaControl, $time) { + $buildDate = strtotime($self->getCurrentBuildDate()); $releaseTime = strtotime($updateData->releaseDate); if ($buildDate < $releaseTime) { $updateChannel = $maniaControl->settingManager->getSetting($self, UpdateManager::SETTING_UPDATECHECK_CHANNEL); if ($updateChannel != UpdateManager::CHANNEL_NIGHTLY) { $maniaControl->log('New ManiaControl Version ' . $updateData->version . ' available!'); - } else { + } + else { $maniaControl->log('New Nightly Build (' . $updateData->releaseDate . ') available!'); } $self->setCoreUpdateData($updateData); @@ -116,7 +120,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener /** * Handle ManiaControl PlayerJoined callback - * + * * @param Player $player */ public function handlePlayerJoined(Player $player) { @@ -127,14 +131,15 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener if (!$this->maniaControl->authenticationManager->checkPermission($player, self::SETTING_PERMISSION_UPDATE)) { return; } - - $buildDate = strtotime($this->currentBuildDate); + + $buildDate = strtotime($this->currentBuildDate); $releaseTime = strtotime($this->coreUpdateData->releaseDate); if ($buildDate < $releaseTime) { $updateChannel = $this->maniaControl->settingManager->getSetting($this, self::SETTING_UPDATECHECK_CHANNEL); if ($updateChannel != self::CHANNEL_NIGHTLY) { $this->maniaControl->chat->sendInformation('New ManiaControl Version ' . $this->coreUpdateData->version . ' available!', $player->login); - } else { + } + else { $this->maniaControl->chat->sendSuccess('New Nightly Build (' . $this->coreUpdateData->releaseDate . ') available!', $player->login); } } @@ -142,7 +147,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener /** * Perform automatic update as soon as a the Server is empty (also every hour got checked when its empty) - * + * * @param mixed $callback */ public function autoUpdate($callback) { @@ -150,26 +155,26 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener if (!$autoUpdate) { return; } - + if (count($this->maniaControl->playerManager->getPlayers()) > 0) { return; } - + if (!$this->coreUpdateData) { return; } - + $version = $this->maniaControl->client->getVersion(); if ($this->coreUpdateData->minDedicatedBuild > $version->build) { return; } - - $buildDate = strtotime($this->currentBuildDate); + + $buildDate = strtotime($this->currentBuildDate); $releaseTime = strtotime($this->coreUpdateData->releaseDate); if ($buildDate && $buildDate >= $releaseTime) { return; } - + $this->maniaControl->log("Starting Update to Version v{$this->coreUpdateData->version}..."); $performBackup = $this->maniaControl->settingManager->getSetting($this, self::SETTING_PERFORM_BACKUPS); if ($performBackup && !$this->performBackup()) { @@ -178,11 +183,10 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener $this->performCoreUpdate($this->coreUpdateData); } - /** * Handle //checkupdate command - * - * @param array $chatCallback + * + * @param array $chatCallback * @param Player $player */ public function handle_CheckUpdate(array $chatCallback, Player $player) { @@ -191,39 +195,22 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener return; } $updateChannel = $this->maniaControl->settingManager->getSetting($this, self::SETTING_UPDATECHECK_CHANNEL); - if ($updateChannel != self::CHANNEL_NIGHTLY) { - // Check update and send result message - $self = $this; - $this->checkCoreUpdateAsync(function (UpdateData $updateData) use (&$self, &$player) { - if (!$updateData) { - $self->maniaControl->chat->sendInformation('No Update available!', $player->login); - return; - } - - $version = $self->maniaControl->client->getVersion(); - if ($updateData->minDedicatedBuild > $version->build) { - $self->maniaControl->chat->sendError("No new Build for this Server-version available!", $player->login); - return; - } - - $self->maniaControl->chat->sendSuccess('Update for Version ' . $updateData->version . ' available!', $player->login); - }); - } else { + if ($updateChannel === self::CHANNEL_NIGHTLY) { // Special nightly channel updating $self = $this; - $this->checkCoreUpdateAsync(function (UpdateData $updateData) use (&$self, &$player) { + $this->checkCoreUpdateAsync(function ($updateData) use(&$self, &$player) { if (!$updateData) { $self->maniaControl->chat->sendInformation('No Update available!', $player->login); return; } - + $version = $self->maniaControl->client->getVersion(); if ($updateData->minDedicatedBuild > $version->build) { $self->maniaControl->chat->sendError("No new Build for this Server-version available!", $player->login); return; } - - $buildTime = strtotime($self->currentBuildDate); + + $buildTime = strtotime($self->currentBuildDate); $releaseTime = strtotime($updateData->releaseDate); if ($buildTime != '') { if ($buildTime >= $releaseTime) { @@ -231,31 +218,53 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener return; } $self->maniaControl->chat->sendSuccess('New Nightly Build (' . $updateData->releaseDate . ') available, current build: ' . $self->currentBuildDate . '!', $player->login); - } else { + } + else { $self->maniaControl->chat->sendSuccess('New Nightly Build (' . $updateData->releaseDate . ') available!', $player->login); } }, true); } + else { + // Check update and send result message + $self = $this; + $this->checkCoreUpdateAsync(function ($updateData) use(&$self, &$player) { + + if (!$updateData) { + $self->maniaControl->chat->sendInformation('No Update available!', $player->login); + return; + } + + $version = $self->maniaControl->client->getVersion(); + + if ($updateData->minDedicatedBuild > $version->build) { + $self->maniaControl->chat->sendError("No new Build for this Server-version available!", $player->login); + return; + } + + $self->maniaControl->chat->sendSuccess('Update for Version ' . $updateData->version . ' available!', $player->login); + }); + } } /** * Handle PlayerManialinkPageAnswer callback - * + * * @param array $callback */ 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); - - $login = $callback[1][1]; + $update = (strpos($actionId, PluginMenu::ACTION_PREFIX_UPDATEPLUGIN) === 0); + $install = (strpos($actionId, PluginInstallMenu::ACTION_PREFIX_INSTALLPLUGIN) === 0); + + $login = $callback[1][1]; $player = $this->maniaControl->playerManager->getPlayer($login); - + if ($update) { $pluginClass = substr($actionId, strlen(PluginMenu::ACTION_PREFIX_UPDATEPLUGIN)); if ($pluginClass == 'All') { $this->checkPluginsUpdate($player); - } else { + } + else { $newUpdate = $this->checkPluginUpdate($pluginClass); if ($newUpdate != false) { $newUpdate->pluginClass = $pluginClass; @@ -263,12 +272,12 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener } } } - + if ($install) { $pluginId = substr($actionId, strlen(PluginInstallMenu::ACTION_PREFIX_INSTALLPLUGIN)); - - $url = ManiaControl::URL_WEBSERVICE . 'plugins?id=' . $pluginId; - $dataJson = FileUtil::loadFile($url); + + $url = ManiaControl::URL_WEBSERVICE . 'plugins?id=' . $pluginId; + $dataJson = FileUtil::loadFile($url); $pluginVersions = json_decode($dataJson); if ($pluginVersions && isset($pluginVersions[0])) { $pluginData = $pluginVersions[0]; @@ -279,7 +288,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener /** * Get the Build Date of the local Nightly Build Version - * + * * @return String $buildTime */ private function getNightlyBuildDate() { @@ -293,7 +302,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener /** * Get the CurrentBuildDate - * + * * @return string */ public function getCurrentBuildDate() { @@ -302,21 +311,21 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener /** * Set the Build Date of the local Nightly Build Version - * + * * @param $date * @return mixed */ private function setNightlyBuildDate($date) { - $nightlyBuildDateFile = ManiaControlDir . '/core/nightly_build.txt'; - $success = file_put_contents($nightlyBuildDateFile, $date); + $nightlyBuildDateFile = ManiaControlDir . '/core/nightly_build.txt'; + $success = file_put_contents($nightlyBuildDateFile, $date); $this->currentBuildDate = $date; return $success; } /** * Handle //coreupdate command - * - * @param array $chatCallback + * + * @param array $chatCallback * @param Player $player */ public function handle_CoreUpdate(array $chatCallback, Player $player) { @@ -324,9 +333,9 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener $this->maniaControl->authenticationManager->sendNotAllowed($player); return; } - + $self = $this; - $this->checkCoreUpdateAsync(function (UpdateData $updateData) use (&$self, &$player) { + $this->checkCoreUpdateAsync(function (UpdateData $updateData) use(&$self, &$player) { if (!$updateData) { $self->maniaControl->chat->sendError('Update is currently not possible!', $player->login); return; @@ -336,7 +345,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener $self->maniaControl->chat->sendError("ManiaControl update version requires a newer Dedicated Server version!", $player->login); return; } - + $self->maniaControl->chat->sendInformation("Starting Update to Version v{$updateData->version}...", $player->login); $self->maniaControl->log("Starting Update to Version v{$updateData->version}..."); $performBackup = $self->maniaControl->settingManager->getSetting($self, UpdateManager::SETTING_PERFORM_BACKUPS); @@ -344,15 +353,15 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener $self->maniaControl->chat->sendError('Creating backup failed.', $player->login); $self->maniaControl->log("Creating backup failed."); } - + $self->performCoreUpdate($updateData, $player); }, true); } /** * Handle //pluginupdate command - * - * @param array $chatCallback + * + * @param array $chatCallback * @param Player $player */ public function handle_PluginUpdate(array $chatCallback, Player $player) { @@ -360,31 +369,31 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener $this->maniaControl->authenticationManager->sendNotAllowed($player); return; } - + $this->checkPluginsUpdate($player); } /** * Checks if there are outdated plugins active. - * + * * @param Player $player */ public function checkPluginsUpdate(Player $player = null) { $this->maniaControl->log('[UPDATE] Checking plugins for newer versions ...'); - + $self = $this; - $this->maniaControl->pluginManager->fetchPluginList(function ($data, $error) use (&$self, &$player) { + $this->maniaControl->pluginManager->fetchPluginList(function ($data, $error) use(&$self, &$player) { $outdatedPlugins = array(); - + if (!$data || $error) { $self->maniaControl->log('[UPDATE] Error while checking plugins for newer version'); return; } - + $pluginClasses = $self->maniaControl->pluginManager->getPluginClasses(); - - foreach($data as $plugin) { - foreach($pluginClasses as $pluginClass) { + + foreach ($data as $plugin) { + foreach ($pluginClasses as $pluginClass) { $id = $pluginClass::getId(); if ($plugin->id == $id) { if ($plugin->currentVersion->version > $pluginClass::getVersion()) { @@ -394,17 +403,18 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener } } } - + if (count($outdatedPlugins) > 0) { $self->maniaControl->log('[UPDATE] Checking plugins: COMPLETE, there are ' . count($outdatedPlugins) . ' outdated plugins, now updating ...'); if ($player) { $self->maniaControl->chat->sendInformation('Checking plugins: COMPLETE, there are ' . count($outdatedPlugins) . ' outdated plugins, now updating ...', $player->login); } $self->performPluginsBackup(); - foreach($outdatedPlugins as $plugin) { + foreach ($outdatedPlugins as $plugin) { $self->updatePlugin($plugin, $player); } - } else { + } + else { $self->maniaControl->log('[UPDATE] Checking plugins: COMPLETE, all plugins are up-to-date!'); if ($player) { $self->maniaControl->chat->sendInformation('Checking plugins: COMPLETE, all plugins are up-to-date!', $player->login); @@ -415,7 +425,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener /** * Check given Plugin Class for Update - * + * * @param string $pluginClass * @return mixed */ @@ -423,15 +433,18 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener if (is_object($pluginClass)) { $pluginClass = get_class($pluginClass); } - /** @var Plugin $pluginClass */ - $pluginId = $pluginClass::getId(); - $url = ManiaControl::URL_WEBSERVICE . 'plugins?id=' . $pluginId; - $dataJson = FileUtil::loadFile($url); + /** + * + * @var Plugin $pluginClass + */ + $pluginId = $pluginClass::getId(); + $url = ManiaControl::URL_WEBSERVICE . 'plugins?id=' . $pluginId; + $dataJson = FileUtil::loadFile($url); $pluginVersions = json_decode($dataJson); if (!$pluginVersions || !isset($pluginVersions[0])) { return false; } - $pluginData = $pluginVersions[0]; + $pluginData = $pluginVersions[0]; $pluginVersion = $pluginClass::getVersion(); if ($pluginData->currentVersion->version <= $pluginVersion) { return false; @@ -441,26 +454,29 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener /** * Check for updates - * + * * @return mixed */ public function getPluginsUpdates() { $pluginUpdates = array(); - $pluginsWS = array(); - - $url = ManiaControl::URL_WEBSERVICE . 'plugins'; - $dataJson = FileUtil::loadFile($url); + $pluginsWS = array(); + + $url = ManiaControl::URL_WEBSERVICE . 'plugins'; + $dataJson = FileUtil::loadFile($url); $pluginVersions = json_decode($dataJson); if (!$pluginVersions || !isset($pluginVersions[0])) { return false; } - - foreach($pluginVersions as $plugin) { + + foreach ($pluginVersions as $plugin) { $pluginsWS[$plugin->id] = $plugin; } - - /** @var Plugin $pluginClass */ - foreach($this->maniaControl->pluginManager->getPluginClasses() as $pluginClass) { + + /** + * + * @var Plugin $pluginClass + */ + foreach ($this->maniaControl->pluginManager->getPluginClasses() as $pluginClass) { $pluginId = $pluginClass::getId(); if (array_key_exists($pluginId, $pluginsWS)) { if ($pluginsWS[$pluginId]->currentVersion->version > $pluginClass::getVersion()) { @@ -468,7 +484,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener } } } - + if (empty($pluginUpdates)) { return false; } @@ -477,14 +493,14 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener /** * Update pluginfile - * - * @param $pluginData + * + * @param $pluginData * @param Player $player - * @param bool $reopen + * @param bool $reopen */ private function updatePlugin($pluginData, Player $player = null, $reopen = false) { $self = $this; - $this->maniaControl->fileReader->loadFile($pluginData->currentVersion->url, function ($updateFileContent, $error) use (&$self, &$updateData, &$player, &$pluginData, &$reopen) { + $this->maniaControl->fileReader->loadFile($pluginData->currentVersion->url, function ($updateFileContent, $error) use(&$self, &$updateData, &$player, &$pluginData, &$reopen) { $self->maniaControl->log('[UPDATE] Now updating ' . $pluginData->name . ' ...'); if ($player) { $self->maniaControl->chat->sendInformation('Now updating ' . $pluginData->name . ' ...', $player->login); @@ -494,7 +510,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener mkdir($tempDir); } $updateFileName = $tempDir . $pluginData->currentVersion->zipfile; - + $bytes = file_put_contents($updateFileName, $updateFileContent); if (!$bytes || $bytes <= 0) { trigger_error("Couldn't save plugin Zip."); @@ -503,7 +519,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener } return; } - $zip = new \ZipArchive(); + $zip = new \ZipArchive(); $result = $zip->open($updateFileName); if ($result !== true) { trigger_error("Couldn't open plugin Zip. ({$result})"); @@ -512,18 +528,18 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener } return; } - + $zip->extractTo(ManiaControlDir . '/plugins'); $zip->close(); unlink($updateFileName); @rmdir($tempDir); - + $self->maniaControl->log('[UPDATE] Successfully updated ' . $pluginData->name . '!'); if ($player) { $self->maniaControl->chat->sendSuccess('Successfully updated ' . $pluginData->name . '!', $player->login); $self->maniaControl->pluginManager->deactivatePlugin($pluginData->pluginClass); $self->maniaControl->pluginManager->activatePlugin($pluginData->pluginClass); - + if ($reopen) { $menuId = $self->maniaControl->configurator->getMenuId('Plugins'); $self->maniaControl->configurator->reopenMenu($player, $menuId); @@ -534,52 +550,52 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener /** * Install pluginfile - * - * @param $pluginData + * + * @param $pluginData * @param Player $player - * @param bool $reopen + * @param bool $reopen */ private function installPlugin($pluginData, Player $player, $reopen = false) { $self = $this; - $this->maniaControl->fileReader->loadFile($pluginData->currentVersion->url, function ($installFileContent, $error) use (&$self, &$updateData, &$player, &$pluginData, &$reopen) { + $this->maniaControl->fileReader->loadFile($pluginData->currentVersion->url, function ($installFileContent, $error) use(&$self, &$updateData, &$player, &$pluginData, &$reopen) { $pluginsDirectory = ManiaControlDir . '/plugins/'; - $pluginFiles = scandir($pluginsDirectory); - + $pluginFiles = scandir($pluginsDirectory); + $self->maniaControl->log('[UPDATE] Now installing ' . $pluginData->name . ' ...'); $self->maniaControl->chat->sendInformation('Now installing ' . $pluginData->name . ' ...', $player->login); - + $tempDir = ManiaControlDir . '/temp/'; if (!is_dir($tempDir)) { mkdir($tempDir); } $installFileName = $tempDir . $pluginData->currentVersion->zipfile; - + $bytes = file_put_contents($installFileName, $installFileContent); if (!$bytes || $bytes <= 0) { trigger_error("Couldn't save plugin Zip."); $self->maniaControl->chat->sendError("Install failed: Couldn't save plugin zip!", $player->login); return; } - $zip = new \ZipArchive(); + $zip = new \ZipArchive(); $result = $zip->open($installFileName); if ($result !== true) { trigger_error("Couldn't open plugin Zip. ({$result})"); $self->maniaControl->chat->sendError("Install failed: Couldn't open plugin zip!", $player->login); return; } - + $zip->extractTo(ManiaControlDir . '/plugins'); $zip->close(); unlink($installFileName); @rmdir($tempDir); - + $pluginFilesAfter = scandir($pluginsDirectory); - $newFiles = array_diff($pluginFilesAfter, $pluginFiles); - + $newFiles = array_diff($pluginFilesAfter, $pluginFiles); + $classesBefore = get_declared_classes(); - foreach($newFiles as $newFile) { + foreach ($newFiles as $newFile) { $filePath = $pluginsDirectory . $newFile; - + if (is_file($filePath)) { $success = include_once $filePath; if (!$success) { @@ -587,7 +603,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener } continue; } - + $dirPath = $pluginsDirectory . $newFile; if (is_dir($dirPath)) { $self->maniaControl->pluginManager->loadPluginFiles($dirPath); @@ -595,17 +611,20 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener } } $classesAfter = get_declared_classes(); - + $newClasses = array_diff($classesAfter, $classesBefore); - foreach($newClasses as $className) { + foreach ($newClasses as $className) { if (!$self->maniaControl->pluginManager->isPluginClass($className)) { continue; } - - /** @var Plugin $className */ + + /** + * + * @var Plugin $className + */ $self->maniaControl->pluginManager->addPluginClass($className); $className::prepare($self->maniaControl); - + if ($self->maniaControl->pluginManager->isPluginActive($className)) { continue; } @@ -613,10 +632,10 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener continue; } } - + $self->maniaControl->log('[UPDATE] Successfully installed ' . $pluginData->name . '!'); $self->maniaControl->chat->sendSuccess('Successfully installed ' . $pluginData->name . '!', $player->login); - + if ($reopen) { $menuId = $self->maniaControl->configurator->getMenuId('Install Plugins'); $self->maniaControl->configurator->reopenMenu($player, $menuId); @@ -626,7 +645,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener /** * Set Core Update Data - * + * * @param UpdateData $coreUpdateData */ public function setCoreUpdateData(UpdateData $coreUpdateData = null) { @@ -635,31 +654,32 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener /** * Checks a core update Asynchronously - * - * @param $function + * + * @param $function * @param bool $ignoreVersion */ private function checkCoreUpdateAsync($function, $ignoreVersion = false) { $updateChannel = $this->getCurrentUpdateChannelSetting(); - $url = ManiaControl::URL_WEBSERVICE . 'versions?update=1¤t=1&channel=' . $updateChannel; - - $this->maniaControl->fileReader->loadFile($url, function ($dataJson, $error) use (&$function, $ignoreVersion) { + $url = ManiaControl::URL_WEBSERVICE . 'versions?current=1&channel=' . $updateChannel; + + $this->maniaControl->fileReader->loadFile($url, function ($dataJson, $error) use(&$function, $ignoreVersion) { $versions = json_decode($dataJson); if (!$versions || !isset($versions[0])) { return; } $updateData = new UpdateData($versions[0]); if (!$ignoreVersion && $updateData->version <= ManiaControl::VERSION) { - return; + call_user_func($function, null); + } + else { + call_user_func($function, $updateData); } - - call_user_func($function, $updateData); }); } /** * Perform a Backup of ManiaControl - * + * * @return bool */ private function performBackup() { @@ -668,15 +688,15 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener mkdir($backupFolder); } $backupFileName = $backupFolder . 'backup_' . ManiaControl::VERSION . '_' . date('y-m-d') . '_' . time() . '.zip'; - $backupZip = new \ZipArchive(); + $backupZip = new \ZipArchive(); if ($backupZip->open($backupFileName, \ZipArchive::CREATE) !== TRUE) { trigger_error("Couldn't create Backup Zip!"); return false; } - $excludes = array('.', '..', 'backup', 'logs', 'ManiaControl.log'); - $pathInfo = pathInfo(ManiaControlDir); + $excludes = array('.', '..', 'backup', 'logs', 'ManiaControl.log'); + $pathInfo = pathInfo(ManiaControlDir); $parentPath = $pathInfo['dirname'] . '/'; - $dirName = $pathInfo['basename']; + $dirName = $pathInfo['basename']; $backupZip->addEmptyDir($dirName); $this->zipDirectory($backupZip, ManiaControlDir, strlen($parentPath), $excludes); $backupZip->close(); @@ -685,7 +705,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener /** * Perform a Backup of the plugins - * + * * @return bool */ private function performPluginsBackup() { @@ -694,15 +714,15 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener mkdir($backupFolder); } $backupFileName = $backupFolder . 'backup_plugins_' . date('y-m-d') . '_' . time() . '.zip'; - $backupZip = new \ZipArchive(); + $backupZip = new \ZipArchive(); if ($backupZip->open($backupFileName, \ZipArchive::CREATE) !== TRUE) { trigger_error("Couldn't create Backup Zip!"); return false; } - $excludes = array('.', '..'); - $pathInfo = pathInfo(ManiaControlDir . '/plugins'); + $excludes = array('.', '..'); + $pathInfo = pathInfo(ManiaControlDir . '/plugins'); $parentPath = $pathInfo['dirname'] . '/'; - $dirName = $pathInfo['basename']; + $dirName = $pathInfo['basename']; $backupZip->addEmptyDir($dirName); $this->zipDirectory($backupZip, ManiaControlDir . '/plugins', strlen($parentPath), $excludes); $backupZip->close(); @@ -711,11 +731,11 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener /** * Add a complete Directory to the ZipArchive - * + * * @param \ZipArchive $zipArchive - * @param string $folderName - * @param int $prefixLength - * @param array $excludes + * @param string $folderName + * @param int $prefixLength + * @param array $excludes * @return bool */ private function zipDirectory(\ZipArchive &$zipArchive, $folderName, $prefixLength, array $excludes = array()) { @@ -724,11 +744,11 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener trigger_error("Couldn't open Folder '{$folderName}' for Backup!"); return false; } - while(false !== ($file = readdir($folderHandle))) { + while (false !== ($file = readdir($folderHandle))) { if (in_array($file, $excludes)) { continue; } - $filePath = $folderName . '/' . $file; + $filePath = $folderName . '/' . $file; $localPath = substr($filePath, $prefixLength); if (is_file($filePath)) { $zipArchive->addFile($filePath, $localPath); @@ -746,9 +766,9 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener /** * Perform a Core Update - * + * * @param object $updateData - * @param $player + * @param $player * @return bool */ private function performCoreUpdate(UpdateData $updateData, Player $player = null) { @@ -759,7 +779,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener $this->maniaControl->log('Update failed!'); return false; } - + if (!isset($updateData->url) && !isset($updateData->releaseDate)) { if ($player) { $this->maniaControl->chat->sendError('Update failed: No update Data available!', $player->login); @@ -767,15 +787,15 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener $this->maniaControl->log('Update failed: No update Data available!'); return false; } - + $self = $this; - $this->maniaControl->fileReader->loadFile($updateData->url, function ($updateFileContent, $error) use (&$self, &$updateData, &$player) { + $this->maniaControl->fileReader->loadFile($updateData->url, function ($updateFileContent, $error) use(&$self, &$updateData, &$player) { $tempDir = ManiaControlDir . '/temp/'; if (!is_dir($tempDir)) { mkdir($tempDir); } $updateFileName = $tempDir . basename($updateData->url); - + $bytes = file_put_contents($updateFileName, $updateFileContent); if (!$bytes || $bytes <= 0) { trigger_error("Couldn't save Update Zip."); @@ -784,7 +804,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener } return false; } - $zip = new \ZipArchive(); + $zip = new \ZipArchive(); $result = $zip->open($updateFileName); if ($result !== true) { trigger_error("Couldn't open Update Zip. ({$result})"); @@ -793,40 +813,40 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener } return false; } - + $zip->extractTo(ManiaControlDir); $zip->close(); unlink($updateFileName); @rmdir($tempDir); - - //Set the Nightly Build Date + + // Set the Nightly Build Date $self->setNightlyBuildDate($updateData->releaseDate); - + if ($player) { $self->maniaControl->chat->sendSuccess('Update finished!', $player->login); } $self->maniaControl->log("Update finished!"); - + $self->maniaControl->restart(); - + return true; }); - + return true; } /** * Function checks if ManiaControl has sufficient access to files to update them. - * + * * @return bool */ private function checkPermissions() { $writableDirectories = array('/core/', '/plugins/'); - $path = ManiaControlDir; - - foreach($writableDirectories as $writableDirecotry) { + $path = ManiaControlDir; + + foreach ($writableDirectories as $writableDirecotry) { $dir = new \RecursiveDirectoryIterator($path . $writableDirecotry); - foreach(new \RecursiveIteratorIterator($dir) as $filename => $file) { + foreach (new \RecursiveIteratorIterator($dir) as $filename => $file) { if (substr($filename, -1) != '.' && substr($filename, -2) != '..') { if (!is_writable($filename)) { $this->maniaControl->log('Cannot update: the file/directory "' . $filename . '" is not writable!'); @@ -840,7 +860,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener /** * Retrieve the Update Channel Setting - * + * * @return string */ private function getCurrentUpdateChannelSetting() {