adaptations pour pludieurs instances d'applications

[mtweb] / mw / mw_app.php

diff --git a/mw/mw_app.php b/mw/mw_app.php
index 86978c2..044d711 100644 (file)
--- a/mw/mw_app.php
+++ b/mw/mw_app.php
@@ -24,25 +24,31 @@
         &&  ($empty_class_file = (file_exists($PATHES["mw_dir"]."libs/empty_class.php") ? $PATHES["mw_dir"]."libs/empty_class.php" : ""))
         &&  ($env_class_file = (file_exists($PATHES["mw_dir"]."env/mw_env.php") ? $PATHES["mw_dir"]."env/mw_env.php" : ""))
       ){
-        require $sxml_class_file;
-        require $empty_class_file;
-        require $env_class_file;
-        $env = new mw_env(true);
-        $this->set_env($env);
-        $env->load_modules($PATHES["mw_dir"], "env/modules/");
-        $env->set_config_file($config_file);
-        $env->set_PATHES($PATHES);
-        $env->init_plugins();
-        $env->load_config($bdd, $CONFIG);
-        $env->init();
+        if(!class_exists("sxml")) require_once $sxml_class_file;
+        if(!class_exists("empty_class")) require_once $empty_class_file;
+        if(!class_exists("mw_env")) require_once $env_class_file;
+        if(
+              class_exists("sxml")
+          &&  class_exists("empty_class")
+          &&  class_exists("mw_env")
+        ){
+          $env = new mw_env(true);
+          $this->set_env($env);
+          $env->load_modules($PATHES["mw_dir"], "env/modules/");
+          $env->set_config_file($config_file);
+          $env->set_PATHES($PATHES);
+          $env->init_plugins();
+          $env->load_config($bdd, $CONFIG);
+          $env->init();
+        }
       }
       return $this->env();
     }
 
-    function run($etat = ""){
+    function run($etat = "", $params = array(), $valid_role = true){
       $env = $this->env();
       $etat = ($etat === false ? false : ($etat ? $etat : (isset($_GET[$env->param("e")]) ? $_GET[$env->param("e")] : "")));
-      if($etat !== false) $env->run($etat);
+      if($etat !== false) $env->run($etat, $params, $valid_role);
     }
   
     function display(){