Commit 79e4717bee4902377b3219da42b1afca06dd43a6
1 parent
9c933d39
Exists in
master
and in
3 other branches
Version: 2.4.3.7
Ajout utilisateur - Mode ldap --> Bugfixes utilisateur sans mail Version majeure en cours (2.5): https://projects.irap.omp.eu/versions/99 ROADMAP: https://projects.irap.omp.eu/projects/labinvent/roadmap
Showing
3 changed files
with
8 additions
and
4 deletions
Show diff stats
README-LABINVENT.md
... | ... | @@ -51,9 +51,9 @@ Logiciel testé et validé sur les configurations suivantes : |
51 | 51 | VERSION ACTUELLE |
52 | 52 | |
53 | 53 | Date: 10/06/2016 |
54 | -Version: 2.4.3.6 | |
54 | +Version: 2.4.3.7 | |
55 | 55 | |
56 | -Configurations / form - Visibilité infos ldap | |
56 | +Ajout utilisateur - Mode ldap --> Bugfixes utilisateur sans mail | |
57 | 57 | |
58 | 58 | Version majeure en cours (2.5): https://projects.irap.omp.eu/versions/99 |
59 | 59 | ... | ... |
src/Controller/UsersController.php
... | ... | @@ -204,7 +204,11 @@ class UsersController extends AppController |
204 | 204 | if (!empty($u[$i][$this->request->session()->read('authType')][0])) { |
205 | 205 | |
206 | 206 | if ($userName == $u[$i]['givenname'][0].' '.$u[$i]['sn'][0]) { |
207 | - $this->set ('email', $u[$i]['mail'][0] ); | |
207 | + if (isset($u[$i]['mail'][0]) && filter_var($u[$i]['mail'][0], FILTER_VALIDATE_EMAIL)) { | |
208 | + $this->set ('email', $u[$i]['mail'][0] ); | |
209 | + } else { | |
210 | + $this->set ('email', ' '); | |
211 | + } | |
208 | 212 | } |
209 | 213 | } |
210 | 214 | ... | ... |
src/Template/Configurations/edit.ctp
... | ... | @@ -29,7 +29,7 @@ |
29 | 29 | echo $this->Form->input('emailGuest5', ['label' => 'Mail guest 5']); |
30 | 30 | |
31 | 31 | echo $this->Form->input('use_ldap', ['label' => 'Utilisation du LDAP', 'onchange' => 'display_ldap();']); |
32 | - echo '<div id="ldap" style="border-top: 1px solid #CCC; border-bottom: 1px solid #CCC; margin-bottom: 0; background: #EEE;">'; | |
32 | + echo '<div id="ldap" style="border-top: 1px solid #CCC; border-bottom: 1px solid #CCC; margin-bottom: 0; background: #EEE; '.$disp.'">'; | |
33 | 33 | echo $this->Form->input('host_ldap', ['label' => 'Host du LDAP']); |
34 | 34 | echo $this->Form->input('port_ldap', ['label' => 'Port du LDAP']); |
35 | 35 | echo $this->Form->input('authentificationType_ldap', ['label' => 'Type d\'authentification du LDAP']); | ... | ... |