bug REQUEST_URI

[mtweb] / mw / mw_app.php

diff --git a/mw/mw_app.php b/mw/mw_app.php
index 990d7a7..4b0b2eb 100644 (file)
--- a/mw/mw_app.php
+++ b/mw/mw_app.php
@@ -9,10 +9,10 @@
     var $config;
     var $bdd;
     var $error;
-    var $DO_SETUP;
+    var $DO_INSTALL;
 
-    function mw_app($path_file, $DO_SETUP = false){
-      $this->DO_SETUP = $DO_SETUP;
+    function mw_app($path_file, $DO_INSTALL = false){
+      $this->DO_INSTALL = $DO_INSTALL;
       $this->path_file = $path_file;
       $this->pathes = array();
       $this->config_file = "";
@@ -39,30 +39,32 @@
       if(!$this->init_config()) return $this->get_error();
       if(!$this->init_env()) return $this->get_error();
       if(!$this->config_file){
-        if($this->DO_SETUP){
-          $this->setup();
+        if($this->DO_INSTALL){
+          $this->install();
           exit;
         }
         return $this->get_error();
       }
       $env = $this->env();
-      if(!$env->version("mtweb")){
-        $this->error("impossible de lire la version du code");
-        return $this->get_error();
-      }
-      $data = $env->data();
-      if($data->version("mtweb") != $env->version("mtweb")){
+      if(($res = $env->data_upgrade_required()) === true){
         $this->upgrade();
         exit;
       }
+      else{
+        if($res !== false){
+          $this->error($res);
+          return $this->get_error();
+        }
+      }
       return true;
     }
 
     function init_pathes(){
-      if(($n = strpos($_SERVER["REQUEST_URI"], "?")) !== false){
-        $_SERVER["REQUEST_URI"] = substr($_SERVER["REQUEST_URI"], 0, $n);
+      $REQUEST_URI = $_SERVER["REQUEST_URI"];
+      if(($n = strpos($REQUEST_URI, "?")) !== false){
+        $REQUEST_URI = substr($REQUEST_URI, 0, $n);
       }
-      $web_path = explode("/", preg_replace('#/+#','/',$_SERVER["REQUEST_URI"]));
+      $web_path = explode("/", preg_replace('#/+#','/',$REQUEST_URI));
       $this->pathes["web"] = "";
       for($i = 0; $i < count($web_path) - 1; $i++) $this->pathes["web"] .= $web_path[$i]."/";
       if(
@@ -128,7 +130,7 @@
         }
       }
       else{
-        if(!$this->DO_SETUP){
+        if(!$this->DO_INSTALL){
           $this->error("fichier config.php manquant");
           return false;
         }
@@ -165,6 +167,10 @@
       $env->load_versions();
       $env->load_config($this->bdd, $this->config);
       $env->init();
+      if(($res = $env->init_data_upgrades()) !== true){
+        $this->error("impossible de lire les upgrades. ".$res);
+        return false;
+      }
       return true;
     }
 
@@ -175,24 +181,42 @@
       return true;
     }
   
-    function display(){
+    function run_mod($mod_name, $valid_role = true){
       $env = $this->env();
-      if($env->etat_is_valid()){
-        $template = $env->get_template();
-        $layout = $env->init_layout();
-        $template->render_layout($layout);
+      $etat = false;
+      if(isset($_GET[$env->param("e")])){
+        $etat = $env->valid_etat($_GET[$env->param("e")]);
+        if(!$etat || ($etat["mod"] != $mod_name)){
+          $etat = false;
+        }
+      }
+      if(!$etat){
+        $etat = $env->valid_etat($mod_name);
       }
+      if(!$etat) return false;
+      $env->run($etat, array(), $valid_role);
+      return true;
     }
 
-    function setup(){
-      $env = $this->env();
-      $etat = isset($_GET[$env->param("e")]) ? $_GET[$env->param("e")] : "install";
-      $env->run($etat, array(), false);
-      $this->display();
+    function install(){
+      if($this->run_mod("install", false)){
+        $this->display();
+      }
     }
 
     function upgrade(){
-      debug("la base de données doit être mise à jour");
+      if($this->run_mod("upgrade", false)){
+        $this->display();
+      }
+    }
+
+    function display(){
+      $env = $this->env();
+      if($env->etat_is_valid()){
+        $template = $env->get_template();
+        $layout = $env->init_layout();
+        $template->render_layout($layout);
+      }
     }
 
     function error($content){