X-Git-Url: http://git.dj3c1t.com/index.cgi?a=blobdiff_plain;f=mw%2Fapp%2Fcontrollers%2Finstall%2Findex.php;h=79734f3fdf4f79eacdbd1ebabe00b72293982f54;hb=HEAD;hp=94e146bd9b9d99e4bd967c753ed9876f7349d416;hpb=abc64414fdac6533c011c28b53cba6d28dee4f2a;p=mtweb

diff --git a/mw/app/controllers/install/index.php b/mw/app/controllers/install/index.php
index 94e146b..79734f3 100644
--- a/mw/app/controllers/install/index.php
+++ b/mw/app/controllers/install/index.php
@@ -2,16 +2,16 @@
 
   class mw_install_index extends mw_controller{
 
-    var $config_file;
+    public $config_file;
 
-    function validate(){
+    public function validate(){
       $env = $this->env();
       $this->config_file = $env->path("content")."config/config.php";
       if(file_exists($this->config_file)) return "le site est deja installé";
       return true;
     }
 
-    function index(){
+    public function index(){
       $env = $this->env();
       $data = $env->data();
       $admin = array(
@@ -19,7 +19,7 @@
         "email" => "",
         "password" => ""
       );
-      if(($sgbds = $data->sgbds()) === false){
+      if(($sgbds = $env->sgbds()) === false){
         $env->erreur("impossible de lister les sgbds disponibles");
         return;
       }
@@ -77,14 +77,9 @@
         else $env->message("merci de choisir un mot de passe pour l'administrateur");
         if(!$env->messages()){
           $sgbds[$current_sgbd] = null;
-          $impl = new $current_sgbd($params);
+          $impl = new $current_sgbd($env, $params);
           $sgbds[$current_sgbd] = $impl;
-          $data->set_sgbd(
-            new mw_sgbd(
-              $sgbds[$current_sgbd],
-              $env
-            )
-          );
+          $data->set_sgbd($sgbds[$current_sgbd]);
           $data->load_modules($env->path("mw_dir")."app/", "data/modules/".($current_sgbd == "mw_xml" ? "xml" : "sql")."/");
           if(
                 $current_sgbd == "mw_xml"
@@ -128,10 +123,6 @@
             $env->erreur("la base de données a été installée mais impossible d'ajouter l'administrateur");
             return;
           }
-          if(!$env->set_webmaster_user($admin["login"], md5($admin["password"]))){
-            $env->erreur("la base de données a été installée mais impossible d'enregistrer le webmaster");
-            return;
-          }
         }
         if(!$env->messages()){
           if(!$content = @file_get_contents($template_file)){
@@ -200,12 +191,12 @@
             if(!$plugin["installed"]){
               $env->run("config/plugins/install", array("get" => array("id" => $plugin_name)), false);
               if($env->erreurs()) return;
-              $env->init_plugins("DESC", true);
+              $env->load_plugin($plugin_name);
             }
             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->load_plugin($plugin_name);
             }
           }
           $env->redirect(
@@ -221,5 +212,3 @@
     }
 
   }
-
-?>
\ No newline at end of file