Changeset 3007:f9d013776723 for inc

Timestamp:

06/05/15 15:56:08 (10 years ago)

Author:

Dsls

Branch:

default

Message:

Update dependencies management, add notices and prevent enabling/disabling modules when dependencies are unmet.

Location:

inc

Files:

• admin/lib.moduleslist.php (modified) (4 diffs)
• core/class.dc.modules.php (modified) (1 diff)

inc/admin/lib.moduleslist.php

@@ -672 +672 @@
                     echo
                     '<td class="module-desc maximal">'.html::escapeHTML(__($module['desc']));
-                    if (in_array('deps', $cols)) {
-
-                         if (isset($module['disable_also'])) {
-                              echo
-                              '<br/><span class="info">'.__('Disabling or removing this plugin will also disable the following plugins: ').
-                              join(',',$module['disable_also']).'</span>';
+                    if (isset($module['cannot_disable']) && $module['enabled']) {
+                         echo
+                         '<br/><span class="info">'.
+                         sprintf(__('This module cannot be disabled nor deleted, since the following modules are also enabled : %s'),
+                                   join(',',$module['cannot_disable'])).
+                         '</span>';
+                    }
+                    if (isset($module['cannot_enable']) && !$module['enabled']) {
+                         echo
+                         '<br/><span class="info">'.
+                         __('This module cannot be enabled, because of the following reasons :').
+                         '<ul>';
+                         foreach ($module['cannot_enable'] as $m=>$reason) {
+                              echo '<li>'.$reason.'</li>';
                          }
+                         echo '</ul>'.
+                         '</span>';
                     }
                     echo '</td>';
@@ -815 +825 @@
 
                     # Deactivate
-                    case 'activate': if ($this->core->auth->isSuperAdmin() && $module['root_writable']) {
+                    case 'activate': if ($this->core->auth->isSuperAdmin() && $module['root_writable'] && !isset($module['cannot_enable'])) {
                          $submits[] =
                          '<input type="submit" name="activate['.html::escapeHTML($id).']" value="'.__('Activate').'" />';
@@ -821 +831 @@
 
                     # Activate
-                    case 'deactivate': if ($this->core->auth->isSuperAdmin() && $module['root_writable']) {
+                    case 'deactivate': if ($this->core->auth->isSuperAdmin() && $module['root_writable'] && !isset($module['cannot_disable'])) {
                          $submits[] =
                          '<input type="submit" name="deactivate['.html::escapeHTML($id).']" value="'.__('Deactivate').'" class="reset" />';
@@ -827 +837 @@
 
                     # Delete
-                    case 'delete': if ($this->core->auth->isSuperAdmin() && $this->isDeletablePath($module['root'])) {
+                    case 'delete': if ($this->core->auth->isSuperAdmin() && $this->isDeletablePath($module['root'])&& !isset($module['cannot_disable'])) {
                          $dev = !preg_match('!^'.$this->path_pattern.'!', $module['root']) && defined('DC_DEV') && DC_DEV ? ' debug' : '';
                          $submits[] =

inc/core/class.dc.modules.php

@@ -52 +52 @@
      }
 
-
+     /**
+      * Checks all modules dependencies
+      *   Fills in the following information in module :
+      *     * cannot_enable : list reasons why module cannot be enabled. Not set if module can be enabled
+      *     * cannot_disable : list reasons why module cannot be disabled. Not set if module can be disabled
+      *     * implies : reverse dependencies
+      * @return array list of enabled modules with unmet dependencies, and that must be disabled.
+      */
      public function checkDependencies() {
           $to_disable = array();
           foreach ($this->all_modules as $k => &$m) {
                if (isset($m['requires'])) {
+                    $missing = array();
                     foreach ($m['requires'] as &$dep) {
-                         $missing = array();
                          if (!is_array($dep)) {
                               $dep = array($dep);
                          }
+                         // grab missing dependencies
                          if (!isset($this->all_modules[$dep[0]])) {
                               // module not present
-                              $missing[$dep[0]] = true;
-                         } elseif (count($dep)>1 && version_compare($m['version'],$dep[1],'<')) {
+                              $missing[$dep[0]] = sprintf(__("Requires module %s which is not installed"), $dep[0]);
+                         } elseif ((count($dep)>1) && version_compare($this->all_modules[$dep[0]]['version'],$dep[1])==-1) {
+                              echo "bla:".version_compare($this->all_modules[$dep[0]]['version'],$dep[1],'<');
                               // module present, but version missing
-                              $missing[$dep[0]] = $dep[1];
+                              $missing[$dep[0]] = sprintf(__("Requires module %s version %s, but version %s is installed"), $dep[0],$dep[1],$m['version']);
+                         } elseif (!$this->all_modules[$dep[0]]['enabled']) {
+                              // module disabled
+                              $missing[$dep[0]] = sprintf(__("Requires module %s which is disabled"), $dep[0]);
                          }
-                         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;
-                              }
+                         $this->all_modules[$dep[0]]['implies'][]=$k;
+                    }
+                    if (count($missing)) {
+                         $m['cannot_enable']=$missing;
+                         if ($m['enabled']) {
+                              $to_disable[]=array('name' => $k,'reason'=> $missing);
                          }
                     }
                }
           }
+          // Check modules that cannot be disabled
+          foreach ($this->modules as $k => &$m) {
+               if (isset($m['implies']) && $m['enabled']) {
+                    foreach ($m['implies'] as $im) {
+                         if (isset($this->all_modules[$im]) && $this->all_modules[$im]['enabled']) {
+                              $m['cannot_disable'][]=$im;
+                         }
+                    }
+               }
+          }
+          return $to_disable;
      }