Changeset 2997:8f7c065a8639 for inc/core/class.dc.modules.php

Timestamp:

04/21/15 20:01:46 (10 years ago)

Author:

Dsls

Branch:

default

Message:

First step in modules dependencies management

File:

• inc/core/class.dc.modules.php (modified) (7 diffs)

inc/core/class.dc.modules.php

@@ -26 +26 @@
      protected $errors = array();
      protected $modules_names = array();
+     protected $all_modules = array();
      protected $disabled_mode = false;
      protected $disabled_meta = array();
@@ -49 +50 @@
      {
           $this->core =& $core;
+     }
+
+
+     public function checkDependencies() {
+          $to_disable = array();
+          foreach ($this->all_modules as $k => &$m) {
+               if (isset($m['requires'])) {
+                    foreach ($m['requires'] as &$dep) {
+                         $missing = array();
+                         if (!is_array($dep)) {
+                              $dep = array($dep);
+                         }
+                         if (!isset($this->all_modules[$dep[0]])) {
+                              // module not present
+                              $missing[$dep[0]] = true;
+                         } elseif (count($dep)>1 && version_compare($m['version'],$dep[1],'<')) {
+                              // module present, but version missing
+                              $missing[$dep[0]] = $dep[1];
+                         }
+                         if (count($missing)) {
+                              $m['errors']=$missing;
+                              $to_disable[]=$k;
+                         } else {
+                              $this->all_modules[$dep[0]]['disable_also'][]=$k;
+                              $m['require_enable'][]=$dep[0];
+                              if (!$this->all_modules[$dep[0]]['enabled']) {
+                                   $to_disable[]=$k;
+                              }
+                         }
+                    }
+               }
+          }
      }
 
@@ -100 +133 @@
                               $this->mroot = $full_entry;
                               require $full_entry.'/_define.php';
+                              $this->all_modules[$entry] =& $this->modules[$entry];
                               $this->id = null;
                               $this->mroot = null;
@@ -106 +140 @@
                          {
                               if (file_exists($full_entry.'/_define.php')) {
+                                   $this->id = $entry;
+                                   $this->mroot = $full_entry;
                                    $this->disabled_mode=true;
                                    require $full_entry.'/_define.php';
                                    $this->disabled_mode=false;
                                    $this->disabled[$entry] =  $this->disabled_meta;
+                                   $this->all_modules[$entry] =& $this->disabled[$entry];
+                                   $this->id = null;
+                                   $this->mroot = null;
                               }
                          }
@@ -116 +155 @@
                $d->close();
           }
-
+          $this->checkDependencies();
           # Sort plugins
           uasort($this->modules,array($this,'sortModules'));
@@ -190 +229 @@
                               'author' => $author,
                               'version' => $version,
+                              'enabled' => false,
                               'root_writable' => is_writable($this->mroot)
                          )
@@ -214 +254 @@
                     'standalone_config' => false,
                     'type' => null,
+                    'enabled' => true,
                     'requires' => array()
                ), $properties