X-Git-Url: http://git.dj3c1t.com/index.cgi?a=blobdiff_plain;f=mw%2Fapp%2Fmods%2Fadmin%2Fusers.php;fp=mw%2Fapp%2Fmods%2Fadmin%2Fusers.php;h=302096ba85c21492415952e3a3215de5eb9e9206;hb=2ff0191d4033a2e45ca57e478ff81132c132ed1f;hp=95dfed0dc71a5fca7a1a7bc342b862de61c1c159;hpb=3c17f81e1d2fb68f69cfa620ca00ad63e83cc17c;p=mtweb

diff --git a/mw/app/mods/admin/users.php b/mw/app/mods/admin/users.php
index 95dfed0..302096b 100644
--- a/mw/app/mods/admin/users.php
+++ b/mw/app/mods/admin/users.php
@@ -2,11 +2,11 @@
 
   class mw_admin_users extends mw_mod{
 
-    var $status;
+    var $roles;
 
     function validate(&$env){
       $data = $env->data();
-      if(($this->status = $data->status()) === false) return "impossible de lire la liste des statuts";
+      if(($this->roles = $data->roles()) === false) return "impossible de lire la liste des statuts";
       return true;
     }
 
@@ -16,16 +16,16 @@
 
     function index(&$env){
       $data = $env->data();
-      if($this->status) $env->set_out("status", $this->status);
+      if($this->roles) $env->set_out("roles", $this->roles);
       else{
-        $env->erreur("impossible de lire la liste des status");
+        $env->erreur("impossible de lire la liste des roles");
         return;
       }
       if(
         ( $users = $data->users(
             isset($_GET[$env->param("start")]) ? $_GET[$env->param("start")] : 0,
             isset($_GET[$env->param("alpha")]) ? $_GET[$env->param("alpha")] : null,
-            isset($_GET[$env->param("status")]) ? $_GET[$env->param("status")] : null
+            isset($_GET[$env->param("role")]) ? $_GET[$env->param("role")] : null
           )
         ) !== false
       ){
@@ -36,12 +36,12 @@
 
     function add(&$env){
       $data = $env->data();
-      if($this->status){
-        $env->set_out("status", $this->status);
+      if($this->roles){
+        $env->set_out("roles", $this->roles);
         $user = array(
           "login" => "",
           "email" => "",
-          "status" => array()
+          "roles" => array()
         );
         if($_POST){
           $VALID = true;
@@ -78,12 +78,12 @@
             $env->message("merci de preciser un mot de passe");
             $VALID = false;
           }
-          $user["status"] = array();
+          $user["roles"] = array();
           foreach($_POST as $key => $value){
-            if(substr($key, 0, 7) == "status_"){
-              $id_role = substr($key, 7);
+            if(substr($key, 0, 5) == "role_"){
+              $id_role = substr($key, 5);
               if(preg_match("/^[0-9]+$/", $id_role)){
-                $user["status"][] = $id_role;
+                $user["roles"][] = $id_role;
               }
             }
           }
@@ -93,7 +93,7 @@
                 $user["login"],
                 $user["password"],
                 $user["email"],
-                $user["status"]
+                $user["roles"]
               )
             ){
               $env->redirect(
@@ -106,13 +106,13 @@
         }
         $env->set_out("user", $user);
       }
-      else $env->erreur("impossible de lire la liste des status");
+      else $env->erreur("impossible de lire la liste des roles");
     }
 
     function edit(&$env){
       $data = $env->data();
-      if($this->status){
-        $env->set_out("status", $this->status);
+      if($this->roles){
+        $env->set_out("roles", $this->roles);
         if($user = $data->user($_GET[$env->param("id")])){
           if($_POST){
             $VALID = true;
@@ -132,12 +132,12 @@
               }
               if($VALID) $user["password"] = md5($_POST["password"]);
             }
-            $user["status"] = array();
+            $user["roles"] = array();
             foreach($_POST as $key => $value){
-              if(substr($key, 0, 7) == "status_"){
-                $id_role = substr($key, 7);
-                if(preg_match("/^[0-9]+$/", $id_role) && isset($this->status[$id_role])){
-                  $user["status"][] = $id_role;
+              if(substr($key, 0, 5) == "role_"){
+                $id_role = substr($key, 5);
+                if(preg_match("/^[0-9]+$/", $id_role) && isset($this->roles[$id_role])){
+                  $user["roles"][] = $id_role;
                 }
               }
             }
@@ -148,7 +148,7 @@
                   $user["login"],
                   $user["password"],
                   $user["email"],
-                  $user["status"]
+                  $user["roles"]
                 )
               )
               $env->redirect(
@@ -162,7 +162,7 @@
         }
         else $env->erreur("Impossible de lire les informations de cet utilisateur");
       }
-      else $env->erreur("impossible de lire la liste des status");
+      else $env->erreur("impossible de lire la liste des roles");
     }
 
     function del(&$env){
@@ -201,7 +201,7 @@
 
     function roles(&$env){
       $data = $env->data();
-      $roles = $data->status();
+      $roles = $data->roles();
       $id_role = isset($_GET[$env->param("id")]) && $_GET[$env->param("id")] ? $_GET[$env->param("id")] : 0;
       $env->set_out("id_role", $id_role);
       if(!isset($roles) || $roles === false){
@@ -271,21 +271,21 @@
         $env->erreur("impossible de supprimer les actions du role");
         return;
       }
-      $action_status = array();
+      $action_roles = array();
       $als = array();
       foreach($_POST as $key => $value){
-        if(substr($key, 0, 7) == "module_" && ($action = substr($key, 7))) $action_status[$action] = $role["id"];
-        elseif(substr($key, 0, 11) == "controleur_" && ($action = substr($key, 11))) $action_status[$action] = $role["id"];
+        if(substr($key, 0, 7) == "module_" && ($action = substr($key, 7))) $action_roles[$action] = $role["id"];
+        elseif(substr($key, 0, 11) == "controleur_" && ($action = substr($key, 11))) $action_roles[$action] = $role["id"];
         elseif(substr($key, 0, 3) == "al_" && ($al_index = substr($key, 3))) $als[] = $al_index;
       }
       foreach($als as $al_index){
         $al_prefix = "action_".$al_index."_";
         $al_prefix_length = strlen($al_prefix);
         foreach($_POST as $key => $value){
-          if(substr($key, 0, $al_prefix_length) == $al_prefix) $action_status[$value] = $role["id"];
+          if(substr($key, 0, $al_prefix_length) == $al_prefix) $action_roles[$value] = $role["id"];
         }
       }
-      foreach($action_status as $action => $id_role){
+      foreach($action_roles as $action => $id_role){
         if(!$data->add_role_action($id_role, $action)){
           $env->erreur("impossible d'enregistrer les actions du role");
           return;