identification install sur table users

diff --git a/mw/app/controllers/install/index.php b/mw/app/controllers/install/index.php
index 94e146b..07fb56e 100644 (file)
--- a/mw/app/controllers/install/index.php
+++ b/mw/app/controllers/install/index.php
@@ -128,10 +128,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)){

diff --git a/mw/app/controllers/upgrade/index.php b/mw/app/controllers/upgrade/index.php
index 7b0752d..83d0b6c 100644 (file)
--- a/mw/app/controllers/upgrade/index.php
+++ b/mw/app/controllers/upgrade/index.php
@@ -2,12 +2,6 @@
 
   class mw_upgrade_index extends mw_controller{
 
-    function validate(){
-      $env = $this->env();
-      $env->load_webmaster_session();
-      return true;
-    }
-
     function index(){
       $env = $this->env();
       $data = $env->data();
@@ -22,17 +16,6 @@
         $env->redirect($env->url("upgrade"), "", 0);
         return;
       }
-      if(!($webmaster_user = $env->get_webmaster_user())){
-        $env->erreur("impossible de lire le user webmaster");
-        return;
-      }
-      if(
-            ($user["login"] != $webmaster_user["login"])
-        ||  ($user["password"] != $webmaster_user["password"])
-      ){
-        $env->erreur("identification incorrecte");
-        return;
-      }
       if(($res = $env->do_data_upgrade()) !== true){
         $env->erreur("Erreur durant l'upgrade: ".$res);
         return;

diff --git a/mw/app/controllers/upgrade/user.php b/mw/app/controllers/upgrade/user.php
index 68dce71..9e9485e 100644 (file)
--- a/mw/app/controllers/upgrade/user.php
+++ b/mw/app/controllers/upgrade/user.php
@@ -2,18 +2,12 @@
 
   class mw_upgrade_user extends mw_controller{
 
-    function validate(){
-      $env = $this->env();
-      $env->load_webmaster_session();
-      return true;
-    }
-
     function login(){
       $env = $this->env();
       if($_POST){
         $data = $env->data();
         $message = "Identifiants incorrects";
-        if($user = $env->webmaster_login(trim($_POST['login']), trim($_POST['pass']))){
+        if($user = $data->login(trim($_POST['login']), trim($_POST['pass']))){
           $message = "Vous êtes maintenant identifié en tant que ".$user['login'];
         }
         $env->redirect(

diff --git a/mw/app/out/default/views/upgrade/head.php b/mw/app/out/default/views/upgrade/head.php
index 0f9cce0..b5647bb 100644 (file)
--- a/mw/app/out/default/views/upgrade/head.php
+++ b/mw/app/out/default/views/upgrade/head.php
@@ -8,6 +8,7 @@
 
     <script type="text/javascript"> mw_site_url = "<?php echo $this->path("web") ?>"; </script>
     <script type="text/javascript" src="<?php echo $this->out_url("js/md5.js"); ?>"></script>
+    <script type="text/javascript" src="<?php echo $this->out_url("js/login.js"); ?>"></script>
     <?php foreach($this->js_files() as $js_file) : ?>
     <script type="text/javascript" src="<?php echo $js_file; ?>"></script>
     <?php endforeach; ?>

diff --git a/mw/app/out/default/views/upgrade/index.php b/mw/app/out/default/views/upgrade/index.php
index 296778a..802ae94 100644 (file)
--- a/mw/app/out/default/views/upgrade/index.php
+++ b/mw/app/out/default/views/upgrade/index.php
@@ -29,9 +29,6 @@
       method="post">
   <fieldset>
     <legend>Identification</legend>
-    <p>
-      Identifiez-vous avec l'utilisateur que vous avez créé pendant l'installation du site.
-    </p>
     <input type="hidden" name="pass" value="" />
     <ul>
       <li>

diff --git a/mw/env/modules/mw_env_webmaster.php b/mw/env/modules/mw_env_webmaster.php
deleted file mode 100644 (file)
index d1ceabc..0000000
--- a/mw/env/modules/mw_env_webmaster.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-  class mw_env_webmaster extends mw_env{
-
-    function load_webmaster_session(){
-      $data = $this->data();
-      if(!($webmaster_user = $this->get_webmaster_user())) return array();
-      return $data->load_session($webmaster_user);
-    }
-
-    function get_webmaster_user(){
-      if(!file_exists($this->get_webmaster_user_file())) return array();
-      if(!($content = @file_get_contents($this->get_webmaster_user_file()))) return false;
-      $v_content = explode(":", $content);
-      if(count($v_content) != 2) return false;
-      return array(
-        "login" => trim($v_content[0]),
-        "password" => trim($v_content[1])
-      );
-    }
-
-    function set_webmaster_user($login, $password){
-      return @file_put_contents($this->get_webmaster_user_file(), $login.":".$password);
-    }
-
-    function get_webmaster_user_file(){
-      return $this->path("content")."data/.webmaster";
-    }
-
-    function webmaster_login($login, $password){
-      $data = $this->data();
-      if(!($webmaster_user = $this->get_webmaster_user())){
-        return false;
-      }
-      return $data->login($login, $password, $webmaster_user);
-    }
-
-  }

diff --git a/mw/mw_app.php b/mw/mw_app.php
index e666add..a488bce 100644 (file)
--- a/mw/mw_app.php
+++ b/mw/mw_app.php
@@ -209,6 +209,9 @@
     }
 
     function upgrade(){
+      $env = $this->env();
+      $data = $env->data();
+      $data->load_session();
       if($this->run_mod("upgrade", false)){
         $this->display();
       }