Commit 140daa86f58ff0923300d55e76ab90855c903449
1 parent
a1d41dea
more conflict resolution
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@93 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
0 additions
and
14 deletions
lib/class.AuthLdap.php
| ... | ... | @@ -373,26 +373,12 @@ class AuthLdap { |
| 373 | 373 | for( $i = 0; $i < $info["count"]; $i++){ |
| 374 | 374 | // Get the username, and create an array indexed by it... |
| 375 | 375 | // Modify these as you see fit. |
| 376 | -<<<<<<< class.AuthLdap.php | |
| 377 | 376 | $uname = $info[$i]["uid"][0]; |
| 378 | 377 | // add to the array for each attribute in my list |
| 379 | - for ( $i = 0; $i < count( $attributeArray); $i++) { | |
| 380 | - $userslist["$uname"]["$attributeArray[$i]"] = $info[$i][strtolower($attributeArra[$i])][0]; | |
| 381 | - } | |
| 382 | - /* | |
| 383 | - $userslist["$uname"]["uid"] = $info[$i]["uid"][0]; | |
| 384 | - $userslist["$uname"]["mail"] = $info[$i]["mail"][0]; | |
| 385 | - $userslist["$uname"]["phone"] = $info[$i]["telephonenumber"][0]; | |
| 386 | - $userslist["$uname"]["job"] = $info[$i]["employeetype"][0]; | |
| 387 | - $userslist["$uname"]["entryid"] = $info[$i]["entryid"][0]; | |
| 388 | - */ | |
| 389 | -======= | |
| 390 | - $uname = $info[$i]["uid"][0]; | |
| 391 | 378 | // add to the array for each attribute in my list |
| 392 | 379 | for ( $i = 0; $i < count( $attributeArray); $i++) { |
| 393 | 380 | $userslist["$uname"]["$attributeArray[$i]"] = $info[$i][strtolower($attributeArra[$i])][0]; |
| 394 | 381 | } |
| 395 | ->>>>>>> 1.2 | |
| 396 | 382 | } |
| 397 | 383 | |
| 398 | 384 | if ( !@asort( $userslist)) { | ... | ... |