beu/TrackManiaControl
1
0
Fork 0
Code Issues 11 Pull Requests Releases Wiki Activity

Plugininstallation now fixed

Browse Source
This commit is contained in:
Max Klaversma 2014-05-01 14:25:55 +02:00 committed by Steffen Schröder
parent 31e03730a8
commit 4f4f46c56f
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
application/core/Update/UpdateManager.php
View File

@ -561,7 +561,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
$self = $this; $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/'; $pluginsDirectory = ManiaControlDir . '/plugins/';
$pluginFiles = scandir($pluginsDirectory); $pluginFiles = $this->scanDirectory($pluginsDirectory);
$self->maniaControl->log('[UPDATE] Now installing ' . $pluginData->name . ' ...'); $self->maniaControl->log('[UPDATE] Now installing ' . $pluginData->name . ' ...');
$self->maniaControl->chat->sendInformation('Now installing ' . $pluginData->name . ' ...', $player->login); $self->maniaControl->chat->sendInformation('Now installing ' . $pluginData->name . ' ...', $player->login);
@ -590,15 +590,15 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
$zip->close(); $zip->close();
unlink($installFileName); unlink($installFileName);
@rmdir($tempDir); @rmdir($tempDir);
$pluginFilesAfter = scandir($pluginsDirectory); $pluginFilesAfter = $this->scanDirectory($pluginsDirectory);
$newFiles = array_diff($pluginFilesAfter, $pluginFiles); $newFiles = array_diff($pluginFilesAfter, $pluginFiles);
$classesBefore = get_declared_classes(); $classesBefore = get_declared_classes();
foreach ($newFiles as $newFile) { foreach ($newFiles as $newFile) {
$filePath = $pluginsDirectory . $newFile; $filePath = $pluginsDirectory . $newFile;
if (is_file($filePath)) { if (is_file($filePath) && strstr($filePath, '.php')) {
$success = include_once $filePath; $success = include_once $filePath;
if (!$success) { if (!$success) {
trigger_error("Error loading File '{$filePath}'!"); trigger_error("Error loading File '{$filePath}'!");
@ -645,6 +645,31 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
}); });
} }
/**
* Scans the plugindirectory recursively.
*
* @param $dir
* @return array
*/
function scanDirectory($dir) {
$result = array();
$cdir = scandir($dir);
foreach($cdir as $key => $value) {
if(!in_array($value,array(".",".."))) {
if(is_dir($dir . DIRECTORY_SEPARATOR . $value)) {
foreach($this->scanDirectory($dir . DIRECTORY_SEPARATOR . $value) as $dirValue) {
$result[] = $value.DIRECTORY_SEPARATOR.$dirValue;
}
} else {
$result[] = $value;
}
}
}
return $result;
}
/** /**
* Set Core Update Data * Set Core Update Data
* *