FuzeWorks/Core
FuzeWorks/Core
1
0
Fork 0
Code Issues 9 Pull Requests Packages Releases Activity

Fix for #28 and #23. This patch removes the mod and event registers so that modules can now be loaded dynamicly instead of using a global configuration file.

Browse Source
This commit is contained in:
Abel Hoogeveen 2015-04-22 11:31:29 +02:00
parent 71547eec26
commit 8c1a7afda5
6 changed files with 44 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Application/Config/config.eventregister.php
View File

@ -1,5 +0,0 @@
<?php return array (
'register' =>
array (
),
) ;

1
Application/Config/config.main.php
View File

@ -2,7 +2,6 @@
'SITE_URL' => '',
'SITE_DOMAIN' => '',
'SERVER_NAME' => '',
'registers_update_interval' => 3600,
'administrator_mail' => '',
'default_controller' => 'standard',
'default_function' => 'index',

0
Application/Config/config.modregister.php
View File

17
Core/Events/event.eventRegisterBuildEvent.php
View File

@ -1,17 +0,0 @@
<?php
class EventRegisterBuildEvent extends Event {
public $register = array();
public function init($call){}
public function addEvent($modName, $eventName) {
if (!isset($this->register[$eventName])) {
$this->register[$eventName] = array();
}
$this->register[$eventName][] = $modName;
}
}
?>

59
Core/System/class.core.php
View File

@ -11,7 +11,7 @@ class Core {
public $mods;
private $loaded = false;
private $register;
public $register;
## START/STOP
public function init() {
@ -23,12 +23,12 @@ class Core {
$this->mods = new stdClass();
$this->loadStartupFiles();
$this->mods->events->fireEvent('coreStartEvent');
// Mod register exists, check if expired
if ( ( date('U') - $this->mods->config->main->registers_last_update) > $this->mods->config->main->registers_update_interval) {
$this->mods->logger->log("Registers have expired. Updating...", 'Core');
$this->buildModRegister();
$this->mods->events->buildEventRegister();
$this->buildRegister();
$this->mods->events->buildEventRegister();
$event = $this->mods->events->fireEvent('coreStartEvent');
if ($event->isCancelled()) {
return true;
}
}
@ -99,13 +99,6 @@ class Core {
}
private function loadModule($name, $version = null) {
// Load the register if not loaded yet
if (!isset($this->mods->config->modregister->register)) {
$this->buildModRegister();
} else {
$this->register = $this->mods->config->modregister->register;
}
// The basic module path
$path = FUZEPATH . "Modules/";
@ -186,14 +179,20 @@ class Core {
'moduleName' => $name);
}
public function buildModRegister() {
$this->mods->logger->newLevel("Building Mod Register", 'Core');
$dir = FUZEPATH . "Modules/";
$mods = array_values(array_diff(scandir($dir), array('..', '.')));
$register = array();
for ($i=0; $i < count($mods); $i++) {
$mod_dir = $dir . $mods[$i] . "/";
if (file_exists($mod_dir . "/moduleInfo.php")) {
public function buildRegister() {
$this->mods->logger->newLevel("Loading Module Headers", 'Core');
// Get all the module directories
$dir = FUZEPATH . "Modules/";
$mod_dirs = array();
$mod_dirs = array_values(array_diff(scandir($dir), array('..', '.')));
// Build the module register
$register = array();
for ($i=0; $i < count($mod_dirs); $i++) {
$mod_dir = $dir . $mod_dirs[$i] . "/";
// If a moduleInfo.php exists, load it
if (file_exists($mod_dir . "/moduleInfo.php")) {
$cfg = (object) require($mod_dir . "/moduleInfo.php");
$name = "";
$name .= (!empty($cfg->author) ? strtolower($cfg->author)."/" : "");
@ -203,11 +202,11 @@ class Core {
$cfg->directory = $mod_dir;
$register[$name] = (array) $cfg;
$this->mods->logger->log("Found module: '".$name."'");
} else {
} else {
// Get the name
$name = $mods[$i];
$name = $mod_dirs[$i];
// Build a dynamic module config
// Build a default module config
$cfg = new stdClass();
$cfg->module_class = ucfirst($name);
$cfg->module_file = 'class.'.strtolower($name).".php";
@ -217,12 +216,12 @@ class Core {
$cfg->directory = $mod_dir;
$register[$name] = (array)$cfg;
$this->mods->logger->log("Found module: '".$name."'");
}
}
}
}
$this->mods->logger->stopLevel();
$this->mods->config->set('modregister', 'register', $register);
$this->mods->config->set('main', 'registers_last_update', date('U'));
$this->register = $register;
$this->mods->logger->stopLevel();
}
}

26
Core/System/class.events.php
View File

@ -112,7 +112,7 @@ class Events extends Bus{
$this->logger->log("Checking for Listeners");
// Read the event register for listeners
$register = $this->config->eventregister->register;
$register = $this->register;
if (isset($register[$eventName])) {
for ($i=0; $i < count($register[$eventName]); $i++) {
$this->core->loadMod($register[$eventName][$i]);
@ -154,18 +154,22 @@ class Events extends Bus{
// Event Preparation:
public function buildEventRegister() {
$this->logger->newLevel("Building Event Register", 'Events');
$dir = FUZEPATH . "/Modules/";
$mods = $this->config->modregister->register;
foreach ($mods as $key => $value) {
try {
$this->core->loadMod($key);
} catch (Exception $e) {}
$event_register = array();
foreach ($this->core->register as $key => $value) {
if (isset($value['events'])) {
if (!empty($value['events'])) {
for ($i=0; $i < count($value['events']); $i++) {
if (isset($event_register[$value['events'][$i]])) {
$event_register[$value['events'][$i]][] = $key;
} else {
$event_register[$value['events'][$i]] = array($key);
}
}
}
}
}
$event = $this->fireEvent('eventRegisterBuildEvent', '');
$this->config->set('eventregister', 'register', $event->register);
$this->logger->stopLevel();
$this->register = $event_register;
}
}