changed context loader

FoolCode · Jan 26, 2015 · 2dcf66e · 2dcf66e
1 parent 85b65c5
commit 2dcf66e
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 19 deletions.
diff --git a/config/package.php b/config/package.php
@@ -16,6 +16,8 @@
          */
         'name' => 'FoolFrame',
 
+        'class_context' => '\\Foolz\\FoolFrame\\Model\\Context',
+
         /**
          * The name that can be used in classes names
          */

diff --git a/src/Controller/Admin.php b/src/Controller/Admin.php
@@ -148,7 +148,7 @@ private function getSidebarValues()
 
         // load sidebars from modules and leave FoolFrame sidebar on bottom
         foreach($this->config->get('foolz/foolframe', 'config', 'modules.installed') as $module) {
-            $module_sidebar = $this->config->get($module, 'sidebar');
+            $module_sidebar = $this->config->get($module['namespace'], 'sidebar');
             if(is_array($module_sidebar)) {
                 $sidebar = array_merge($module_sidebar['sidebar'], $sidebar);
             }

diff --git a/src/Controller/Admin/Preferences.php b/src/Controller/Admin/Preferences.php
@@ -123,15 +123,15 @@ function action_general()
         );
 
         foreach ($this->config->get('foolz/foolframe', 'config', 'modules.installed') as $module) {
-            if ($module === 'foolz/foolframe') {
+            if ($module['namespace'] === 'foolz/foolframe') {
                 continue;
             }
 
             $theme_loader = new \Foolz\Theme\Loader();
-            $theme_loader->addDir($this->config->get($module, 'package', 'directories.themes'));
+            $theme_loader->addDir($this->config->get($module['namespace'], 'package', 'directories.themes'));
             $themes = $theme_loader->getAll();
 
-            $module_name = $this->config->get($module, 'package', 'main.name');
+            $module_name = $this->config->get($module['namespace'], 'package', 'main.name');
 
             $theme_checkboxes = [];
 

diff --git a/src/Model/Auth.php b/src/Model/Auth.php
@@ -71,7 +71,7 @@ public function __construct(Context $context)
         $this->groups = $this->config->get('foolz/foolframe', 'foolauth', 'groups');
 
         foreach ($this->config->get('foolz/foolframe', 'config', 'modules.installed') as $module) {
-            foreach ($this->config->get($module, 'foolauth', 'roles') as $key => $item) {
+            foreach ($this->config->get($module['namespace'], 'foolauth', 'roles') as $key => $item) {
                 if (!isset($this->roles[$key])) {
                     $this->roles[$key] = $item;
                 } else {

diff --git a/src/Model/Context.php b/src/Model/Context.php
@@ -207,15 +207,9 @@ class_alias('Foolz\Foolframe\Model\Users', 'Users');
 
         // run the Framework class for each module
         foreach($this->config->get('foolz/foolframe', 'config', 'modules.installed') as $module) {
-            if ($module !== 'foolz/foolframe') {
-                $class_arr = explode('/', $module);
-                $class = '\\';
-                foreach ($class_arr as $str) {
-                    $class .= ucfirst($str).'\\';
-                }
-
-                $class .= 'Model\Context';
-                $this->child_contextes[$module] = new $class($this);
+            if ($module['namespace'] !== 'foolz/foolframe') {
+                $context = $module['context'];
+                $this->child_contextes[$module] = new $context($this);
             }
         }
 

diff --git a/src/Model/Install.php b/src/Model/Install.php
@@ -81,8 +81,14 @@ public function install_modules()
         $name_lowercase = strtolower($class_name);
 
         $modules = [
-            'foolframe' => 'foolz/foolframe',
-            $name_lowercase => 'foolz/'.$name_lowercase
+            'foolframe' => [
+                'context' => '\\Foolz\\FoolFrame\\Model\\Context',
+                'namespace' => 'foolz/foolframe'
+            ],
+            $name_lowercase => [
+                'context' => $this->config->get('unknown', 'package', 'main.class_context'),
+                'namespace' => 'foolz/'.$name_lowercase
+            ]
         ];
 
         $dc = new DoctrineConnection($this->getContext(), $this->config);

diff --git a/src/Model/Plugins.php b/src/Model/Plugins.php
@@ -51,9 +51,9 @@ public function instantiate()
 
         // store all the relevant data from the modules
         foreach ($this->config->get('foolz/foolframe', 'config', 'modules.installed') as $module) {
-            $dir = $this->config->get($module, 'package', 'directories.plugins');
+            $dir = $this->config->get($module['namespace'], 'package', 'directories.plugins');
             $this->loader->addDir($dir);
-            $dir = VAPPPATH.$module.'/plugins';
+            $dir = VAPPPATH.$module['namespace'].'/plugins';
             $this->loader->addDir($dir);
         }
 

diff --git a/src/Model/Preferences.php b/src/Model/Preferences.php
@@ -125,7 +125,7 @@ public function get($setting, $fallback = null, $show_empty_string = false)
         $identifier = array_shift($segments);
         $query = implode('.', $segments);
 
-        return $this->config->get($this->modules[$identifier], 'package', 'preferences.'.$query);
+        return $this->config->get($this->modules[$identifier]['namespace'], 'package', 'preferences.'.$query);
     }
 
     public function set($setting, $value, $reload = true)