maj version dans config.xml

[mtweb] / mw / app / controllers / install / index.php

diff --git a/mw/app/controllers/install/index.php b/mw/app/controllers/install/index.php
index 8407538..07fb56e 100644 (file)
--- a/mw/app/controllers/install/index.php
+++ b/mw/app/controllers/install/index.php
@@ -29,7 +29,7 @@
           "#--" => $table_prefix
         )
       );
-      $current_sgbd = "mw_pdo_sqlite";
+      $current_sgbd = isset($sgbds["mw_pdo_sqlite"]) ? "mw_pdo_sqlite" : "mw_xml";
       if($_POST){
         if(!isset($_POST["sgbd"])){
           $env->erreur("Parametre de SGBD manquant");
@@ -57,6 +57,7 @@
           "user" => isset($_POST[$current_sgbd."_user"]) ? $_POST[$current_sgbd."_user"] : "",
           "password" => isset($_POST[$current_sgbd."_password"]) ? $_POST[$current_sgbd."_password"] : ""
         );
+        $sgbds[$current_sgbd]->user = $params["user"];
         $admin = array(
           "login" => trim($_POST["admin_login"]),
           "email" => trim($_POST["admin_email"]),
@@ -158,6 +159,51 @@
             $env->erreur("impossible de créer le fichier de configuration");
             return;
           }
+          require_once $this->config_file;
+          if(
+                isset($CONFIG)
+            &&  is_array($CONFIG)
+          ){
+            $env->set_config($CONFIG);
+          }
+          if(
+                isset($bdd)
+            &&  is_array($bdd)
+          ){
+            foreach($bdd as $bdd_key => $bdd_value){
+              if($bdd_key == "table_prefix"){
+                if(!($table_prefix = $env->bdd("table_prefix"))){
+                  $env->erreur("impossible de lire les prefixes de tables");
+                  return;
+                }
+                foreach($table_prefix as $prefix_code => $prefix_value) break;
+                if(!isset($prefix_code)){
+                  $env->erreur("impossible de lire le code pour le prefixe de tables");
+                  return;
+                }
+                $table_prefix[$prefix_code] = $bdd_value;
+                $env->add_table_prefix($table_prefix);
+              }
+              else{
+                $env->set_bdd($bdd_key, $bdd_value);
+              }
+            }
+          }
+          if(($plugins = $env->plugins("DESC")) === false){
+            $env->erreur("impossible de lister les plugins");
+          }
+          foreach($plugins as $plugin_name => $plugin){
+            if(!$plugin["installed"]){
+              $env->run("config/plugins/install", array("get" => array("id" => $plugin_name)), false);
+              if($env->erreurs()) return;
+              $env->init_plugins("DESC", true);
+            }
+            if(!$plugin["enabled"]){
+              $env->run("config/plugins/enable", array("get" => array("id" => $plugin_name)), false);
+              if($env->erreurs()) return;
+              $env->init_plugins("DESC", true);
+            }
+          }
           $env->redirect(
             $env->url(),
             "le site a été installé"