le dossier out passe dans le dossier app

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

diff --git a/mw/env/modules/mw_env_out.php b/mw/env/modules/mw_env_out.php
index 12ab2ed..00f4a84 100644 (file)
--- a/mw/env/modules/mw_env_out.php
+++ b/mw/env/modules/mw_env_out.php
@@ -31,7 +31,7 @@
       $pathes = array();
       if(($plugins = $this->plugins()) !== false){
         foreach($plugins as $plugin_name => $plugin){
-          $out_dir = $this->path("mw_dir")."plugins/".$plugin_name."/out/";
+          $out_dir = $this->path("mw_dir")."plugins/".$plugin_name."/app/out/";
           if(
                $plugin["installed"]
             && $plugin["enabled"]
@@ -42,7 +42,7 @@
           }
         }
         if($pathes !== false){
-          $pathes = $this->_out_pathes($this->path("mw_dir")."out/", $pathes);
+          $pathes = $this->_out_pathes($this->path("mw_dir")."app/out/", $pathes);
         }
       }
       else $pathes = false;
@@ -82,12 +82,12 @@
     function _out_file($file, $PRIORITE = "DESC"){
       $out_file = false;
       if($PRIORITE == "ASC"){
-        $tmp_out_file = "out/".$this->config("out")."/".$file;
+        $tmp_out_file = "app/out/".$this->config("out")."/".$file;
         if($file && file_exists($this->path("mw_dir").$tmp_out_file)){
           $out_file = $tmp_out_file;
         }
         if(!$out_file){
-          $tmp_out_file = "out/".$this->config("default_out")."/".$file;
+          $tmp_out_file = "app/out/".$this->config("default_out")."/".$file;
           if($file && file_exists($this->path("mw_dir").$tmp_out_file)){
             $out_file = $tmp_out_file;
           }
@@ -96,13 +96,13 @@
       if($out_file) return $out_file;
       if(($plugins = $this->plugins($PRIORITE)) !== false){
         foreach($plugins as $plugin_name => $plugin){
-          $tmp_out_file = "plugins/".$plugin_name."/out/".$this->config("out")."/".$file;
+          $tmp_out_file = "plugins/".$plugin_name."/app/out/".$this->config("out")."/".$file;
           if($file && $plugin["installed"] && $plugin["enabled"] && file_exists($this->path("mw_dir").$tmp_out_file)){
             $out_file = $tmp_out_file;
             break;
           }
           if(!$out_file){
-            $tmp_out_file = "plugins/".$plugin_name."/out/".$this->config("default_out")."/".$file;
+            $tmp_out_file = "plugins/".$plugin_name."/app/out/".$this->config("default_out")."/".$file;
             if($file && $plugin["installed"] && $plugin["enabled"] && file_exists($this->path("mw_dir").$tmp_out_file)){
               $out_file = $tmp_out_file;
               break;
@@ -110,12 +110,12 @@
           }
         }
         if($PRIORITE == "DESC" && !$out_file){
-          $tmp_out_file = "out/".$this->config("out")."/".$file;
+          $tmp_out_file = "app/out/".$this->config("out")."/".$file;
           if($file && file_exists($this->path("mw_dir").$tmp_out_file)){
             $out_file = $tmp_out_file;
           }
           if(!$out_file){
-            $tmp_out_file = "out/".$this->config("default_out")."/".$file;
+            $tmp_out_file = "app/out/".$this->config("default_out")."/".$file;
             if($file && file_exists($this->path("mw_dir").$tmp_out_file)){
               $out_file = $tmp_out_file;
             }
@@ -160,13 +160,13 @@
         foreach($plugins as $plugin_name => $plugin){
           if($plugin["installed"] && $plugin["enabled"]){
             $FOUND = false;
-            $functions_file = $this->path("mw_dir")."plugins/".$plugin_name."/out/".$this->config("out")."/functions.php";
+            $functions_file = $this->path("mw_dir")."plugins/".$plugin_name."/app/out/".$this->config("out")."/functions.php";
             if(file_exists($functions_file)){
               $FOUND = true;
               require $functions_file;
             }
             if(!$FOUND){
-              $functions_file = $this->path("mw_dir")."plugins/".$plugin_name."/out/".$this->config("default_out")."/functions.php";
+              $functions_file = $this->path("mw_dir")."plugins/".$plugin_name."/app/out/".$this->config("default_out")."/functions.php";
               if($plugin["installed"] && $plugin["enabled"] && file_exists($functions_file)){
                 require $functions_file;
               }
@@ -174,13 +174,13 @@
           }
         }
         $FOUND = false;
-        $functions_file = $this->path("mw_dir")."out/".$this->config("out")."/functions.php";
+        $functions_file = $this->path("mw_dir")."app/out/".$this->config("out")."/functions.php";
         if(file_exists($functions_file)){
           $FOUND = true;
           require $functions_file;
         }
         if(!$FOUND){
-          $functions_file = $this->path("mw_dir")."out/".$this->config("default_out")."/functions.php";
+          $functions_file = $this->path("mw_dir")."app/out/".$this->config("default_out")."/functions.php";
           if(file_exists($functions_file)){
             require $functions_file;
           }
@@ -204,20 +204,20 @@
     function _init_layout($mod){
       if(($plugins = $this->plugins("ASC")) !== false){
         $layout_file = false;
-        $tmp_layout_file = $this->path("mw_dir")."out/".$this->config("out")."/layouts/".$mod.".xml";
+        $tmp_layout_file = $this->path("mw_dir")."app/out/".$this->config("out")."/layouts/".$mod.".xml";
         if(file_exists($tmp_layout_file)) $layout_file = $tmp_layout_file;
         if(!$layout_file){
-          $tmp_layout_file = $this->path("mw_dir")."out/".$this->config("default_out")."/layouts/".$mod.".xml";
+          $tmp_layout_file = $this->path("mw_dir")."app/out/".$this->config("default_out")."/layouts/".$mod.".xml";
           if(file_exists($tmp_layout_file)) $layout_file = $tmp_layout_file;
         }
         if($layout_file) $this->load_layout($layout_file);
         foreach($plugins as $plugin_name => $plugin){
           if($plugin["installed"] && $plugin["enabled"]){
             $layout_file = false;
-            $tmp_layout_file = $this->path("mw_dir")."plugins/".$plugin_name."/out/".$this->config("out")."/layouts/".$mod.".xml";
+            $tmp_layout_file = $this->path("mw_dir")."plugins/".$plugin_name."/app/out/".$this->config("out")."/layouts/".$mod.".xml";
             if(file_exists($tmp_layout_file)) $layout_file = $tmp_layout_file;
             if(!$layout_file){
-              $tmp_layout_file = $this->path("mw_dir")."plugins/".$plugin_name."/out/".$this->config("default_out")."/layouts/".$mod.".xml";
+              $tmp_layout_file = $this->path("mw_dir")."plugins/".$plugin_name."/app/out/".$this->config("default_out")."/layouts/".$mod.".xml";
               if(file_exists($tmp_layout_file)) $layout_file = $tmp_layout_file;
             }
             if($layout_file) $this->load_layout($layout_file);