Commit 29f5918b26753f994b52339098fdbb690ed65fdc
1 parent
100699f4
Exists in
master
and in
3 other branches
Version: 2.4.4.3
Demande (en terminé) : bugfixes users (mail et login auto) Version majeure en cours (2.4): https://projects.irap.omp.eu/versions/107 ROADMAP: https://projects.irap.omp.eu/projects/labinvent/roadmap
Showing
4 changed files
with
11 additions
and
26 deletions
Show diff stats
README-LABINVENT.md
| ... | ... | @@ -50,10 +50,10 @@ Logiciel testé et validé sur les configurations suivantes : |
| 50 | 50 | |
| 51 | 51 | VERSION ACTUELLE |
| 52 | 52 | |
| 53 | -Date: 15/06/2016 | |
| 54 | -Version: 2.4.4.2 | |
| 53 | +Date: 16/06/2016 | |
| 54 | +Version: 2.4.4.3 | |
| 55 | 55 | |
| 56 | -Demande (en terminé) : tri liste utilisateurs | |
| 56 | +Demande (en terminé) : bugfixes users (mail et login auto) | |
| 57 | 57 | |
| 58 | 58 | Version majeure en cours (2.4): https://projects.irap.omp.eu/versions/107 |
| 59 | 59 | ... | ... |
src/Model/Table/LdapConnectionsTable.php
| ... | ... | @@ -191,7 +191,13 @@ class LdapConnectionsTable extends AppTable { |
| 191 | 191 | //tri des utilisateurs par nom |
| 192 | 192 | sort($utilisateurs); |
| 193 | 193 | |
| 194 | - return $utilisateurs; | |
| 194 | + $users = []; | |
| 195 | + for($i = 0; $i < sizeof($utilisateurs); $i++) { | |
| 196 | + $users[$utilisateurs[$i]] = $utilisateurs[$i]; | |
| 197 | + } | |
| 198 | + debug($users); | |
| 199 | + | |
| 200 | + return $users; | |
| 195 | 201 | } |
| 196 | 202 | |
| 197 | 203 | /** | ... | ... |
src/Model/Table/UsersTable.php
| ... | ... | @@ -99,27 +99,6 @@ class UsersTable extends AppTable |
| 99 | 99 | return $rules; |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - // $ldapName = login | |
| 103 | - public function getEmailFromLdapName($ldapName) { | |
| 104 | - if(isset($ldapName)) { | |
| 105 | - $attributes = TableRegistry::get('LdapConnections')->getUserAttributes($ldapName); | |
| 106 | - @$mail = $attributes[0]['mail'][0]; | |
| 107 | - return $mail; | |
| 108 | - } | |
| 109 | - } | |
| 110 | - | |
| 111 | - public function getLdapUsers() { | |
| 112 | - $allUsers = TableRegistry::get('LdapConnections')->getAllLdapUsers(); | |
| 113 | - | |
| 114 | - $ldapUsers = []; | |
| 115 | - $usersName = []; | |
| 116 | - foreach($allUsers as $user) | |
| 117 | - if(!empty($user['sn'][0]) && !empty($user['givenname'][0])) | |
| 118 | - array_push($usersName, $user['sn'][0] . ' ' . $user['givenname'][0]); | |
| 119 | - | |
| 120 | - return $ldapUsers; | |
| 121 | - } | |
| 122 | - | |
| 123 | 102 | |
| 124 | 103 | |
| 125 | 104 | function beforeSave($event, $entity, $options) { | ... | ... |
src/Template/Layout/default.ctp
| ... | ... | @@ -94,7 +94,7 @@ $cakeDescription = 'Labinvent 2.0'; |
| 94 | 94 | </i></td> |
| 95 | 95 | <td id="version"> |
| 96 | 96 | <!-- VERSION M.m.f.b (version (M)ajeure, version (m)ineure, numero de nouvelle (f)onctionnalite, numero de (b)ugfix) --> |
| 97 | - <font color="black">VERSION 2.4.4.2 (15/06/2016)</font> | |
| 97 | + <font color="black">VERSION 2.4.4.3 (16/06/2016)</font> | |
| 98 | 98 | </td> |
| 99 | 99 | </tr> |
| 100 | 100 | </table> | ... | ... |