Changeset 3066:aa297059d2a0

Timestamp:

08/10/15 15:31:48 (10 years ago)

Author:

Dsls

Branch:

default

Message:

Disable plugins with unmetdependencies, in admin home and plugins.php admin page. See #1842, fixed partially (need to see how to cope with themes now)

Files:

• admin/index.php (modified) (1 diff)
• admin/plugins.php (modified) (1 diff)
• inc/core/class.dc.modules.php (modified) (4 diffs)

admin/index.php

@@ -28 +28 @@
 
 dcPage::check('usage,contentadmin');
+
+if ($core->plugins->disableDepModules($core->adminurl->get('admin.home',array()))) {
+     exit;
+}
 
 # Logout

admin/plugins.php

@@ -25 +25 @@
 adminModulesList::$distributed_modules = explode(',', DC_DISTRIB_PLUGINS);
 
+if ($core->plugins->disableDepModules($core->adminurl->get('admin.plugins',array()))) {
+     exit;
+}
+
 # -- Display module configuration page --
 if ($list->setConfiguration()) {

inc/core/class.dc.modules.php

@@ -29 +29 @@
      protected $disabled_mode = false;
      protected $disabled_meta = array();
+     protected $to_disable = array();
 
      protected $id;
@@ -61 +62 @@
       */
      public function checkDependencies() {
-          $to_disable = array();
+          $this->to_disable = array();
           foreach ($this->all_modules as $k => &$m) {
                if (isset($m['requires'])) {
@@ -85 +86 @@
                          $m['cannot_enable']=$missing;
                          if ($m['enabled']) {
-                              $to_disable[]=array('name' => $k,'reason'=> $missing);
+                              $this->to_disable[]=array('name' => $k,'reason'=> $missing);
                          }
                     }
@@ -100 +101 @@
                }
           }
-          return $to_disable;
+     }
+
+     /**
+      * Checks all modules dependencies, and disable unmet dependencies
+      * @param  string $redir_url URL to redirect if modules are to disable
+      * @return boolea, true if a redirection has been performed
+      */
+     public function disableDepModules($redir_url) {
+          if (isset($_GET['dep'])) {
+               // Avoid infinite redirects
+               return false;
+          }
+          $reason = array();
+          foreach ($this->to_disable as $module) {
+                    try{
+                         $this->deactivateModule($module['name']);
+                         $reason[] = sprintf("<li>%s : %s</li>",$module['name'],join(',',$module['reason']));
+                    } catch (Exception $e) {
+                    }
+          }
+          if (count($reason)) {
+               $message = sprintf ("<p>%s</p><ul>%s</ul>",
+                    __("The following extensions have been disabled :"),
+                    join('',$reason)
+               );
+               dcPage::addWarningNotice($message,array('divtag'=>true,'with_ts' => false));
+               if (strpos($redir_url,"?")) {
+                    $url = $redir_url."&"."dep=1";
+               } else {
+                    $url = $redir_url."?"."dep=1";
+               }
+               http::redirect($url);
+               return true;
+          }
+          return false;
      }