reorganisation des dossiers

[mtweb] / mw / env / modules / mw_env_plugins.php

diff --git a/web/app/env/modules/mw_env_plugins.php b/mw/env/modules/mw_env_plugins.php
similarity index 62%
rename from web/app/env/modules/mw_env_plugins.php
rename to mw/env/modules/mw_env_plugins.php
index 375e3c7..1df1834 100644 (file)
--- a/web/app/env/modules/mw_env_plugins.php
+++ b/mw/env/modules/mw_env_plugins.php
@@ -28,64 +28,62 @@
       }
       $plugins = array();
       if(!class_exists("mw_plugin")){
-        require $this->path("app")."mw_plugin.php";
+        require $this->path("mw_dir")."plugins/mw_plugin.php";
         if(!class_exists("mw_plugin")){
           $plugins = false;
           return;
         }
       }
-      if(file_exists($this->path("plugins"))){
-        if($dh = opendir($this->path("plugins"))){
-          $OK = true;
-          while($OK && ($plugin_name = readdir($dh)) !== false){
-            if(substr($plugin_name, 0 ,1) !== "." && is_dir($this->path("plugins").$plugin_name)){
-              if(!isset($plugins[$plugin_name])){
-                if(($plugin = $this->plugin_data($plugin_name)) !== false){
-                  $MAJ = false;
-                  if(!isset($plugin["installed"]) || !isset($plugin["enabled"])){
-                    $plugin["installed"] = false;
-                    $plugin["enabled"] = false;
-                    $plugin["priorite"] = 0;
-                    $MAJ = true;
-                  }
-                  if(!$plugin["installed"] && $plugin["enabled"]){
-                    $plugin["enabled"] = false;
-                    $MAJ = true;
-                  }
-                  if($MAJ) $OK = $this->set_plugin_data($plugin_name, $plugin);
-                  if($OK){
-                    if(($plugin["impl"] = $this->plugin_impl($plugin_name)) !== false){
-                      $plugin["title"] =  ($plugin_title = $this->plugin_call($plugin["impl"], "title")) ? $plugin_title : "";
-                      $plugin["description"] = ($plugin_description = $this->plugin_call($plugin["impl"], "description")) ? $plugin_description : "";
-                      $plugin["name"] = $plugin_name;
-                      $plugins[$plugin_name] = $plugin;
-                    }
+      if($dh = opendir($this->path("mw_dir")."plugins/")){
+        $OK = true;
+        while($OK && ($plugin_name = readdir($dh)) !== false){
+          if(substr($plugin_name, 0 ,1) !== "." && is_dir($this->path("mw_dir")."plugins/".$plugin_name)){
+            if(!isset($plugins[$plugin_name])){
+              if(($plugin = $this->plugin_data($plugin_name)) !== false){
+                $MAJ = false;
+                if(!isset($plugin["installed"]) || !isset($plugin["enabled"])){
+                  $plugin["installed"] = false;
+                  $plugin["enabled"] = false;
+                  $plugin["priorite"] = 0;
+                  $MAJ = true;
+                }
+                if(!$plugin["installed"] && $plugin["enabled"]){
+                  $plugin["enabled"] = false;
+                  $MAJ = true;
+                }
+                if($MAJ) $OK = $this->set_plugin_data($plugin_name, $plugin);
+                if($OK){
+                  if(($plugin["impl"] = $this->plugin_impl($plugin_name)) !== false){
+                    $plugin["title"] =  ($plugin_title = $this->plugin_call($plugin["impl"], "title")) ? $plugin_title : "";
+                    $plugin["description"] = ($plugin_description = $this->plugin_call($plugin["impl"], "description")) ? $plugin_description : "";
+                    $plugin["name"] = $plugin_name;
+                    $plugins[$plugin_name] = $plugin;
                   }
                 }
-                else $OK = false;
               }
+              else $OK = false;
             }
-            if(!$OK) $plugins = false;
           }
-          closedir($dh);
-          if($plugins !== false){
-            if(file_exists($this->plugins_data_dir()) && is_dir($this->plugins_data_dir())){
-              if($dh = opendir($this->plugins_data_dir())){
-                $plugins_data_files = array();
-                $OK = true;
-                while($OK && ($plugin_name = readdir($dh)) !== false){
-                  if(substr($plugin_name, 0 ,1) != "." && !is_dir($this->plugin_data_file($plugin_name))){
-                    if(!$plugins[$plugin_name]) $this->del_plugin_data($plugin_name);
-                  }
-                  if(!$OK) $plugins = false;
+          if(!$OK) $plugins = false;
+        }
+        closedir($dh);
+        if($plugins !== false){
+          if(file_exists($this->plugins_data_dir()) && is_dir($this->plugins_data_dir())){
+            if($dh = opendir($this->plugins_data_dir())){
+              $plugins_data_files = array();
+              $OK = true;
+              while($OK && ($plugin_name = readdir($dh)) !== false){
+                if(substr($plugin_name, 0 ,1) != "." && !is_dir($this->plugin_data_file($plugin_name))){
+                  if(!isset($plugins[$plugin_name])) $this->del_plugin_data($plugin_name);
                 }
-                closedir($dh);
+                if(!$OK) $plugins = false;
               }
+              closedir($dh);
             }
           }
         }
-        else $plugins = false;
       }
+      else $plugins = false;
       if($plugins !== false){
         if($PRIORITE == "ASC") $this->plugins_asc = $this->ordonne_plugins($plugins, $PRIORITE);
         elseif($PRIORITE == "DESC") $this->plugins_desc = $this->ordonne_plugins($plugins, $PRIORITE);
@@ -129,10 +127,10 @@
 
     function plugin_impl($plugin_name){
       $plugin = false;
-      if(file_exists($this->path("plugins"))){
-        if(substr($plugin_name, 0 ,1) !== "." && is_dir($this->path("plugins").$plugin_name)){
-          if(file_exists($this->path("plugins").$plugin_name."/".$plugin_name.".php")){
-            require $this->path("plugins").$plugin_name."/".$plugin_name.".php";
+      if(file_exists($this->path("mw_dir")."plugins")){
+        if(substr($plugin_name, 0 ,1) !== "." && is_dir($this->path("mw_dir")."plugins/".$plugin_name)){
+          if(file_exists($this->path("mw_dir")."plugins/".$plugin_name."/".$plugin_name.".php")){
+            require $this->path("mw_dir")."plugins/".$plugin_name."/".$plugin_name.".php";
             if(class_exists($plugin_name)){
               $plugin = new $plugin_name();
             }