From 54a381027a8ea6022787bd9b3ac8fc5e2cfd7036 Mon Sep 17 00:00:00 2001
From: Alexandre Cases <alexandre.cases@etu.univ-tlse2.fr>
Date: Mon, 13 Jun 2016 11:18:17 +0200
Subject: [PATCH] Version: 2.4.3.8

---
 README-LABINVENT.md                    | 6 +++---
 src/Controller/AppController.php       | 4 ++++
 src/Controller/MaterielsController.php | 2 --
 src/Controller/UsersController.php     | 3 +++
 src/Template/Layout/default.ctp        | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/README-LABINVENT.md b/README-LABINVENT.md
index 592119f..b52e09a 100755
--- a/README-LABINVENT.md
+++ b/README-LABINVENT.md
@@ -50,10 +50,10 @@ Logiciel testé et validé sur les configurations suivantes :
 
 VERSION ACTUELLE
 
-Date: 10/06/2016
-Version: 2.4.3.7
+Date: 13/06/2016
+Version: 2.4.3.8
 
-Ajout utilisateur - Mode ldap --> Bugfixes utilisateur sans mail 
+Ajout informations debug - Utilisateur LDAP
 			
 Version majeure en cours (2.5): https://projects.irap.omp.eu/versions/99
 
diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
index 84d8421..06acd57 100755
--- a/src/Controller/AppController.php
+++ b/src/Controller/AppController.php
@@ -156,6 +156,9 @@ class AppController extends Controller
         }
         $this->set('username', $this->LdapAuth->user('givenname')[0].' '.$this->LdapAuth->user('sn')[0]);
         
+        
+        
+        
         $configuration = TableRegistry::get('Configurations')->find()->where(['id =' => 1])->first();
         $this->set('configuration', $configuration);
         $this->request->session()->write("authType", $configuration->authentificationType_ldap);
@@ -169,6 +172,7 @@ class AppController extends Controller
         		echo '<tr><td><strong>'.$nom.' </strong></td><td>'.$valeur.'</td></tr>';
         };
         $this->set('displayElement', $displayElement);
+        
     }
     
     // "le materiel", "le suivi"...
diff --git a/src/Controller/MaterielsController.php b/src/Controller/MaterielsController.php
index bc25ea4..6894a3f 100755
--- a/src/Controller/MaterielsController.php
+++ b/src/Controller/MaterielsController.php
@@ -152,8 +152,6 @@ class MaterielsController extends AppController
     	}
     	
     	
-    	$this->myDebug($this);
-    	
     	$this->paginate = [
             'contain' => ['SurCategories', 'Categories', 'SousCategories', 'GroupesThematiques', 'GroupesMetiers', 'Organismes', 'Sites'],
     		'order' => ['Materiels.numero_laboratoire' => 'desc']
diff --git a/src/Controller/UsersController.php b/src/Controller/UsersController.php
index cb93bad..c2f8ae4 100755
--- a/src/Controller/UsersController.php
+++ b/src/Controller/UsersController.php
@@ -83,6 +83,9 @@ class UsersController extends AppController
         ];
         $users = $this->paginate($this->Users);
 
+        //Affichage informations disponible pour l'utilisateur connecté
+        $this->myDebug($this->LdapAuth->user());
+        
         $this->set(compact('users'));
         $this->set('_serialize', ['users']);
     }
diff --git a/src/Template/Layout/default.ctp b/src/Template/Layout/default.ctp
index 84aac9c..e4a3069 100755
--- a/src/Template/Layout/default.ctp
+++ b/src/Template/Layout/default.ctp
@@ -94,7 +94,7 @@ $cakeDescription = 'Labinvent 2.0';
 					</i></td>
 					<td id="version">
 						<!-- VERSION M.m.f.b (version (M)ajeure, version (m)ineure, numero de nouvelle (f)onctionnalite, numero de (b)ugfix) -->
-						<font color="black">VERSION 2.4.3.6 (10/06/2016)</font>
+						<font color="black">VERSION 2.4.3.8 (13/06/2016)</font>
 					</td>
 				</tr>
 			</table>
--
libgit2 0.21.2