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

pluginmanager fix

Browse Source
This commit is contained in:
kremsy 2014-02-14 18:17:05 +01:00 committed by Steffen Schröder
parent 3022e33bda
commit e4a0ac2207
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/core/ManiaControl.php
View File

@ -304,12 +304,12 @@ class ManiaControl implements CommandListener {
$this->callbackManager->manageCallbacks(); $this->callbackManager->manageCallbacks();
} catch(Exception $e) { } catch(Exception $e) {
if ($e->getMessage() == 'Connection interupted' || $e->getMessage() == 'transport error - connection interrupted!') { if ($e->getMessage() == 'Connection interupted' || $e->getMessage() == 'transport error - connection interrupted!') {
$this->quit($e->getMessage()); $this->quit($e->getMessage());
return; return;
}
throw $e;
} }
throw $e;
}
// Manage FileReader // Manage FileReader
$this->fileReader->appendData(); $this->fileReader->appendData();

12
application/core/Plugins/PluginManager.php
View File

@ -180,16 +180,23 @@ class PluginManager {
return true; return true;
} }
/** /**
* Load complete plugins directory and start all configured plugins * Load complete plugins directory and start all configured plugins
*/ */
public function loadPlugins() { public function loadPlugins($dir = '') {
$pluginsDirectory = ManiaControlDir . '/plugins/'; $pluginsDirectory = ManiaControlDir . '/plugins/' . $dir . '/';
$pluginFiles = scandir($pluginsDirectory, 0); $pluginFiles = scandir($pluginsDirectory, 0);
foreach($pluginFiles as $pluginFile) { foreach($pluginFiles as $pluginFile) {
if (stripos($pluginFile, '.') === 0) { if (stripos($pluginFile, '.') === 0) {
continue; continue;
} }
if (is_dir($pluginsDirectory . $pluginFile)) {
$this->loadPlugins($pluginFile);
continue;
}
$classesBefore = get_declared_classes(); $classesBefore = get_declared_classes();
$success = include_once $pluginsDirectory . $pluginFile; $success = include_once $pluginsDirectory . $pluginFile;
if (!$success) { if (!$success) {
@ -201,6 +208,7 @@ class PluginManager {
if (!$this->isPluginClass($className)) { if (!$this->isPluginClass($className)) {
continue; continue;
} }
//Prepare Plugin //Prepare Plugin
$className::prepare($this->maniaControl); $className::prepare($this->maniaControl);